rdf-isomorphic 3.0.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d714d7b459fdfb27d50eb4e23e6a3bf072e4b82f57c03bed4d6fabfeb131158b
-  data.tar.gz: 8e7f4db3878d2c33896cdec9feffbdbf9d4fa367241198f999044f1346e6fce8
+  metadata.gz: 49c61ee96966b6063eb6a8983dd8bf97f5b5cedb9d108fd238113dc7a9416d01
+  data.tar.gz: 4186c4ff77576a77a70f13174f69c7f880b4e37f79fad59bfd83f36a44179d07
 SHA512:
-  metadata.gz: bdd1d92135c36fa11803b23821b64c008ba8884bb99ff8bcfb9551044b2fbf6c75dd232befd29c771c49e6d449409c30d179e7a128f9814b89f238cf611f1f5d
-  data.tar.gz: 206eb8c499223a59eff52e31572546cc086d22cffb811708981a8322e537092b15ce5bf18c111edf8a20fa51c16ffd7c71461c884f4286adf61756641e09461c
+  metadata.gz: a037ee04fb91ff3d98ffa5bc7165240a17395ebd40cf1c6543a562a14f019a72037cb1e2e3c94e51296146cf36e28d59b9c2190bc40c8b956331ce5ece01445f
+  data.tar.gz: fe150895a773f28f10175e77a9226eea9442745d27eb24af21fc65a61cbf9d8174252707ed5d8377c6dbb531a890c7f1a1696bf89e1a36a7609897d9e9a6cc45

data/AUTHORS

@@ -1,3 +1,3 @@
 * Ben Lavender <blavender@gmail.com> (Lead developer)
 * Arto Bendiken <arto.bendiken@gmail.com>
-* Gregg Kellogg <gregg@kellogg-assoc.com>
+* Gregg Kellogg <gregg@greggkellogg.net>

data/README.md

@@ -3,17 +3,18 @@
 This is an [RDF.rb][] extension for RDF Isomorphism functionality for RDF::Enumerables.
 That includes RDF::Repository, RDF::Graph, query results, and more.
 
-For more information about [RDF.rb][], see <http://www.rubydoc.info/github/ruby-rdf/rdf/>
+For more information about [RDF.rb][], see <https://ruby-rdf.github.io/rdf/>
 
