Finish 2.2.3

VERSION

@@ -1 +1 @@
-2.2.2
+2.2.3

lib/rdf/microdata/jsonld_reader.rb

@@ -31,7 +31,7 @@ def self.format(klass = nil)
     # @raise [RDF::ReaderError] if _validate_
     def initialize(input = $stdin, options = {}, &block)
       @options = options
-      log_debug('', "using JSON-LD transformation reader")
+      log_info('', "using JSON-LD transformation reader")
 
       input = case input
       when ::Nokogiri::XML::Document, ::Nokogiri::HTML::Document then input

lib/rdf/microdata/rdfa_reader.rb

@@ -76,14 +76,12 @@ def initialize(input = $stdin, options = {}, &block)
             item['vocab'] = vocab.uri.to_s if vocab
           end
         end
+        item['typeof'] ||= ''
 
         # Change each itemid attribute to an resource attribute with the same value
         if item['itemid']
           id = item.attribute('itemid').remove
-          item[item['itemprop'] ? 'resource' : 'about'] = id
-        else
-          # Otherwise, ensure that @typeof has at least an empty value
-          item['typeof'] ||= ''
+          item['resource'] = id
         end
       end
 

rdf-microdata.gemspec

@@ -23,8 +23,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.2.2'
   gem.requirements          = []
-  gem.add_runtime_dependency     'rdf',             '~> 2.2', '>= 2.2.8'
-  gem.add_runtime_dependency     'rdf-xsd',         '~> 2.2'
+  #gem.add_runtime_dependency     'rdf',             '~> 2.2', '>= 2.2.8'
+  #gem.add_runtime_dependency     'rdf-xsd',         '~> 2.2'
+  gem.add_runtime_dependency     'rdf',             '>= 2.2.8', '< 4.0'
+  gem.add_runtime_dependency     'rdf-xsd',         '>= 2.2', '< 4.0'
   gem.add_runtime_dependency     'htmlentities',    '~> 4.3'
   gem.add_runtime_dependency     'nokogiri' ,       '~> 1.8'
 
@@ -33,11 +35,16 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec',           '~> 3.6'
   gem.add_development_dependency 'rspec-its',       '~> 1.2'
 
-  gem.add_development_dependency 'json-ld',         '~> 2.1'
-  gem.add_development_dependency 'rdf-spec',        '~> 2.2'
-  gem.add_development_dependency 'rdf-rdfa',        '~> 2.2'
-  gem.add_development_dependency 'rdf-turtle',      '~> 2.2'
-  gem.add_development_dependency 'rdf-isomorphic',  '~> 2.2'
+  #gem.add_development_dependency 'json-ld',         '~> 2.1'
+  #gem.add_development_dependency 'rdf-spec',        '~> 2.2'
+  #gem.add_development_dependency 'rdf-rdfa',        '~> 2.2'
+  #gem.add_development_dependency 'rdf-turtle',      '~> 2.2'
+  #gem.add_development_dependency 'rdf-isomorphic',  '~> 2.2'
+  gem.add_development_dependency 'json-ld',         '>= 2.1', '< 4.0'
+  gem.add_development_dependency 'rdf-spec',        '>= 2.2', '< 4.0'
+  gem.add_development_dependency 'rdf-rdfa',        '>= 2.2', '< 4.0'
+  gem.add_development_dependency 'rdf-turtle',      '>= 2.2', '< 4.0'
+  gem.add_development_dependency 'rdf-isomorphic',  '>= 2.2', '< 4.0'
 
   # Rubinius has it's own dependencies
   if RUBY_ENGINE == "rbx" && RUBY_VERSION >= "2.1.0"

spec/suite_spec.rb

@@ -7,42 +7,52 @@
     require 'suite_helper'
     MANIFEST = Fixtures::SuiteTest::BASE + "manifest.jsonld"
 
-    Fixtures::SuiteTest::Manifest.open(MANIFEST).each do |m|
-      describe m.comment do
-        m.entries.each do |t|
-          specify "#{t.name}: #{t.comment}" do
-            t.logger = ::RDF::Spec.logger
-            t.logger.info t.inspect
-            t.logger.info "source:\n#{t.input}"
+    {native: :native, RDFa: :rdfa, "JSON-LD": :jsonld}.each do |w, sym|
+      describe w do
+        Fixtures::SuiteTest::Manifest.open(MANIFEST).each do |m|
+          describe m.comment do
+            m.entries.each do |t|
+              specify "#{t.name}: #{t.comment}" do
+                t.logger = ::RDF::Spec.logger
+                t.logger.info t.inspect
+                t.logger.info "source:\n#{t.input}"
 
-            reader = RDF::Microdata::Reader.open(t.action,
-              base_uri:        t.action,
-              strict:          true,
-              validate:        t.negative_test?,
-              registry:        t.registry,
-              vocab_expansion: t.vocab_expansion,
-              logger:          t.logger,
-            )
-            expect(reader).to be_a RDF::Reader
-            graph = RDF::Repository.new
+                reader = RDF::Microdata::Reader.open(t.action,
+                  base_uri:        t.action,
+                  strict:          true,
+                  validate:        t.negative_test?,
+                  registry:        t.registry,
+                  vocab_expansion: t.vocab_expansion,
+                  logger:          t.logger,
+                  sym           => true # Invoke appropriat writer
+                )
+                expect(reader).to be_a RDF::Reader
+                graph = RDF::Repository.new
 
-            if t.positive_test?
-              begin
-                graph << reader
-              rescue Exception => e
-                expect(e.message).to produce("Not exception #{e.inspect}\n#{e.backtrace.join("\n")}", t.logger)
-              end
-              if t.evaluate?
-                output_graph = RDF::Graph.load(t.result, base_uri: t.action)
-                expect(graph).to be_equivalent_graph(output_graph, t)
-              else
-                expect(graph).to be_a(RDF::Enumerable)
+                if t.positive_test?
+                  begin
+                    graph << reader
+                  rescue Exception => e
+                    expect(e.message).to produce("Not exception #{e.inspect}\n#{e.backtrace.join("\n")}", t.logger)
+                  end
+                  if t.evaluate?
+
+                    # Remove any rdfa:usesVocabulary property
+                    graph.query(predicate: RDF::RDFA.usesVocabulary) do |st|
+                      graph.delete!(st)
+                    end
+                    output_graph = RDF::Graph.load(t.result, base_uri: t.action)
+                    expect(graph).to be_equivalent_graph(output_graph, t)
+                  else
+                    expect(graph).to be_a(RDF::Enumerable)
+                  end
+                else
+                  expect {
+                    graph << reader
+                    expect(graph.dump(:ntriples)).to eql "not this"
+                  }.to raise_error(RDF::ReaderError)
+                end
               end
-            else
-              expect {
-                graph << reader
-                expect(graph.dump(:ntriples)).to eql "not this"
-              }.to raise_error(RDF::ReaderError)
             end
           end
         end