json-ld 3.1.2 → 3.1.7

data/lib/json/ld/to_rdf.rb

@@ -16,6 +16,8 @@ module JSON::LD
     # @return RDF::Resource the subject of this item
     def item_to_rdf(item, graph_name: nil, &block)
       # Just return value object as Term
+      return unless item
+
       if value?(item)
         value, datatype = item.fetch('@value'), item.fetch('@type', nil)
 
@@ -76,11 +78,13 @@ module JSON::LD
         return parse_list(item['@list'], graph_name: graph_name, &block)
       end
 
-      # Skip if '@id' is nil
-      subject = if item.has_key?('@id')
-        item['@id'].nil? ? nil : as_resource(item['@id'])
-      else
-        node
+      subject = case item['@id']
+      when nil then node
+      when String then as_resource(item['@id'])
+      when Object
+        # Embedded statement
+        # (No error checking, as this is done in expansion)
+        to_enum(:item_to_rdf, item['@id']).to_a.first
       end
 
       #log_debug("item_to_rdf")  {"subject: #{subject.to_ntriples rescue 'malformed rdf'}"}

data/lib/json/ld/writer.rb

@@ -93,7 +93,7 @@ module JSON::LD
           datatype: RDF::URI,
           control: :url2,
           on: ["--context CONTEXT"],
-          description: "Context to use when compacting.") {|arg| RDF::URI(arg)},
+          description: "Context to use when compacting.") {|arg| RDF::URI(arg).absolute? ? RDF::URI(arg) : StringIO.new(File.read(arg))},
         RDF::CLI::Option.new(
           symbol: :embed,
           datatype: %w(@always @once @never),
@@ -107,6 +107,13 @@ module JSON::LD
           control: :checkbox,
           on: ["--[no-]explicit"],
           description: "Only include explicitly declared properties in output (false)") {|arg| arg},
+        RDF::CLI::Option.new(
+          symbol: :frame,
+          datatype: RDF::URI,
+          control: :url2,
+          use: :required,
+          on: ["--frame FRAME"],
+          description: "Frame to use when serializing.") {|arg| RDF::URI(arg).absolute? ? RDF::URI(arg) : StringIO.new(File.read(arg))},
         RDF::CLI::Option.new(
           symbol: :lowercaseLanguage,
           datatype: TrueClass,
@@ -137,7 +144,7 @@ module JSON::LD
           default: 'null',
           control: :select,
           on: ["--rdf-direction DIR", %w(i18n-datatype compound-literal)],
-          description: "How to serialize literal direction (i18n-datatype compound-literal)") {|arg| RDF::URI(arg)},
+          description: "How to serialize literal direction (i18n-datatype compound-literal)") {|arg| arg},
         RDF::CLI::Option.new(
           symbol: :requireAll,
           datatype: TrueClass,
@@ -202,7 +209,7 @@ module JSON::LD
     end
 
     ##
-    # Initializes the RDF-LD writer instance.
+    # Initializes the JSON-LD writer instance.
     #
     # @param  [IO, File] output
     #   the output stream

data/spec/compact_spec.rb

@@ -564,6 +564,7 @@ describe JSON::LD::API do
           documentUrl: "http://example.com/context")
       end
       it "uses referenced context" do
+        JSON::LD::Context.instance_variable_set(:@cache, nil)
         input = ::JSON.parse %({
           "http://example.com/b": "c"
         })
@@ -3112,6 +3113,210 @@ describe JSON::LD::API do
     end
   end
 
