json-ld 3.0.2 → 3.1.0

data/spec/streaming_writer_spec.rb

@@ -111,13 +111,13 @@ describe JSON::LD::StreamingWriter do
             t.logger.info "source: #{t.input}"
             specify "#{t.property('@id')}: #{t.name}" do
               repo = RDF::Repository.load(t.input_loc, format: :nquads)
-              jsonld = JSON::LD::Writer.buffer(stream: true, context: ctx, logger: t.logger) do |writer|
+              jsonld = JSON::LD::Writer.buffer(stream: true, context: ctx, logger: t.logger, **t.options) do |writer|
                 writer << repo
               end
               t.logger.info "Generated: #{jsonld}"
 
               # And then, re-generate jsonld as RDF
-              expect(parse(jsonld, format: :jsonld)).to be_equivalent_graph(repo, t)
+              expect(parse(jsonld, format: :jsonld, **t.options)).to be_equivalent_graph(repo, t)
             end
           end
         end
@@ -127,12 +127,12 @@ describe JSON::LD::StreamingWriter do
 
   def parse(input, format: :trig, **options)
     reader = RDF::Reader.for(format)
-    RDF::Repository.new << reader.new(input, options)
+    RDF::Repository.new << reader.new(input, **options)
   end
 
   # Serialize ntstr to a string and compare against regexps
   def serialize(ntstr, **options)
-    g = ntstr.is_a?(String) ? parse(ntstr, options) : ntstr
+    g = ntstr.is_a?(String) ? parse(ntstr, **options) : ntstr
     logger = RDF::Spec.logger
     logger.info(g.dump(:ttl))
     result = JSON::LD::Writer.buffer(logger: logger, stream: true, **options) do |writer|

data/spec/suite_compact_spec.rb

@@ -9,12 +9,12 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
-          t.run self
+          expect{t.run self}.not_to write.to(:error)
         end
 
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = true
-          t.run self
+          expect {t.run self}.not_to write.to(:error)
         end
       end
     end

data/spec/suite_expand_spec.rb

