grit-ext 0.0.5 → 0.0.6

data/lib/grit/ext/diff_hunk.rb

@@ -4,19 +4,23 @@ module Grit
 
     def initialize(header, diff_hunk)
       @header = header
-      @lines = diff_hunk.each_with_index.map do |line, index|
+      @lines = []
+
+      diff_hunk.each_with_index.map do |line, index|
         content = line[1..line.length - 1]
-        status = case line[0]
-                 when '+' then :added
-                 when '-' then :removed
-                 when ' ' then :unchanged
-                 else
-                   nil
-                 end
+        status = DiffLine.status_from_char(line[0])
 
         if status
-          diff_position = header.start + index
-          DiffLine.new(content, status, diff_position)
+          line_number = header.start + index
+
+          case status
+          when :added, :unchanged
+            line_number = line_number - removed.count
+          when :removed
+            line_number = line_number - added.count
+          end
+
+          @lines << DiffLine.new(content, status, line_number, index)
         end
       end.compact
     end

data/lib/grit/ext/diff_line.rb

@@ -1,5 +1,5 @@
 module Grit
-  class DiffLine < Struct.new(:content, :status, :diff_position)
+  class DiffLine < Struct.new(:content, :status, :line_number, :diff_position)
     def added?
       status == :added
     end
@@ -12,16 +12,28 @@ module Grit
       status == :unchanged
     end
 
+    def self.status_from_char(char)
+      case char
+      when '+' then :added
+      when '-' then :removed
+      when ' ' then :unchanged
+      else
+        nil
+      end
+    end
+
     def to_s
-      symbol = case status
-               when :added
-                 '+'
-               when :removed
-                 '-'
-               when :unchanged
-                 ' '
-               end
-      "#{symbol}#{content}"
+      "#{char_from_status}#{content}"
+    end
+
+    private
+
+    def char_from_status
+      case status
+      when :added then '+'
+      when :removed then '-'
+      when :unchanged then ' '
+      end
     end
   end
 end

data/lib/grit/ext/version.rb

@@ -1,5 +1,5 @@
 module Grit
   module Ext
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grit-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit