markdiff 0.5.4 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 253f738465580e885b9b7724ed900dbf171c90e3
-  data.tar.gz: b9b941d9fc3b4169e309750ee952698f40d4c60d
+SHA256:
+  metadata.gz: 720d3daa84f7b4c40f555ef52f2e9912e1d8170a120be554069679beab0d1954
+  data.tar.gz: 5b9a4631de297e8fa20e615d423c827075f0664b706f763334b65459bd8618a4
 SHA512:
-  metadata.gz: f3cc15598bf1ff8a2915a05b78fb9e0fce660edd5557de5f023353c1a355c5fa353b40beeb6c0caf4b81918aeea560b302e02c8f6c371c7f5d4a6810e482c9d8
-  data.tar.gz: 662a972f514dce5543a8b1f2a0107a8e05411751bef87bc7bef63c63b97ac6831d65fd1620b57534192b6aa5c1e9716ce52c989566df69399f4ddb59cfab2757
+  metadata.gz: 8d26e5b8cb610502f323eb8f7084c17c43a5879112b978a6faaae193d96d5534ff2254a6cac6af26988f44cc2be163130fc242667c0d591e8073fc5b6b3fb5cb
+  data.tar.gz: 945860da782918d04fbb6d38c61e4ae447aa1c3e448e2ec422617c3c52a5bc2ce904e14d3c8aaec43c1ab325a3fcf8c4880329d63303e679eeda66acfbbd4e47

data/CHANGELOG.md

@@ -1,30 +1,60 @@
+## 0.6.3
+
+- Support diff-lcs v1.4+.
+
+## 0.6.2
+
+- Support tr.added and tr.deleted.
+
+## 0.6.1
+
+- Fix patch order bug by making sort stable.
+
+## 0.6.0
+
+- Add .del class to all del elements.
+
+## 0.5.5
+
+- Preserve classes on adding new class (e.g. .added).
+
 ## 0.5.4
-- Fix bug on patch operations order
+
+- Fix bug on patch operations order.
 
 ## 0.5.3
-- Fix bug on comparing nodes
+
+- Fix bug on comparing nodes.
 
 ## 0.5.2
-- Fix bug on comparing attributes and text nodes
+
+- Fix bug on comparing attributes and text nodes.
 
 ## 0.5.1
-- Fix bug on text-diff operation
+
+- Fix bug on text-diff operation.
 
 ## 0.5.0
-- Wrap changed nodes by div.changed
+
+- Wrap changed nodes by div.changed.
 
 ## 0.4.0
-- Chanage .changed specs
-- Fix bugs on text diff
+
+- Chanage .changed specs.
+- Fix bugs on text diff.
 
 ## 0.3.0
-- Support partial text diff
+
+- Support partial text diff.
 
 ## 0.2.1
-- Support li.added and li.removed
+
+- Support li.added and li.removed.
 
 ## 0.2.0
-- Support div.changed and li.changed
+
+- Support div.changed and li.changed.
 
 ## 0.1.0
-- 1st Release
+
+- 1st Release.

data/lib/markdiff/differ.rb

@@ -14,34 +14,35 @@ module Markdiff
     # @param [Nokogiri::XML::Node] node
     # @return [Nokogiri::XML::Node] Converted node
     def apply_patch(operations, node)
-      operations.sort_by {|operation| -operation.priority }.each do |operation|
+      i = 0
+      operations.sort_by {|operation| i += 1; [-operation.priority, i] }.each do |operation|
         case operation
         when ::Markdiff::Operations::AddChildOperation
           operation.target_node.add_child(operation.inserted_node)
-          mark_li_as_changed(operation.target_node)
+          mark_li_or_tr_as_changed(operation.target_node)
           mark_top_level_node_as_changed(operation.target_node)
         when ::Markdiff::Operations::AddDataBeforeHrefOperation
           operation.target_node["data-before-href"] = operation.target_node["href"]
           operation.target_node["href"] = operation.after_href