@@ -9,12 +9,24 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
-          t.run self
+          if %w(#t0068).include?(t.property('@id'))
+            expect{t.run self}.to write("[DEPRECATION]").to(:error)
+          elsif %w(#t0005 #tpr34 #tpr35 #tpr36 #tpr37 #t0119 #t0120).include?(t.property('@id'))
+            expect{t.run self}.to write("beginning with '@' are reserved for future use").to(:error)
+          else
+            expect {t.run self}.not_to write.to(:error)
+          end
         end
 
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = true
-          t.run self
+          if %w(#t0068).include?(t.property('@id'))
+            expect{t.run self}.to write("[DEPRECATION]").to(:error)
+          elsif %w(#t0005 #tpr34 #tpr35 #tpr36 #tpr37 #t0119 #t0120).include?(t.property('@id'))
+            expect{t.run self}.to write("beginning with '@' are reserved for future use").to(:error)
+          else
+            expect {t.run self}.not_to write.to(:error)
+          end
         end
       end
     end

data/spec/suite_flatten_spec.rb

@@ -9,12 +9,20 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
-          t.run self
+          if %w(#t0005).include?(t.property('@id'))
+            expect{t.run self}.to write("Terms beginning with '@' are reserved for future use").to(:error)
+          else
+            expect {t.run self}.not_to write.to(:error)
+          end
         end
 
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = true
-          t.run self
+          if %w(#t0005).include?(t.property('@id'))
+            expect{t.run self}.to write("Terms beginning with '@' are reserved for future use").to(:error)
+          else
+            expect {t.run self}.not_to write.to(:error)
+          end
         end
       end
     end

data/spec/suite_frame_spec.rb

@@ -9,12 +9,13 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
-          t.run self
+          expect {t.run self}.not_to write.to(:error)
         end
 
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          pending "Ordered version of in03" if %w(#tin03).include?(t.property('@id'))
           t.options[:ordered] = true
-          t.run self
+          expect {t.run self}.not_to write.to(:error)
         end
       end
     end

data/spec/suite_from_rdf_spec.rb

@@ -9,12 +9,12 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
-          t.run self
+          expect {t.run self}.not_to write.to(:error)
         end
 
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = true
-          t.run self
+          expect {t.run self}.not_to write.to(:error)
         end
       end
     end

data/spec/suite_helper.rb

@@ -26,7 +26,10 @@ module RDF::Util
       LOCAL_PATHS.each do |r, l|
         next unless Dir.exist?(l) && filename_or_url.start_with?(r)
         #puts "attempt to open #{filename_or_url} locally"
-        localpath = filename_or_url.to_s.sub(r, l)
+        url_no_frag_or_query = RDF::URI(filename_or_url).dup
+        url_no_frag_or_query.query = nil
+        url_no_frag_or_query.fragment = nil
+        localpath = url_no_frag_or_query.to_s.sub(r, l)
         response = begin
           ::File.open(localpath)
         rescue Errno::ENOENT => e
@@ -40,9 +43,11 @@ module RDF::Util
           headers:      options.fetch(:headers, {})
         }
         #puts "use #{filename_or_url} locally"
-        document_options[:headers][:content_type] = case filename_or_url.to_s
+        document_options[:headers][:content_type] = case localpath
         when /\.ttl$/    then 'text/turtle'
+        when /\.nq$/     then 'application/n-quads'
         when /\.nt$/     then 'application/n-triples'
+        when /\.html$/   then 'text/html'
         when /\.jsonld$/ then 'application/ld+json'
         when /\.json$/   then 'application/json'
         else                  'unknown'
@@ -52,7 +57,7 @@ module RDF::Util
         # For overriding content type from test data
         document_options[:headers][:content_type] = options[:contentType] if options[:contentType]
 
-        remote_document = RDF::Util::File::RemoteDocument.new(response.read, document_options)
+        remote_document = RDF::Util::File::RemoteDocument.new(response.read, **document_options)
         if block_given?
           return yield remote_document
         else
@@ -60,7 +65,7 @@ module RDF::Util
         end
       end
 
-      original_open_file(filename_or_url, options, &block)
+      original_open_file(filename_or_url, **options, &block)
     end
   end
 end
@@ -112,15 +117,18 @@ module Fixtures
         super
       end
 
-      # Base is expanded input file
+      # Base is expanded input if not specified
       def base
         options.fetch('base', manifest_url.join(property('input')).to_s)
       end
 
       def options
         @options ||= begin
-          opts = {documentLoader: Fixtures::SuiteTest.method(:documentLoader)}
-          opts = {}
+          opts = {
+            documentLoader: Fixtures::SuiteTest.method(:documentLoader),
+            validate: true,
+            lowercaseLanguage: true,
+          }
           {'specVersion' => "json-ld-1.1"}.merge(property('option') || {}).each do |k, v|
             opts[k.to_sym] = v
           end
@@ -136,7 +144,7 @@ module Fixtures
           file = self.send("#{m}_loc".to_sym)
 
           dl_opts = {safe: true}
-          RDF::Util::File.open_file(file, dl_opts) do |remote_doc|
+          RDF::Util::File.open_file(file, **dl_opts) do |remote_doc|
             res = remote_doc.read
           end
           res
@@ -181,14 +189,15 @@ module Fixtures
         logger.info "options: #{options.inspect}" unless options.empty?
         logger.info "frame: #{frame}" if frame_loc
 
-        options = self.options.merge(documentLoader: Fixtures::SuiteTest.method(:documentLoader))
-        options = {validate: true}.merge(options)
-
+        options = self.options
         unless options[:specVersion] == "json-ld-1.1"
           skip "not a 1.1 test" 
           return
         end
 
+        # Because we're doing exact comparisons when ordered.
+        options[:lowercaseLanguage] = true if options[:ordered]
+
         if positiveTest?
           logger.info "expected: #{expect rescue nil}" if expect_loc
           begin
@@ -205,16 +214,32 @@ module Fixtures
               # Use an array, to preserve input order
               repo = RDF::NQuads::Reader.open(input_loc) do |reader|
                 reader.each_statement.to_a
-              end.uniq.extend(RDF::Enumerable)
-              logger.info "repo: #{repo.dump(id == '#t0012' ? :nquads : :trig)}"
+              end.to_a.uniq.extend(RDF::Enumerable)
+              logger.info "repo: #{repo.dump(self.id == '#t0012' ? :nquads : :trig)}"
               JSON::LD::API.fromRdf(repo, logger: logger, **options)
             when "jld:ToRDFTest"
               repo = RDF::Repository.new
               JSON::LD::API.toRdf(input_loc, logger: logger, **options) do |statement|
+                # To properly compare values of rdf:language and i18n datatypes, normalize to lower case
+                if statement.predicate == RDF.to_uri + 'language'
+                  statement.object = RDF::Literal(statement.object.to_s.downcase) if statement.object.literal?
+                elsif statement.object.literal? && statement.object.datatype.to_s.start_with?('https://www.w3.org/ns/i18n#')
+                  statement.object.datatype = RDF::URI(statement.object.datatype.to_s.downcase)
+                end
                 repo << statement
               end
-              logger.info "nq: #{repo.to_nquads}"
+              logger.info "nq: #{repo.map(&:to_nquads)}"
               repo
+            when "jld:HttpTest"
+              res = input_json
+              rspec_example.instance_eval do
+                # use the parsed input file as @result for Rack Test application
+                @results = res
+                get "/", {}, "HTTP_ACCEPT" => options.fetch(:httpAccept, ""), "HTTP_LINK" => options.fetch(:httpLink, nil)
+                expect(last_response.status).to eq 200
+                expect(last_response.content_type).to eq options.fetch(:contentType, "")
+                JSON.parse(last_response.body)
+              end
             else
               fail("Unknown test type: #{testType}")
             end
@@ -273,14 +298,24 @@ module Fixtures
                   JSON::LD::API.frame(t.input_loc, t.frame_loc, logger: logger, **options)
                 when "jld:FromRDFTest"
                   repo = RDF::Repository.load(t.input_loc)
-                  logger.info "repo: #{repo.dump(id == '#t0012' ? :nquads : :trig)}"
+                  logger.info "repo: #{repo.dump(t.id == '#t0012' ? :nquads : :trig)}"
                   JSON::LD::API.fromRdf(repo, logger: logger, **options)
+                when "jld:HttpTest"
+                  rspec_example.instance_eval do
+                    # use the parsed input file as @result for Rack Test application
+                    @results = t.input_json
+                    get "/", {}, "HTTP_ACCEPT" => options.fetch(:httpAccept, "")
+                    expect(last_response.status).to eq t.property('expect')
+                    expect(last_response.content_type).to eq options.fetch(:contentType, "")
+                    raise "406" if t.property('expect') == 406
+                    raise "Expected status #{t.property('expectErrorCode')}, not #{last_response.status}"
+                  end
                 when "jld:ToRDFTest"
                   JSON::LD::API.toRdf(t.input_loc, logger: logger, **options) {}
                 else
                   success("Unknown test type: #{testType}")
                 end
-              end.to raise_error(/#{t.property('expect')}/)
+              end.to raise_error(/#{t.property('expectErrorCode')}/)
             else
               fail("No support for NegativeSyntaxTest")
             end
@@ -335,16 +370,16 @@ module Fixtures
     # @param [Hash<Symbol => Object>] options
     # @option options [Boolean] :validate
     #   Allow only appropriate content types
-    # @return [RemoteDocument] retrieved remote document and context information unless block given
+    # @return [RDF::Util::File::RemoteDocument] retrieved remote document and context information unless block given
     # @yield remote_document
-    # @yieldparam [RemoteDocument] remote_document
+    # @yieldparam [RDF::Util::File::RemoteDocument] remote_document
     # @raise [JsonLdError]
     def documentLoader(url, **options, &block)
-      options[:headers] ||= JSON::LD::API::OPEN_OPTS[:headers]
+      options[:headers] ||= JSON::LD::API::OPEN_OPTS[:headers].dup
       options[:headers][:link] = Array(options[:httpLink]).join(',') if options[:httpLink]
     
       url = url.to_s[5..-1] if url.to_s.start_with?("file:")
-      JSON::LD::API.documentLoader(url, options, &block)
+      JSON::LD::API.documentLoader(url, **options, &block)
     rescue JSON::LD::JsonLdError::LoadingDocumentFailed, JSON::LD::JsonLdError::MultipleContextLinkHeaders
       raise unless options[:safe]
       "don't raise error"

data/spec/suite_html_spec.rb

@@ -0,0 +1,22 @@
+# coding: utf-8
+require_relative 'spec_helper'
+
+describe JSON::LD do
+  describe "test suite" do
+    require_relative 'suite_helper'
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}html-manifest.jsonld")
+    describe m.name do
+      m.entries.each do |t|
+        specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = false
+          expect {t.run self}.not_to write.to(:error)
+        end
+
+        specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = true
+         expect {t.run self}.not_to write.to(:error)
+        end
+      end
+    end
+  end
+end unless ENV['CI']

data/spec/suite_http_spec.rb

@@ -0,0 +1,35 @@
+# coding: utf-8
+require_relative 'spec_helper'
+require 'rack/linkeddata'
+require 'rack/test'
+
+begin
+  describe JSON::LD do
+    describe "test suite" do
+      require_relative 'suite_helper'
+      m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}http-manifest.jsonld")
+      describe m.name do
+        include ::Rack::Test::Methods
+        before(:all) {JSON::LD::Writer.default_context = "#{Fixtures::SuiteTest::SUITE}http/default-context.jsonld"}
+        after(:all) {JSON::LD::Writer.default_context = nil}
+        let(:app) do
+          JSON::LD::ContentNegotiation.new(
+            Rack::LinkedData::ContentNegotiation.new(
+              double("Target Rack Application", :call => [200, {}, @results]),
+              {}
+            )
+          )
+        end
+
+        m.entries.each do |t|
+          specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+            t.options[:ordered] = false
+            expect {t.run self}.not_to write.to(:error)
+          end
+        end
+      end
+    end
+  end unless ENV['CI']
+rescue IOError
+  # Skip this until such a test suite is re-added
+end

data/spec/suite_remote_doc_spec.rb

@@ -9,12 +9,12 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
-          t.run self
+          expect {t.run self}.not_to write.to(:error)
         end
 
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = true
-          t.run self
+          expect {t.run self}.not_to write.to(:error)
         end
       end
     end

data/spec/suite_to_rdf_spec.rb

@@ -8,9 +8,20 @@ describe JSON::LD do
     describe m.name do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
-          skip "Native value fidelity" if %w(toRdf/0035-in.jsonld).include?(t.property('input'))
-          pending "Generalized RDF" if %w(toRdf/0118-in.jsonld).include?(t.property('input'))
-          t.run self
+          pending "Generalized RDF" if t.options[:produceGeneralizedRdf]
+          if %w(#t0118).include?(t.property('@id'))
+            expect {t.run self}.to write(/Statement .* is invalid/).to(:error)
+          elsif %w(#te075).include?(t.property('@id'))
+            expect {t.run self}.to write(/is invalid/).to(:error)
+          elsif %w(#te005 #tpr34 #tpr35 #tpr36 #tpr37 #te119 #te120).include?(t.property('@id'))
+            expect {t.run self}.to write("beginning with '@' are reserved for future use").to(:error)
+          elsif %w(#te068).include?(t.property('@id'))
+            expect {t.run self}.to write("[DEPRECATION]").to(:error)
+          elsif %w(#twf05).include?(t.property('@id'))
+            expect {t.run self}.to write("@language must be valid BCP47").to(:error)
+          else
+            expect {t.run self}.not_to write.to(:error)
+          end
         end
       end
     end

data/spec/support/extensions.rb

@@ -9,7 +9,11 @@ class Hash
     return false unless other.is_a?(Hash) && other.length == length
     all? do |key, value|
       # List values are still ordered
-      value.equivalent_jsonld?(other[key], ordered: key == '@list')
+      if key == '@language' && value.is_a?(String)
+        value.downcase.equivalent_jsonld?(other[key].to_s.downcase, ordered: key == '@list')
+      else
+        value.equivalent_jsonld?(other[key], ordered: key == '@list')
+      end
     end
   end
 

data/spec/test-files/test-4-input.json

@@ -1,10 +1,10 @@
 {
   "@context": {
-    "":       "http://manu.sporny.org/",
+    "foo":       "http://manu.sporny.org/",
     "foaf":   "http://xmlns.com/foaf/0.1/"
   },
-  "@id":       ":#me",
+  "@id":       "foo:#me",
   "@type":          "foaf:Person",
   "foaf:name":      "Manu Sporny",
-  "foaf:homepage":  { "@id": ":" }
+  "foaf:homepage":  { "@id": "foo:" }
 }

data/spec/test-files/test-5-input.json

@@ -1,9 +1,9 @@
 {
   "@context": {
-    "":       "http://manu.sporny.org/",
+    "foo":       "http://manu.sporny.org/",
     "foaf":   "http://xmlns.com/foaf/0.1/"
   },
-  "@id":       ":#me",
+  "@id":       "foo:#me",
   "@type":          "foaf:Person",
   "foaf:name":      "Manu Sporny",
   "foaf:knows": {

data/spec/test-files/test-8-framed.json

@@ -8,22 +8,18 @@
     "Library": "http://example.org/vocab#Library",
     "title": "http://purl.org/dc/terms/title"
   },
-  "@graph": [
-    {
-      "@id": "http://example.com/library",
-      "@type": "Library",
-      "contains": {
-        "@id": "http://example.org/library/the-republic",
-        "@type": "Book",
-        "contains": {
-          "@id": "http://example.org/library/the-republic#introduction",
-          "@type": "Chapter",
-          "description": "An introductory chapter on The Republic.",
-          "title": "The Introduction"
-        },
-        "creator": "Plato",
-        "title": "The Republic"
-      }
-    }
-  ]
+  "@id": "http://example.com/library",
+  "@type": "Library",
+  "contains": {
+    "@id": "http://example.org/library/the-republic",
+    "@type": "Book",
+    "contains": {
+      "@id": "http://example.org/library/the-republic#introduction",
+      "@type": "Chapter",
+      "description": "An introductory chapter on The Republic.",
+      "title": "The Introduction"
+    },
+    "creator": "Plato",
+    "title": "The Republic"
+  }
 }