json-ld 3.2.0 → 3.2.3

data/lib/json/ld/to_rdf.rb

@@ -11,10 +11,11 @@ module JSON::LD
     ##
     # @param [Hash{String => Object}] item
     # @param [RDF::Resource] graph_name
+    # @param [Boolean] quoted emitted triples are quoted triples.
     # @yield statement
     # @yieldparam [RDF::Statement] statement
     # @return RDF::Resource the subject of this item
-    def item_to_rdf(item, graph_name: nil, &block)
+    def item_to_rdf(item, graph_name: nil, quoted: false, &block)
       # Just return value object as Term
       return unless item
 
@@ -82,9 +83,9 @@ module JSON::LD
       when nil then node
       when String then as_resource(item['@id'])
       when Object
-        # Embedded statement
+        # Embedded/quoted statement
         # (No error checking, as this is done in expansion)
-        to_enum(:item_to_rdf, item['@id']).to_a.first
+        to_enum(:item_to_rdf, item['@id'], quoted: true).to_a.first
       end
 
       #log_debug("item_to_rdf")  {"subject: #{subject.to_ntriples rescue 'malformed rdf'}"}
@@ -95,12 +96,12 @@ module JSON::LD
           values.each do |v|
             object = as_resource(v)
             #log_debug("item_to_rdf")  {"type: #{object.to_ntriples rescue 'malformed rdf'}"}
-            yield RDF::Statement(subject, RDF.type, object, graph_name: graph_name)
+            yield RDF::Statement(subject, RDF.type, object, graph_name: graph_name, quoted: quoted)
           end
         when '@graph'
           values = [values].compact unless values.is_a?(Array)
           values.each do |nd|
-            item_to_rdf(nd, graph_name: subject, &block)
+            item_to_rdf(nd, graph_name: subject, quoted: quoted, &block)
           end
         when '@reverse'
           raise "Huh?" unless values.is_a?(Hash)
@@ -113,7 +114,7 @@ module JSON::LD
               object = item_to_rdf(v, graph_name: graph_name, &block)
               #log_debug("item_to_rdf")  {"subject: #{object.to_ntriples rescue 'malformed rdf'}"}
               # yield subject, prediate, and literal to results.
-              yield RDF::Statement(object, predicate, subject, graph_name: graph_name)
+              yield RDF::Statement(object, predicate, subject, graph_name: graph_name, quoted: quoted)
             end
           end
         when '@included'
@@ -136,13 +137,13 @@ module JSON::LD
               object = parse_list(v['@list'], graph_name: graph_name, &block)
 
               # Append a triple composed of subject, prediate, and object to results and add all triples from list_results to results.
-              yield RDF::Statement(subject, predicate, object, graph_name: graph_name)
+              yield RDF::Statement(subject, predicate, object, graph_name: graph_name, quoted: quoted)
             else
               # Otherwise, item is a value object or a node definition. Generate object as the result of the Object Converstion algorithm passing item.
               object = item_to_rdf(v, graph_name: graph_name, &block)
               #log_debug("item_to_rdf")  {"object: #{object.to_ntriples rescue 'malformed rdf'}"}
               # yield subject, prediate, and literal to results.
-              yield RDF::Statement(subject, predicate, object, graph_name: graph_name)
+              yield RDF::Statement(subject, predicate, object, graph_name: graph_name, quoted: quoted)
             end
           end
         end

data/lib/json/ld/writer.rb

@@ -71,7 +71,7 @@ module JSON::LD
 
     ##
     # JSON-LD Writer options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
+    # @see https://ruby-rdf.github.io/rdf/RDF/Writer#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -186,10 +186,6 @@ module JSON::LD
       # @return [Boolean]
       # @see    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
       def accept?(accept_params)
-        # Profiles that aren't specific IANA relations represent the URL
-        # of a context or frame that may be subject to black- or white-listing
-        profile = accept_params[:profile].to_s.split(/\s+/)
-
         if block_given?
           yield(accept_params)
         else
@@ -229,6 +225,8 @@ module JSON::LD
     #   frame to use when serializing.
     # @option options [Boolean]  :unique_bnodes   (false)
     #   Use unique bnode identifiers, defaults to using the identifier which the node was originall initialized with (if any).
+    # @option options [Proc] serializer (JSON::LD::API.serializer)
+    #   A Serializer method used for generating the JSON serialization of the result.
     # @option options [Boolean] :stream (false)
     #   Do not attempt to optimize graph presentation, suitable for streaming large graphs.
     # @yield  [writer] `self`
@@ -239,6 +237,7 @@ module JSON::LD
     def initialize(output = $stdout, **options, &block)
       options[:base_uri] ||= options[:base] if options.key?(:base)
       options[:base] ||= options[:base_uri] if options.key?(:base_uri)
+      @serializer = options.fetch(:serializer, JSON::LD::API.method(:serializer))
       super do
         @repo = RDF::Repository.new
 
@@ -300,7 +299,7 @@ module JSON::LD
       else
 
         log_debug("writer") { "serialize #{@repo.count} statements, #{@options.inspect}"}
-        result = API.fromRdf(@repo, **@options)
+        result = API.fromRdf(@repo, **@options.merge(serializer: nil))
 
         # Some options may be indicated from accept parameters
         profile = @options.fetch(:accept_params, {}).fetch(:profile, "").split(' ')
@@ -322,20 +321,20 @@ module JSON::LD
 
         # Rename BNodes to uniquify them, if necessary
         if options[:unique_bnodes]
-          result = API.flatten(result, context, **@options)
+          result = API.flatten(result, context, **@options.merge(serializer: nil))
         end
 
         if frame = @options[:frame]
           # Perform framing, if given a frame
           log_debug("writer") { "frame result"}
-          result = API.frame(result, frame, **@options)
+          result = API.frame(result, frame, **@options.merge(serializer: nil))
         elsif context
           # Perform compaction, if we have a context
           log_debug("writer") { "compact result"}
-          result = API.compact(result, context,  **@options)
+          result = API.compact(result, context,  **@options.merge(serializer: nil))
         end
 
-        @output.write(result.to_json(JSON_STATE))
+        @output.write(@serializer.call(result, **@options))
       end
 
       super

data/lib/json/ld.rb

@@ -46,6 +46,9 @@ module JSON
     # Default context when compacting without one being specified
     DEFAULT_CONTEXT = "http://schema.org"
 
+    # Acceptable MultiJson adapters
+    MUTLI_JSON_ADAPTERS = %i(oj json_gem json_pure ok_json yajl nsjsonseerialization)
+
     KEYWORDS = Set.new(%w(
       @annotation
       @base

data/spec/api_spec.rb

@@ -48,30 +48,78 @@ describe JSON::LD::API do
       context "with MultiJson adapter #{adapter.inspect}" do
         Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), 'test-files/*-input.*'))) do |filename|
           test = File.basename(filename).sub(/-input\..*$/, '')
-          frame = filename.sub(/-input\..*$/, '-frame.json')
-          framed = filename.sub(/-input\..*$/, '-framed.json')
-          compacted = filename.sub(/-input\..*$/, '-compacted.json')
-          context = filename.sub(/-input\..*$/, '-context.json')
-          expanded = filename.sub(/-input\..*$/, '-expanded.json')
+          frame = filename.sub(/-input\..*$/, '-frame.jsonld')
+          framed = filename.sub(/-input\..*$/, '-framed.jsonld')
+          compacted = filename.sub(/-input\..*$/, '-compacted.jsonld')
+          context = filename.sub(/-input\..*$/, '-context.jsonld')
+          expanded = filename.sub(/-input\..*$/, '-expanded.jsonld')
           ttl = filename.sub(/-input\..*$/, '-rdf.ttl')
       
           context test, skip: ("Not supported in JRuby" if RUBY_ENGINE == "jruby" && %w(oj yajl).include?(adapter.to_s)) do
-            it "expands" do
-              options = {logger: logger, adapter: adapter}
-              options[:expandContext] = File.open(context) if context
-              jld = described_class.expand(File.open(filename), **options)
-              expect(jld).to produce_jsonld(JSON.load(File.open(expanded)), logger)
-            end if File.exist?(expanded)
+            around do |example|
+              @file = File.open(filename)
+              case filename
+              when /.jsonld$/
+                @file.define_singleton_method(:content_type) {'application/ld+json'}
+              end
+              if context
+                @ctx_io = File.open(context)
+                case context
+                when /.jsonld$/
+                  @ctx_io.define_singleton_method(:content_type) {'application/ld+json'}
+                end
+              end
+              example.run
+              @file.close
+              @ctx_io.close if @ctx_io
+            end
+
+            if File.exist?(expanded)
+              it "expands" do
+                options = {logger: logger, adapter: adapter}
+                options[:expandContext] = @ctx_io if context
+                jld = described_class.expand(@file, **options)
+                expect(jld).to produce_jsonld(JSON.parse(File.read(expanded)), logger)
+              end
+
+              it "expands with serializer" do
+                options = {logger: logger, adapter: adapter}
+                options[:expandContext] = @ctx_io if context
+                jld = described_class.expand(@file, serializer: JSON::LD::API.method(:serializer), **options)
+                expect(jld).to be_a(String)
+                expect(JSON.load(jld)).to produce_jsonld(JSON.parse(File.read(expanded)), logger)
+              end
+            end
         
-            it "compacts" do
-              jld = described_class.compact(File.open(filename), File.open(context), adapter: adapter, logger: logger)
-              expect(jld).to produce_jsonld(JSON.load(File.open(compacted)), logger)
-            end if File.exist?(compacted) && File.exist?(context)
+            if File.exist?(compacted) && File.exist?(context)
+              it "compacts" do
+                jld = described_class.compact(@file, @ctx_io, adapter: adapter, logger: logger)
+                expect(jld).to produce_jsonld(JSON.parse(File.read(compacted)), logger)
+              end
+
+              it "compacts with serializer" do
+                jld = described_class.compact(@file, @ctx_io, serializer: JSON::LD::API.method(:serializer), adapter: adapter, logger: logger)
+                expect(jld).to be_a(String)
+                expect(JSON.load(jld)).to produce_jsonld(JSON.parse(File.read(compacted)), logger)
+              end
+            end
         
-            it "frame" do
-              jld = described_class.frame(File.open(filename), File.open(frame), adapter: adapter, logger: logger)
-              expect(jld).to produce_jsonld(JSON.load(File.open(framed)), logger)
-            end if File.exist?(framed) && File.exist?(frame)
+            if File.exist?(framed) && File.exist?(frame)
+              it "frames" do
+                File.open(frame) do |frame_io|
+                  jld = described_class.frame(@file, frame_io, adapter: adapter, logger: logger)
+                  expect(jld).to produce_jsonld(JSON.parse(File.read(framed)), logger)
+                end
+              end
+
+              it "frames with serializer" do
+                File.open(frame) do |frame_io|
+                  jld = described_class.frame(@file, frame_io, serializer: JSON::LD::API.method(:serializer), adapter: adapter, logger: logger)
+                  expect(jld).to be_a(String)
+                  expect(JSON.load(jld)).to produce_jsonld(JSON.parse(File.read(framed)), logger)
+                end
+              end
+            end
 
             it "toRdf" do
               expect(RDF::Repository.load(filename, format: :jsonld, adapter: adapter, logger: logger)).to be_equivalent_graph(RDF::Repository.load(ttl), logger: logger)

data/spec/format_spec.rb

@@ -41,6 +41,10 @@ describe JSON::LD::Format do
     specify {expect(described_class.to_sym).to eq :jsonld}
   end
 
+  describe "#to_uri" do
+    specify {expect(described_class.to_uri).to eq RDF::URI('http://www.w3.org/ns/formats/JSON-LD')}
+  end
+
   describe ".detect" do
     {
       jsonld: '{"@context" => "foo"}',
@@ -66,11 +70,11 @@ describe JSON::LD::Format do
     end
   end
 
-  describe ".cli_commands" do
+  describe ".cli_commands", skip: Gem.win_platform? do
     require 'rdf/cli'
     let(:ttl) {File.expand_path("../test-files/test-1-rdf.ttl", __FILE__)}
-    let(:json) {File.expand_path("../test-files/test-1-input.json", __FILE__)}
-    let(:context) {File.expand_path("../test-files/test-1-context.json", __FILE__)}
+    let(:json) {File.expand_path("../test-files/test-1-input.jsonld", __FILE__)}
+    let(:context) {File.expand_path("../test-files/test-1-context.jsonld", __FILE__)}
 
     describe "#expand" do
       it "expands RDF" do

data/spec/frame_spec.rb

@@ -2438,7 +2438,31 @@ describe JSON::LD::API do
           "@id": "ex:entity1"
         }),
         processingMode: "json-ld-1.1"
