markdiff 0.6.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 720d3daa84f7b4c40f555ef52f2e9912e1d8170a120be554069679beab0d1954
-  data.tar.gz: 5b9a4631de297e8fa20e615d423c827075f0664b706f763334b65459bd8618a4
+  metadata.gz: 50d045a93d1bcd80cd9013959fac8d671c856e298a4d0834b0b1c97b1c920143
+  data.tar.gz: 16c0aad8bfdc01e84406ac9fd0201c65851429dc505f5519c23aac20221e5ebb
 SHA512:
-  metadata.gz: 8d26e5b8cb610502f323eb8f7084c17c43a5879112b978a6faaae193d96d5534ff2254a6cac6af26988f44cc2be163130fc242667c0d591e8073fc5b6b3fb5cb
-  data.tar.gz: 945860da782918d04fbb6d38c61e4ae447aa1c3e448e2ec422617c3c52a5bc2ce904e14d3c8aaec43c1ab325a3fcf8c4880329d63303e679eeda66acfbbd4e47
+  metadata.gz: 402f46556ab43370f244cd6adeb9ddd538d0dbc0a9668fa12ba25cf244b27b561c254ea9fb9173991c464d6d5775766f0d37a742209290cdda742d48bbed1fc7
+  data.tar.gz: 1c1e45375255e2a13ec0dffd193a06574abe0aff60154256ec0254d0c6b4bee6766404e9de108a4a1b470b75d5338195c9bf1d3505d00e1fee901f3119c6d755

data/.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7.3
+          - 3.1.3
+    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,60 +1,114 @@
+# Changelog
+
+## Unreleased
+
+## 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

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    markdiff (0.8.0)
+      diff-lcs
+      nokogiri
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.5.0)
+    nokogiri (1.14.2-x86_64-linux)
+      racc (~> 1.4)
+    racc (1.6.2)
+    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.12.0)
+    rspec-mocks (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  bundler
+  markdiff!
+  rake
+  redcarpet
+  rspec
+
+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/operations/text_diff_operation.rb

@@ -13,17 +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(" ")
-        ::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>)
-          else
-            before_elements[position] = "#{before_elements[position]}<ins>#{element}</ins>"
+        before_elements = target_node.to_s.split(' ')
+        after_elements = @after_node.to_s.split(' ')
+        last_operation = nil
+
+        groupings = ::Diff::LCS.sdiff(before_elements, after_elements)
+          .slice_when { |prev, cur| prev.action != cur.action }
+
+        output = groupings.map do |grouping|
+          action = grouping.first.action
+
+          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
+              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.6.3"
+  VERSION = "0.8.0"
 end

data/markdiff.gemspec

@@ -13,11 +13,10 @@ 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 "rake", "~> 10.0"
-  spec.add_development_dependency "redcarpet", "3.3.3"
-  spec.add_development_dependency "rspec", "3.4.0"
+  spec.add_development_dependency "bundler"
+  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,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: markdiff
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2023-03-09 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
     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
@@ -108,17 +94,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - r7kamura@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -140,7 +127,7 @@ homepage: https://github.com/r7kamura/markdiff
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Rendered Markdown differ.
 test_files: []

data/.travis.yml

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