+  context "JSON-LD*" do
+    {
+      "subject-iii": {
+        input: %([{
+          "@id": {
+            "@id": "http://example/s1",
+            "http://example/p1": [{"@id": "http://example/o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+         "@context": {"ex": "http://example/"},
+         "@id": {
+           "@id": "ex:s1",
+           "ex:p1": {"@id": "ex:o1"}
+         },
+         "ex:p": {"@id": "ex:o"}
+       })
+      },
+      "subject-iib": {
+        input: %([{
+          "@id": {
+            "@id": "http://example/s1",
+            "http://example/p1": [{"@id": "_:o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "ex:s1",
+            "ex:p1": {"@id": "_:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-iil": {
+        input: %([{
+          "@id": {
+            "@id": "http://example/s1",
+            "http://example/p1": [{"@value": "o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "ex:s1",
+            "ex:p1": "o1"
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bii": {
+        input: %([{
+          "@id": {
+            "@id": "_:s1",
+            "http://example/p1": [{"@id": "http://example/o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": {"@id": "ex:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bib": {
+        input: %([{
+          "@id": {
+            "@id": "_:s1",
+            "http://example/p1": [{"@id": "_:o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": {"@id": "_:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bil": {
+        input: %([{
+          "@id": {
+            "@id": "_:s1",
+            "http://example/p1": [{"@value": "o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": "o1"
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "object-iii":  {
+        input: %([{
+          "@id": "http://example/s",
+          "http://example/p": [{
+            "@id": {
+              "@id": "http://example/s1",
+              "http://example/p1": [{"@id": "http://example/o1"}]
+            }
+          }]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": {"@id": "ex:o1"}
+            }
+          }
+        })
+      },
+      "object-iib":  {
+        input: %([{
+          "@id": "http://example/s",
+          "http://example/p": [{
+            "@id": {
+              "@id": "http://example/s1",
+              "http://example/p1": [{"@id": "_:o1"}]
+            }
+          }]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": {"@id": "_:o1"}
+            }
+          }
+        })
+      },
+      "object-iil":  {
+        input: %([{
+          "@id": "http://example/s",
+          "http://example/p": [{
+            "@id": {
+              "@id": "http://example/s1",
+              "http://example/p1": [{"@value": "o1"}]
+            }
+          }]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": "o1"
+            }
+          }
+        })
+      },
+      "recursive-subject": {
+        input: %([{
+          "@id": {
+            "@id": {
+              "@id": "http://example/s2",
+              "http://example/p2": [{"@id": "http://example/o2"}]
+            },
+            "http://example/p1": [{"@id": "http://example/o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": {
+              "@id": "ex:s2",
+              "ex:p2": {"@id": "ex:o2"}
+            },
+            "ex:p1": {"@id": "ex:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+    }.each do |name, params|
+      it(name) {run_compact(params.merge(rdfstar: true))}
+    end
+  end
 
   context "problem cases" do
     {
@@ -3199,8 +3404,8 @@ describe JSON::LD::API do
       expect(jld).to produce_jsonld(output, logger)
 
       # Compare expanded jld/output too to make sure list values remain ordered
-      exp_jld = JSON::LD::API.expand(jld, processingMode: 'json-ld-1.1')
-      exp_output = JSON::LD::API.expand(output, processingMode: 'json-ld-1.1')
+      exp_jld = JSON::LD::API.expand(jld, processingMode: 'json-ld-1.1', rdfstar: params[:rdfstar])
+      exp_output = JSON::LD::API.expand(output, processingMode: 'json-ld-1.1', rdfstar: params[:rdfstar])
       expect(exp_jld).to produce_jsonld(exp_output, logger)
     end
   end

data/spec/context_spec.rb

@@ -56,15 +56,8 @@ describe JSON::LD::Context do
   describe "#parse" do
     context "remote" do
 
-      it "retrieves and parses a remote context document" do
-        JSON::LD::Context::PRELOADED.clear
-        expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
-        ec = subject.parse("http://example.com/context")
-        expect(ec.provided_context).to produce("http://example.com/context", logger)
-      end
-
       it "fails given a missing remote @context" do
-        JSON::LD::Context::PRELOADED.clear
+        JSON::LD::Context.instance_variable_set(:@cache, nil)
         expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_raise(IOError)
         expect {subject.parse("http://example.com/context")}.to raise_error(JSON::LD::JsonLdError::LoadingRemoteContextFailed, %r{http://example.com/context})
       end
@@ -116,7 +109,7 @@ describe JSON::LD::Context do
             documentUrl: "http://example.com/context",
             contentType: "text/html")
 
-        JSON::LD::Context::PRELOADED.clear
+        JSON::LD::Context.instance_variable_set(:@cache, nil)
         expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
         ec = subject.parse("http://example.com/context")
         expect(ec.send(:mappings)).to produce({
@@ -154,7 +147,7 @@ describe JSON::LD::Context do
             ),
             documentUrl: "http://example.com/context",
             contentType: "text/html")
-          JSON::LD::Context::PRELOADED.clear
+          JSON::LD::Context.instance_variable_set(:@cache, nil)
         expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
         ec = subject.parse("http://example.com/context")
         expect(ec.send(:mappings)).to produce({
@@ -170,7 +163,7 @@ describe JSON::LD::Context do
       end
 
       it "parses a referenced context at a relative URI" do
-        JSON::LD::Context::PRELOADED.clear
+        JSON::LD::Context.instance_variable_set(:@cache, nil)
         rd1 = JSON::LD::API::RemoteDocument.new(%({"@context": "context"}), base_uri: "http://example.com/c1")
         expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/c1", anything).and_yield(rd1)
         expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
@@ -185,17 +178,11 @@ describe JSON::LD::Context do
 
       context "remote with local mappings" do
         let(:ctx) {["http://example.com/context", {"integer" => "xsd:integer"}]}
-        before {JSON::LD::Context::PRELOADED.clear}
+        before {JSON::LD::Context.instance_variable_set(:@cache, nil)}
         it "retrieves and parses a remote context document" do
           expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
           subject.parse(ctx)
         end
-
-        it "does not use passed context as provided_context" do
-          expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
-          ec = subject.parse(ctx)
-          expect(ec.provided_context).to produce(ctx, logger)
-        end
       end
 
       context "pre-loaded remote" do
@@ -206,7 +193,7 @@ describe JSON::LD::Context do
           )
           JSON::LD::Context.alias_preloaded("https://example.com/preloaded", "http://example.com/preloaded")
         }
-        after(:all) {JSON::LD::Context::PRELOADED.clear}
+        after(:all) {JSON::LD::Context.instance_variable_set(:@cache, nil)}
 
         it "does not load referenced context" do
           expect(JSON::LD::API).not_to receive(:documentLoader).with(ctx, anything)
@@ -249,6 +236,7 @@ describe JSON::LD::Context do
       end
 
       it "merges definitions from remote contexts" do
+        JSON::LD::Context.instance_variable_set(:@cache, nil)
         expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
         rd2 = JSON::LD::API::RemoteDocument.new(%q({
           "@context": {
@@ -476,7 +464,7 @@ describe JSON::LD::Context do
       end
 
       context "@import" do
-        before(:each) {JSON::LD::Context::PRELOADED.clear}
+        before(:each) {JSON::LD::Context.instance_variable_set(:@cache, nil)}
         it "generates an InvalidImportValue error if not a string" do
           expect {subject.parse({'@version' => 1.1, '@import' => true})}.to raise_error(JSON::LD::JsonLdError::InvalidImportValue)
         end
@@ -642,26 +630,8 @@ describe JSON::LD::Context do
     end
   end
 
-  describe "#merge!" do
-    it "updates context with components from new" do
-      c2 = JSON::LD::Context.parse({'foo' => "http://example.com/"})
-      cm = context.merge!(c2)
-      expect(cm).to equal context
-      expect(cm).not_to equal c2
-      expect(cm.term_definitions).to eq c2.term_definitions
-    end
-  end
-
   describe "#serialize" do
-    before {JSON::LD::Context::PRELOADED.clear}
-    it "context document" do
-      expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
-      ec = subject.parse("http://example.com/context")
-      expect(ec.serialize).to produce({
-        "@context" => "http://example.com/context"
-      }, logger)
-    end
-
+    before {JSON::LD::Context.instance_variable_set(:@cache, nil)}
     it "context hash" do
       ctx = {"foo" => "http://example.com/"}
 
@@ -693,7 +663,7 @@ describe JSON::LD::Context do
 
     it "term mappings" do
       c = subject.
-        parse({'foo' => "http://example.com/"}).send(:clear_provided_context)
+        parse({'foo' => "http://example.com/"})
       expect(c.serialize).to produce({
         "@context" => {
           "foo" => "http://example.com/"
@@ -705,7 +675,7 @@ describe JSON::LD::Context do
     it "@context" do
       expect(subject.parse({
         "foo" => {"@id" => "http://example.com/", "@context" => {"bar" => "http://example.com/baz"}}
-      }).send(:clear_provided_context).
+      }).
       serialize).to produce({
         "@context" => {
           "foo" => {
@@ -721,7 +691,6 @@ describe JSON::LD::Context do
         'xsd' => "http://www.w3.org/2001/XMLSchema#",
         'homepage' => {'@id' => RDF::Vocab::FOAF.homepage.to_s, '@type' => '@id'}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "xsd" => RDF::XSD.to_uri.to_s,
@@ -734,7 +703,6 @@ describe JSON::LD::Context do
       expect(subject.parse({
         'knows' => {'@id' => RDF::Vocab::FOAF.knows.to_s, '@container' => '@list'}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@container" => "@list"}
@@ -746,7 +714,6 @@ describe JSON::LD::Context do
       expect(subject.parse({
         "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@container" => "@set"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@container" => "@set"}
@@ -758,7 +725,6 @@ describe JSON::LD::Context do
       expect(subject.parse({
         "name" => {"@id" => RDF::Vocab::FOAF.name.to_s, "@language" => "en"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "name" => {"@id" => RDF::Vocab::FOAF.name.to_s, "@language" => "en"}
@@ -771,7 +737,6 @@ describe JSON::LD::Context do
         "@language" => 'en',
         "name" => {"@id" => RDF::Vocab::FOAF.name.to_s, "@language" => 'en'}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "@language" => 'en',
@@ -785,7 +750,6 @@ describe JSON::LD::Context do
         "@language" => 'en',
         "name" => {"@id" => RDF::Vocab::FOAF.name.to_s, "@language" => "de"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "@language" => 'en',
@@ -799,7 +763,6 @@ describe JSON::LD::Context do
         "@language" => 'en',
         "name" => {"@id" => RDF::Vocab::FOAF.name.to_s, "@language" => nil}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "@language" => 'en',
@@ -812,7 +775,6 @@ describe JSON::LD::Context do
       expect(subject.parse({
         "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@type" => "@id", "@container" => "@list"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@type" => "@id", "@container" => "@list"}
@@ -824,7 +786,6 @@ describe JSON::LD::Context do
       expect(subject.parse({
         "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@type" => "@id", "@container" => "@set"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@type" => "@id", "@container" => "@set"}
@@ -836,7 +797,6 @@ describe JSON::LD::Context do
       expect(subject.parse({
         "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@type" => "@json"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@type" => "@json"}
@@ -851,7 +811,6 @@ describe JSON::LD::Context do
           "@container" => "@list"
         }
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "foaf" => RDF::Vocab::FOAF.to_uri.to_s,
@@ -867,7 +826,6 @@ describe JSON::LD::Context do
         "id" => "@id",
         "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@container" => "@list"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "id" => "@id",
@@ -884,7 +842,6 @@ describe JSON::LD::Context do
           "@type" => "@id"
         }
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "foaf" => RDF::Vocab::FOAF.to_uri.to_s,
@@ -902,7 +859,6 @@ describe JSON::LD::Context do
         "type" => "@type",
         "foaf:homepage" => {"@type" => "@id"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "foaf" => RDF::Vocab::FOAF.to_uri.to_s,
@@ -917,7 +873,6 @@ describe JSON::LD::Context do
         "container" => "@container",
         "knows" => {"@id" => RDF::Vocab::FOAF.knows.to_s, "@container" => "@list"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "container" => "@container",
@@ -931,7 +886,6 @@ describe JSON::LD::Context do
         "ex" => 'http://example.org/',
         "term" => {"@id" => "ex:term", "@type" => "ex:datatype"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "ex" => 'http://example.org/',
@@ -945,7 +899,6 @@ describe JSON::LD::Context do
         "@vocab" => 'http://example.org/',
         "term" => {"@id" => "http://example.org/term", "@type" => "datatype"}
       }).
-      send(:clear_provided_context).
       serialize).to produce({
         "@context" => {
           "@vocab" => 'http://example.org/',
@@ -1254,7 +1207,7 @@ describe JSON::LD::Context do
       it "does not use @vocab if it would collide with a term" do
         subject.set_mapping("name", "http://xmlns.com/foaf/0.1/name")
         subject.set_mapping("ex", nil)
-        expect(subject.compact_iri("http://example.org/name", position: :predicate)).
+        expect(subject.compact_iri("http://example.org/name", vocab: true)).
           not_to produce("name", logger)
       end
 
@@ -1537,7 +1490,7 @@ describe JSON::LD::Context do
         })
       end
       it "Compact @id that is a property IRI when @container is @list" do
-        expect(ctx.compact_iri("http://example.org/ns#property", position: :subject)).
+        expect(ctx.compact_iri("http://example.org/ns#property", vocab: false)).
           to produce("ex:property", logger)
       end
     end