diffy 2.1.4 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 76ce8cec51c77bf0432c2d9a953bfdd181b1ceea
+  data.tar.gz: 47d22a7082256b6f54ac767c4d8611e2e52519ee
+SHA512:
+  metadata.gz: e081b4c0c64904d11d4fb20aea33476b2181f4e4123bce3dd739a217b812da09add950fefeedd3f52177a540c1999d845c7a1610389481408f21d6faa5f6d3f6
+  data.tar.gz: 06870ff6c73584776b531591418cae5fd5d8890912c6062f7e03a9ed2ac66c06fde3fa01f6aba4d75ad0167c62c14a1c3aec85caefa20deece3a174a09a75a24

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+allow_empty_diff is true by default
+
 == 2.1.0 ==
 Windows support
 

data/CONTRIBUTORS

@@ -4,3 +4,5 @@
 * Lincoln Ritter
 * Bernhard Weichel
 * Yuichi Tateno
+* Nigel Thorne
+* Richard Stiller

data/README.md

@@ -151,10 +151,10 @@ And even deals a bit with the formatting!
 
 ### Empty Diff Behavior
 
-By default diffy will return the full text of its first input if there are no
-differences with the second input.  Sometimes it's useful to return the actual
-diff, the empty string, in this case.  To enable this behavior, simply use the
-`:allow_empty_diff => true` option when initializing.
+By default diffy will return empty string if there are no
+differences in inputs. In previous versions the full text of its first input
+was returned in this case. To restore this behaviour simply use the
+`:allow_empty_diff => false` option when initializing.
 
 ### Plus and Minus symbols in HTML output
 

data/VERSION

@@ -1 +1 @@
-2.1.4
+3.0.0

data/diffy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "diffy"
-  s.version = "2.1.4"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2013-04-10"
+  s.date = "2013-07-15"
   s.description = "Convenient diffing in ruby"
   s.email = "sgrock@gmail.com"
   s.extra_rdoc_files = [
@@ -38,11 +38,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/samg/diffy/tree/master"
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.2"
   s.summary = "A convenient way to diff string in ruby"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.0"])

data/lib/diffy/diff.rb

@@ -14,7 +14,8 @@ module Diffy
           :source => 'strings',
           :include_diff_info => false,
           :include_plus_and_minus_in_html => false,
-          :context => nil
+          :context => nil,
+          :allow_empty_diff => true,
         }
       end
 

data/lib/diffy/html_formatter.rb

@@ -40,7 +40,11 @@ module Diffy
     end
 
     def wrap_lines(lines)
-      %'<div class="diff">\n  <ul>\n#{lines.join("\n")}\n  </ul>\n</div>\n'
+      if lines.empty?
+        %'<div class="diff"/>'
+      else
+        %'<div class="diff">\n  <ul>\n#{lines.join("\n")}\n  </ul>\n</div>\n'
+      end
     end
 
     def highlighted_words
@@ -61,14 +65,19 @@ module Diffy
         dir2 = chunk2.each_char.first
         case [dir1, dir2]
         when ['-', '+']
-          line_diff = Diffy::Diff.new(
-            split_characters(chunk1),
-            split_characters(chunk2)
-          )
-          hi1 = reconstruct_characters(line_diff, '-')
-          hi2 = reconstruct_characters(line_diff, '+')
-          processed << (index + 1)
-          [hi1, hi2]
+          if chunk1.each_char.take(3).join("") =~ /^(---|\+\+\+|\\\\)/ and
+              chunk2.each_char.take(3).join("") =~ /^(---|\+\+\+|\\\\)/
+            ERB::Util.h(chunk1)
+          else
+            line_diff = Diffy::Diff.new(
+                                        split_characters(chunk1),
+                                        split_characters(chunk2)
+                                        )
+            hi1 = reconstruct_characters(line_diff, '-')
+            hi2 = reconstruct_characters(line_diff, '+')
+            processed << (index + 1)
+            [hi1, hi2]
+          end
         else
           ERB::Util.h(chunk1)
         end

data/spec/diffy_spec.rb

@@ -35,7 +35,8 @@ describe Diffy::Diff do
       end
 
       it "should show everything" do
-        Diffy::Diff.new(@path1, @path2, :source => 'files').to_s.should == <<-DIFF
+        Diffy::Diff.new(@path1, @path2, :source => 'files', :allow_empty_diff => false).
+          to_s.should == <<-DIFF
  foo
  bar
  bang
@@ -70,10 +71,12 @@ describe Diffy::Diff do
          @path1, @path2 = tempfile(string1), tempfile(string2)
        end
        it "should not raise invalid encoding issues" do
-         Diffy::Diff.new(@path1, @path2, :source => 'files').to_s.should == <<-DIFF
+         desired = <<-DIFF
 -Foo ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000
 +Bar ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000
          DIFF
+         desired.force_encoding("ASCII-8BIT") if desired.respond_to?(:force_encoding)
+         Diffy::Diff.new(@path1, @path2, :source => 'files').to_s.should == desired
        end
      end
 
@@ -173,7 +176,7 @@ describe Diffy::Diff do
 
   describe "options[:diff]" do
     it "should accept an option to diff" do
-      @diff = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :diff => "-w")
+      @diff = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :diff => "-w", :allow_empty_diff => false)
       @diff.to_s.should == <<-DIFF
   foo
  bar
@@ -198,7 +201,7 @@ describe Diffy::Diff do
       end
 
       it "should show everything" do
-        Diffy::Diff.new(@string1, @string2).to_s.should == <<-DIFF
+        Diffy::Diff.new(@string1, @string2, :allow_empty_diff => false).to_s.should == <<-DIFF
  foo
  bar
  bang

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 2.1.4
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +65,7 @@ files:
 - spec/diffy_spec.rb
 homepage: http://github.com/samg/diffy/tree/master
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --inline-source
@@ -77,21 +73,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A convenient way to diff string in ruby
 test_files: []