rdf-normalize 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4228bee01dba3de0d611ae8431824ebf1f6f09ae6039a5570ea3e86f4cb8c467
-  data.tar.gz: c932b23a352bf3771a5e426c0976050b128f41473a8ea6cea675c1a7bc26ef5a
+  metadata.gz: 75218bd6e68ada2e64c27fb691f0ff8b92cfd8b9fe9747f02d862bcbcdd8a5dd
+  data.tar.gz: fbe6c3579b66435b0b2620178a3ebf46e1bd56f17180a7a64f081aab65a3c447
 SHA512:
-  metadata.gz: 0d5995bdc3c593385a74ba69bf367c01a2d5b44fd7d0b5aab9f8495ebc14d16c3b709ceff21c2294c951613726190c49eab41098feaac0c2ba350afd25552fc4
-  data.tar.gz: e0e70f5aa3bdfb49bc0679cae8e362fa3191d9452a2ca3aaa004b995622837865dca6d61aaa264407c8fc0d4197fadfbfee6dd91a19cf9e46f399b57e587634c
+  metadata.gz: 1363fb834466a6a643245a12776ab6c49cff62436af19ecd5d6dfe58feb83b49971868838dc1d9f687a997ee93af2b12b98a51eedc2f6846e1e0e74810eb4285
+  data.tar.gz: 62fb2457433083c9b4181353bfa0ec8740a871f3f58b6ac83233a0dd6385b3556a7540c62b1041bab5ba2aee17a55234c70a323fedfc41db09912bf7d3675215

data/LICENSE

@@ -21,5 +21,5 @@ 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/README.md

@@ -1,11 +1,13 @@
 # RDF::Normalize
 RDF Graph normalizer for [RDF.rb][RDF.rb].
 
-[![Gem Version](https://badge.fury.io/rb/rdf-normalize.png)](http://badge.fury.io/rb/rdf-normalize)
-[![Build Status](https://secure.travis-ci.org/ruby-rdf/rdf-normalize.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-normalize)
+[![Gem Version](https://badge.fury.io/rb/rdf-normalize.png)](https://badge.fury.io/rb/rdf-normalize)
+[![Build Status](https://github.com/ruby-rdf/rdf-normalize/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-normalize/actions?query=workflow%3ACI)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-normalize/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-normalize?branch=develop)
+[![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
@@ -14,18 +16,28 @@ to serialize normalized statements.
 
 Algorithms implemented:
 
-* [URGNA2012](http://json-ld.github.io/normalization/spec/index.html#dfn-urgna2012)
-* [URDNA2015](http://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`
 
-* 100% free and unencumbered [public domain](http://unlicense.org/) software.
-* Compatible with  Ruby >= 2.4.
+* 100% free and unencumbered [public domain](https://unlicense.org/) software.
+* Compatible with  Ruby >= 2.6.
 
 ## 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}
@@ -35,24 +47,23 @@ Full documentation available on [Rubydoc.info][Normalize doc]
   * {RDF::Normalize::URGNA2012}
   * {RDF::Normalize::URDNA2015}
 
-
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.4)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
+* [Ruby](https://ruby-lang.org/) (>= 2.6)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
 
 ## Installation
 
-The recommended installation method is via [RubyGems](http://rubygems.org/).
+The recommended installation method is via [RubyGems](https://rubygems.org/).
 To install the latest official release of the `RDF::Normalize` gem, do:
 
     % [sudo] gem install rdf-normalize
 
 ## Mailing List
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+* <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
 ## Author
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
+* [Gregg Kellogg](https://github.com/gkellogg) - <https://greggkellogg.net/>
 
 ## Contributing
 * Do your best to adhere to the existing coding conventions and idioms.
@@ -65,18 +76,20 @@ To install the latest official release of the `RDF::Normalize` gem, do:
   list in the the `README`. Alphabetical order applies.
 * 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:LICENSE} file.
-
-[Ruby]:         http://ruby-lang.org/
-[RDF]:          http://www.w3.org/RDF/
-[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]:       http://rubydoc.info/github/ruby-rdf/rdf-normalize
-[N-Triples]:    http://www.w3.org/TR/rdf-testcases/#ntriples
-[RDF Normalize]:http://json-ld.github.io/normalization/spec/
-[Normalize doc]:http://rubydoc.info/github/ruby-rdf/rdf-normalize/master
+see <https://unlicense.org/> or the accompanying {file:LICENSE} file.
+
+[Ruby]:         https://ruby-lang.org/
+[RDF]:          https://www.w3.org/RDF/
+[YARD]:         https://yardoc.org/
+[YARD-GS]:      https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:              https://unlicense.org/#unlicensing-contributions
+[RDF.rb]:       https://ruby-rdf.github.io/rdf-normalize
+[N-Triples]:    https://www.w3.org/TR/rdf-testcases/#ntriples
+[RDF Dataset Canonicalization]: https://www.w3.org/TR/rdf-canon/
+[Normalize doc]: https://ruby-rdf.github.io/rdf-normalize/

data/VERSION

@@ -1 +1 @@
-0.4.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,11 +4,11 @@ module RDF::Normalize
   #
   # Normalizes the enumerated statements into normal form in the form of N-Quads.
   #
-  # @author [Gregg Kellogg](http://kellogg-assoc.com/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   class Writer < RDF::NQuads::Writer
     format RDF::Normalize::Format
 
-    # @attr_accessor [RDF::Repository] Repository of statements to serialized
+    # @return [RDF::Repository] Repository of statements to serialized
     attr_accessor :repo
 
     ##
@@ -69,7 +69,7 @@ module RDF::Normalize
     ##
     # Insert an Enumerable
     #
-    # @param  [RDF::Enumerable] graph
+    # @param  [RDF::Enumerable] enumerable
     # @return [void]
     def insert_statements(enumerable)
       @repo = enumerable

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.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,105 +16,71 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: open-uri-cached
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  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: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
-description: RDF::Normalize is a Graph normalizer for the RDF.rb library suite.
+        version: '0.9'
+description: RDF::Normalize performs Dataset Canonicalization for RDF.rb.
 email: public-rdf-ruby@w3.org
 executables: []
 extensions: []
@@ -132,11 +98,16 @@ files:
 - lib/rdf/normalize/urgna2012.rb
 - lib/rdf/normalize/version.rb
 - lib/rdf/normalize/writer.rb
-homepage: http://github.com/gkellogg/rdf-normalize
+homepage: https://github.com/ruby-rdf/rdf-normalize
 licenses:
 - Unlicense
-metadata: {}
-post_install_message: 
+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:
 - lib
@@ -144,15 +115,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: RDF Graph normalizer for Ruby.
 test_files: []