markdiff 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e49f17b9acfed092397a0802104a99b6b29b82a
-  data.tar.gz: 614efe0f44dba5c6fb62796a45e99c9e580a3d7e
+  metadata.gz: dc5276d66e3a92675f67df003904b6af4e11e07a
+  data.tar.gz: 6f87e774e011a747c1d0ca04d3c03aa254ace843
 SHA512:
-  metadata.gz: ada905b91769facabbd99b9afaa5a05a623701d8520322ac781727640214b01a184bcb6803167901c66cfe1a59cf3659787a3105de03a9d59e99ebdcefda59c7
-  data.tar.gz: 477f06da5d70286baec743f843e6c6476fb0d47cf7d1c10e9d194968e6ac213ff57a191f379a409695e0540d8e0b24c269356f28102e77983e69962f142872b9
+  metadata.gz: 0875b2ed67d13d30eb534b9c791a2157f99da480815b8c2f92ab039defa67fdb70afcf2d1bafb78862771c38db7118df5e6ffea4cfe77e051589824eff370d91
+  data.tar.gz: 04d03b94cd96f994a7e752988ce33ba0117231ff7269a2efc17c6403c59e97d38899968a589d2e9d7ee56b8a7d0ee2a117837a875e990fcf51f9b8839c05bbe6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.3
+- Fix bug on comparing nodes
+
 ## 0.5.2
 - Fix bug on comparing attributes and text nodes
 

data/example/app.rb

@@ -8,6 +8,8 @@ get "/" do
   if params[:before] && params[:after]
     html_before = markdown.render(params[:before])
     html_after = markdown.render(params[:after])
+    p html_before
+    p html_after
     @diff = Markdiff::Differ.new.render(html_before, html_after)
   end
   erb :index

data/lib/markdiff/differ.rb

@@ -1,3 +1,4 @@
+require "diff/lcs"
 require "nokogiri"
 require "markdiff/operations/add_child_operation"
 require "markdiff/operations/add_data_before_href_operation"
@@ -72,21 +73,6 @@ module Markdiff
 
     private
 
-    # @param [Nokogiri::XML::Node] node1
-    # @param [Nokogiri::XML::Node] node2
-    # @return [false, true] True if given two nodes can be treated as same
-    def check_exact_match(node1, node2)
-      if node1.text?
-        if node2.text?
-          node1.to_s == node2.to_s
-        else
-          false
-        end
-      else
-        node1.to_html.gsub("\n", "") == node2.to_html.gsub("\n", "")
-      end
-    end
-
     # 1. Create identity map and collect patches from descendants
     #   1-1. Detect exact-matched nodes
     #   1-2. Detect partial-matched nodes and recursively walk through its children
@@ -102,30 +88,16 @@ module Markdiff
       identity_map = {}
       inverted_identity_map = {}
 
-      # Exactly matching with index
-      before_node.children.each_with_index do |before_child, before_index|
-        after_child = after_node.children[before_index]
-        if !after_child.nil? && check_exact_match(before_child, after_child)
+      ::Diff::LCS.sdiff(before_node.children.map(&:to_s), after_node.children.map(&:to_s)).each do |element|
+        type, before, after = *element
+        if type == "="
+          before_child = before_node.children[before[0]]
+          after_child = after_node.children[after[0]]
           identity_map[before_child] = after_child
           inverted_identity_map[after_child] = before_child
         end
       end
 
-      # Exactly matching
-      before_node.children.each do |before_child|
-        next if identity_map[before_child]
-        after_node.children.each do |after_child|
-          case
-          when identity_map[before_child]
-            break
-          when inverted_identity_map[after_child]
-          when check_exact_match(before_child, after_child)
-            identity_map[before_child] = after_child
-            inverted_identity_map[after_child] = before_child
-          end
-        end
-      end
-
       # Partial matching
       before_node.children.each do |before_child|
         if identity_map[before_child]

data/lib/markdiff/version.rb

@@ -1,3 +1,3 @@
 module Markdiff
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdiff
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler