markdiff 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86c8ef911af47d5d4271365f2a576564b2425424f1bedc8fc66cda39186ce3a
-  data.tar.gz: 7c059f14e29a4b0496b9412f481ced9f10d4742e43d3cab31ade9b85f551b7df
+  metadata.gz: bcbedaaac5248f5ca65457efc285d8b931083379d9459fefd1633d6ba0074e6f
+  data.tar.gz: b32ed85a69e42c9ccd57dc2f5c2fd8c3835274b5a07e7629a5766a5fecd0bd97
 SHA512:
-  metadata.gz: aa74b28c0589094b03defb2ccfadbba23572530fca2ec07e1fe73f0e810dbc8eba019257a119ea929736ca54c04c3721960e74d41037b07395b92495dbad2736
-  data.tar.gz: 8a6a633604eaa4fdb221a779133adae4e4489e98258ef1e39e81b44c73d0fd3215b9d3bb6b1aceffb850517c21f3f2bc3ec7153f7d19e84367e0791e068c95c2
+  metadata.gz: 3fab67dd051cbebacdfd8cefd270b1ef4375c9cdec915f5ab06351a4504d2cbbed9970835f794c7c509394d36ceb86410719bed969f3d69ac7001e2a529570cd
+  data.tar.gz: febf67a5e7eb49412789f3cfb519f3e2de5daa8e42ac311c99373066cf96041a7d650d24e72337a9ffdca0fdbe1bbd403d204d18a82e143049d78fdcf8ba02e9

data/.github/workflows/test.yml

@@ -12,7 +12,8 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.7.2
+          - 2.7.3
+          - 3.1.3
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -2,65 +2,119 @@
 
 ## Unreleased
 
+## 0.8.1
+
+### Fixed
+
+- Fix issue with diffs between blocks of matches.
+
+## 0.8.0
+
+### Changed
+
+- Add class attributes to ins element: `.ins.ins-before` or `.ins.ins-after`.
+
+### Fixed
+
+- Fix issue on insertion and deletion on same position.
+- Fix issue with long sentences.
+
+## 0.7.0
+
+### Fixed
+
 - Fixed replaces shown wrongly.
 
 ## 0.6.3
 
+### Fixed
+
 - Support diff-lcs v1.4+.
 
 ## 0.6.2
 
+### Changed
+
 - Support tr.added and tr.deleted.
 
 ## 0.6.1
 
+### Changed
+
 - Fix patch order bug by making sort stable.
 
 ## 0.6.0
 
+### Changed
+
 - Add .del class to all del elements.
 
 ## 0.5.5
 
+### Fixed
+
 - Preserve classes on adding new class (e.g. .added).
 
 ## 0.5.4
 
+### Fixed
+
 - Fix bug on patch operations order.
 
 ## 0.5.3
 
+### Fixed
+
 - Fix bug on comparing nodes.
 
 ## 0.5.2
 
+### Fixed
+
 - Fix bug on comparing attributes and text nodes.
 
 ## 0.5.1
 
+### Fixed
+
 - Fix bug on text-diff operation.
 
 ## 0.5.0
 
+### Changed
+
 - Wrap changed nodes by div.changed.
 
 ## 0.4.0
 
+### Changed
+
 - Chanage .changed specs.
+
+### Fixed
+
 - Fix bugs on text diff.
 
 ## 0.3.0
 
+### Changed
+
 - Support partial text diff.
 
 ## 0.2.1
 
+### Changed
+
 - Support li.added and li.removed.
 
 ## 0.2.0
 
+### Changed
+
 - Support div.changed and li.changed.
 
 ## 0.1.0
 
+### Added
+
 - 1st Release.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdiff (0.6.3)
+    markdiff (0.8.1)
       diff-lcs
       nokogiri
 
@@ -9,24 +9,24 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
-    nokogiri (1.13.1-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
-    racc (1.6.0)
-    rake (10.5.0)
-    redcarpet (3.3.3)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    racc (1.7.1)
+    rake (13.0.6)
+    redcarpet (3.6.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
 
 PLATFORMS
   x86_64-linux
@@ -34,9 +34,9 @@ PLATFORMS
 DEPENDENCIES
   bundler
   markdiff!
-  rake (~> 10.0)
-  redcarpet (= 3.3.3)
-  rspec (= 3.4.0)
+  rake
+  redcarpet
+  rspec
 
 BUNDLED WITH
    2.3.6

data/lib/markdiff/differ.rb

@@ -100,14 +100,17 @@ module Markdiff
       end
 
       # Partial matching
-      before_node.children.each do |before_child|
-        if identity_map[before_child]
-          next
-        end
+      before_node.children.each_with_index do |before_child, index|
+        next if identity_map[before_child]
+
+        next_match = before_node.children[index..].find { |child| identity_map[child] }
+
         after_node.children.each do |after_child|
           case
           when identity_map[before_child]
             break
+          when next_match && inverted_identity_map[after_child] == next_match
+            break
           when inverted_identity_map[after_child]
           when before_child.text?
             if after_child.text?

data/lib/markdiff/operations/text_diff_operation.rb

@@ -13,30 +13,37 @@ module Markdiff
 
       # @return [Nokogiri::XML::Node]
       def inserted_node
-        before_elements = target_node.to_s.split(" ")
-        after_elements = @after_node.to_s.split(" ")
-        last_deleted_pos = nil
+        before_elements = target_node.to_s.split(' ')
+        after_elements = @after_node.to_s.split(' ')
+        last_operation = nil
 
-        ::Diff::LCS.diff(before_elements, after_elements).flatten(1).each do |operation|
-          type, position, element = *operation
+        groupings = ::Diff::LCS.sdiff(before_elements, after_elements)
+          .slice_when { |prev, cur| prev.action != cur.action }
 
-          if type == "-"
-            before_elements[position] = %(<del class="del">#{element}</del>)
-            last_deleted_pos = position
-          elsif type == "+"
-            insert = "<ins>#{element}</ins>"
+        output = groupings.map do |grouping|
+          action = grouping.first.action
 
-            if last_deleted_pos == position
-              before_elements[position] = "#{before_elements[position]}#{insert}"
+          response = case action
+            when "="
+              grouping.map(&:new_element).join(" ")
+            when "-"
+              %(<del class="del">#{grouping.map(&:old_element).join(" ")}</del>)
+            when "+"
+              %(<ins class="ins ins-before">#{grouping.map(&:new_element).join(" ")}</ins>)
+            when "!"
+              %(<del class="del">#{grouping.map(&:old_element).join(" ")}</del><ins class="ins ins-after">#{grouping.map(&:new_element).join(" ")}</ins>)
             else
-              before_elements[position] = "#{insert}#{before_elements[position]}"
-            end
-          else
-            raise "Unhandled type: #{type}"
+              raise "Unknown action #{action}"
           end
+
+          response = " #{response}" if last_operation && last_operation != '+'
+
+          last_operation = action
+
+          response
         end
 
-        ::Nokogiri::HTML.fragment(before_elements.join(" "))
+        ::Nokogiri::HTML.fragment(output.join(''))
       end
 
       def priority

data/lib/markdiff/version.rb

@@ -1,3 +1,3 @@
 module Markdiff
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end

data/markdiff.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "redcarpet", "3.3.3"
-  spec.add_development_dependency "rspec", "3.4.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "redcarpet"
+  spec.add_development_dependency "rspec"
   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.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-29 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,44 +28,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Rendered Markdown differ.