Update to name algorithm RDFC-1.0 instead of URDNA2015.

ruby-rdf · Jun 10, 2023 · ea96e02 · ea96e02
1 parent da4a6ed
commit ea96e02
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 132 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ to serialize normalized statements.
 Algorithms implemented:
 
 * [URGNA2012](https://www.w3.org/TR/rdf-canon/#dfn-urgna2012)
-* [URDNA2015](https://www.w3.org/TR/rdf-canon/#dfn-urdna2015)
+* [RDFC-1.0](https://www.w3.org/TR/rdf-canon/#dfn-rdfc-1-0)
 
 Install with `gem install rdf-normalize`
 
@@ -45,7 +45,7 @@ Full documentation available on [GitHub][Normalize doc]
   * {RDF::Normalize::Format}
   * {RDF::Normalize::Writer}
   * {RDF::Normalize::URGNA2012}
-  * {RDF::Normalize::URDNA2015}
+  * {RDF::Normalize::RDFC10}
 
 ## Dependencies
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.1
+0.6.0
diff --git a/etc/earl.ttl b/etc/earl.ttl
diff --git a/examples/test022.yml b/examples/test022.yml
@@ -1,4 +1,4 @@
-run manifest-urdna2015#test022ca:
+run manifest-rdfc10#test022ca:
   log point: Entering the canonicalization function (4.5.3).
   ca.2:
     log point: Extract quads for each bnode (4.5.3 (2)).

diff --git a/lib/rdf/normalize.rb b/lib/rdf/normalize.rb
@@ -32,7 +32,7 @@ module Normalize
     autoload :Base,       'rdf/normalize/base'
     autoload :Carroll2001,'rdf/normalize/carroll2001'
     autoload :URGNA2012,  'rdf/normalize/urgna2012'
-    autoload :URDNA2015,  'rdf/normalize/urdna2015'
+    autoload :RDFC10,     'rdf/normalize/rdfc10'
     autoload :VERSION,    'rdf/normalize/version'
     autoload :Writer,     'rdf/normalize/writer'
 
@@ -43,19 +43,19 @@ module Normalize
     ALGORITHMS = {
       carroll2001: :Carroll2001,
       urgna2012:   :URGNA2012,
-      urdna2015:   :URDNA2015
+      rdfc10:   :RDFC10
     }.freeze
 
     ##
     # Creates a new normalizer instance using either the specified or default normalizer algorithm
     # @param [RDF::Enumerable] enumerable
     # @param [Hash{Symbol => Object}] options
-    # @option options [Base] :algorithm (:urdna2015)
-    #   One of `:carroll2001`, `:urgna2012`, or `:urdna2015`
+    # @option options [Base] :algorithm (:rdfc10)
+    #   One of `:carroll2001`, `:urgna2012`, or `:rdfc10`
     # @return [RDF::Normalize::Base]
     # @raise [ArgumentError] selected algorithm not defined
     def new(enumerable, **options)
-      algorithm = options.fetch(:algorithm, :urdna2015)
+      algorithm = options.fetch(:algorithm, :rdfc10)
       raise ArgumentError, "No algoritm defined for #{algorithm.to_sym}" unless ALGORITHMS.has_key?(algorithm)
       algorithm_class = const_get(ALGORITHMS[algorithm])
       algorithm_class.new(enumerable, **options)

diff --git a/lib/rdf/normalize/urdna2015.rb → lib/rdf/normalize/rdfc10.rb b/lib/rdf/normalize/urdna2015.rb → lib/rdf/normalize/rdfc10.rb
@@ -6,7 +6,7 @@
 end
 
 module RDF::Normalize
-  class URDNA2015
+  class RDFC10
     include RDF::Enumerable
     include RDF::Util::Logger
     include Base

diff --git a/lib/rdf/normalize/urgna2012.rb b/lib/rdf/normalize/urgna2012.rb
@@ -1,12 +1,12 @@
 module RDF::Normalize
-  class URGNA2012 < URDNA2015
+  class URGNA2012 < RDFC10
 
     def each(&block)
       ns = NormalizationState.new(@options)
       normalize_statements(ns, &block)
     end
 
-    class NormalizationState < URDNA2015::NormalizationState
+    class NormalizationState < RDFC10::NormalizationState
       protected
 
       # 2012 version uses SHA-1

diff --git a/script/tc b/script/tc
@@ -142,7 +142,7 @@ end
 
 earl_preamble(options) if options[:earl]
 
-%w(urdna2015).each do |variant|
+%w(rdfc10).each do |variant|
   manifest = Fixtures::SuiteTest::BASE + "manifest-#{variant}.jsonld"
 
   Fixtures::SuiteTest::Manifest.open(manifest, manifest[0..-8]) do |m|

diff --git a/spec/suite_spec.rb b/spec/suite_spec.rb
@@ -4,7 +4,7 @@
 describe RDF::Normalize::Writer do
   require_relative 'suite_helper'
 
-  %w(urdna2015).each do |variant|
+  %w(rdfc10).each do |variant|
     describe "w3c Normalization #{variant.upcase} tests" do
       manifest = Fixtures::SuiteTest::BASE + "manifest-#{variant}.jsonld"