unified_diff 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/unified_diff/diff.rb

@@ -7,7 +7,11 @@ module UnifiedDiff
     FILE_PATTERN =      /(.*)\t'{2}?(.*)'{2}?/
     OLD_FILE_PATTERN =  /--- #{FILE_PATTERN}/
     NEW_FILE_PATTERN =  /\+\+\+ #{FILE_PATTERN}/
-    CHUNK_PATTERN =     /@@ -(\d+),(\d+) \+(\d+),(\d+) @@/
+    # Match assignment is tricky for CHUNK_PATTERN
+    # $1,$2 are static, but $3,$4,$5 vary
+    # if pattern is X,Y then $3 = X,Y, $4 = X, $5 = Y
+    # if pattern is X   then $3 = X
+    CHUNK_PATTERN =     /@@ -(\d+),(\d+) \+((\d+),(\d+)|(\d+)) @@/ 
     ADDED_PATTERN =     /\+(.*)/
     REMOVED_PATTERN =   /-(.*)/
     UNCHANGED_PATTERN = / (.*)/
@@ -41,8 +45,13 @@ module UnifiedDiff
         when CHUNK_PATTERN
           old_begin = $1.to_i
           old_end = old_begin + $2.to_i
-          new_begin = $3.to_i
-          new_end = new_begin + $4.to_i
+          if $3.include?(',') # Will match if non-edge case encountered
+            new_begin = $4.to_i
+            new_end = new_begin + $5.to_i
+          else
+            new_begin = $3.to_i
+            new_end = new_begin + 1
+          end
           @working_chunk = Chunk.new(original: (old_begin...old_end), modified: (new_begin...new_end))
           @chunks << @working_chunk
         when ADDED_PATTERN

data/test/test_unified_diff.rb

@@ -93,4 +93,16 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
   def test_to_s
     assert_equal @original, @diff.to_s
   end
+
+  def test_handles_one_element_chunk_range
+    diff = <<-DIFF.unindent
+      --- /tmp/old.txt	2011-06-01 14:18:37.000000000 -0500
+      +++ /tmp/new.txt	2011-06-01 14:18:38.000000000 -0500
+      @@ -0,0 +1 @@
+      +   IFrame
+    DIFF
+    @diff = UnifiedDiff.parse(diff)
+    @chunk = @diff.chunks.first
+    assert_equal (1...2), @chunk.modified_range
+  end
 end

data/unified_diff.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unified_diff}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Neufeld"]

metadata

@@ -2,7 +2,7 @@
 name: unified_diff
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ryan Neufeld
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1003861306608030008
+      hash: -1091492518955260007
       segments: 
       - 0
       version: "0"