-          mark_li_as_changed(operation.target_node)
+          mark_li_or_tr_as_changed(operation.target_node)
           mark_top_level_node_as_changed(operation.target_node)
         when ::Markdiff::Operations::AddDataBeforeTagNameOperation
           operation.target_node["data-before-tag-name"] = operation.target_node.name
           operation.target_node.name = operation.after_tag_name
-          mark_li_as_changed(operation.target_node)
+          mark_li_or_tr_as_changed(operation.target_node)
           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) if operation.target_node.name != "li"
+          mark_li_or_tr_as_changed(operation.target_node) if operation.target_node.name != "li" && operation.target_node.name != "tr"
           mark_top_level_node_as_changed(operation.target_node.parent)
         when ::Markdiff::Operations::RemoveOperation
           operation.target_node.replace(operation.inserted_node) if operation.target_node != operation.inserted_node
-          mark_li_as_changed(operation.target_node)
+          mark_li_or_tr_as_changed(operation.target_node)
           mark_top_level_node_as_changed(operation.target_node)
         when ::Markdiff::Operations::TextDiffOperation
           parent = operation.target_node.parent
           operation.target_node.replace(operation.inserted_node)
-          mark_li_as_changed(parent)
+          mark_li_or_tr_as_changed(parent)
           mark_top_level_node_as_changed(parent)
         end
       end
@@ -181,10 +182,13 @@ module Markdiff
     end
 
     # @param [Nokogiri::XML::Node] node
-    def mark_li_as_changed(node)
+    def mark_li_or_tr_as_changed(node)
       until node.parent.nil? || node.parent.fragment?
-        if node.name == "li" && node["class"].nil?
-          node["class"] = "changed"
+        if node.name == "li" || node.name == "tr"
+          classes = node["class"].to_s.split(/\s/)
+          unless classes.include?("added") || classes.include?("changed") || classes.include?("removed")
+            node["class"] = (classes + ["changed"]).join(" ")
+          end
         end
         node = node.parent
       end

data/lib/markdiff/operations/add_child_operation.rb

@@ -5,8 +5,8 @@ module Markdiff
     class AddChildOperation < Base
       # @return [String]
       def inserted_node
-        if @inserted_node.name == "li"
-          @inserted_node["class"] = "added"
+        if @inserted_node.name == "li" || @inserted_node.name == "tr"
+          @inserted_node["class"] = (@inserted_node["class"].to_s.split(/\s/) + ["added"]).join(" ")
           @inserted_node.inner_html = "<ins>#{@inserted_node.inner_html}</ins>"
           @inserted_node
         else

data/lib/markdiff/operations/add_previous_sibling_operation.rb

@@ -5,9 +5,9 @@ module Markdiff
     class AddPreviousSiblingOperation < Base
       # @return [String]
       def inserted_node
-        if @inserted_node.name == "li"
+        if @inserted_node.name == "li" || @inserted_node.name == "tr"
           node = @inserted_node.clone
-          node["class"] = "added"
+          node["class"] = (node["class"].to_s.split(/\s/) + ["added"]).join(" ")
           node.inner_html = "<ins>#{@inserted_node.inner_html}</ins>"
           node
         else

data/lib/markdiff/operations/remove_operation.rb

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

data/lib/markdiff/operations/text_diff_operation.rb

@@ -15,10 +15,10 @@ module Markdiff
       def inserted_node
         before_elements = target_node.to_s.split(" ")
         after_elements = @after_node.to_s.split(" ")
-        ::Diff::LCS.diff(before_elements, after_elements).flatten.each do |operation|
+        ::Diff::LCS.diff(before_elements, after_elements).flatten(1).each do |operation|
           type, position, element = *operation
           if type == "-"
-            before_elements[position] = "<del>#{element}</del>"
+            before_elements[position] = %(<del class="del">#{element}</del>)
           else
             before_elements[position] = "#{before_elements[position]}<ins>#{element}</ins>"
           end

data/lib/markdiff/version.rb

@@ -1,3 +1,3 @@
 module Markdiff
-  VERSION = "0.5.4"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdiff
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,10 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Rendered Markdown differ.
 test_files: []
-has_rdoc: