json-ld 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5715dffdbdb323f985e7bdf87089a40f2a1cf41d5087e57ab8247385fa6ac65
-  data.tar.gz: ccc4d39e21b7842cfb80b605416cafffe1ea8ef65a4c7e52678804ce5dcdea64
+  metadata.gz: d001920e29ad882ce1ffd196b475b8fdbf4b7ed3f8bf5e569713fa93efda5cf9
+  data.tar.gz: f30409b4fc97e1e604a003f0973c20c75cb4c705852d9622aad15d94c574eafb
 SHA512:
-  metadata.gz: 203ab67a38535c5c977b95a90efa691947e3d87db7cf4b5c052608590a1695362788f9a32c4896bc1a180607923013c2924d948e27fe4ffb3d8fdde2c14bf04b
-  data.tar.gz: 22523bf4c3e6aa951e50ed0e0f942aaa6a5c83737d5686884106108391f253e73d76626288efb4934debea5064cc5ac88f9b056aa9339a55156aeccfdf210f3a
+  metadata.gz: cbb8283e5bf415a9cb05f17f29947d7f546699f8a5fa0c674559b5343ff344d87a36c15b26389bae813fb9daac26876b8ddaa2871181cd2c0ab49c513b5f96e6
+  data.tar.gz: 111003a143c84c9820c120bbc42c5199b493cbcd4b1b33de64ef65ea578ba4130aec6e4c534121299f5e2420d51984901056d52a5c856a7c79069c00fb9f257f

data/README.md

@@ -603,6 +603,10 @@ To get a local working copy of the development repository, do:
 
     % git clone git://github.com/ruby-rdf/json-ld.git
 
+## Change Log
+
+See [Release Notes on GitHub](https://github.com/ruby-rdf/json-ld/releases)
+
 ## Mailing List
 * <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
 

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/lib/json/ld/api.rb

@@ -290,8 +290,7 @@ module JSON
       def self.flatten(input, context, expanded: false, serializer: nil, **options)
         flattened = []
         options = {
-          compactToRelative: true,
-          extractAllScripts: true
+          compactToRelative: true
         }.merge(options)
 
         # Expand input to simplify processing
@@ -518,6 +517,8 @@ module JSON
       # @option options (see #initialize)
       # @option options [Boolean] :produceGeneralizedRdf (false)
       #   If true, output will include statements having blank node predicates, otherwise they are dropped.
+      # @option options [Boolean] :extractAllScripts (true)
+      #   If set, when given an HTML input without a fragment identifier, extracts all `script` elements with type `application/ld+json` into an array during expansion.
       # @raise [JsonLdError]
       # @yield statement
       # @yieldparam [RDF::Statement] statement
@@ -638,7 +639,7 @@ module JSON
             options[:headers]['Accept'].sub('application/ld+json,',
               "application/ld+json;profile=#{requestProfile}, application/ld+json;q=0.9,")
         end
-        documentLoader.call(url, **options) do |remote_doc|
+        documentLoader.call(url, extractAllScripts: extractAllScripts, **options) do |remote_doc|
           case remote_doc
           when RDF::Util::File::RemoteDocument
             # Convert to RemoteDocument
@@ -758,6 +759,28 @@ module JSON
         alias fromRDF fromRdf
       end
 
+      ##
+      # Hash of recognized script types and the loaders that decode them
+      # into a hash or array of hashes.
+      #
+      # @return Hash{type, Proc}
+      SCRIPT_LOADERS = {
+        'application/ld+json' => ->(content, url:, **options) do
+            validate_input(content, url: url) if options[:validate]
+            mj_opts = options.keep_if { |k, v| k != :adapter || MUTLI_JSON_ADAPTERS.include?(v) }
+            MultiJson.load(content, **mj_opts)
+          end
+      }
+
+      ##
+      # Adds a loader for some specific content type
+      #
+      # @param [String] type
+      # @param [Proc] loader
+      def self.add_script_loader(type, loader)
+        SCRIPT_LOADERS[type] = loader
+      end
+
       ##
       # Load one or more script tags from an HTML source.
       # Unescapes and uncomments input, returns the internal representation
@@ -812,47 +835,52 @@ module JSON
           element = input.at_xpath("//script[@id='#{id}']")
           raise JSON::LD::JsonLdError::LoadingDocumentFailed, "No script tag found with id=#{id}" unless element
 
-          unless element.attributes['type'].to_s.start_with?('application/ld+json')
+          script_type = SCRIPT_LOADERS.keys.detect {|type| element.attributes['type'].to_s.start_with?(type)}
+          unless script_type
             raise JSON::LD::JsonLdError::LoadingDocumentFailed,
               "Script tag has type=#{element.attributes['type']}"
           end
 
-          content = element.inner_html
-          validate_input(content, url: url) if options[:validate]
-          mj_opts = options.keep_if { |k, v| k != :adapter || MUTLI_JSON_ADAPTERS.include?(v) }
-          MultiJson.load(content, **mj_opts)
+          loader = SCRIPT_LOADERS[script_type]
+          loader.call(element.inner_html, url: url, **options)
         elsif extractAllScripts
           res = []
-          elements = if profile
-            es = input.xpath("//script[starts-with(@type, 'application/ld+json;profile=#{profile}')]")
-            # If no profile script, just take a single script without profile
-            es = [input.at_xpath("//script[starts-with(@type, 'application/ld+json')]")].compact if es.empty?
-            es
-          else
-            input.xpath("//script[starts-with(@type, 'application/ld+json')]")
-          end
-          elements.each do |element|
-            content = element.inner_html
-            validate_input(content, url: url) if options[:validate]
-            mj_opts = options.keep_if { |k, v| k != :adapter || MUTLI_JSON_ADAPTERS.include?(v) }
-            r = MultiJson.load(content, **mj_opts)
-            if r.is_a?(Hash)
-              res << r
-            elsif r.is_a?(Array)
-              res.concat(r)
+
+          SCRIPT_LOADERS.each do |type, loader|
+            elements = if profile
+              es = input.xpath("//script[starts-with(@type, '#{type};profile=#{profile}')]")
+              # If no profile script, just take a single script without profile
+              es = [input.at_xpath("//script[starts-with(@type, '#{type}')]")].compact if es.empty?
+              es
+            else
+              input.xpath("//script[starts-with(@type, '#{type}')]")
+            end
+            elements.each do |element|
+              content = element.inner_html
+              r = loader.call(content, url: url, extractAllScripts: true, **options)
+              if r.is_a?(Hash)
+                res << r
+              elsif r.is_a?(Array)
+                res.concat(r)
+              end
             end
           end
           res
         else
-          # Find the first script with type application/ld+json.
-          element = input.at_xpath("//script[starts-with(@type, 'application/ld+json;profile=#{profile}')]") if profile
-          element ||= input.at_xpath("//script[starts-with(@type, 'application/ld+json')]")
-          raise JSON::LD::JsonLdError::LoadingDocumentFailed, "No script tag found" unless element
+          # Find the first script with a known type
+          script_type, element = nil, nil
+          SCRIPT_LOADERS.keys.each do |type|
+            next if script_type # already found the type
+            element = input.at_xpath("//script[starts-with(@type, '#{type};profile=#{profile}')]") if profile
+            element ||= input.at_xpath("//script[starts-with(@type, '#{type}')]")
+            script_type = type if element
+          end
+          unless script_type
+            raise JSON::LD::JsonLdError::LoadingDocumentFailed, "No script tag found" unless element
+          end
 
           content = element.inner_html
-          validate_input(content, url: url) if options[:validate]
-          mj_opts = options.keep_if { |k, v| k != :adapter || MUTLI_JSON_ADAPTERS.include?(v) }
-          MultiJson.load(content, **mj_opts)
+          SCRIPT_LOADERS[script_type].call(content, url: url, **options)
         end
       rescue MultiJson::ParseError => e
         raise JSON::LD::JsonLdError::InvalidScriptElement, e.message

data/lib/json/ld/compact.rb

@@ -299,10 +299,10 @@ module JSON
                   else
                     index_key = context.expand_iri(index_key, vocab: true)
                     container_key = context.compact_iri(index_key, vocab: true)
-                    map_key, *others = Array(compacted_item[container_key])
+                    map_key, *others = Array(compacted_item.is_a?(Hash) && compacted_item[container_key])
                     if map_key.is_a?(String)
                       case others.length
-                      when 0 then compacted_item.delete(container_key)
+                      when 0 then compacted_item.delete(container_key) if compacted_item.is_a?(Hash)
                       when 1 then compacted_item[container_key] = others.first
                       else        compacted_item[container_key] = others
                       end
@@ -316,15 +316,15 @@ module JSON
                   map_key = expanded_item['@language']
                   value?(expanded_item) ? expanded_item['@value'] : compacted_item
                 elsif container.include?('@type')
-                  map_key, *types = Array(compacted_item[container_key])
+                  map_key, *types = Array(compacted_item.is_a?(Hash) && compacted_item[container_key])
                   case types.length
-                  when 0 then compacted_item.delete(container_key)
+                  when 0 then compacted_item.delete(container_key) if compacted_item.is_a?(Hash)
                   when 1 then compacted_item[container_key] = types.first
                   else        compacted_item[container_key] = types
                   end
 
                   # if compacted_item contains a single entry who's key maps to @id, then recompact the item without @type
-                  if compacted_item.keys.length == 1 && expanded_item.key?('@id')
+                  if compacted_item.is_a?(Hash) && compacted_item.keys.length == 1 && expanded_item.key?('@id')
                     compacted_item = compact({ '@id' => expanded_item['@id'] },
                       base: base,
                       property: item_active_property,

data/lib/json/ld/context.rb

@@ -843,9 +843,11 @@ module JSON
           end
         end
 
-        if previous_definition&.protected? && definition != previous_definition && !override_protected
+        if !override_protected && previous_definition&.protected?
+          if definition != previous_definition
+            raise JSON::LD::JsonLdError::ProtectedTermRedefinition, "Attempt to redefine protected term #{term}"
+          end
           definition = previous_definition
-          raise JSON::LD::JsonLdError::ProtectedTermRedefinition, "Attempt to redefine protected term #{term}"
         end
 
         term_definitions[term] = definition

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -106,6 +106,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: getoptlong
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: jsonlint
   requirement: !ruby/object:Gem::Requirement