json-ld 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e157972b224a8cbe834defdf32656a0b9f090357760fab179076e728427d1639
-  data.tar.gz: a63cd584853e5a830c85a427d30711bc84999e958949c81bc7d236df20f14ee6
+  metadata.gz: 54bba5db6d794f8e36e96200fb75cce4377021ea02c008bcc09b76a4a6ff95a2
+  data.tar.gz: bbd5282a8f1b87d6c44b567a49135f32765f11ada771fffd5e26683481589a19
 SHA512:
-  metadata.gz: 77a85aa85eea6844e1adb9107fe0b2d5a4ad82b877456adcdbbc56031f884da21cc992169232c326f255491d8aa6f607aacbeaeb386578fe8a1ac374cc795ff5
-  data.tar.gz: 2f8353dca7bb6ea9bed3ed7fbea3e0bf883bdec9a3687d3b084f936ae0171a21df1d55bda8cf44fc0ae6d6682d5235234792901fb2fc7ffed327d2956fec289f
+  metadata.gz: 7f13bf980c40f0aa82965c6cd6ee9fe5f8c63d91b5206974630d5bfd84ebf9318902654e8937644ef79aa02f1447c41cc3c3ea4382998b74b275f80ebff00f93
+  data.tar.gz: 36a5a219f342d13249f1c6a3971448b9dea645640f5bc55d21278b831c3c619d584ad2dda27cee94793b5bd3954c5a0e54507ea6c99a328a3da7feb19730058a

data/README.md

@@ -72,7 +72,7 @@ In the first case, the embedded node is not asserted, and only appears as the su
 
 #### Serializing a Graph containing embedded statements
 
-    require 'json-ld'
+    require 'json/ld'
     statement = RDF::Statement(RDF::URI('bob'), RDF::Vocab::FOAF.age, RDF::Literal(23))
     graph = RDF::Graph.new << [statement, RDF::URI("ex:certainty"), RDF::Literal(0.9)]
     graph.dump(:jsonld, validate: false, standard_prefixes: true)
@@ -565,7 +565,7 @@ The {JSON::LD::ContentNegotiation#call} method looks for a result which includes
 See [Rack::LinkedData][] to do the same thing with an RDF Graph or Dataset as the source, rather than Ruby objects.
 
 ## Documentation
-Full documentation available on [RubyDoc](https://rubydoc.info/gems/json-ld/file/README.md)
+Full documentation available on [RubyDoc](https://ruby-rdf.github.io/json-ld/file/README.md)
 
 ## Differences from [JSON-LD API][]
 The specified JSON-LD API is based on a WebIDL definition implementing [Promises][] intended for use within a browser.

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

data/lib/json/ld/context.rb

@@ -5,13 +5,6 @@ require 'bigdecimal'
 require 'set'
 require 'rdf/util/cache'
 
-begin
-  # Attempt to load this to avoid unnecessary context fetches
-  require 'json-ld-preloaded'
-rescue LoadError
-  # Silently allow this to fail
-end
-
 module JSON::LD
   class Context
     include Utils
@@ -50,6 +43,13 @@ module JSON::LD
       end
     end
 
+    begin
+      # Attempt to load this to avoid unnecessary context fetches
+      require 'json/ld/preloaded'
+    rescue LoadError
+      # Silently allow this to fail
+    end
+
     # The base.
     #
     # @return [RDF::URI] Current base IRI, used for expanding relative IRIs.

data/lib/json/ld/expand.rb

@@ -88,7 +88,7 @@ module JSON::LD
 
         # If element contains the key @context, set active context to the result of the Context Processing algorithm, passing active context and the value of the @context key as local context.
         if input.key?('@context')
-          context = context.parse(input.delete('@context'), base: @options[:base])
+          context = context.parse(input['@context'], base: @options[:base])
           log_debug("expand", depth: log_depth.to_i) {"context: #{context.inspect}"}
         end
 
@@ -99,7 +99,7 @@ module JSON::LD
 
         # See if keys mapping to @type have terms with a local context
         type_key = nil
-        input.keys.sort.
+        (input.keys - %w(@context)).sort.
           select {|k| context.expand_iri(k, vocab: true, base: @options[:base]) == '@type'}.
           each do |tk|
 

data/lib/json/ld/format.rb

@@ -23,7 +23,8 @@ module JSON::LD
   class Format < RDF::Format
     content_type     'application/ld+json',
                      extension: :jsonld,
-                     alias: 'application/x-ld+json'
+                     alias: 'application/x-ld+json',
+                     uri: 'http://www.w3.org/ns/formats/JSON-LD'
     content_encoding 'utf-8'
 
     reader { JSON::LD::Reader }

data/lib/json/ld/reader.rb

@@ -12,7 +12,7 @@ module JSON::LD
 
     ##
     # JSON-LD Reader options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
+    # @see https://ruby-rdf.github.io/rdf/RDF/Reader#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(

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] 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(

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,7 +70,7 @@ 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__)}

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/>.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -411,7 +411,12 @@ files:
 homepage: https://github.com/ruby-rdf/json-ld
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  documentation_uri: https://ruby-rdf.github.io/json-ld
+  bug_tracker_uri: https://github.com/ruby-rdf/json-ld/issues
+  homepage_uri: https://github.com/ruby-rdf/json-ld
+  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
+  source_code_uri: https://github.com/ruby-rdf/json-ld
 post_install_message:
 rdoc_options: []
 require_paths: