rdf-normalize 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60932e4daabb349e76fb838c46aeea30ea39ff2406d7fd2f08b4df20b22975e4
-  data.tar.gz: d1f1b87ac1a46ad18c7a1e848c8e7306b20cedbdb374cc1a197f8a2235875b27
+  metadata.gz: 75218bd6e68ada2e64c27fb691f0ff8b92cfd8b9fe9747f02d862bcbcdd8a5dd
+  data.tar.gz: fbe6c3579b66435b0b2620178a3ebf46e1bd56f17180a7a64f081aab65a3c447
 SHA512:
-  metadata.gz: 263602b7c6861bf74745600e5828f5095cb9a3a3f08974621d050982a78bc6d4d6e1c6e421cc69e5bc9fa0146cfd0521b0f4817989b8644b4d25fa02c13015dd
-  data.tar.gz: 98a1391dd232a2db5ea8353a51268fcfe9def16dc7a8f309bb305c7feeb9df85f8e96c8cc5dbcf4b3486e34d0133b33bdb353d2aa567bb948d412bb36be5e202
+  metadata.gz: 1363fb834466a6a643245a12776ab6c49cff62436af19ecd5d6dfe58feb83b49971868838dc1d9f687a997ee93af2b12b98a51eedc2f6846e1e0e74810eb4285
+  data.tar.gz: 62fb2457433083c9b4181353bfa0ec8740a871f3f58b6ac83233a0dd6385b3556a7540c62b1041bab5ba2aee17a55234c70a323fedfc41db09912bf7d3675215

data/README.md

@@ -7,7 +7,7 @@ RDF Graph normalizer for [RDF.rb][RDF.rb].
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Description
-This is a [Ruby][] implementation of a [RDF Normalize][] for [RDF.rb][].
+This is a [Ruby][] implementation of a [RDF Dataset Canonicalization][] for [RDF.rb][].
 
 ## Features
 RDF::Normalize generates normalized [N-Quads][] output for an RDF Dataset using the algorithm
@@ -16,8 +16,8 @@ to serialize normalized statements.
 
 Algorithms implemented:
 
-* [URGNA2012](https://json-ld.github.io/normalization/spec/index.html#dfn-urgna2012)
-* [URDNA2015](https://json-ld.github.io/normalization/spec/index.html#dfn-urdna2015)
+* [URGNA2012](https://www.w3.org/TR/rdf-canon/#dfn-urgna2012)
+* [URDNA2015](https://www.w3.org/TR/rdf-canon/#dfn-urdna2015)
 
 Install with `gem install rdf-normalize`
 
@@ -27,7 +27,17 @@ Install with `gem install rdf-normalize`
 ## Usage
 
 ## Documentation
-Full documentation available on [Rubydoc.info][Normalize doc]
+
+Full documentation available on [GitHub][Normalize doc]
+
+## Examples
+
+### Returning normalized N-Quads
+
+    require 'rdf/normalize'
+    require 'rdf/turtle'
+    g = RDF::Graph.load("etc/doap.ttl")
+    puts g.dump(:normalize)
 
 ### Principle Classes
 * {RDF::Normalize}
@@ -37,7 +47,6 @@ Full documentation available on [Rubydoc.info][Normalize doc]
   * {RDF::Normalize::URGNA2012}
   * {RDF::Normalize::URDNA2015}
 
-
 ## Dependencies
 
 * [Ruby](https://ruby-lang.org/) (>= 2.6)
@@ -80,7 +89,7 @@ see <https://unlicense.org/> or the accompanying {file:LICENSE} file.
 [YARD]:         https://yardoc.org/
 [YARD-GS]:      https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              https://unlicense.org/#unlicensing-contributions
-[RDF.rb]:       https://rubydoc.info/github/ruby-rdf/rdf-normalize
+[RDF.rb]:       https://ruby-rdf.github.io/rdf-normalize
 [N-Triples]:    https://www.w3.org/TR/rdf-testcases/#ntriples
-[RDF Normalize]:https://json-ld.github.io/normalization/spec/
-[Normalize doc]:https://rubydoc.info/github/ruby-rdf/rdf-normalize/master
+[RDF Dataset Canonicalization]: https://www.w3.org/TR/rdf-canon/
+[Normalize doc]: https://ruby-rdf.github.io/rdf-normalize/

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/rdf/normalize/urdna2015.rb

@@ -27,30 +27,23 @@ module RDF::Normalize
         end
       end
 
-      non_normalized_identifiers, simple = ns.bnode_to_statements.keys, true
+      ns.hash_to_bnodes = {}
 
-      while simple
-        simple = false
-        ns.hash_to_bnodes = {}
-
-        # Calculate hashes for first degree nodes
-        non_normalized_identifiers.each do |node|
-          hash = log_depth {ns.hash_first_degree_quads(node)}
-          log_debug("1deg") {"hash: #{hash}"}
-          ns.add_bnode_hash(node, hash)
-        end
+      # Calculate hashes for first degree nodes
+      ns.bnode_to_statements.each_key do |node|
+        hash = log_depth {ns.hash_first_degree_quads(node)}
+        log_debug("1deg") {"hash: #{hash}"}
+        ns.add_bnode_hash(node, hash)
+      end
 
-        # Create canonical replacements for hashes mapping to a single node
-        ns.hash_to_bnodes.keys.sort.each do |hash|
-          identifier_list = ns.hash_to_bnodes[hash]
-          next if identifier_list.length > 1
-          node = identifier_list.first
-          id = ns.canonical_issuer.issue_identifier(node)
-          log_debug("single node") {"node: #{node.to_ntriples}, hash: #{hash}, id: #{id}"}
-          non_normalized_identifiers -= identifier_list
-          ns.hash_to_bnodes.delete(hash)
-          simple = true
-        end
+      # Create canonical replacements for hashes mapping to a single node
+      ns.hash_to_bnodes.keys.sort.each do |hash|
+        identifier_list = ns.hash_to_bnodes[hash]
+        next if identifier_list.length > 1
+        node = identifier_list.first
+        id = ns.canonical_issuer.issue_identifier(node)
+        log_debug("single node") {"node: #{node.to_ntriples}, hash: #{hash}, id: #{id}"}
+        ns.hash_to_bnodes.delete(hash)
       end
 
       # Iterate over hashs having more than one node
@@ -107,12 +100,13 @@ module RDF::Normalize
 
       def add_statement(node, statement)
         bnode_to_statements[node] ||= []
-        bnode_to_statements[node] << statement unless bnode_to_statements[node].include?(statement)
+        bnode_to_statements[node] << statement unless bnode_to_statements[node].any? {|st| st.eql?(statement)}
       end
 
       def add_bnode_hash(node, hash)
         hash_to_bnodes[hash] ||= []
-        hash_to_bnodes[hash] << node unless hash_to_bnodes[hash].include?(node)
+        # Match on object IDs of nodes, rather than simple node equality
+        hash_to_bnodes[hash] << node unless hash_to_bnodes[hash].any? {|n| n.eql?(node)}
       end
 
       # @param [RDF::Node] node
@@ -143,7 +137,7 @@ module RDF::Normalize
         identifier = canonical_issuer.identifier(related) ||
                      issuer.identifier(related) ||
                      hash_first_degree_quads(related)
-        input = position.to_s
+        input = "#{position}"
         input << statement.predicate.to_ntriples unless position == :g
         input << identifier
         log_debug("hrel") {"input: #{input.inspect}, hash: #{hexdigest(input)}"}
@@ -225,7 +219,7 @@ module RDF::Normalize
 
           hash = log_depth {hash_related_node(term, statement, issuer, pos)}
           map[hash] ||= []
-          map[hash] << term unless map[hash].include?(term)
+          map[hash] << term unless map[hash].any? {|n| n.eql?(term)}
         end
       end
     end

data/lib/rdf/normalize/urgna2012.rb

@@ -23,9 +23,7 @@ module RDF::Normalize
         identifier = canonical_issuer.identifier(related) ||
                      issuer.identifier(related) ||
                      hash_first_degree_quads(related)
-        input = position.to_s
-        input << statement.predicate.to_s
-        input << identifier
+        input = "#{position}#{statement.predicate}#{identifier}"
         log_debug("hrel") {"input: #{input.inspect}, hash: #{hexdigest(input)}"}
         hexdigest(input)
       end
@@ -35,11 +33,11 @@ module RDF::Normalize
         if statement.subject.node? && statement.subject != identifier
           hash = log_depth {hash_related_node(statement.subject, statement, issuer, :p)}
           map[hash] ||= []
-          map[hash] << statement.subject unless map[hash].include?(statement.subject)
+          map[hash] << statement.subject unless map[hash].any? {|n| n.eql?(statement.subject)}
         elsif statement.object.node? && statement.object != identifier
           hash = log_depth {hash_related_node(statement.object, statement, issuer, :r)}
           map[hash] ||= []
-          map[hash] << statement.object unless map[hash].include?(statement.object)
+          map[hash] << statement.object unless map[hash].any? {|n| n.eql?(statement.object)}
         end
       end
     end

data/lib/rdf/normalize/version.rb

@@ -1,5 +1,5 @@
 module RDF::Normalize::VERSION
-  VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "..", "VERSION")
+  VERSION_FILE = File.expand_path("../../../../VERSION", __FILE__)
   MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chop.split(".")
 
   STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

data/lib/rdf/normalize/writer.rb

@@ -4,7 +4,7 @@ module RDF::Normalize
   #
   # Normalizes the enumerated statements into normal form in the form of N-Quads.
   #
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   class Writer < RDF::NQuads::Writer
     format RDF::Normalize::Format
 

data/lib/rdf/normalize.rb

@@ -25,7 +25,7 @@ module RDF
   #     writer << RDF::Repository.load("etc/doap.ttl")
   #   end
   #
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   module Normalize
     require  'rdf/normalize/format'
     autoload :Base,       'rdf/normalize/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-normalize
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: RDF::Normalize is a Graph normalizer for the RDF.rb library suite.
+description: RDF::Normalize performs Dataset Canonicalization for RDF.rb.
 email: public-rdf-ruby@w3.org
 executables: []
 extensions: []
@@ -115,7 +101,12 @@ files:
 homepage: https://github.com/ruby-rdf/rdf-normalize
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  documentation_uri: https://ruby-rdf.github.io/rdf-normalize
+  bug_tracker_uri: https://github.com/ruby-rdf/rdf-normalize/issues
+  homepage_uri: https://github.com/ruby-rdf/rdf-normalize
+  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
+  source_code_uri: https://github.com/ruby-rdf/rdf-normalize
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -131,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: RDF Graph normalizer for Ruby.