pretty_diff 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d1f835ae8a57aac2ad92f1d48d993dddfddc9a
-  data.tar.gz: 11ceb7a5777734a552fc0f0635f6b605a2ae9990
+  metadata.gz: aa8fdb38ef57b9d401bd02d8755fd35c12f1b328
+  data.tar.gz: 7813678ca54211816a9a7c484b837b718548623a
 SHA512:
-  metadata.gz: 89316d8b0c1f972a8adf6baf7f6fa3d55903f8bb648eaa6eb8587070328be015530495495baf6263bf2f4691b56ff26e74745dd418cdf78d111c9cc756469319
-  data.tar.gz: 1d5d2ab3bf30422b7b95d2fa3b0c9cc9cd1dcbac53bcb7a238a9953f7bfe0f20ca0e506d90ca46439322a7889f387714f7e1f652170caf4aaacba1fa6f4d3d66
+  metadata.gz: e103bae389f4f3433db7ced131e764490ce97f9c9c2f19ecf377e92baf37164016c847f037d12cf7f52ba272803163a25a98e8ef5e5affd26e03299c1540fd86
+  data.tar.gz: 9b3af1e0b269f1c5f259b2962e8ff9d2e71c1fb17fa2806d1de45ba61623466d74d137096a753c45b9ca788a2f333138f4fcf9b0bc6892b1ad05a95dc865e69c

data/Gemfile

@@ -1,8 +1,3 @@
 source "http://rubygems.org"
 
-gem "charlock_holmes", "~> 0.6"
-
-group :development do
-  gem "jeweler"
-  gem "builder"
-end
+gemspec

data/Gemfile.lock

@@ -1,9 +1,15 @@
+PATH
+  remote: .
+  specs:
+    pretty_diff (2.1.0)
+      pretty_diff
+
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.5)
+    ansi (1.4.3)
     builder (3.1.4)
-    charlock_holmes (0.6.9.1)
     descendants_tracker (0.0.3)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
@@ -46,11 +52,14 @@ GEM
     rake (10.1.1)
     rdoc (4.1.1)
       json (~> 1.4)
+    turn (0.9.6)
+      ansi
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   builder
-  charlock_holmes (~> 0.6)
   jeweler
+  pretty_diff!
+  turn

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/lib/pretty_diff.rb

@@ -1,5 +1,5 @@
 module PrettyDiff
-  class InvalidGenerator < Exception; end
+  class InvalidGeneratorError < Exception; end
 end
 
 def require_local(suffix)
@@ -11,5 +11,6 @@ require_local 'pretty_diff/diff'
 require_local 'pretty_diff/chunk'
 require_local 'pretty_diff/line_numbers'
 require_local 'pretty_diff/line'
+require_local 'pretty_diff/word_diff_finder'
 require_local 'pretty_diff/abstract_generator'
 require_local 'pretty_diff/basic_generator'

data/lib/pretty_diff/chunk.rb

@@ -15,9 +15,13 @@ module PrettyDiff
 
   private
 
+    def wdiff(lines)
+      PrettyDiff::WordDiffFinder.find_word_diffs(lines)
+    end
+
     def find_lines
       [].tap do |lines|
-        contents.split(/\r?\n|\r/).each do |line_str|
+        wdiff(contents.split(/\r?\n|\r/)).each do |line_str|
           line = Line.new(self, line_str)
           next if line.ignored?
           lines << line

data/lib/pretty_diff/diff.rb

@@ -26,7 +26,7 @@ module PrettyDiff
       @unified_diff = unified_diff
       @options = options
       @out_encoding = 
-      @generator = validate_generator(options[:generator]) || BasicGenerator
+      @generator = validate_generator( options[:generator] || BasicGenerator )
       @out_encoding = options[:out_encoding] || 'utf-8'
     end
 
@@ -73,7 +73,7 @@ module PrettyDiff
       if valid_generator?(gen)
         gen
       else
