diff --git a/README.md b/README.md index 2c03463..1210aff 100755 --- 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 index 4b9fcbe..a918a2a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.1 +0.6.0 diff --git a/etc/earl.ttl b/etc/earl.ttl index 53364af..960b7e5 100644 --- a/etc/earl.ttl +++ b/etc/earl.ttl @@ -29,12 +29,12 @@ dc:creator . doap:release [ - doap:name "rdf-normalize-0.5.1"; - doap:revision "0.5.1"; - doap:created "2022-11-27"^^xsd:date; + doap:name "rdf-normalize-0.6.0"; + doap:revision "0.6.0"; + doap:created "2023-06-10"^^xsd:date; ] . <> foaf:primaryTopic ; - dc:issued "2023-02-11T14:57:03-08:00"^^xsd:dateTime ; + dc:issued "2023-06-10T14:45:01-07:00"^^xsd:dateTime ; foaf:maker . a foaf:Person, earl:Assertor; @@ -45,569 +45,569 @@ [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . [ a earl:Assertion; earl:assertedBy ; earl:subject ; - earl:test ; + earl:test ; earl:result [ a earl:TestResult; earl:outcome earl:passed; - dc:date "2023-02-11T14:57:03-08:00"^^xsd:dateTime]; + dc:date "2023-06-10T14:45:01-07:00"^^xsd:dateTime]; earl:mode earl:automatic ] . diff --git a/examples/test022.yml b/examples/test022.yml index b1a10a4..954efa6 100644 --- 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 index dca39a6..e2ce0ac 100644 --- 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 b/lib/rdf/normalize/rdfc10.rb similarity index 99% rename from lib/rdf/normalize/urdna2015.rb rename to lib/rdf/normalize/rdfc10.rb index 9fd14a4..08b0cc7 100644 --- a/lib/rdf/normalize/urdna2015.rb +++ b/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 index c973bd0..2c979a5 100644 --- 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 index 691c581..373b4ee 100755 --- 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 index b00250c..18823e2 100644 --- 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"