markdiff 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1701e665032bb63942b695d27e60fd525b45ee03
-  data.tar.gz: 7e499210e87d6c72e0a72311276fc5459d7a55b0
+  metadata.gz: bb6772c25f4c97ca2a3db7f2ccf4400e14bbaa7e
+  data.tar.gz: 4c09fe6b043e5eb4476d57c81cf2dac97c29edfb
 SHA512:
-  metadata.gz: fadc3f8eec548e6242e5a42953e2a14cca69e5c430d3915f27670a1d7d975d95fefc9d86086a80b5a0fd0787244fd964195d2f0bfdc60c265713f9e4aa686a21
-  data.tar.gz: 4fb4ee14d8183d2d831aeb3e62b1ccae757fe2d8cbc8e7e7844c763e45b625ea75412b188bb9472091b51ec8d26b644e2832ab8278cf37f919bf73c378595d60
+  metadata.gz: 253e048d69981d9d3ca09c2bf0473524699d1f226ce144d309c18d04377cc7810919c3033f3d879f30eb77681914c1d2ce03e6acd4ab56a0e732530eec5c1b3e
+  data.tar.gz: d1483244668b83c844b071fe2ccf610a214705a272d42ec26fd6f4c90c396caca1bd778be76f8b7d3059055963e17a0a98af0b8412b7fc13b79e5b2915fafaac

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0
+- Support partial text diff
+
 ## 0.2.1
 - Support li.added and li.removed
 

data/lib/markdiff/differ.rb

@@ -4,6 +4,7 @@ require "markdiff/operations/add_data_before_href_operation"
 require "markdiff/operations/add_data_before_tag_name_operation"
 require "markdiff/operations/add_previous_sibling_operation"
 require "markdiff/operations/remove_operation"
+require "markdiff/operations/text_diff_operation"
 
 module Markdiff
   class Differ
@@ -36,6 +37,11 @@ module Markdiff
           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)
+        when ::Markdiff::Operations::TextDiffOperation
+          parent = operation.target_node.parent
+          operation.target_node.replace(operation.inserted_node)
+          mark_li_as_changed(parent)
+          mark_top_level_node_as_changed(parent)
         end
       end
       node
@@ -100,16 +106,22 @@ module Markdiff
           next
         end
         after_node.children.each do |after_child|
-          next if inverted_identity_map[after_child]
-          next if before_child.text?
-          if before_child.name == after_child.name
+          case
+          when inverted_identity_map[after_child]
+          when before_child.text?
+            if after_child.text?
+              identity_map[before_child] = after_child
+              inverted_identity_map[after_child] = before_child
+              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)
               operations << ::Markdiff::Operations::AddDataBeforeHrefOperation.new(after_href: after_child["href"], target_node: before_child)
             end
             identity_map[before_child] = after_child
             inverted_identity_map[after_child] = before_child
             operations += create_patch(before_child, after_child)
-          elsif detect_heading_level_difference(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
             inverted_identity_map[after_child] = before_child

data/lib/markdiff/operations/text_diff_operation.rb

@@ -0,0 +1,30 @@
+require "diff/lcs"
+require "nokogiri"
+require "markdiff/operations/base"
+
+module Markdiff
+  module Operations
+    class TextDiffOperation < Base
+      # @param [Nokogiri::XML::Node] after_node
+      def initialize(after_node:, **args)
+        super(**args)
+        @after_node = after_node
+      end
+
+      # @return [Nokogiri::XML::Node]
+      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|
+          type, position, element = *operation
+          if type == "-"
+            before_elements[position] = "<del>#{element}</del>"
+          else
+            before_elements[position] += "<ins>#{element}</ins>"
+          end
+        end
+        ::Nokogiri::HTML.fragment(before_elements.join(" "))
+      end
+    end
+  end
+end

data/lib/markdiff/version.rb

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

data/markdiff.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "0.10.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "3.4.0"
+  spec.add_runtime_dependency "diff-lcs"
   spec.add_runtime_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdiff
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,7 @@ files:
 - lib/markdiff/operations/add_previous_sibling_operation.rb
 - lib/markdiff/operations/base.rb
 - lib/markdiff/operations/remove_operation.rb
+- lib/markdiff/operations/text_diff_operation.rb
 - lib/markdiff/version.rb
 - markdiff.gemspec
 homepage: https://github.com/r7kamura/markdiff