json-ld 3.1.1 → 3.1.6

data/spec/suite_expand_spec.rb

@@ -13,7 +13,7 @@ describe JSON::LD 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)
@@ -24,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
@@ -182,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
@@ -224,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
@@ -316,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

@@ -9,11 +9,12 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
           pending "Generalized RDF" if t.options[:produceGeneralizedRdf]
+          pending "RDF*" if t.property('@id') == '#te122'
           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'))
+          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

@@ -1175,6 +1175,212 @@ describe JSON::LD::API do
       end
     end
 
+    context "JSON-LD*" do
+      {
+        "node with embedded subject without rdfstar option": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": "value"
+            },
+            "ex:prop": "value2"
+          }),
+          exception: JSON::LD::JsonLdError::InvalidIdValue
+        },
+      }.each do |title, params|
+        it(title) {run_to_rdf params}
+      end
+
+      {
+        "node with embedded subject having no @id": {
+          input: %({
+            "@id": {
+              "ex:prop": "value"
+            },
+            "ex:prop": "value2"
+          }),
+          expected: %(
+            <<_:b0 <ex:prop> "value">> <ex:prop> "value2" .
+          ),
+        },
+        "node with embedded subject having IRI @id": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": "value"
+            },
+            "ex:prop": "value2"
+          }),
+          expected: %(
+            <<<ex:rei> <ex:prop> "value">> <ex:prop> "value2" .
+          ),
+        },
+        "node with embedded subject having BNode @id": {
+          input: %({
+            "@id": {
+              "@id": "_:rei",
+              "ex:prop": "value"
+            },
+            "ex:prop": "value2"
+          }),
+          expected: %(
+           <<_:b0 <ex:prop> "value">> <ex:prop> "value2" .
+          ),
+        },
+        "node with embedded subject having a type": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "@type": "ex:Type"
+            },
+            "ex:prop": "value2"
+          }),
+          expected: %(
+            <<<ex:rei> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <ex:Type>>> <ex:prop> "value2" .
+          ),
+        },
+        "node with embedded subject having an IRI value": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": {"@id": "ex:value"}
+            },
+            "ex:prop": "value2"
+          }),
+          expected: %(
+            <<<ex:rei> <ex:prop> <ex:value>>> <ex:prop> "value2" .
+          ),
+        },
+        "node with embedded subject having an BNode value": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": {"@id": "_:value"}
+            },
+            "ex:prop": "value2"
+          }),
+          expected: %(
+            <<<ex:rei> <ex:prop> _:b0>> <ex:prop> "value2" .
+          ),
+        },
+        "node with recursive embedded subject": {
+          input: %({
+            "@id": {
+              "@id": {
+                "@id": "ex:rei",
+                "ex:prop": "value3"
+              },
+              "ex:prop": "value"
+            },
+            "ex:prop": "value2"
+          }),
+          expected: %(
+            <<<<<ex:rei> <ex:prop> "value3">> <ex:prop> "value">> <ex:prop> "value2" .
+          ),
+        },
+        "illegal node with subject having no property": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei"
+            },
+            "ex:prop": "value3"
+          }),
+          exception: JSON::LD::JsonLdError::InvalidEmbeddedNode
+        },
+        "illegal node with subject having multiple properties": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": ["value1", "value2"]
+            },
+            "ex:prop": "value3"
+          }),
+          exception: JSON::LD::JsonLdError::InvalidEmbeddedNode
+        },
+        "illegal node with subject having multiple types": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "@type": ["ex:Type1", "ex:Type2"]
+            },
+            "ex:prop": "value3"
+          }),
+          exception: JSON::LD::JsonLdError::InvalidEmbeddedNode
+        },
+        "illegal node with subject having type and property": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "@type": "ex:Type",
+              "ex:prop": "value"
+            },
+            "ex:prop": "value2"
+          }),
+          exception: JSON::LD::JsonLdError::InvalidEmbeddedNode
+        },
+        "node with embedded object": {
+          input: %({
+            "@id": "ex:subj",
+            "ex:value": {
+              "@id": {
+                "@id": "ex:rei",
+                "ex:prop": "value"
+              }
+            }
+          }),
+          expected: %(
+            <ex:subj> <ex:value> <<<ex:rei> <ex:prop> "value">> .
+          ),
+        },
+        "node with embedded object having properties": {
+          input: %({
+            "@id": "ex:subj",
+            "ex:value": {
+              "@id": {
+                "@id": "ex:rei",
+                "ex:prop": "value"
+              },
+              "ex:prop": "value2"
+            }
+          }),
+          expected: %(
+            <ex:subj> <ex:value> <<<ex:rei> <ex:prop> "value">> .
+            <<<ex:rei> <ex:prop> "value">> <ex:prop> "value2" .
+          ),
+        },
+        "node with recursive embedded object": {
+          input: %({
+            "@id": "ex:subj",
+            "ex:value": {
+              "@id": {
+                "@id": {
+                  "@id": "ex:rei",
+                  "ex:prop": "value3"
+                },
+                "ex:prop": "value"
+              },
+              "ex:prop": "value2"
+            }
+          }),
+          expected: %(
+            <ex:subj> <ex:value> <<<<<ex:rei> <ex:prop> "value3">> <ex:prop> "value">> .
+            <<<<<ex:rei> <ex:prop> "value3">> <ex:prop> "value">> <ex:prop> "value2" .
+          ),
+        },
+      }.each do |title, params|
+        context(title) do
+          it "Generates statements" do
+            output_graph = RDF::Graph.new {|g| g << RDF::NTriples::Reader.new(params[:expected], rdfstar: true)}
+            run_to_rdf params.merge(rdfstar: true, output: output_graph)
+          end if params[:expected]
+
+          it "Exception" do
+            run_to_rdf params.merge(rdfstar: true)
+          end if params[:exception]
+        end
+      end
+    end
+
     context "exceptions" do
       {
         "Invalid subject" => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.6
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -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,84 +426,85 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.0.rc.2
+signing_key:
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
 test_files:
-- spec/spec_helper.rb
-- spec/matchers.rb
 - spec/api_spec.rb
-- spec/suite_from_rdf_spec.rb
+- spec/compact_spec.rb
+- spec/conneg_spec.rb
 - spec/context_spec.rb
+- spec/expand_spec.rb
+- spec/flatten_spec.rb
+- spec/format_spec.rb
+- spec/frame_spec.rb
 - spec/from_rdf_spec.rb
-- spec/suite_helper.rb
+- spec/matchers.rb
 - spec/reader_spec.rb
-- spec/streaming_writer_spec.rb
 - spec/resource_spec.rb
-- spec/suite_to_rdf_spec.rb
-- spec/suite_remote_doc_spec.rb
-- spec/format_spec.rb
-- spec/frame_spec.rb
-- spec/to_rdf_spec.rb
-- spec/conneg_spec.rb
-- spec/support/extensions.rb
-- spec/suite_html_spec.rb
-- spec/flatten_spec.rb
-- spec/suite_frame_spec.rb
+- spec/spec_helper.rb
+- spec/streaming_reader_spec.rb
+- spec/streaming_writer_spec.rb
 - spec/suite_compact_spec.rb
-- spec/expand_spec.rb
 - spec/suite_expand_spec.rb
 - spec/suite_flatten_spec.rb
-- spec/compact_spec.rb
+- spec/suite_frame_spec.rb
+- spec/suite_from_rdf_spec.rb
+- spec/suite_helper.rb
+- spec/suite_html_spec.rb
 - spec/suite_http_spec.rb
+- spec/suite_remote_doc_spec.rb
+- spec/suite_to_rdf_spec.rb
+- spec/support/extensions.rb
+- spec/to_rdf_spec.rb
 - spec/writer_spec.rb
-- spec/test-files/test-3-compacted.json
-- spec/test-files/test-2-rdf.ttl
-- spec/test-files/test-4-compacted.json
-- spec/test-files/test-5-input.json
-- spec/test-files/test-3-rdf.ttl
-- spec/test-files/test-5-compacted.json
-- spec/test-files/test-9-expanded.json
-- spec/test-files/test-8-input.json
-- spec/test-files/test-2-compacted.json
-- spec/test-files/test-8-compacted.json
-- spec/test-files/test-7-expanded.json
-- spec/test-files/test-1-rdf.ttl
-- spec/test-files/test-7-context.json
-- spec/test-files/test-3-expanded.json
-- spec/test-files/test-8-rdf.ttl
+- spec/test-files/test-1-compacted.json
+- spec/test-files/test-1-context.json
+- spec/test-files/test-1-expanded.json
+- spec/test-files/test-1-input.json
 - spec/test-files/test-1-normalized.json
+- spec/test-files/test-1-rdf.ttl
+- spec/test-files/test-2-compacted.json
+- spec/test-files/test-2-context.json
+- spec/test-files/test-2-expanded.json
 - spec/test-files/test-2-input.json
-- spec/test-files/test-7-compacted.json
-- spec/test-files/test-1-context.json
-- spec/test-files/test-6-context.json
-- spec/test-files/test-6-compacted.json
-- spec/test-files/test-7-input.json
-- spec/test-files/test-1-compacted.json
-- spec/test-files/test-4-expanded.json
-- spec/test-files/test-9-compacted.json
+- spec/test-files/test-2-normalized.json
+- spec/test-files/test-2-rdf.ttl
+- spec/test-files/test-3-compacted.json
+- spec/test-files/test-3-context.json
+- spec/test-files/test-3-expanded.json
+- spec/test-files/test-3-input.json
+- spec/test-files/test-3-normalized.json
+- spec/test-files/test-3-rdf.ttl
+- spec/test-files/test-4-compacted.json
 - spec/test-files/test-4-context.json
+- spec/test-files/test-4-expanded.json
 - spec/test-files/test-4-input.json
-- spec/test-files/test-3-context.json
-- spec/test-files/test-5-rdf.ttl
-- spec/test-files/test-1-expanded.json
-- spec/test-files/test-9-input.json
-- spec/test-files/test-8-framed.json
+- spec/test-files/test-4-rdf.ttl
+- spec/test-files/test-5-compacted.json
+- spec/test-files/test-5-context.json
 - spec/test-files/test-5-expanded.json
-- spec/test-files/test-3-normalized.json
-- spec/test-files/test-2-expanded.json
+- spec/test-files/test-5-input.json
+- spec/test-files/test-5-rdf.ttl
+- spec/test-files/test-6-compacted.json
+- spec/test-files/test-6-context.json
 - spec/test-files/test-6-expanded.json
-- spec/test-files/test-2-context.json
-- spec/test-files/test-5-context.json
-- spec/test-files/test-1-input.json
-- spec/test-files/test-4-rdf.ttl
-- spec/test-files/test-8-frame.json
 - spec/test-files/test-6-input.json
-- spec/test-files/test-8-context.json
-- spec/test-files/test-8-expanded.json
 - spec/test-files/test-6-rdf.ttl
+- spec/test-files/test-7-compacted.json
+- spec/test-files/test-7-context.json
+- spec/test-files/test-7-expanded.json
+- spec/test-files/test-7-input.json
 - spec/test-files/test-7-rdf.ttl
-- spec/test-files/test-3-input.json
-- spec/test-files/test-2-normalized.json
+- spec/test-files/test-8-compacted.json
+- spec/test-files/test-8-context.json
+- spec/test-files/test-8-expanded.json
+- spec/test-files/test-8-frame.json
+- spec/test-files/test-8-framed.json
+- spec/test-files/test-8-input.json
+- spec/test-files/test-8-rdf.ttl
+- spec/test-files/test-9-compacted.json
 - spec/test-files/test-9-context.json
+- spec/test-files/test-9-expanded.json
+- spec/test-files/test-9-input.json