markdiff 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2346464a728f27b53d6e41867c54f6fc98be7b3
-  data.tar.gz: 39a6911a132f9fdf92d55fe0de403148670c14af
+SHA256:
+  metadata.gz: f86c8ef911af47d5d4271365f2a576564b2425424f1bedc8fc66cda39186ce3a
+  data.tar.gz: 7c059f14e29a4b0496b9412f481ced9f10d4742e43d3cab31ade9b85f551b7df
 SHA512:
-  metadata.gz: d2ee80ab7bedc30ff0eff09a4cff8115fb7200e1433bc5cfb0330a64dafb28a10c351175a3268ee7c7d1115ef19b5df468a51c6837ba135d385ef870e5c27ee7
-  data.tar.gz: 5ee096c2d67f82ea0434f9c925a821cdf2458bae9942f5c0c34d141a8460f5bb1292afbf7c5fee89246d9926382627140b50175bf01fa73f5a94fede09be563a
+  metadata.gz: aa74b28c0589094b03defb2ccfadbba23572530fca2ec07e1fe73f0e810dbc8eba019257a119ea929736ca54c04c3721960e74d41037b07395b92495dbad2736
+  data.tar.gz: 8a6a633604eaa4fdb221a779133adae4e4489e98258ef1e39e81b44c73d0fd3215b9d3bb6b1aceffb850517c21f3f2bc3ec7153f7d19e84367e0791e068c95c2

data/.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7.2
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/CHANGELOG.md

@@ -1,36 +1,66 @@
+# Changelog
+
+## Unreleased
+
+- Fixed replaces shown wrongly.
+
+## 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
+
+- Add .del class to all del elements.
 
 ## 0.5.5
-- Preserve classes on adding new class (e.g. .added)
+
+- 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/Gemfile.lock

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    markdiff (0.6.3)
+      diff-lcs
+      nokogiri
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.5.0)
+    nokogiri (1.13.1-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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  bundler
+  markdiff!
+  rake (~> 10.0)
+  redcarpet (= 3.3.3)
+  rspec (= 3.4.0)
+
+BUNDLED WITH
+   2.3.6

data/README.md

@@ -1,4 +1,8 @@
-# Markdiff [![Build Status](https://travis-ci.org/r7kamura/markdiff.svg)](https://travis-ci.org/r7kamura/markdiff)
+# Markdiff
+
+[![test](https://github.com/r7kamura/markdiff/actions/workflows/test.yml/badge.svg)](https://github.com/r7kamura/markdiff/actions/workflows/test.yml)
+[![Gem Version](https://badge.fury.io/rb/markdiff.svg)](https://rubygems.org/gems/markdiff)
+
 Rendered Markdown differ.
 
 ## Usage

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,9 +182,9 @@ 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"
+        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(" ")

data/lib/markdiff/operations/add_child_operation.rb

@@ -5,7 +5,7 @@ module Markdiff
     class AddChildOperation < Base
       # @return [String]
       def inserted_node
-        if @inserted_node.name == "li"
+        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

data/lib/markdiff/operations/add_previous_sibling_operation.rb

@@ -5,7 +5,7 @@ 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"] = (node["class"].to_s.split(/\s/) + ["added"]).join(" ")
           node.inner_html = "<ins>#{@inserted_node.inner_html}</ins>"

data/lib/markdiff/operations/remove_operation.rb

@@ -5,7 +5,7 @@ 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 class="del">#{target_node.inner_html}</del>)
           target_node

data/lib/markdiff/operations/text_diff_operation.rb

@@ -15,14 +15,27 @@ 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|
+        last_deleted_pos = nil
+
+        ::Diff::LCS.diff(before_elements, after_elements).flatten(1).each do |operation|
           type, position, element = *operation
+
           if type == "-"
             before_elements[position] = %(<del class="del">#{element}</del>)
+            last_deleted_pos = position
+          elsif type == "+"
+            insert = "<ins>#{element}</ins>"
+
+            if last_deleted_pos == position
+              before_elements[position] = "#{before_elements[position]}#{insert}"
+            else
+              before_elements[position] = "#{insert}#{before_elements[position]}"
+            end
           else
-            before_elements[position] = "#{before_elements[position]}<ins>#{element}</ins>"
+            raise "Unhandled type: #{type}"
           end
         end
+
         ::Nokogiri::HTML.fragment(before_elements.join(" "))
       end
 

data/lib/markdiff/version.rb

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

data/markdiff.gemspec

@@ -13,8 +13,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?("spec/") }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "pry", "0.10.3"
+  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"

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: markdiff
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,10 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -155,10 +142,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: 

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.0
-before_install: gem install bundler -v 1.10.6