-[![Gem Version](https://badge.fury.io/rb/rdf-isomorphic.png)](http://badge.fury.io/rb/rdf-isomorphic)
-[![Build Status](https://travis-ci.org/ruby-rdf/rdf-isomorphic.png)](https://travis-ci.org/ruby-rdf/rdf-isomorphic)
+[![Gem Version](https://badge.fury.io/rb/rdf-isomorphic.png)](https://badge.fury.io/rb/rdf-isomorphic)
+[![Build Status](https://github.com/ruby-rdf/rdf-isomorphic/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-isomorphic/actions?query=workflow%3ACI)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-isomorphic/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-isomorphic?branch=develop)
+[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Synopsis:
 
     require 'rdf/isomorphic'
     require 'rdf/ntriples'
 
-
     a = RDF::Repository.load './tests/isomorphic/test1/test1-1.nt'
     a.first
     # < RDF::Statement:0xd344c4(<http://example.org/a> <http://example.org/prop> <_:abc> .) >
@@ -32,8 +33,7 @@ For more information about [RDF.rb][], see <http://www.rubydoc.info/github/ruby-
 ## Algorithm
 
 The algorithm used here is very similar to the one described by Jeremy Carroll
-in <http://www.hpl.hp.com/techreports/2001/HPL-2001-293.pdf>.  See
-<http://blog.datagraph.org/2010/03/rdf-isomorphism>.
+in <https://www.hpl.hp.com/techreports/2001/HPL-2001-293.pdf>.
 
 Generally speaking, the Carroll algorithm is a very good fit for RDF graphs. It
 is a specialization of the naive factorial-time test for graph isomorphism,
@@ -64,14 +64,15 @@ specs in RDF libraries.  Try this in your tests:
     end
 
 ### Information
- * Author: Ben Lavender <blavender@gmail.com> - <http://bhuga.net>
- * Author: Arto Bendiken <arto.bendiken@gmail.com> - <http://ar.to>
- * Source: <http://github.com/bhuga/RDF-Isomorphic>
- * Issues: <http://github.com/bhuga/RDF-Isomorphic/issues>
+ * Author: Ben Lavender <blavender@gmail.com> - <https://bhuga.net/>
+ * Author: Arto Bendiken <arto.bendiken@gmail.com> - <https://ar.to/>
+ * Author: Gregg Kellogg <gregg@greggkellogg.net> - <https://greggkellogg.net/>
+ * Source: <https://github.com/ruby-rdf/rdf-isomorphic>
+ * Issues: <https://github.com/ruby-rdf/rdf-isomorphic/issues>
 
 ### See also
- * RDF.rb: <http://ruby-rdf.github.com>
- * RDF.rb source: <http://github.com/ruby-rdf/rdf>
+ * RDF.rb: <https://ruby-rdf.github.io>
+ * RDF.rb source: <https://github.com/ruby-rdf/rdf>
 
 ## Contributing
 
@@ -90,14 +91,16 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
   enough, be assured we will eventually add you in there.
 * Do note that in order for us to merge any non-trivial changes (as a rule
   of thumb, additions larger than about 15 lines of code), we need an
-  explicit [public domain dedication][PDD] on record from you.
+  explicit [public domain dedication][PDD] on record from you,
+  which you will be asked to agree to on the first commit to a repo within the organization.
+  Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
 
 ## License
 
 This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
+see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
-[RDF.rb]:           http://ruby-rdf.github.com/
-[YARD]:             http://yardoc.org/
-[YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
+[RDF.rb]:           https://ruby-rdf.github.io/
+[YARD]:             https://yardoc.org/
+[YARD-GS]:          https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:              https://unlicense.org/#unlicensing-contributions

data/UNLICENSE

@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org/>
+For more information, please refer to <https://unlicense.org/>

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.2.1

data/lib/rdf/isomorphic.rb

@@ -9,25 +9,22 @@ module RDF
   #
   # RDF::Isomorphic provides the functions isomorphic_with and bijection_to for RDF::Enumerable.
   #
-  # @see http://www.rubydoc.info/github/ruby-rdf/rdf/
-  # @see http://www.hpl.hp.com/techreports/2001/HPL-2001-293.pdf
+  # @see https://ruby-rdf.github.io/rdf/
+  # @see https://www.hpl.hp.com/techreports/2001/HPL-2001-293.pdf
   module Isomorphic
     autoload :VERSION,        'rdf/isomorphic/version'
 
     # Returns `true` if this RDF::Enumerable is isomorphic with another.
     #
-    # Takes a canonicalize: true argument.  If true, RDF::Literals will be
-    # canonicalized while producing a bijection.  This results in broader
-    # matches for isomorphism in the case of equivalent literals with different
-    # representations.
-    #
-    # @param opts [Hash<Symbol => Any>] options
+    # @param canonicalize [Boolean] (false)
+    #   If `true`, RDF::Literals will be canonicalized while producing a bijection.  This results in broader matches for isomorphism in the case of equivalent literals with different representations.
+    # @param opts [Hash<Symbol => Any>] other options ignored
     # @param other [RDF::Enumerable]
     # @return [Boolean]
     # @example
     #     repository_a.isomorphic_with repository_b #=> true
-    def isomorphic_with?(other, opts = {})
-      !(bijection_to(other, opts).nil?)
+    def isomorphic_with?(other, canonicalize: false, **opts)
+      !(bijection_to(other, canonicalize: false, **opts).nil?)
     end
 
     alias_method :isomorphic?, :isomorphic_with?
@@ -45,9 +42,11 @@ module RDF
     # @example
     #     repository_a.bijection_to repository_b
     # @param other [RDF::Enumerable]
-    # @param opts [Hash<Symbol => Any>] options
+    # @param canonicalize [Boolean] (false)
+    #   If true, RDF::Literals will be canonicalized while producing a bijection.  This results in broader matches for isomorphism in the case of equivalent literals with different representations.
+    # @param opts [Hash<Symbol => Any>] other options ignored
     # @return [Hash, nil]
-    def bijection_to(other, opts = {})
+    def bijection_to(other, canonicalize: false, **opts)
 
       grounded_stmts_match = (count == other.count)
 
@@ -65,7 +64,10 @@ module RDF
 
         nodes = RDF::Isomorphic.blank_nodes_in(blank_stmts)
         other_nodes = RDF::Isomorphic.blank_nodes_in(other_blank_stmts)
-        build_bijection_to blank_stmts, nodes, other_blank_stmts, other_nodes, {}, {}, opts
+        build_bijection_to blank_stmts, nodes, other_blank_stmts, other_nodes,
+          these_grounded_hashes: {},
+          other_grounded_hashes: {},
+          canonicalize: false
       else
         nil
       end
@@ -77,7 +79,7 @@ module RDF
     # The main recursive bijection algorithm.
     #
     # This algorithm is very similar to the one explained by Jeremy Carroll in
-    # http://www.hpl.hp.com/techreports/2001/HPL-2001-293.pdf. Page 12 has the
+    # https://www.hpl.hp.com/techreports/2001/HPL-2001-293.pdf. Page 12 has the
     # relevant pseudocode.
     #
     # Many more comments are in the method itself.
@@ -88,10 +90,14 @@ module RDF
     # @param [Array]            other_nodes
     # @param [Hash]             these_grounded_hashes
     # @param [Hash]             other_grounded_hashes
-    # @param [Hash]             opts
+    # @param canonicalize [Boolean] (false)
+    #   If true, RDF::Literals will be canonicalized while producing a bijection.  This results in broader matches for isomorphism in the case of equivalent literals with different representations.
     # @return [nil,Hash]
     # @private
-    def build_bijection_to(anon_stmts, nodes, other_anon_stmts, other_nodes, these_grounded_hashes = {}, other_grounded_hashes = {}, opts = {})
+    def build_bijection_to(anon_stmts, nodes, other_anon_stmts, other_nodes,
+                           these_grounded_hashes: {},
+                           other_grounded_hashes: {},
+                           canonicalize: false)
 
       # Create a hash signature of every node, based on the signature of
       # statements it exists in.  
@@ -99,8 +105,8 @@ module RDF
       # that information to eliminate possible recursion combinations.
       # 
       # Any mappings given in the method parameters are considered grounded.
-      these_hashes, these_ungrounded_hashes = RDF::Isomorphic.hash_nodes(anon_stmts, nodes, these_grounded_hashes, opts[:canonicalize])
-      other_hashes, other_ungrounded_hashes = RDF::Isomorphic.hash_nodes(other_anon_stmts, other_nodes, other_grounded_hashes, opts[:canonicalize])
+      these_hashes, these_ungrounded_hashes = RDF::Isomorphic.hash_nodes(anon_stmts, nodes, these_grounded_hashes, canonicalize: canonicalize)
+      other_hashes, other_ungrounded_hashes = RDF::Isomorphic.hash_nodes(other_anon_stmts, other_nodes, other_grounded_hashes, canonicalize: canonicalize)
 
       # Grounded hashes are built at the same rate between the two graphs (if
       # they are isomorphic).  If there exists a grounded node in one that is
@@ -116,7 +122,7 @@ module RDF
       # around for when we recurse later (we only recurse on ungrounded nodes)
       bijection = {}
       nodes.each do | node |
-        other_node, other_hash = other_ungrounded_hashes.find do | other_node, other_hash |
+        other_node, _ = other_ungrounded_hashes.find do | other_node, other_hash |
           # we need to use eql?, as coincedentally-named bnode identifiers are == in rdf.rb
           these_ungrounded_hashes[node].eql? other_hash
         end
@@ -148,7 +154,11 @@ module RDF
             next unless these_ungrounded_hashes[node] == other_ungrounded_hashes[other_node]
 
             hash = Digest::SHA1.hexdigest(node.to_s)
-            bijection = build_bijection_to(anon_stmts, nodes, other_anon_stmts, other_nodes, these_hashes.merge( node => hash), other_hashes.merge(other_node => hash))
+            bijection = build_bijection_to(anon_stmts, nodes,
+                         other_anon_stmts, other_nodes,
+                         these_grounded_hashes: these_hashes.merge( node => hash),
+                         other_grounded_hashes: other_hashes.merge(other_node => hash),
+                         canonicalize: canonicalize)
           end
           bijection
         end
@@ -162,7 +172,7 @@ module RDF
     # @param [Array<RDF::Statement>] blank_stmt_list
     # @return [Array<RDF::Node>]
     def self.blank_nodes_in(blank_stmt_list)
-      blank_stmt_list.map {|statement | statement.to_quad.compact.select(&:node?)}.flatten.uniq
+      blank_stmt_list.map {|statement | statement.terms.select(&:node?)}.flatten.uniq
     end
 
     # Given a set of statements, create a mapping of node => SHA1 for a given
@@ -180,7 +190,7 @@ module RDF
     # @param [Hash] grounded_hashes
     # @private
     # @return [Hash, Hash]
-    def self.hash_nodes(statements, nodes, grounded_hashes, canonicalize = false)
+    def self.hash_nodes(statements, nodes, grounded_hashes, canonicalize: false)
       hashes = grounded_hashes.dup
       ungrounded_hashes = {}
       hash_needed = true
@@ -192,7 +202,7 @@ module RDF
         starting_grounded_nodes = hashes.size
         nodes.each do | node |
           unless hashes.member? node
-            grounded, hash = node_hash_for(node, statements, hashes, canonicalize)
+            grounded, hash = node_hash_for(node, statements, hashes, canonicalize: canonicalize)
             if grounded
               hashes[node] = hash
             end
@@ -231,13 +241,13 @@ module RDF
     # @param [Hash] hashes
     # @param [Boolean] canonicalize
     # @return [Boolean, String]
-    def self.node_hash_for(node, statements, hashes, canonicalize)
+    def self.node_hash_for(node, statements, hashes, canonicalize:)
       statement_signatures = []
       grounded = true
       statements.each do | statement |
-        if statement.to_quad.include?(node)
-          statement_signatures << hash_string_for(statement, hashes, node, canonicalize)
-          statement.to_quad.compact.each do | resource |
+        if statement.terms.include?(node)
+          statement_signatures << hash_string_for(statement, hashes, node, canonicalize: canonicalize)
+          statement.terms.each do | resource |
             grounded = false unless grounded?(resource, hashes) || resource == node
           end
         end
@@ -251,8 +261,8 @@ module RDF
     # string signatures for grounded node elements.
     # return [String]
     # @private
-    def self.hash_string_for(statement, hashes, node, canonicalize)
-      statement.to_quad.map {|r| string_for_node(r, hashes, node, canonicalize)}.join("")
+    def self.hash_string_for(statement, hashes, node, canonicalize:)
+      statement.terms.map {|r| string_for_node(r, hashes, node, canonicalize: canonicalize)}.join("")
     end
 
     # Returns true if a given node is grounded
@@ -269,7 +279,7 @@ module RDF
     # nodes will return their hashed form.
     # @return [String]
     # @private
-    def self.string_for_node(node, hashes,target, canonicalize)
+    def self.string_for_node(node, hashes,target, canonicalize:)
       case
         when node.nil?
           ""
@@ -291,7 +301,10 @@ module RDF
 
 
   # Extend RDF::Enumerables with these functions.
-  module Enumerable 
+  module Enumerable
+    include RDF::Isomorphic
+  end
+  class Enumerable::Enumerator
     include RDF::Isomorphic
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rdf-isomorphic
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Ben Lavender
 - Arto Bendiken
-autorequire: 
+- Gregg Kellogg
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,56 +18,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
 description: RDF.rb extension for graph bijections and isomorphic equivalence.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -79,11 +80,16 @@ files:
 - VERSION
 - lib/rdf/isomorphic.rb
 - lib/rdf/isomorphic/version.rb
-homepage: http://ruby-rdf.github.com/rdf-isomorphic
+homepage: https://github.com/ruby-rdf/rdf-isomorphic
 licenses:
 - Unlicense
-metadata: {}
-post_install_message: 
+metadata:
+  documentation_uri: https://ruby-rdf.github.io/rdf-isomorphic
+  bug_tracker_uri: https://github.com/ruby-rdf/rdf-isomorphic/issues
+  homepage_uri: https://github.com/ruby-rdf/rdf-isomorphic
+  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
+  source_code_uri: https://github.com/ruby-rdf/rdf-isomorphic
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,16 +97,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: RDF Graph/Dataset Isomorphism as defined in RDF 1.1 Concepts.
 test_files: []