-        raise InvalidGenerator, "#{gen.inspect} is not a valid PrettyDiff generator"
+        raise InvalidGeneratorError, "#{gen.inspect} is not a valid PrettyDiff generator"
       end
     end
 

data/lib/pretty_diff/line.rb

@@ -34,6 +34,5 @@ module PrettyDiff
     def not_modified?
       status == :not_modified
     end
-
   end
 end

data/lib/pretty_diff/word_diff_finder.rb

@@ -0,0 +1,130 @@
+require 'levenshtein'
+require 'diff_match_patch_native'
+
+module PrettyDiff
+  module WordDiffFinder
+    WDIFF_INSERTED_START = "\x01"
+    WDIFF_INSERTED_END   = "\x02"
+    WDIFF_DELETED_START  = "\x03"
+    WDIFF_DELETED_END    = "\x04"
+
+    extend self
+
+    def find_word_diffs(lines)
+      dmp = DiffMatchPatch.new
+      result = []
+      added_next_line_already = false
+
+      lines.each_with_index do |line, idx|
+        if added_next_line_already
+          added_next_line_already = false
+          next
+        end
+
+        previous_line = idx > 0 ? lines[idx - 1] : nil
+        stripped_line = strip(line)
+        next_line = lines[idx + 1]
+        stripped_next_line = strip(next_line || '')
+        after_next_line = idx < lines.size ? lines[idx + 2] : nil
+
+        # only show word diffing when change was a single line
+        if changed_line?(line, next_line) && !changed_block?(previous_line, line, next_line, after_next_line) && similiar_lines?(stripped_line, stripped_next_line)
+          diffs = dmp.diff_cleanup_semantic!(dmp.diff_main(stripped_line, stripped_next_line, true))
+          replacement, next_replacement = join_diffs(diffs)
+
+          if line.include?(replacement.first)
+            # String#gsub in the form gsub(exp,replacement) has odd quirks
+            # affecting the replacement string which sometimes require
+            # lots of escaping slashes. Ruby users are frequently directed
+            # to use the block form instead.
+            # See: http://stackoverflow.com/a/13818467/204927
+            line.gsub!(replacement.first) { replacement.last }
+          else # it has to come form next_line
+            next_line.gsub!(replacement.first) { replacement.last }
+            added_next_line_already = true
+          end
+
+          if next_line && next_replacement
+            next_line.gsub!(next_replacement.first) { next_replacement.last }
+            added_next_line_already = true
+          end
+        end
+
+        result << line
+
+        if added_next_line_already
+          result << next_line
+        end
+      end
+
+      result
+    end
+
+  private
+
+    def to_utf8(str)
+      str.force_encoding('utf-8')
+    end
+
+    def wrap_in_inserted_tokens(str)
+      "#{WDIFF_INSERTED_START}#{str}#{WDIFF_INSERTED_END}"
+    end
+
+    def wrap_in_deleted_tokens(str)
+      "#{WDIFF_DELETED_START}#{str}#{WDIFF_DELETED_END}"
+    end
+
+    def join_diffs(diffs)
+      inserted, deleted = '', ''
+      inserted_with_token, deleted_with_token = '', ''
+
+      operations = diffs.map(&:first)
+      # inline change
+      if ( operations.include?(1) && !operations.include?(-1) ) || ( operations.include?(-1) && !operations.include?(1) )
+        diffs.each do |diff|
+          deleted += diff.last
+          if diff.first == 0 # didn't change
+            deleted_with_token += diff.last
+          elsif diff.first == 1 # inserted
+            deleted_with_token += wrap_in_inserted_tokens(diff.last)
+          elsif diff.first == -1 # deleted
+            deleted_with_token += wrap_in_deleted_tokens(diff.last)
+          end
+        end
+      else
+        diffs.each do |diff|
+          if diff.first == 0 # didn't change
+            inserted += diff.last
+            deleted  += diff.last
+            inserted_with_token += diff.last
+            deleted_with_token  += diff.last
+          elsif diff.first == 1  # inserted
+            inserted += diff.last
+            inserted_with_token += wrap_in_inserted_tokens(diff.last)
+          elsif diff.first == -1 # deleted
+            deleted += diff.last
+            deleted_with_token += wrap_in_deleted_tokens(diff.last)
+          end
+        end
+      end
+
+      [[to_utf8(deleted), to_utf8(deleted_with_token)], [to_utf8(inserted), to_utf8(inserted_with_token)]]
+    end
+
+    def strip(line)
+      line[1..-1]
+    end
+
+    def changed_line?(line, next_line)
+      (line =~ /^-/ && next_line =~ /^\+/)
+    end
+
+    def changed_block?(previous_line, line, next_line, after_next_line)
+      (previous_line =~ /^-/ && line =~ /^-/ && next_line =~ /^\+/ && after_next_line =~ /^\+/)
+    end
+
+    def similiar_lines?(first, second)
+      Levenshtein.distance(first, second) <= [first.size, second.size].max * 0.60
+    end
+  end
+end

