markdiff 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d21040c507d42a274d28a00d208d8f8870326697
-  data.tar.gz: d2530960295fac137bb42865a97f237b59b640bd
+  metadata.gz: 8e49f17b9acfed092397a0802104a99b6b29b82a
+  data.tar.gz: 614efe0f44dba5c6fb62796a45e99c9e580a3d7e
 SHA512:
-  metadata.gz: 0d0210b09bff8321cac16ff7e2aa9e1d918bcf1fcc827d0fe024e799a2a1fa16e8cd14ea387f1bf6222dae6e783b3c488a735bf3960a5e5a57fb142f3b675693
-  data.tar.gz: 82f349441e1760e223fbdcf760a6e008cac624f9470d5ca67946bc18695601f2ab9289f75e6f718530cc48b3665d2dd0de77b7fe0be6715800f028a9cf0ba975
+  metadata.gz: ada905b91769facabbd99b9afaa5a05a623701d8520322ac781727640214b01a184bcb6803167901c66cfe1a59cf3659787a3105de03a9d59e99ebdcefda59c7
+  data.tar.gz: 477f06da5d70286baec743f843e6c6476fb0d47cf7d1c10e9d194968e6ac213ff57a191f379a409695e0540d8e0b24c269356f28102e77983e69962f142872b9

data/CHANGELOG.md

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

data/lib/markdiff/differ.rb

@@ -72,6 +72,21 @@ 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
@@ -90,7 +105,7 @@ module Markdiff
       # 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? && before_child.to_html.gsub("\n", "") == after_child.to_html.gsub("\n", "")
+        if !after_child.nil? && check_exact_match(before_child, after_child)
           identity_map[before_child] = after_child
           inverted_identity_map[after_child] = before_child
         end
@@ -104,7 +119,7 @@ module Markdiff
           when identity_map[before_child]
             break
           when inverted_identity_map[after_child]
-          when before_child.to_html.gsub("\n", "") == after_child.to_html.gsub("\n", "")
+          when check_exact_match(before_child, after_child)
             identity_map[before_child] = after_child
             inverted_identity_map[after_child] = before_child
           end
@@ -128,12 +143,16 @@ module Markdiff
               operations << ::Markdiff::Operations::TextDiffOperation.new(target_node: before_child, after_node: after_child)
             end
           when before_child.name == after_child.name
-            if detect_href_difference(before_child, after_child)
+            if before_child.attributes == after_child.attributes
+              identity_map[before_child] = after_child
+              inverted_identity_map[after_child] = before_child
+              operations += create_patch(before_child, after_child)
+            elsif detect_href_difference(before_child, after_child)
               operations << ::Markdiff::Operations::AddDataBeforeHrefOperation.new(after_href: after_child["href"], target_node: before_child)
+              identity_map[before_child] = after_child
+              inverted_identity_map[after_child] = before_child
+              operations += create_patch(before_child, after_child)
             end
-            identity_map[before_child] = after_child
-            inverted_identity_map[after_child] = before_child
-            operations += create_patch(before_child, after_child)
           when detect_heading_level_difference(before_child, after_child)
             operations << ::Markdiff::Operations::AddDataBeforeTagNameOperation.new(after_tag_name: after_child.name, target_node: before_child)
             identity_map[before_child] = after_child

data/lib/markdiff/version.rb

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

metadata

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