-      }
+      },
+      "don't embed list elements": {
+        frame: %({
+          "@context": {"ex": "http://example.org/"},
+          "ex:embed": {
+            "@list": [{"@embed": "@never"}]
+          }
+        }),
+        input: %({
+          "@context": {"ex": "http://example.org/"},
+          "@id": "ex:Sub1",
+          "ex:embed": {
+            "@list": [{
+              "@id": "ex:Sub2",
+              "ex:prop": "property"
+            }]
+          }
+        }),
+        output: %({
+          "@context": {"ex": "http://example.org/"},
+          "@id": "ex:Sub1",
+          "ex:embed": {"@list": [{"@id": "ex:Sub2"}]}
+        }),
+        processingMode: "json-ld-1.1"
+      },
     }.each do |title, params|
       it title do
         do_frame(params)

data/spec/reader_spec.rb

@@ -131,7 +131,7 @@ describe JSON::LD::Reader do
       {
         "@context": {"@base": "http://a/bb/ccc/d;p?q", "urn:ex:p": {"@type": "@id"}},
         "@graph": [
-          {"@id": "urn:ex:s001", "urn:ex:p": "g:h"},
+          {"@id": "urn:ex:s001", "urn:ex:p": "gg:h"},
           {"@id": "urn:ex:s002", "urn:ex:p": "g"},
           {"@id": "urn:ex:s003", "urn:ex:p": "./g"},
           {"@id": "urn:ex:s004", "urn:ex:p": "g/"},
@@ -183,7 +183,7 @@ describe JSON::LD::Reader do
       {
         "@context": {"@base": "http://a/bb/ccc/d/", "urn:ex:p": {"@type": "@id"}},
         "@graph": [
-          {"@id": "urn:ex:s043", "urn:ex:p": "g:h"},
+          {"@id": "urn:ex:s043", "urn:ex:p": "gg:h"},
           {"@id": "urn:ex:s044", "urn:ex:p": "g"},
           {"@id": "urn:ex:s045", "urn:ex:p": "./g"},
           {"@id": "urn:ex:s046", "urn:ex:p": "g/"},
@@ -235,7 +235,7 @@ describe JSON::LD::Reader do
       {
         "@context": {"@base": "http://a/bb/ccc/./d;p?q", "urn:ex:p": {"@type": "@id"}},
         "@graph": [
-          {"@id": "urn:ex:s085", "urn:ex:p": "g:h"},
+          {"@id": "urn:ex:s085", "urn:ex:p": "gg:h"},
           {"@id": "urn:ex:s086", "urn:ex:p": "g"},
           {"@id": "urn:ex:s087", "urn:ex:p": "./g"},
           {"@id": "urn:ex:s088", "urn:ex:p": "g/"},
@@ -287,7 +287,7 @@ describe JSON::LD::Reader do
       {
         "@context": {"@base": "http://a/bb/ccc/../d;p?q", "urn:ex:p": {"@type": "@id"}},
         "@graph": [
-          {"@id": "urn:ex:s127", "urn:ex:p": "g:h"},
+          {"@id": "urn:ex:s127", "urn:ex:p": "gg:h"},
           {"@id": "urn:ex:s128", "urn:ex:p": "g"},
           {"@id": "urn:ex:s129", "urn:ex:p": "./g"},
           {"@id": "urn:ex:s130", "urn:ex:p": "g/"},
@@ -339,7 +339,7 @@ describe JSON::LD::Reader do
       {
         "@context": {"@base": "http://a/bb/ccc/.", "urn:ex:p": {"@type": "@id"}},
         "@graph": [
-          {"@id": "urn:ex:s169", "urn:ex:p": "g:h"},
+          {"@id": "urn:ex:s169", "urn:ex:p": "gg:h"},
           {"@id": "urn:ex:s170", "urn:ex:p": "g"},
           {"@id": "urn:ex:s171", "urn:ex:p": "./g"},
           {"@id": "urn:ex:s172", "urn:ex:p": "g/"},
@@ -391,7 +391,7 @@ describe JSON::LD::Reader do
       {
         "@context": {"@base": "http://a/bb/ccc/..", "urn:ex:p": {"@type": "@id"}},
         "@graph": [
-          {"@id": "urn:ex:s211", "urn:ex:p": "g:h"},
+          {"@id": "urn:ex:s211", "urn:ex:p": "gg:h"},
           {"@id": "urn:ex:s212", "urn:ex:p": "g"},
           {"@id": "urn:ex:s213", "urn:ex:p": "./g"},
           {"@id": "urn:ex:s214", "urn:ex:p": "g/"},
@@ -443,7 +443,7 @@ describe JSON::LD::Reader do
       {
         "@context": {"@base": "file:///a/bb/ccc/d;p?q", "urn:ex:p": {"@type": "@id"}},
         "@graph": [
-          {"@id": "urn:ex:s253", "urn:ex:p": "g:h"},
+          {"@id": "urn:ex:s253", "urn:ex:p": "gg:h"},
           {"@id": "urn:ex:s254", "urn:ex:p": "g"},
           {"@id": "urn:ex:s255", "urn:ex:p": "./g"},
           {"@id": "urn:ex:s256", "urn:ex:p": "g/"},
@@ -523,7 +523,7 @@ describe JSON::LD::Reader do
     let(:nt) {%q{
       # RFC3986 normal examples
 
-      <urn:ex:s001> <urn:ex:p> <g:h>.
+      <urn:ex:s001> <urn:ex:p> <gg:h>.
       <urn:ex:s002> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s003> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s004> <urn:ex:p> <http://a/bb/ccc/g/>.
@@ -571,7 +571,7 @@ describe JSON::LD::Reader do
 
       # RFC3986 normal examples with trailing slash in base IRI
 
-      <urn:ex:s043> <urn:ex:p> <g:h>.
+      <urn:ex:s043> <urn:ex:p> <gg:h>.
       <urn:ex:s044> <urn:ex:p> <http://a/bb/ccc/d/g>.
       <urn:ex:s045> <urn:ex:p> <http://a/bb/ccc/d/g>.
       <urn:ex:s046> <urn:ex:p> <http://a/bb/ccc/d/g/>.
@@ -619,7 +619,7 @@ describe JSON::LD::Reader do
 
       # RFC3986 normal examples with /. in the base IRI
 
-      <urn:ex:s085> <urn:ex:p> <g:h>.
+      <urn:ex:s085> <urn:ex:p> <gg:h>.
       <urn:ex:s086> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s087> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s088> <urn:ex:p> <http://a/bb/ccc/g/>.
@@ -667,7 +667,7 @@ describe JSON::LD::Reader do
 
       # RFC3986 normal examples with /.. in the base IRI
 
-      <urn:ex:s127> <urn:ex:p> <g:h>.
+      <urn:ex:s127> <urn:ex:p> <gg:h>.
       <urn:ex:s128> <urn:ex:p> <http://a/bb/g>.
       <urn:ex:s129> <urn:ex:p> <http://a/bb/g>.
       <urn:ex:s130> <urn:ex:p> <http://a/bb/g/>.
@@ -715,7 +715,7 @@ describe JSON::LD::Reader do
 
       # RFC3986 normal examples with trailing /. in the base IRI
 
-      <urn:ex:s169> <urn:ex:p> <g:h>.
+      <urn:ex:s169> <urn:ex:p> <gg:h>.
       <urn:ex:s170> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s171> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s172> <urn:ex:p> <http://a/bb/ccc/g/>.
@@ -763,7 +763,7 @@ describe JSON::LD::Reader do
 
       # RFC3986 normal examples with trailing /.. in the base IRI
 
-      <urn:ex:s211> <urn:ex:p> <g:h>.
+      <urn:ex:s211> <urn:ex:p> <gg:h>.
       <urn:ex:s212> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s213> <urn:ex:p> <http://a/bb/ccc/g>.
       <urn:ex:s214> <urn:ex:p> <http://a/bb/ccc/g/>.
@@ -811,7 +811,7 @@ describe JSON::LD::Reader do
 
       # RFC3986 normal examples with file path
 
-      <urn:ex:s253> <urn:ex:p> <g:h>.
+      <urn:ex:s253> <urn:ex:p> <gg:h>.
       <urn:ex:s254> <urn:ex:p> <file:///a/bb/ccc/g>.
       <urn:ex:s255> <urn:ex:p> <file:///a/bb/ccc/g>.
       <urn:ex:s256> <urn:ex:p> <file:///a/bb/ccc/g/>.

data/spec/suite_helper.rb

@@ -60,6 +60,7 @@ module RDF::Util
         document_options[:headers][:content_type] = options[:contentType] if options[:contentType]
 
         remote_document = RDF::Util::File::RemoteDocument.new(response.read, **document_options)
+        response.close
         if block_given?
           return yield remote_document
         else