data/pretty_diff.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pretty_diff"
-  s.version = "2.0.1"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = "2014-02-18"
+  s.date = "2014-02-21"
   s.description = "PrettyDiff is a highly customizable library for creating fully featured HTML\n                     listings out of unified diff format strings.\n                     Include copy/paste-safe line numbers and built-in syntax highlighting."
   s.email = "ilya.sabanin@gmail.com"
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/pretty_diff/encoding.rb",
     "lib/pretty_diff/line.rb",
     "lib/pretty_diff/line_numbers.rb",
+    "lib/pretty_diff/word_diff_finder.rb",
     "pretty_diff.gemspec",
     "test/abstract_generator_test.rb",
     "test/basic_generator_test.rb",
@@ -46,15 +47,21 @@ Gem::Specification.new do |s|
     "test/fixtures/csharp.diff.html",
     "test/fixtures/first.diff",
     "test/fixtures/first.diff.html",
+    "test/fixtures/inline_change.diff",
+    "test/fixtures/mid_sized_change.diff",
+    "test/fixtures/quick_change.diff",
     "test/fixtures/second.diff",
     "test/fixtures/single_line.diff",
     "test/fixtures/single_line.diff.html",
+    "test/fixtures/space_change.diff",
+    "test/fixtures/special_characters.diff",
     "test/fixtures/text.diff",
     "test/fixtures/text.diff.html",
     "test/fixtures/windows-cp1251-lf",
     "test/helper.rb",
     "test/line_numbers_test.rb",
-    "test/line_test.rb"
+    "test/line_test.rb",
+    "test/word_diff_finder_test.rb"
   ]
   s.homepage = "http://github.com/isabanin/pretty_diff"
   s.require_paths = ["lib"]
@@ -65,18 +72,21 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<charlock_holmes>, ["~> 0.6"])
+      s.add_runtime_dependency(%q<pretty_diff>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<builder>, [">= 0"])
+      s.add_development_dependency(%q<turn>, [">= 0"])
     else
