diffy-3.0.6/ 0000755 0001750 0001750 00000000000 12401335376 012203 5 ustar boutil boutil diffy-3.0.6/spec/ 0000755 0001750 0001750 00000000000 12401335376 013135 5 ustar boutil boutil diffy-3.0.6/spec/demo_app.rb 0000644 0001750 0001750 00000003136 12401335376 015251 0 ustar boutil boutil require 'rubygems'
require 'sinatra'
require 'json'
require File.dirname(__FILE__) + '/../lib/diffy'
blk = proc do
Diffy::Diff.default_options.merge! JSON.parse(params[:options]) rescue {}
haml "- d = Diffy::Diff.new(params[:one].to_s, params[:two].to_s)\n%div= d.to_s(:html)\n%pre= d.to_s"
end
post '/', &blk
get '/', &blk
__END__
@@ layout
%html
%head
:css
.diff{overflow:auto;}
.diff ul{background:#fff;overflow:auto;font-size:13px;list-style:none;margin:0;padding:0;display:table;width:100%;}
.diff del, .diff ins{display:block;text-decoration:none;}
.diff li{padding:0; display:table-row;margin: 0;height:1em;}
.diff li.ins{background:#dfd; color:#080}
.diff li.del{background:#fee; color:#b00}
.diff li:hover{background:#ffc}
.diff del, .diff ins, .diff span{white-space:pre-wrap;font-family:courier;}
.diff del strong{font-weight:normal;background:#fcc;}
.diff ins strong{font-weight:normal;background:#9f9;}
.diff li.diff-comment { display: none; }
.diff li.diff-block-info { background: none repeat scroll 0 0 gray; }
%body
= yield
%form{:action => '', :method => 'post'}
%label JSON diff options
%textarea{:name => 'options', :style => 'width:100%;height:250px;'}= params[:options]
%label One
%textarea{:name => 'one', :style => 'width:100%;height:250px;'}= params[:one]
%br/
%label Two
%textarea{:name => 'two', :style => 'width:100%;height:250px;'}= params[:two]
%br/
%input{:type => 'submit'}
%br/
@@ index
%div.title Hello world!!!!!
diffy-3.0.6/spec/diffy_spec.rb 0000644 0001750 0001750 00000044677 12401335376 015617 0 ustar boutil boutil require 'rspec'
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'diffy'))
describe Diffy::Diff do
describe "diffing two files" do
def tempfile(string, fn = 'diffy-spec')
t = Tempfile.new(fn)
# ensure tempfiles aren't unlinked when GC runs by maintaining a
# reference to them.
@tempfiles ||=[]
@tempfiles.push(t)
t.print(string)
t.flush
t.close
t.path
end
it "should accept file paths as arguments" do
string1 = "foo\nbar\nbang\n"
string2 = "foo\nbang\n"
path1, path2 = tempfile(string1), tempfile(string2)
expect(Diffy::Diff.new(path1, path2, :source => 'files').to_s).to eq <<-DIFF
foo
-bar
bang
DIFF
end
it "should accept file paths with spaces as arguments" do
string1 = "foo\nbar\nbang\n"
string2 = "foo\nbang\n"
path1, path2 = tempfile(string1, 'path with spaces'), tempfile(string2, 'path with spaces')
expect(Diffy::Diff.new(path1, path2, :source => 'files').to_s).to eq <<-DIFF
foo
-bar
bang
DIFF
end
it "should accept file paths with spaces as arguments on windows" do
begin
orig_verbose, $VERBOSE = $VERBOSE, nil #silence redefine constant warnings
orig_windows, Diffy::WINDOWS = Diffy::WINDOWS, true
string1 = "foo\nbar\nbang\n"
string2 = "foo\nbang\n"
path1, path2 = tempfile(string1, 'path with spaces'), tempfile(string2, 'path with spaces')
expect(Diffy::Diff.new(path1, path2, :source => 'files').to_s).to eq <<-DIFF
foo
-bar
bang
DIFF
ensure
Diffy::WINDOWS, $VERBOSE = orig_windows, orig_verbose
end
end
describe "with no line different" do
before do
string1 = "foo\nbar\nbang\n"
string2 = "foo\nbar\nbang\n"
@path1, @path2 = tempfile(string1), tempfile(string2)
end
it "should show everything" do
expect(Diffy::Diff.new(@path1, @path2, :source => 'files', :allow_empty_diff => false).
to_s).to eq <<-DIFF
foo
bar
bang
DIFF
end
it "should not show everything if the :allow_empty_diff option is set" do
expect(Diffy::Diff.new(@path1, @path2, :source => 'files', :allow_empty_diff => true).to_s).to eq('')
end
end
describe "with lines that start with backslashes" do
before do
string1 = "foo\n\\\\bag\nbang\n"
string2 = "foo\n\\\\bar\nbang\n"
@path1, @path2 = tempfile(string1), tempfile(string2)
end
it "should not leave lines out" do
expect(Diffy::Diff.new(@path1, @path2, :source => 'files').to_s).to eq <<-DIFF
foo
-\\\\bag
+\\\\bar
bang
DIFF
end
end
describe "with non valid UTF bytes" do
before do
string1 = "Foo ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000\n"
string2 = "Bar ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000\n"
@path1, @path2 = tempfile(string1), tempfile(string2)
end
it "should not raise invalid encoding issues" do
desired = <<-DIFF
-Foo ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000
+Bar ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000
DIFF
desired.force_encoding("ASCII-8BIT") if desired.respond_to?(:force_encoding)
expect(Diffy::Diff.new(@path1, @path2, :source => 'files').to_s).to eq(desired)
end
end
end
describe "handling temp files" do
it "should unlink tempfiles after generating the diff" do
before_tmpfiles = Dir.entries(Dir.tmpdir)
d = ::Diffy::Diff.new("a", "b").to_s
after_tmpfiles = Dir.entries(Dir.tmpdir)
expect(before_tmpfiles).to match_array(after_tmpfiles)
end
it "should still be able to generate multiple diffs" do
d = ::Diffy::Diff.new("a", "b")
expect(d.to_s).to be_a String
expect(d.to_s(:html)).to be_a String
end
end
describe "options[:context]" do
it "should limit context lines to 1" do
diff = Diffy::Diff.new("foo\nfoo\nBAR\nbang\nbaz", "foo\nfoo\nbar\nbang\nbaz", :context => 1)
expect(diff.to_s).to eq <<-DIFF
foo
-BAR
+bar
bang
DIFF
end
end
describe "options[:include_plus_and_minus_in_html]" do
it "defaults to false" do
@diffy = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n")
expect(@diffy.options[:include_plus_and_minus_in_html]).to eq(false)
end
it "can be set to true" do
@diffy = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :include_plus_and_minus_in_html=> true )
expect(@diffy.options[:include_plus_and_minus_in_html]).to eq(true)
end
describe "formats" do
it "includes symbols in html_simple" do
output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\nbang\n", :include_plus_and_minus_in_html => true ).
to_s(:html_simple)
expect(output).to eq <<-HTML
HTML
end
it "includes symbols in html" do
output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\naba\nbang\n", :include_plus_and_minus_in_html => true ).
to_s(:html)
expect(output).to eq <<-HTML
HTML
end
end
end
describe "options[:include_diff_info]" do
it "defaults to false" do
@diffy = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n")
expect(@diffy.options[:include_diff_info]).to eq(false)
end
it "can be set to true" do
@diffy = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :include_diff_info => true )
expect(@diffy.options[:include_diff_info]).to eq(true)
end
it "includes all diff output" do
output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\nbang\n", :include_diff_info => true ).to_s
expect(output.to_s).to match( /@@/)
expect(output).to match( /---/)
expect(output).to match( /\+\+\+/)
end
describe "formats" do
it "works for :color" do
output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\nbang\n", :include_diff_info => true ).to_s(:color)
expect(output).to match( /\e\[0m\n\e\[36m\@\@/ )
expect(output.to_s).to match( /\e\[90m---/)
expect(output.to_s).to match( /\e\[0m\n\e\[90m\+\+\+/)
end
it "works for :html_simple" do
output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\nbang\n", :include_diff_info => true ).to_s(:html_simple)
expect(output.split("\n")).to include( " @@ -1,3 +1,2 @@" )
expect(output).to include( "