hyp_diff 0.0.2 → 0.0.3

data/lib/hyp_diff.rb

@@ -107,7 +107,7 @@ module HypDiff; class << self
           insertions << change.new_element.text
         when "=" then
           apply_insertions_and_deletions
-          new_text << change.new_element.text
+          new_text << escape_html(change.new_element.text)
         when "+" then
           insertions << change.new_element.text
         when "-" then
@@ -132,10 +132,10 @@ module HypDiff; class << self
 
     def apply_insertions_and_deletions
       if deletions.length > 0
-        @new_text << deletion_tag(deletions.join)
+        new_text << deletion_tag(deletions.join)
       end
       if insertions.length > 0
-        @new_text << insertion_tag(insertions.join)
+        new_text << insertion_tag(insertions.join)
       end
 
       @insertions = []
@@ -143,11 +143,17 @@ module HypDiff; class << self
     end
 
     def insertion_tag(text)
-      @render_insertion.call(text)
+      @render_insertion.call(escape_html(text))
     end
 
     def deletion_tag(text)
-      @render_deletion.call(text)
+      @render_deletion.call(escape_html(text))
+    end
+
+    def escape_html(text)
+      fragment = Nokogiri::HTML::DocumentFragment.parse("")
+      fragment.content = text
+      fragment.to_html
     end
 
   end
@@ -162,7 +168,7 @@ module HypDiff; class << self
 
   def text_fragments(node)
     if node.is_a?(Nokogiri::XML::Text)
-      node.text.split(/(?=[.!, ])|\b/).map { |token| TextFromNode.new(token, node) }
+      node.text.split(/(?=[.!,<> ])|\b/).map { |token| TextFromNode.new(token, node) }
     else
       node.children.map { |c| text_fragments(c) }.flatten
     end

data/lib/hyp_diff/version.rb

@@ -1,3 +1,3 @@
 module HypDiff
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/hyp_diff_spec.rb

@@ -98,6 +98,24 @@ describe HypDiff do
     end
   end
 
+  describe "handling html entities" do
+    it "handles them transparently when whole words are entities" do
+      expect_diff(
+        "foo < bar",
+        "foo > bar",
+        "foo <del>&lt;</del><ins>&gt;</ins> bar"
+      )
+    end
+
+    it "handles them transparently when words contain entities" do
+      expect_diff(
+        "f&#252; b&#228;r",
+        "f&#246; b&#228;r",
+        "<del>f&#252;</del><ins>f&#246;</ins> b&#228;r"
+      )
+    end
+  end
+
   describe "handling whitespace" do
     it "treats consecutive whitespace as a single whitespace" do
       expect_diff("hello  world", "hello world", "hello world")

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: hyp_diff
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Kristian Hanekamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,14 +86,15 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
-description: "\nHypDiff compares HTML snippets. It generates a diff between two input
-  snippets. The diff is a new HTML snippet that highlights textual changes. The tag
-  structure and formatting of the input snippets is preserved. The generated diff
-  snippet is valid, well-formed HTML and suitable for presentation inside a WYSIWYG
+description: ! "\nHypDiff compares HTML snippets. It generates a diff between two
+  input snippets. The diff is a new HTML snippet that highlights textual changes.
+  The tag structure and formatting of the input snippets is preserved. The generated
+  diff snippet is valid, well-formed HTML and suitable for presentation inside a WYSIWYG
   environment.\n  "
 email:
 - kris.hanekamp@gmail.com
@@ -107,26 +118,33 @@ files:
 homepage: https://github.com/krishan/hyp_diff
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2073153059126079532
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2073153059126079532
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: HypDiff compares html snippets
 test_files:
 - spec/hyp_diff_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7f4edc59168406b4b1194beb77ecde74bd4e2645
-  data.tar.gz: e89d6a3a2a7c55250d3d9183c6f2b6fcdbb16a80
-SHA512:
-  metadata.gz: d0197e591ec496470791dd49b63bcb78f88fa44d9d86e42bca2ddf95633f9f6576094cb4173aa7d29c71088482e2544c16fbb4ab30e29009947a1f6330f6e2a5
-  data.tar.gz: ed945683196fe5997645ba09f38d16853c9d2acac68d72cf531d8590d8f42227ad3e8389c73d2e254b12ee58d9e6200e16aedd269f026d195323f51cf08cf07d