-      s.add_dependency(%q<charlock_holmes>, ["~> 0.6"])
+      s.add_dependency(%q<pretty_diff>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
+      s.add_dependency(%q<turn>, [">= 0"])
     end
   else
-    s.add_dependency(%q<charlock_holmes>, ["~> 0.6"])
+    s.add_dependency(%q<pretty_diff>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
+    s.add_dependency(%q<turn>, [">= 0"])
   end
 end
 

data/test/basic_generator_test.rb

@@ -4,26 +4,26 @@ class BasicGeneratorTest < MiniTest::Unit::TestCase
 
   def test_generated_html
     diff = new_diff(fixture('first.diff'), :generator => PrettyDiff::BasicGenerator)
-    assert_equal fixture('first.diff.html'), diff.to_html
+    assert_equal fixture('first.diff.html'), strip_word_indicators(diff.to_html)
   end
 
   def test_more_generated_html
     diff = new_diff(fixture('text.diff'), :generator => PrettyDiff::BasicGenerator)
-    assert_equal fixture('text.diff.html'), diff.to_html
+    assert_equal fixture('text.diff.html'), strip_word_indicators(diff.to_html)
   end
 
   def test_another_generated_html
     diff = new_diff(fixture('csharp.diff'), :generator => PrettyDiff::BasicGenerator)
-    assert_equal fixture('csharp.diff.html'), diff.to_html
+    assert_equal fixture('csharp.diff.html'), strip_word_indicators(diff.to_html)
   end
 
   def test_generate_html_for_blank
     diff = new_diff(fixture('blank.diff'), :generator => PrettyDiff::BasicGenerator)
-    assert_equal fixture('blank.diff.html'), diff.to_html
+    assert_equal fixture('blank.diff.html'), strip_word_indicators(diff.to_html)
   end
 
   def test_generate_html_for_single_line_diffs
     diff = new_diff(fixture('single_line.diff'), :generator => PrettyDiff::BasicGenerator)
-    assert_equal fixture('single_line.diff.html'), diff.to_html
+    assert_equal fixture('single_line.diff.html'), strip_word_indicators(diff.to_html)
   end
 end

data/test/diff_test.rb

@@ -36,7 +36,7 @@ class DiffTest < MiniTest::Unit::TestCase
   end
 
   def test_invalid_custom_generator
-    assert_raises PrettyDiff::InvalidGenerator do
+    assert_raises PrettyDiff::InvalidGeneratorError do
       new_diff('bla', :generator => NotAGenerator)
     end
 

data/test/fixtures/inline_change.diff

@@ -0,0 +1,29 @@
+@@ -130,7 +130,7 @@ class GroovyImage {
+       graph.drawImage(image,new AffineTransform(1.0d,0.0d,0.0d,1.0d,left,top),null);
+       def parsed Width = parseValue(width,image.width,true,"100%");
+       return newImage;
+-      
++
+   }
+ 
+   BufferedImage parseAndFit(image,width,height) {
+@@ -274,15 +274,17 @@ class GroovyImage {
+           switch(type) {
+               case "px":
+                   return decimalValue / size;
+-              case "%":
++              case "percent":
+                   return decimalValue / 100;
++              case "%":
++                  return decimalValue / 100;                 
+               default:
+                   return decimalValue;
+           }
+       }
+   }
+ 
+-    Object argsLength(args,length) {
++    Object argsLength(args,lengths) {
+         if(args.size() < length) {
+             while(args.size() < length) {
+                 args.add("change");

data/test/fixtures/mid_sized_change.diff

@@ -0,0 +1,109 @@
+diff --git a/Core/Contents/Source/PolySceneLine.cpp b/Core/Contents/Source/PolySceneLine.cpp
+index 6c374f2..3d3adc7 100755
+--- a/Core/Contents/Source/PolySceneLine.cpp
++++ b/Core/Contents/Source/PolySceneLine.cpp
+@@ -26,43 +26,29 @@
+ 
+ using namespace Polycode;
+ 
+-SceneLine::SceneLine(Vector3 start, Vector3 end) : SceneEntity() {
++SceneLine::SceneLine(Vector3 start, Vector3 end) : SceneMesh(Mesh::LINE_MESH) {
+ 	this->ent1 = NULL;
+-	this->ent2 = NULL;	
+-	
++	this->ent2 = NULL;
+ 	this->start = start;
+ 	this->end = end;	
+-	
+-	mesh = new Mesh(Mesh::LINE_MESH);	
+-	
+-	Polygon *poly = new Polygon();
+-	poly->addVertex(0,0,0);
+-	poly->addVertex(0,0,0);	
+-	mesh->addPolygon(poly);
+-	
++	initLine();
+ 	ignoreParentMatrix = true;
+-	
+-	lineWidth = 1.0;
+-	lineSmooth = false;
+-	
+ }
+ 
+-SceneLine::SceneLine(SceneEntity *ent1, SceneEntity *ent2) : SceneEntity() {
++SceneLine::SceneLine(SceneEntity *ent1, SceneEntity *ent2) : SceneMesh(Mesh::LINE_MESH) {
+ 	this->ent1 = ent1;
+ 	this->ent2 = ent2;	
++	initLine();
++	ignoreParentMatrix = true;
+ 
+-	mesh = new Mesh(Mesh::LINE_MESH);	
+-	
++}
++
++void SceneLine::initLine() { 
+ 	Polygon *poly = new Polygon();
+-	poly->addVertex(0,0,0);
+-	poly->addVertex(0,0,0);	
++	poly->addVertex(0,0,0,0,0);
++	poly->addVertex(0,0,0,1,0);	
+ 	mesh->addPolygon(poly);
+-	
+-	ignoreParentMatrix = true;
+-	
+-	lineWidth = 1.0;
+-	lineSmooth = false;
+-	
++	mesh->arrayDirtyMap[RenderDataArray::TEXCOORD_DATA_ARRAY] = true;		
+ }
+ 
+ SceneLine *SceneLine::SceneLineWithPositions(Vector3 start, Vector3 end) {
+@@ -70,7 +56,6 @@ SceneLine *SceneLine::SceneLineWithPositions(Vector3 start, Vector3 end) {
+ }
+ 
+ SceneLine::~SceneLine() {
+-	delete mesh;
+ }
+ 
+ void SceneLine::setStart(Vector3 start) {
+@@ -81,11 +66,11 @@ void SceneLine::setEnd(Vector3 end) {
+ 	this->end = end;
+ }
+ 
+-void SceneLine::Render() {	
++void SceneLine::Update(){
+ 
+ 	Vector3 v1;
+-	Vector3 v2;		
+-
++	Vector3 v2;
++	
+ 	if(ent1 != NULL && ent2 != NULL) {
+ 		v1 = ent1->getConcatenatedMatrix().getPosition();
+ 		v2 = ent2->getConcatenatedMatrix().getPosition();
+@@ -93,22 +78,8 @@ void SceneLine::Render() {
+ 		v1 = start;
+ 		v2 = end;
+ 	}
+-
+-	
+-	mesh->getPolygon(0)->getVertex(0)->set(v1.x,v1.y,v1.z); 
+-	mesh->getPolygon(0)->getVertex(1)->set(v2.x,v2.y,v2.z); 	
+-	mesh->arrayDirtyMap[RenderDataArray::VERTEX_DATA_ARRAY] = true;
+-	
+-	Renderer *renderer = CoreServices::getInstance()->getRenderer();
+-	
+-	renderer->setLineSize(lineWidth);
+-	renderer->setLineSmooth(lineSmooth);
+-	
+-	renderer->setTexture(NULL);	
+-	renderer->pushDataArrayForMesh(mesh, RenderDataArray::VERTEX_DATA_ARRAY);
+-	renderer->pushDataArrayForMesh(mesh, RenderDataArray::TEXCOORD_DATA_ARRAY);	
+-	renderer->pushDataArrayForMesh(mesh, RenderDataArray::NORMAL_DATA_ARRAY);		
+-	
+-	renderer->drawArrays(mesh->getMeshType());	
+ 	
++	mesh->getPolygon(0)->getVertex(0)->set(v1.x,v1.y,v1.z);
++	mesh->getPolygon(0)->getVertex(1)->set(v2.x,v2.y,v2.z);
++	mesh->arrayDirtyMap[RenderDataArray::VERTEX_DATA_ARRAY] = true;	
+ }

data/test/fixtures/quick_change.diff

@@ -0,0 +1,3 @@
+@@ -1 +1 @@
+-some example text
++testsome example text

data/test/fixtures/space_change.diff

@@ -0,0 +1,9 @@
+@@ -127,7 +127,7 @@ class GroovyImage {
+       // createGraphics() needs a display, find workaround.
+       def graph = newImage.createGraphics();
+       graph.drawImage(image,new AffineTransform(1.0d,0.0d,0.0d,1.0d,left,top),null);
+-      def parsedWidth = parseValue(width,image.width,true,"100%");
++      def parsed Width = parseValue(width,image.width,true,"100%");
+       return newImage;
+   }
+ 

data/test/fixtures/special_characters.diff

@@ -0,0 +1,25 @@
+@@ -54,11 +54,12 @@ class GroovyImage {
+ 
+       void addOperation(command) {
+ 
+-        def matcher = command =~ "([a-z]+)\\((.*)\\).*";
++/* 57 line */
++        def matcher = command =~ "([a-z]+)\\((.*)\\).*"; 
+         matcher.find();
+ 
+-        def method = matcher.group(1);
+-        def args = matcher.group(2).split(",").toList();
++        def method = matcher.group(1); /* 61 line */
++        def args = matcher.group(62).split(",").toList();
+ 
+         switch(method) {
+             case "scale": // vertical,horizontal 
+@@ -79,7 +80,7 @@ class GroovyImage {
+         }
+     }
+ 
+-  BufferedImage parseAndRotate(image,degrees,x,y) { 
++  BufferedImage parseAndRotate(images83line,degrees,x,y) { 
+       def parsedRadians = 0; 
+       try {
+           parsedRadians = Math.toRadians(Double.parseDouble(degrees));

data/test/helper.rb

@@ -1,17 +1,34 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'minitest/autorun'
+require 'turn'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'pretty_diff')
 
 class MiniTest::Unit::TestCase
+  include PrettyDiff::WordDiffFinder
+
+  class FixtureNotFoundError < StandardError; end
 
   def new_diff(*args)
     PrettyDiff::Diff.new(*args)
   end
 
   def fixture(name)
-    File.read(File.join(File.dirname(__FILE__), "fixtures", name))
+    path = File.join(File.dirname(__FILE__), "fixtures", name)
+    if File.exist?(path)
+      File.read(path)
+    else
+      raise FixtureNotFoundError.new("Fixture at path '#{path}' was not found")
+    end
+  end
+
+  def strip_word_indicators(text)
+    text
+    .gsub(WDIFF_INSERTED_START, '')
+    .gsub(WDIFF_INSERTED_END, '')
+    .gsub(WDIFF_DELETED_START, '')
+    .gsub(WDIFF_DELETED_END, '')
   end
 
 end

data/test/line_test.rb

@@ -8,10 +8,10 @@ class LineTest < MiniTest::Unit::TestCase
   end
 
   def test_contents
-    assert_equal "     color: #999;", @lines[0].contents
-    assert_equal "-  table.account-overview td .status {", @lines[3].contents
-    assert_equal "+  table.account-overview td.label.top {", @lines[4].contents
-    assert_equal "   }", @lines.last.contents
+    assert_equal "     color: #999;", strip_word_indicators(@lines[0].contents)
+    assert_equal "-  table.account-overview td .status {", strip_word_indicators(@lines[3].contents)
+    assert_equal "+  table.account-overview td.label.top {", strip_word_indicators(@lines[4].contents)
+    assert_equal "   }", strip_word_indicators(@lines.last.contents)
   end
 
   def test_ignored

data/test/word_diff_finder_test.rb

@@ -0,0 +1,79 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class WordDiffFinderTest < MiniTest::Unit::TestCase
+  def test_join_diff_from_dmp
+    diffs = [[0, "    Object argsLength(args,length"], [1, "s"], [0, ") {\n"]]
+    expected = "    Object argsLength(args,lengths) {\n"
+    expected_with_token = "    Object argsLength(args,length#{wrap_in_inserted_tokens 's'}) {\n"
+    assert_equal [expected, expected_with_token], join_diffs(diffs).first
+
+    diffs = [[0, "              case \""], [-1, "%"], [1, "percent"], [0, "\":\n"]]
+    expected_first = "              case \"%\":\n"
+    expected_first_with_token = "              case \"#{wrap_in_deleted_tokens '%'}\":\n"
+
+    expected_second = "              case \"percent\":\n"
+    expected_second_with_token = "              case \"#{wrap_in_inserted_tokens 'percent'}\":\n"
+
+    first, second = join_diffs(diffs)
+    assert_equal [expected_first, expected_first_with_token], first
+    assert_equal [expected_second, expected_second_with_token], second
+
+    diffs = [[-1, "      "], [0, "\n"]]
+    expected = "      \n"
+    expected_with_token = "#{wrap_in_deleted_tokens '      '}\n"
+    assert_equal [expected, expected_with_token], join_diffs(diffs).first
+  end
+
+  def test_highlighting_inline_diff
+    content = fixture('inline_change.diff').lines
+    lines_found = find_word_diffs(content)
+    assert_equal content.size, lines_found.size
+
+    # two inline delete highlighted
+    assert 2, num_of_tags(WDIFF_DELETED_START, lines_found)
+    # two inline insert highlighted
+    assert 2, num_of_tags(WDIFF_INSERTED_START, lines_found)
+  end
+
+  def test_highlighting_quick_diff
+    content = fixture('quick_change.diff').lines
+    lines_found = find_word_diffs(content)
+    assert_equal content.size, lines_found.size
+
+    assert lines_include_wrapped_content(lines_found, wrap_in_inserted_tokens('test'))
+    # one inline insert highlighted
+    assert_equal 1, num_of_tags(WDIFF_INSERTED_START, lines_found)
+  end
+
+  def test_highlighting_single_space_diff
+    content = fixture('space_change.diff').lines
+    lines_found = find_word_diffs(content)
+    assert_equal content.size, lines_found.size
+
+    assert lines_include_wrapped_content(lines_found, "parsed#{wrap_in_inserted_tokens ' '}Width")
+    # one inline insert highlighted
+    assert_equal 1, num_of_tags(WDIFF_INSERTED_START, lines_found)
+  end
+
+  def test_highlighting_special_character_diff
+    content = fixture('special_characters.diff').lines
+    lines_found = find_word_diffs(content)
+    assert_equal content.size, lines_found.size
+
+    assert lines_include_wrapped_content(lines_found, wrap_in_inserted_tokens("s83line"))
+
+    # one inline insert highlighted
+    assert_equal 1, num_of_tags(WDIFF_INSERTED_START, lines_found)
+    assert_equal 0, num_of_tags(WDIFF_DELETED_START, lines_found)
+  end
+
+  private
+
+  def lines_include_wrapped_content(lines, content)
+    lines.map(&:to_s).join("\n").include?(content)
+  end
+
+  def num_of_tags(tag, lines)
+    lines.join("\n").scan(/#{tag}/).size
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pretty_diff
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Ilya Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: charlock_holmes
+  name: pretty_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   PrettyDiff is a highly customizable library for creating fully featured HTML
                        listings out of unified diff format strings.
@@ -78,6 +92,7 @@ files:
 - lib/pretty_diff/encoding.rb
 - lib/pretty_diff/line.rb
 - lib/pretty_diff/line_numbers.rb
+- lib/pretty_diff/word_diff_finder.rb
 - pretty_diff.gemspec
 - test/abstract_generator_test.rb
 - test/basic_generator_test.rb
@@ -92,15 +107,21 @@ files:
 - test/fixtures/csharp.diff.html
 - test/fixtures/first.diff
 - test/fixtures/first.diff.html
+- test/fixtures/inline_change.diff
+- test/fixtures/mid_sized_change.diff
+- test/fixtures/quick_change.diff
 - test/fixtures/second.diff
 - test/fixtures/single_line.diff
 - test/fixtures/single_line.diff.html
+- test/fixtures/space_change.diff
+- test/fixtures/special_characters.diff
 - test/fixtures/text.diff
 - test/fixtures/text.diff.html
 - test/fixtures/windows-cp1251-lf
 - test/helper.rb
 - test/line_numbers_test.rb
 - test/line_test.rb
+- test/word_diff_finder_test.rb
 homepage: http://github.com/isabanin/pretty_diff
 licenses: []
 metadata: {}