nokogiri-diff 0.1.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 4374cae69c49465afb2391000bc4c57c0f30db34155afe50c463cf54a86fe719
+  data.tar.gz: eb6e14af7ddca3cf72555d83f8f608cd90310d532c18bd6645afedd3bf3d8437
+SHA512:
+  metadata.gz: d67440441d4581bf0ab7a59dc9ce7ab34fbc3c8078a36f305ee91b3835d808c9cdd7221c5e080fcd6dd7552f61698cb72b7a2df9d0bc1208ddfdc4b46ef7d364
+  data.tar.gz: 995fe16d4e4299b02f4d34a3a1c6a4061ae8f727343e64d5692c9fdeca89bd128d9eb8fa40ff934178580326c35fe63a07ed8fa5dc61458330c4dfe22cc1bd92

data/.github/workflows/ruby.yml

@@ -0,0 +1,28 @@
+name: CI
+
+on: [ push, pull_request ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - jruby
+          - truffleruby
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install --jobs 4 --retry 3
+      - name: Run tests
+        run: bundle exec rake test

data/.gitignore

@@ -1,2 +1,4 @@
-doc/
-pkg/
+/Gemfile.lock
+/coverage
+/doc
+/pkg

data/ChangeLog.md

@@ -1,6 +1,21 @@
+### 0.3.0 / 2024-01-24
+
+* Require [ruby](http://www.ruby-lang.org/) >= 2.0.0.
+* Require [tdiff](http://github.com/postmodern/tdiff) ~> 0.4.
+* Switched to using `require_relative` to improve load-times.
+* Added `# frozen_string_literal: true` to all files.
+
+### 0.2.0 / 2013-04-22
+
+* {Nokogiri::XML::Node#tdiff_each_child} now sorts attributes by name, so that
+  changes in attribute order is ignored. (thanks @bhollis)
+* {Nokogiri::XML::Node#tdiff_equal} now supports `Nokogiri::XML::Comment`
+  and `Nokogiri::XML::ProcessingInstruction` objects. (thanks @bhollis)
+
 ### 0.1.2 / 2012-05-28
 
 * Require tdiff ~> 0.3, >= 0.3.2.
+* Added {Nokogiri::Diff::VERSION}.
 * Replaced ore-tasks with
   [rubygems-tasks](https://github.com/postmodern/rubygems-tasks#readme).
 

data/Gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :development do
+  gem 'rake'
+  gem 'rubygems-tasks', '~> 0.2'
+  
+  gem 'rspec',     '~> 3.0'
+  gem 'simplecov', '~> 0.20', require: false
+
+  gem 'kramdown'
+  gem 'redcarpet',  platform: :mri
+  gem 'yard',       '~> 0.9'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2024 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,9 +1,10 @@
 # nokogiri-diff
 
+[![CI](https://github.com/postmodern/nokogiri-diff/actions/workflows/ruby.yml/badge.svg)](https://github.com/postmodern/nokogiri-diff/actions/workflows/ruby.yml)
+
 * [Source](https://github.com/postmodern/nokogiri-diff)
 * [Issues](https://github.com/postmodern/nokogiri-diff/issues)
 * [Documentation](http://rubydoc.info/gems/nokogiri-diff/frames)
-* [Email](mailto:postmodern.mod3 at gmail.com)
 
 ## Description
 
@@ -19,56 +20,62 @@ removed nodes) between two XML/HTML documents.
 
 ## Examples
 
-Enumerate over the the differences between two HTML documents:
+Enumerate over the differences between two HTML documents:
 
-    require 'nokogiri/diff'
+```ruby
+require 'nokogiri/diff'
 
-    doc1 = Nokogiri::HTML('<div><p>one</p> two </div>')
-    doc2 = Nokogiri::HTML('<div><p id="1">one</p> <p>three</p></div>')
+doc1 = Nokogiri::HTML('<div><p>one</p> two </div>')
+doc2 = Nokogiri::HTML('<div><p id="1">one</p> <p>three</p></div>')
 
-    doc1.diff(doc2) do |change,node|
-      puts "#{change} #{node.to_html}".ljust(30) + node.parent.path
-    end
+doc1.diff(doc2) do |change,node|
+  puts "#{change} #{node.to_html}".ljust(30) + node.parent.path
+end
 
-    #   <div>
-    # <p>one</p> two </div> /
-    #   <p>one</p>                  /div
-    # -  two                        /div
-    # +                             /div
-    # + <p>three</p>                /div
-    # +  id="1"                     /div/p[1]
-    #   one                         /div/p
+#   <div>
+# <p>one</p> two </div> /
+#   <p>one</p>                  /div
+# -  two                        /div
+# +                             /div
+# + <p>three</p>                /div
+# +  id="1"                     /div/p[1]
+#   one                         /div/p
+```
 
 Only find the added nodes:
 
-    doc1.diff(doc2, :added => true) do |change,node|
-      puts node.to_html.ljust(30) + node.parent.path
-    end
+```ruby
+doc1.diff(doc2, :added => true) do |change,node|
+  puts node.to_html.ljust(30) + node.parent.path
+end
 
-    #                               /div
-    # <p>three</p>                  /div
-    #  id="1"                       /div/p[1]
+#                               /div
+# <p>three</p>                  /div
+#  id="1"                       /div/p[1]
+```
 
 Only find the removed nodes:
 
-    doc1.diff(doc2, :removed => true) do |change,node|
-      puts node.to_html.ljust(30) + node.parent.path
-    end
+```ruby
+doc1.diff(doc2, :removed => true) do |change,node|
+  puts node.to_html.ljust(30) + node.parent.path
+end
 
-    #  two                          /div
+#  two                          /div
+```
 
 ## Requirements
 
-* [ruby](http://www.ruby-lang.org/) >= 1.8.7
-* [tdiff](http://github.com/postmodern/tdiff) ~> 0.3, >= 0.3.2
+* [ruby](http://www.ruby-lang.org/) >= 2.0.0
+* [tdiff](http://github.com/postmodern/tdiff) ~> 0.4
 * [nokogiri](http://nokogiri.rubyforge.org/) ~> 1.5
 
 ## Install
 
-    $ gem install nokogiri-diff
-
-## Copyright
+```shell
+$ gem install nokogiri-diff
+```
 
-Copyright (c) 2010-2012 Hal Brodigan
+## License
 
 See {file:LICENSE.txt} for details.

data/Rakefile

@@ -1,36 +1,10 @@
-require 'rubygems'
-require 'rake'
+require 'rubygems/tasks'
+Gem::Tasks.new
 
-begin
-  gem 'rubygems-tasks', '~> 0.1'
-  require 'rubygems/tasks'
-
-  Gem::Tasks.new
-rescue LoadError => e
-  warn e.message
-  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
-end
-
-begin
-  gem 'rspec', '~> 2.4'
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new
-rescue LoadError => e
-  task :spec do
-    abort "Please run `gem install rspec` to install RSpec."
-  end
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
 task :test => :spec
 task :default => :spec
 
-begin
-  gem 'yard', '~> 0.7'
-  require 'yard'
-
-  YARD::Rake::YardocTask.new  
-rescue LoadError => e
-  task :yard do
-    abort "Please run `gem install yard` to install YARD."
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new  

data/gemspec.yml

@@ -10,13 +10,18 @@ email: postmodern.mod3@gmail.com
 homepage: https://github.com/postmodern/nokogiri-diff#readme
 has_yard: true
 
-required_ruby_version: ">= 1.8.7"
+metadata:
+  documentation_uri: https://rubydoc.info/gems/nokogiri-diff
+  source_code_uri:   https://github.com/postmodern/nokogiri-diff
+  bug_tracker_uri:   https://github.com/postmodern/nokogiri-diff/issues
+  changelog_uri:     https://github.com/postmodern/nokogiri-diff/blob/main/ChangeLog.md
+  rubygems_mfa_required: 'true'
+
+required_ruby_version: ">= 2.0.0"
 
 dependencies:
-  tdiff: ~> 0.3, >= 0.3.2
+  tdiff: ~> 0.4
   nokogiri: ~> 1.5
 
 development_dependencies:
-  rubygems-tasks: ~> 0.1
-  rspec: ~> 2.4
-  yard: ~> 0.7
+  bundler: ~> 2.0

data/lib/nokogiri/diff/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module Diff
     # nokogiri-diff version
-    VERSION = '0.1.2'
+    VERSION = '0.3.0'
   end
 end

data/lib/nokogiri/diff/xml/document.rb

@@ -1,4 +1,6 @@
-require 'nokogiri/diff/xml/node'
+# frozen_string_literal: true
+
+require_relative 'node'
 
 class Nokogiri::XML::Document < Nokogiri::XML::Node
 
@@ -6,7 +8,7 @@ class Nokogiri::XML::Document < Nokogiri::XML::Node
   # Overrides `tdiff` to only compare the child nodes of the document.
   #
   def tdiff(tree,&block)
-    return enum_for(:tdiff,tree) unless block
+    return enum_for(__method__,tree) unless block
 
     tdiff_recursive(tree,&block)
     return self
@@ -16,7 +18,7 @@ class Nokogiri::XML::Document < Nokogiri::XML::Node
   # Overrides `tdiff_unordered` to only compare the child nodes of the document.
   #
   def tdiff_unordered(tree,&block)
-    return enum_for(:tdiff_unordered,tree) unless block
+    return enum_for(__method__,tree) unless block
 
     tdiff_recursive_unordered(tree,&block)
     return self

data/lib/nokogiri/diff/xml/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'tdiff'
 
@@ -22,8 +24,10 @@ class Nokogiri::XML::Node
         (self.name == node.name && self.value == node.value)
       when Nokogiri::XML::Element, Nokogiri::XML::DTD
         self.name == node.name
-      when Nokogiri::XML::Text
+      when Nokogiri::XML::Text, Nokogiri::XML::Comment
         self.text == node.text
+      when Nokogiri::XML::ProcessingInstruction
+        (self.name == node.name && self.content == node.content)
       else
         false
       end
@@ -46,7 +50,7 @@ class Nokogiri::XML::Node
   #
   def tdiff_each_child(node,&block)
     if node.kind_of?(Nokogiri::XML::Element)
-      node.attribute_nodes.each(&block)
+      node.attribute_nodes.sort_by(&:name).each(&block)
     end
 
     node.children.each(&block)
@@ -80,14 +84,12 @@ class Nokogiri::XML::Node
   #   If no block was given, an Enumerator object will be returned.
   #
   def diff(other,options={},&block)
-    return enum_for(:diff,other,options) unless block
+    return enum_for(__method__,other,options) unless block
 
     if (options[:added] || options[:removed])
       tdiff_unordered(other) do |change,node|
-        if (change == '+' && options[:added])
-          yield change, node
-        elsif (change == '-' && options[:removed])
-          yield change, node
+        if    (change == '+' && options[:added])   then yield change, node
+        elsif (change == '-' && options[:removed]) then yield change, node
         end
       end
     else

data/lib/nokogiri/diff/xml.rb

@@ -1,2 +1,4 @@
-require 'nokogiri/diff/xml/node'
-require 'nokogiri/diff/xml/document'
+# frozen_string_literal: true
+
+require_relative 'xml/node'
+require_relative 'xml/document'

data/lib/nokogiri/diff.rb

@@ -1,2 +1,4 @@
-require 'nokogiri/diff/xml'
-require 'nokogiri/diff/version'
+# frozen_string_literal: true
+
+require_relative 'diff/xml'
+require_relative 'diff/version'

data/nokogiri-diff.gemspec

@@ -7,10 +7,7 @@ Gem::Specification.new do |gem|
 
   gem.name    = gemspec.fetch('name')
   gem.version = gemspec.fetch('version') do
-                  lib_dir = File.join(File.dirname(__FILE__),'lib')
-                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
-
-                  require 'nokogiri/diff/version'
+                  require_relative 'lib/nokogiri/diff/version'
                   Nokogiri::Diff::VERSION
                 end
 

data/spec/diff_spec.rb

@@ -3,253 +3,264 @@ require 'nokogiri/diff'
 
 describe "nokogiri/diff" do
   let(:contents) { '<div><p>one</p></div>' }
-  let(:doc) { Nokogiri::XML(contents) }
+  let(:doc)      { Nokogiri::XML(contents) }
 
-  let(:added_text) { Nokogiri::XML('<div><p>one</p>two</div>') }
+  let(:added_text)    { Nokogiri::XML('<div><p>one</p>two</div>') }
   let(:added_element) { Nokogiri::XML('<div><p>one</p><p>two</p></div>') }
-  let(:added_attr) { Nokogiri::XML('<div><p id="1">one</p></div>') }
+  let(:added_attr)    { Nokogiri::XML('<div><p id="1">one</p></div>') }
+  let(:added_attrs)   { Nokogiri::XML('<div><p id="1" class="2">one</p></div>') }
 
-  let(:changed_text) { Nokogiri::XML('<div><p>two</p></div>') }
-  let(:changed_element) { Nokogiri::XML('<div><span>one</span></div>') }
-  let(:changed_attr_name) { Nokogiri::XML('<div><p i="1">one</p></div>') }
+  let(:changed_text)       { Nokogiri::XML('<div><p>two</p></div>') }
+  let(:changed_element)    { Nokogiri::XML('<div><span>one</span></div>') }
+  let(:changed_attr_name)  { Nokogiri::XML('<div><p i="1">one</p></div>') }
   let(:changed_attr_value) { Nokogiri::XML('<div><p id="2">one</p></div>') }
+  let(:changed_attr_order) { Nokogiri::XML('<div><p class="2" id="1">one</p></div>') }
 
-  let(:removed_text) { Nokogiri::XML('<div><p></p>two</div>') }
+  let(:removed_text)    { Nokogiri::XML('<div><p></p>two</div>') }
   let(:removed_element) { Nokogiri::XML('<div></div>') }
-  let(:removed_attr) { Nokogiri::XML('<div><p>one</p></div>') }
+  let(:removed_attr)    { Nokogiri::XML('<div><p>one</p></div>') }
 
   it "should add #diff to Nokogiri::XML::Docuemnt" do
-    doc.should respond_to(:diff)
+    expect(doc).to respond_to(:diff)
   end
 
   it "should add #diff to Nokogiri::XML::Element" do
-    added_element.at('div').should respond_to(:diff)
+    expect(added_element.at('div')).to respond_to(:diff)
   end
 
   it "should add #diff to Nokogiri::XML::Text" do
-    added_text.at('p/text()').should respond_to(:diff)
+    expect(added_text.at('p/text()')).to respond_to(:diff)
   end
 
   it "should add #diff to Nokogiri::XML::Attr" do
-    added_attr.at('p/@id').should respond_to(:diff)
+    expect(added_attr.at('p/@id')).to respond_to(:diff)
   end
 
   it "should not compare the Document objects" do
     change = doc.diff(doc).first
 
-    change[0].should == ' '
-    change[1].should == doc.root
+    expect(change[0]).to eq(' ')
+    expect(change[1]).to eq(doc.root)
   end
 
   it "should determine when two different documents are identical" do
-    doc.diff(Nokogiri::XML(contents)).all? { |change,node|
+    expect(doc.diff(Nokogiri::XML(contents)).all? { |change,node|
       change == ' '
-    }.should == true
+    }).to eq(true)
   end
 
   it "should search down within Nokogiri::XML::Document objects" do
-    doc.diff(changed_text).any? { |change,node|
+    expect(doc.diff(changed_text).any? { |change,node|
       change != ' '
-    }.should == true
+    }).to eq(true)
   end
 
   it "should determine when text nodes are added" do
     changes = doc.at('div').diff(added_text.at('div')).to_a
 
-    changes.length.should == 4
+    expect(changes.length).to eq(4)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == doc.at('div')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(doc.at('div'))
 
-    changes[1][0].should == ' '
-    changes[1][1].should == doc.at('//p')
+    expect(changes[1][0]).to eq(' ')
+    expect(changes[1][1]).to eq(doc.at('//p'))
 
-    changes[2][0].should == '+'
-    changes[2][1].should == added_text.at('//div/text()')
+    expect(changes[2][0]).to eq('+')
+    expect(changes[2][1]).to eq(added_text.at('//div/text()'))
 
-    changes[3][0].should == ' '
-    changes[3][1].should == doc.at('//p/text()')
+    expect(changes[3][0]).to eq(' ')
+    expect(changes[3][1]).to eq(doc.at('//p/text()'))
   end
 
   it "should determine when elements are added" do
     changes = doc.at('div').diff(added_element.at('div')).to_a
 
-    changes.length.should == 5
+    expect(changes.length).to eq(5)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == doc.at('div')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(doc.at('div'))
 
-    changes[1][0].should == '+'
-    changes[1][1].should == added_element.at('//p[1]')
+    expect(changes[1][0]).to eq('+')
+    expect(changes[1][1]).to eq(added_element.at('//p[1]'))
 
-    changes[2][0].should == ' '
-    changes[2][1].should == doc.at('//p')
+    expect(changes[2][0]).to eq(' ')
+    expect(changes[2][1]).to eq(doc.at('//p'))
 
-    changes[3][0].should == '-'
-    changes[3][1].should == doc.at('//p/text()')
+    expect(changes[3][0]).to eq('-')
+    expect(changes[3][1]).to eq(doc.at('//p/text()'))
 
-    changes[4][0].should == '+'
-    changes[4][1].should == added_element.at('//p[2]/text()')
+    expect(changes[4][0]).to eq('+')
+    expect(changes[4][1]).to eq(added_element.at('//p[2]/text()'))
+  end
+
+  it "should ignore when attribute order changes" do
+    changes = added_attrs.at('p').diff(changed_attr_order.at('p')).to_a
+
+    expect(changes.all? { |change| change[0] == ' ' }).to be_truthy
   end
 
   it "should determine when attributes are added" do
     changes = doc.at('p').diff(added_attr.at('p')).to_a
 
-    changes.length.should == 3
+    expect(changes.length).to eq(3)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == doc.at('p')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(doc.at('p'))
 
-    changes[1][0].should == '+'
-    changes[1][1].should == added_attr.at('//p/@id')
+    expect(changes[1][0]).to eq('+')
+    expect(changes[1][1]).to eq(added_attr.at('//p/@id'))
 
-    changes[2][0].should == ' '
-    changes[2][1].should == doc.at('//p/text()')
+    expect(changes[2][0]).to eq(' ')
+    expect(changes[2][1]).to eq(doc.at('//p/text()'))
   end
 
   it "should determine when text nodes differ" do
     changes = doc.at('p').diff(changed_text.at('p')).to_a
 
-    changes.length.should == 3
+    expect(changes.length).to eq(3)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == doc.at('p')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(doc.at('p'))
 
-    changes[1][0].should == '-'
-    changes[1][1].should == doc.at('//p/text()')
+    expect(changes[1][0]).to eq('-')
+    expect(changes[1][1]).to eq(doc.at('//p/text()'))
 
-    changes[2][0].should == '+'
-    changes[2][1].should == changed_text.at('//p/text()')
+    expect(changes[2][0]).to eq('+')
+    expect(changes[2][1]).to eq(changed_text.at('//p/text()'))
   end
 
   it "should determine when element names differ" do
     changes = doc.at('div').diff(changed_element.at('div')).to_a
 
-    changes.length.should == 3
+    expect(changes.length).to eq(3)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == doc.at('div')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(doc.at('div'))
 
-    changes[1][0].should == '-'
-    changes[1][1].should == doc.at('p')
+    expect(changes[1][0]).to eq('-')
+    expect(changes[1][1]).to eq(doc.at('p'))
 
-    changes[2][0].should == '+'
-    changes[2][1].should == changed_element.at('span')
+    expect(changes[2][0]).to eq('+')
+    expect(changes[2][1]).to eq(changed_element.at('span'))
   end
 
   it "should determine when attribute names differ" do
     changes = added_attr.at('p').diff(changed_attr_name.at('p')).to_a
 
-    changes.length.should == 4
+    expect(changes.length).to eq(4)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == added_attr.at('p')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(added_attr.at('p'))
 
-    changes[1][0].should == '-'
-    changes[1][1].should == added_attr.at('//p/@id')
+    expect(changes[1][0]).to eq('-')
+    expect(changes[1][1]).to eq(added_attr.at('//p/@id'))
 
-    changes[2][0].should == '+'
-    changes[2][1].should == changed_attr_name.at('//p/@i')
+    expect(changes[2][0]).to eq('+')
+    expect(changes[2][1]).to eq(changed_attr_name.at('//p/@i'))
 
-    changes[3][0].should == ' '
-    changes[3][1].should == added_attr.at('//p/text()')
+    expect(changes[3][0]).to eq(' ')
+    expect(changes[3][1]).to eq(added_attr.at('//p/text()'))
   end
 
   it "should determine when attribute values differ" do
     changes = added_attr.at('p').diff(changed_attr_value.at('p')).to_a
 
-    changes.length.should == 4
+    expect(changes.length).to eq(4)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == added_attr.at('p')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(added_attr.at('p'))
 
-    changes[1][0].should == '-'
-    changes[1][1].should == added_attr.at('//p/@id')
+    expect(changes[1][0]).to eq('-')
+    expect(changes[1][1]).to eq(added_attr.at('//p/@id'))
 
-    changes[2][0].should == '+'
-    changes[2][1].should == changed_attr_value.at('//p/@id')
+    expect(changes[2][0]).to eq('+')
+    expect(changes[2][1]).to eq(changed_attr_value.at('//p/@id'))
 
-    changes[3][0].should == ' '
-    changes[3][1].should == added_attr.at('//p/text()')
+    expect(changes[3][0]).to eq(' ')
+    expect(changes[3][1]).to eq(added_attr.at('//p/text()'))
   end
 
   it "should determine when text nodes are removed" do
     changes = added_text.at('div').diff(removed_text.at('div')).to_a
 
-    changes.length.should == 4
+    expect(changes.length).to eq(4)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == added_text.at('div')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(added_text.at('div'))
 
-    changes[1][0].should == ' '
-    changes[1][1].should == added_text.at('p')
+    expect(changes[1][0]).to eq(' ')
+    expect(changes[1][1]).to eq(added_text.at('p'))
 
-    changes[2][0].should == ' '
-    changes[2][1].should == added_text.at('//div/text()')
+    expect(changes[2][0]).to eq(' ')
+    expect(changes[2][1]).to eq(added_text.at('//div/text()'))
 
-    changes[3][0].should == '-'
-    changes[3][1].should == added_text.at('//p/text()')
+    expect(changes[3][0]).to eq('-')
+    expect(changes[3][1]).to eq(added_text.at('//p/text()'))
   end
 
   it "should determine when elements are removed" do
     changes = added_element.at('div').diff(removed_element.at('div')).to_a
 
-    changes.length.should == 3
+    expect(changes.length).to eq(3)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == added_element.at('div')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(added_element.at('div'))
 
-    changes[1][0].should == '-'
-    changes[1][1].should == added_element.at('//p[1]')
+    expect(changes[1][0]).to eq('-')
+    expect(changes[1][1]).to eq(added_element.at('//p[1]'))
+
+    expect(changes[2][0]).to eq('-')
+    expect(changes[2][1]).to eq(added_element.at('//p[2]'))
+  end
 
-    changes[2][0].should == '-'
-    changes[2][1].should == added_element.at('//p[2]')
+  it "should ignore when attributes change order" do
   end
 
   it "should determine when attributes are removed" do
     changes = added_attr.at('div').diff(removed_attr.at('div')).to_a
 
-    changes.length.should == 4
+    expect(changes.length).to eq(4)
 
-    changes[0][0].should == ' '
-    changes[0][1].should == added_attr.at('div')
+    expect(changes[0][0]).to eq(' ')
+    expect(changes[0][1]).to eq(added_attr.at('div'))
 
-    changes[1][0].should == ' '
-    changes[1][1].should == added_attr.at('p')
+    expect(changes[1][0]).to eq(' ')
+    expect(changes[1][1]).to eq(added_attr.at('p'))
 
-    changes[2][0].should == '-'
-    changes[2][1].should == added_attr.at('//p/@id')
+    expect(changes[2][0]).to eq('-')
+    expect(changes[2][1]).to eq(added_attr.at('//p/@id'))
 
-    changes[3][0].should == ' '
-    changes[3][1].should == added_attr.at('//p/text()')
+    expect(changes[3][0]).to eq(' ')
+    expect(changes[3][1]).to eq(added_attr.at('//p/text()'))
   end
 
   context ":added" do
     it "should determine only when text nodes are added" do
       changes = doc.at('div').diff(added_text.at('div'), :added => true).to_a
 
-      changes.length.should == 1
+      expect(changes.length).to eq(1)
 
-      changes[0][0].should == '+'
-      changes[0][1].should == added_text.at('//div/text()')
+      expect(changes[0][0]).to eq('+')
+      expect(changes[0][1]).to eq(added_text.at('//div/text()'))
     end
 
     it "should determine only when elements are added" do
       changes = doc.at('div').diff(added_element.at('div'), :added => true).to_a
 
-      changes.length.should == 1
+      expect(changes.length).to eq(1)
 
-      changes[0][0].should == '+'
-      changes[0][1].should == added_element.at('//div/p[2]')
+      expect(changes[0][0]).to eq('+')
+      expect(changes[0][1]).to eq(added_element.at('//div/p[2]'))
     end
 
     it "should determine only when attributes are added" do
       changes = doc.at('div').diff(added_attr.at('div'), :added => true).to_a
 
-      changes.length.should == 1
+      expect(changes.length).to eq(1)
 
-      changes[0][0].should == '+'
-      changes[0][1].should == added_attr.at('//p/@id')
+      expect(changes[0][0]).to eq('+')
+      expect(changes[0][1]).to eq(added_attr.at('//p/@id'))
     end
   end
 
@@ -257,28 +268,28 @@ describe "nokogiri/diff" do
     it "should determine only when text nodes are removed" do
       changes = doc.at('div').diff(removed_text.at('div'), :removed => true).to_a
 
-      changes.length.should == 1
+      expect(changes.length).to eq(1)
 
-      changes[0][0].should == '-'
-      changes[0][1].should == doc.at('//p/text()')
+      expect(changes[0][0]).to eq('-')
+      expect(changes[0][1]).to eq(doc.at('//p/text()'))
     end
 
     it "should determine only when elements are removed" do
       changes = doc.at('div').diff(removed_element.at('div'), :removed => true).to_a
 
-      changes.length.should == 1
+      expect(changes.length).to eq(1)
 
-      changes[0][0].should == '-'
-      changes[0][1].should == doc.at('//div/p')
+      expect(changes[0][0]).to eq('-')
+      expect(changes[0][1]).to eq(doc.at('//div/p'))
     end
 
     it "should determine only when attributes are removed" do
       changes = added_attr.at('div').diff(removed_attr.at('div'), :removed => true).to_a
 
-      changes.length.should == 1
+      expect(changes.length).to eq(1)
 
-      changes[0][0].should == '-'
-      changes[0][1].should == added_attr.at('//p/@id')
+      expect(changes[0][0]).to eq('-')
+      expect(changes[0][1]).to eq(added_attr.at('//p/@id'))
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
-gem 'rspec', '~> 2.4'
 require 'rspec'
+require 'simplecov'
+SimpleCov.start

metadata

@@ -1,102 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Postmodern
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiff
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
 description: Nokogiri::Diff adds the ability to calculate the differences (added or
   removed nodes) between two XML/HTML documents.
 email: postmodern.mod3@gmail.com
@@ -107,12 +62,13 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .gemtest
-- .gitignore
-- .rspec
-- .yardopts
+- ".document"
+- ".github/workflows/ruby.yml"
+- ".gitignore"
+- ".rspec"
+- ".yardopts"
 - ChangeLog.md
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -128,26 +84,24 @@ files:
 homepage: https://github.com/postmodern/nokogiri-diff#readme
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.4.10
+signing_key:
+specification_version: 4
 summary: Calculate the differences between two XML/HTML documents.
 test_files: []