markdiff 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d579e119bf15ea1d6629b7b6fb1f17d2fa2406a0
-  data.tar.gz: 35fa6ffd2804f296fe768b12f3ad550bd2551f2a
+  metadata.gz: d21040c507d42a274d28a00d208d8f8870326697
+  data.tar.gz: d2530960295fac137bb42865a97f237b59b640bd
 SHA512:
-  metadata.gz: 612cfea493d82b55cd8ddb35e7284584cf72b96fbc2b7603d9ef0c183653ad019d5183b6c69dd7463d4b741d27cba46f22318d7593b3664a95983afa7401d402
-  data.tar.gz: f7fc3e3dc5aad82b271d31d145f4674904e5e2d3da34d6b34e99ec3cab0103d30f584e2cfa99b62fe6808815df906962defe49d7c000f18bdf8c06049a0f3103
+  metadata.gz: 0d0210b09bff8321cac16ff7e2aa9e1d918bcf1fcc827d0fe024e799a2a1fa16e8cd14ea387f1bf6222dae6e783b3c488a735bf3960a5e5a57fb142f3b675693
+  data.tar.gz: 82f349441e1760e223fbdcf760a6e008cac624f9470d5ca67946bc18695601f2ab9289f75e6f718530cc48b3665d2dd0de77b7fe0be6715800f028a9cf0ba975

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.1
+- Fix bug on text-diff operation
+
 ## 0.5.0
 - Wrap changed nodes by div.changed
 

data/README.md

@@ -7,7 +7,7 @@ require "markdiff"
 
 differ = Markdiff::Differ.new
 node = differ.render("<p>a</p>", "<p>b</p>")
-node.to_html #=> '<p class="changed"><del>a</del><ins>b</ins></p>'
+node.to_html #=> '<div class="changed"><p><del>a</del><ins>b</ins></p></div>'
 ```
 
 See [spec/markdiff/differ_spec.rb](spec/markdiff/differ_spec.rb) for more examples.

data/lib/markdiff/differ.rb

@@ -13,7 +13,7 @@ module Markdiff
     # @param [Nokogiri::XML::Node] node
     # @return [Nokogiri::XML::Node] Converted node
     def apply_patch(operations, node)
-      operations.each do |operation|
+      operations.sort_by(&:priority).reverse.each do |operation|
         case operation
         when ::Markdiff::Operations::AddChildOperation
           operation.target_node.add_child(operation.inserted_node)
@@ -201,6 +201,7 @@ module Markdiff
 
     # @param [Nokogiri::XML::Node] node
     def mark_top_level_node_as_changed(node)
+      return if node.nil?
       node = node.parent until node.parent.nil? || node.parent.fragment?
       unless node.parent.nil? || node["class"] == "changed"
         div = Nokogiri::XML::Node.new("div", node.document)

data/lib/markdiff/operations/base.rb

@@ -10,6 +10,10 @@ module Markdiff
         @inserted_node = inserted_node
         @target_node = target_node
       end
+
+      def priority
+        3
+      end
     end
   end
 end

data/lib/markdiff/operations/remove_operation.rb

@@ -13,6 +13,10 @@ module Markdiff
           "<del>#{target_node}</del>"
         end
       end
+
+      def priority
+        2
+      end
     end
   end
 end

data/lib/markdiff/operations/text_diff_operation.rb

@@ -25,6 +25,10 @@ module Markdiff
         end
         ::Nokogiri::HTML.fragment(before_elements.join(" "))
       end
+
+      def priority
+        1
+      end
     end
   end
 end

data/lib/markdiff/version.rb

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

metadata

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