unified_diff 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/unified_diff/chunk.rb

@@ -13,6 +13,18 @@ module UnifiedDiff
     end
 
 
+    # Render the chunk as it appeared in the original unified diff
+    #
+    # @return [String] the chunk as it appeared in the original unified diff
+    def to_s
+      "@@ "+
+        "-#{@original_range.begin},#{@original_range.count} " +
+        "+#{@modified_range.begin},#{@modified_range.count} " +
+      "@@\n" +
+      @raw_lines.join("\n") +
+      "\n"
+    end
+
     # Return an array of lines that were removed from the original version of the chunk
     #
     # @return [Array] the lines that were removed from the original

data/lib/unified_diff/diff.rb

@@ -12,11 +12,22 @@ module UnifiedDiff
     REMOVED_PATTERN =   /-(.*)/
     UNCHANGED_PATTERN = / (.*)/
 
+    # Create and parse a unified diff
+    #
+    # @param [String] a string containing a unified diff
+    # @return [Diff] the parsed diff
     def initialize(diff)
       @original = diff
       parse
     end
 
+    # Render the diff as it appeared originally
+    #
+    # @return [String] the original unified diff
+    def to_s
+      @original
+    end
+
   private
 
     def parse
@@ -28,7 +39,11 @@ module UnifiedDiff
         when NEW_FILE_PATTERN
           @modified_file, @modified_timestamp = $1, Time.parse($2)
         when CHUNK_PATTERN
-          @working_chunk = Chunk.new(original: ($1.to_i..$2.to_i), modified: ($3.to_i..$4.to_i))
+          old_begin = $1.to_i
+          old_end = old_begin + $2.to_i
+          new_begin = $3.to_i
+          new_end = new_begin + $4.to_i
+          @working_chunk = Chunk.new(original: (old_begin...old_end), modified: (new_begin...new_end))
           @chunks << @working_chunk
         when ADDED_PATTERN
           @working_chunk.send(:insert_addition, $1)

data/test/test_chunk.rb

@@ -42,4 +42,13 @@ class TestChunk < MiniTest::Unit::TestCase
     @chunk.send(:insert_unchanged, 'bar')
     assert_equal ['foo'], @chunk.added_lines
   end
+
+  def test_to_s
+    @chunk.send(:insert_addition,'foo')
+    to_s = <<-TO_S.unindent
+      @@ -1,2 +1,3 @@
+      +foo
+    TO_S
+    assert_equal to_s, @chunk.to_s
+  end
 end

data/test/test_unified_diff.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class TestUnifiedDiff < MiniTest::Unit::TestCase
   def setup
-    diff = <<-DIFF.unindent
+    @original = <<-DIFF.unindent
       --- original.txt	2011-05-31 11:14:13.000000000 -0500
       +++ modified.txt	2011-05-31 11:14:44.000000000 -0500
       @@ -1,5 +1,5 @@
@@ -13,7 +13,7 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
        qux
        quux
     DIFF
-    @diff = UnifiedDiff.parse(diff)
+    @diff = UnifiedDiff.parse(@original)
   end
 
   def test_setup_method_does_something
@@ -32,8 +32,21 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
 
   def test_parses_chunk_header
     @chunk = @diff.chunks.first
-    assert_equal (1..5), @chunk.original_range
-    assert_equal (1..5), @chunk.modified_range
+    assert_equal (1...6), @chunk.original_range
+    assert_equal (1...6), @chunk.modified_range
+  end
+
+  def test_parses_chunk_header_length_properly
+    diff = <<-DIFF.unindent
+      --- original.txt	2011-05-31 11:14:13.000000000 -0500
+      +++ modified.txt	2011-05-31 11:14:44.000000000 -0500
+      @@ -2,5 +3,5 @@
+       foo
+     DIFF
+     @diff = UnifiedDiff.parse(diff)
+     @chunk = @diff.chunks.first
+     assert_equal (2...7), @chunk.original_range
+     assert_equal (3...8), @chunk.modified_range
   end
 
   def test_parses_unchanged_line
@@ -76,4 +89,8 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     @diff = UnifiedDiff.parse(diff)
     assert_equal 2, @diff.chunks.length
   end
+
+  def test_to_s
+    assert_equal @original, @diff.to_s
+  end
 end

data/unified_diff.gemspec

@@ -5,10 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unified_diff}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ryan Neufeld}]
+  s.authors = ["Ryan Neufeld"]
   s.date = %q{2011-06-01}
   s.description = %q{unified_diff parses unified diff contents into easy-to-use Ruby objects}
   s.email = %q{ryan@ryanneufeld.ca}
@@ -33,9 +33,9 @@ Gem::Specification.new do |s|
     "unified_diff.gemspec"
   ]
   s.homepage = %q{http://github.com/rkneufeld/unified_diff}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.4}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Parse unified diffs in style}
 
   if s.respond_to? :specification_version then

metadata

@@ -2,7 +2,7 @@
 name: unified_diff
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ryan Neufeld
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-06-01 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -80,6 +81,7 @@ files:
 - test/test_chunk.rb
 - test/test_unified_diff.rb
 - unified_diff.gemspec
+has_rdoc: true
 homepage: http://github.com/rkneufeld/unified_diff
 licenses: 
 - MIT
@@ -93,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4395814823410856938
+      hash: -1003861306608030008
       segments: 
       - 0
       version: "0"
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Parse unified diffs in style