json-ld 3.1.0 → 3.1.5

data/spec/suite_expand_spec.rb

@@ -7,11 +7,13 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}expand-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
+        # MultiJson use OJ, by default, which doesn't handle native numbers the same as the JSON gem.
+        t.options[:adapter] = :json_gem if %w(#tjs12).include?(t.property('@id'))
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
           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'))
+          elsif %w(#t0005 #tpr34 #tpr35 #tpr36 #tpr37 #tpr38 #tpr39 #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)
@@ -22,7 +24,7 @@ describe JSON::LD do
           t.options[:ordered] = true
           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'))
+          elsif %w(#t0005 #tpr34 #tpr35 #tpr36 #tpr37 #tpr38 #tpr39 #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)

data/spec/suite_frame_spec.rb

@@ -13,7 +13,6 @@ describe JSON::LD do
         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
           expect {t.run self}.not_to write.to(:error)
         end

data/spec/suite_helper.rb

@@ -6,6 +6,7 @@ module RDF::Util
     LOCAL_PATHS = {
       "https://w3c.github.io/json-ld-api/tests/" => ::File.expand_path("../json-ld-api/tests", __FILE__) + '/',
       "https://w3c.github.io/json-ld-framing/tests/" => ::File.expand_path("../json-ld-framing/tests", __FILE__) + '/',
+      "https://w3c.github.io/json-ld-streaming/tests/" => ::File.expand_path("../json-ld-streaming/tests", __FILE__) + '/',
       "file:" => ""
     }
 
@@ -74,6 +75,7 @@ module Fixtures
   module SuiteTest
     SUITE = RDF::URI("https://w3c.github.io/json-ld-api/tests/")
     FRAME_SUITE = RDF::URI("https://w3c.github.io/json-ld-framing/tests/")
+    STREAM_SUITE = RDF::URI("https://w3c.github.io/json-ld-streaming/tests/")
 
     class Manifest < JSON::LD::Resource
       attr_accessor :manifest_url
@@ -132,6 +134,10 @@ module Fixtures
           {'specVersion' => "json-ld-1.1"}.merge(property('option') || {}).each do |k, v|
             opts[k.to_sym] = v
           end
+          if opts[:expandContext] && !RDF::URI(opts[:expandContext]).absolute?
+            # Resolve relative to manifest location
+            opts[:expandContext] = manifest_url.join(opts[:expandContext]).to_s
+          end
           opts
         end
       end
@@ -144,6 +150,7 @@ module Fixtures
           file = self.send("#{m}_loc".to_sym)
 
           dl_opts = {safe: true}
+          dl_opts[:contentType] = options[:contentType] if m == 'input' && options[:contentType]
           RDF::Util::File.open_file(file, **dl_opts) do |remote_doc|
             res = remote_doc.read
           end
@@ -177,6 +184,10 @@ module Fixtures
       def positiveTest?
         property('@type').to_s.include?('Positive')
       end
+
+      def syntaxTest?
+        property('@type').to_s.include?('Syntax')
+      end
       
 
       # Execute the test
@@ -219,14 +230,14 @@ module Fixtures
               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)
+              if manifest_url.to_s.include?('stream')
+                JSON::LD::Reader.open(input_loc, stream: true, logger: logger, **options) do |statement|
+                  repo << statement
+                end
+              else
+                JSON::LD::API.toRdf(input_loc, logger: logger, **options) do |statement|
+                  repo << statement
                 end
-                repo << statement
               end
               logger.info "nq: #{repo.map(&:to_nquads)}"
               repo
@@ -311,7 +322,11 @@ module Fixtures
                     raise "Expected status #{t.property('expectErrorCode')}, not #{last_response.status}"
                   end
                 when "jld:ToRDFTest"
-                  JSON::LD::API.toRdf(t.input_loc, logger: logger, **options) {}
+                  if t.manifest_url.to_s.include?('stream')
+                    JSON::LD::Reader.open(t.input_loc, stream: true, logger: logger, **options).each_statement {}
+                  else
+                    JSON::LD::API.toRdf(t.input_loc, logger: logger, **options) {}
+                  end
                 else
                   success("Unknown test type: #{testType}")
                 end

data/spec/suite_to_rdf_spec.rb

@@ -13,7 +13,7 @@ describe JSON::LD do
             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'))
+          elsif %w(#te005 #tpr34 #tpr35 #tpr36 #tpr37 #tpr38 #tpr39 #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)

data/spec/to_rdf_spec.rb

@@ -1133,7 +1133,7 @@ describe JSON::LD::API do
           ],
           "en-US rtl": [
             %q({"http://example.org/label": {"@value": "en-US", "@language": "en-US", "@direction": "rtl"}}),
-            %q(_:a <http://example.org/label> "en-US"^^<https://www.w3.org/ns/i18n#en-US_rtl> .)
+            %q(_:a <http://example.org/label> "en-US"^^<https://www.w3.org/ns/i18n#en-us_rtl> .)
           ]
         }.each do |title, (js, ttl)|
           it title do
@@ -1161,7 +1161,7 @@ describe JSON::LD::API do
               @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
               _:a <http://example.org/label> [
                 rdf:value "en-US";
-                rdf:language "en-US";
+                rdf:language "en-us";
                 rdf:direction "rtl"
               ] .
             )
@@ -1218,7 +1218,7 @@ describe JSON::LD::API do
             "@id": "http://example.com/foo",
             "http://example.com/bar": {"@value": "bar", "@type": "http://example.com/baz z"}
           }),
-          output: %()
+          exception: JSON::LD::JsonLdError::InvalidTypedValue
         },
         "Injected IRIs check" => {
           input: %({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.5
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +324,7 @@ files:
 - lib/json/ld/html/rexml.rb
 - lib/json/ld/reader.rb
 - lib/json/ld/resource.rb
+- lib/json/ld/streaming_reader.rb
 - lib/json/ld/streaming_writer.rb
 - lib/json/ld/to_rdf.rb
 - lib/json/ld/utils.rb
@@ -342,6 +343,7 @@ files:
 - spec/reader_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
+- spec/streaming_reader_spec.rb
 - spec/streaming_writer_spec.rb
 - spec/suite_compact_spec.rb
 - spec/suite_expand_spec.rb
@@ -409,7 +411,7 @@ homepage: https://github.com/ruby-rdf/json-ld
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -424,8 +426,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
 test_files:
@@ -455,6 +457,7 @@ test_files:
 - spec/suite_flatten_spec.rb
 - spec/compact_spec.rb
 - spec/suite_http_spec.rb
+- spec/streaming_reader_spec.rb
 - spec/writer_spec.rb
 - spec/test-files/test-3-compacted.json
 - spec/test-files/test-2-rdf.ttl