markdiff 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b3010fbe85faa7a63e166ffe7d18c45007f01a3
-  data.tar.gz: b1a4af8e050c517e9017e60539f3ccb946f394e4
+  metadata.gz: 1701e665032bb63942b695d27e60fd525b45ee03
+  data.tar.gz: 7e499210e87d6c72e0a72311276fc5459d7a55b0
 SHA512:
-  metadata.gz: 6012e20cb4d9129e710c4f49c88cdfe652b8a1951c8b07425433745bead2d49dc58d58c3a251a4042e11c9ef24c2788bee4beb81b705b17f6a6cfeaca737699f
-  data.tar.gz: aab0e79a022a104345388c5f79d378a6affa4774f92ee7aad69abb4211058449d454b0399ee52d49c75216c2bf5844653cdc592abc9a17405bb697edaa7ecb1a
+  metadata.gz: fadc3f8eec548e6242e5a42953e2a14cca69e5c430d3915f27670a1d7d975d95fefc9d86086a80b5a0fd0787244fd964195d2f0bfdc60c265713f9e4aa686a21
+  data.tar.gz: 4fb4ee14d8183d2d831aeb3e62b1ccae757fe2d8cbc8e7e7844c763e45b625ea75412b188bb9472091b51ec8d26b644e2832ab8278cf37f919bf73c378595d60

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.1
+- Support li.added and li.removed
+
 ## 0.2.0
 - Support div.changed and li.changed
 

data/lib/markdiff/differ.rb

@@ -30,10 +30,10 @@ module Markdiff
           mark_top_level_node_as_changed(operation.target_node)
         when ::Markdiff::Operations::AddPreviousSiblingOperation
           operation.target_node.add_previous_sibling(operation.inserted_node)
-          mark_li_as_changed(operation.target_node)
+          mark_li_as_changed(operation.target_node) if operation.target_node.name != "li"
           mark_top_level_node_as_changed(operation.target_node.parent)
         when ::Markdiff::Operations::RemoveOperation
-          operation.target_node.replace(operation.inserted_node)
+          operation.target_node.replace(operation.inserted_node) if operation.target_node != operation.inserted_node
           mark_li_as_changed(operation.target_node)
           mark_top_level_node_as_changed(operation.target_node)
         end
@@ -87,7 +87,7 @@ module Markdiff
           if inverted_identity_map[after_child]
             next
           end
-          if before_child.to_html == after_child.to_html
+          if before_child.to_html.gsub("\n", "") == after_child.to_html.gsub("\n", "")
             identity_map[before_child] = after_child
             inverted_identity_map[after_child] = before_child
           end
@@ -167,7 +167,7 @@ module Markdiff
     # @param [Nokogiri::XML::Node] node
     def mark_li_as_changed(node)
       until node.parent.nil? || node.parent.fragment?
-        if node.name == "li" && node["class"] != "changed"
+        if node.name == "li" && node["class"].nil?
           node["class"] = "changed"
         end
         node = node.parent

data/lib/markdiff/operations/add_child_operation.rb

@@ -5,7 +5,13 @@ module Markdiff
     class AddChildOperation < Base
       # @return [String]
       def inserted_node
-        "<ins>#{@inserted_node}</ins>"
+        if @inserted_node.name == "li"
+          @inserted_node["class"] = "added"
+          @inserted_node.inner_html = "<ins>#{@inserted_node.inner_html}</ins>"
+          @inserted_node
+        else
+          "<ins>#{@inserted_node}</ins>"
+        end
       end
     end
   end

data/lib/markdiff/operations/add_previous_sibling_operation.rb

@@ -5,7 +5,14 @@ module Markdiff
     class AddPreviousSiblingOperation < Base
       # @return [String]
       def inserted_node
-        "<ins>#{@inserted_node}</ins>"
+        if @inserted_node.name == "li"
+          node = @inserted_node.clone
+          node["class"] = "added"
+          node.inner_html = "<ins>#{@inserted_node.inner_html}</ins>"
+          node
+        else
+          "<ins>#{@inserted_node}</ins>"
+        end
       end
     end
   end

data/lib/markdiff/operations/remove_operation.rb

@@ -5,7 +5,13 @@ module Markdiff
     class RemoveOperation < Base
       # @return [String]
       def inserted_node
-        "<del>#{@target_node}</del>"
+        if target_node.name == "li"
+          target_node["class"] = "removed"
+          target_node.inner_html = "<del>#{target_node.inner_html}</del>"
+          target_node
+        else
+          "<del>#{target_node}</del>"
+        end
       end
     end
   end

data/lib/markdiff/version.rb

@@ -1,3 +1,3 @@
 module Markdiff
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdiff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryo Nakamura