rdf 3.2.6 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58dcc9836c4302cad4bb46a86596235794a664d508cc002ce298b6c964265ba9
-  data.tar.gz: 941a3daf3a379acf33fe09688ea9cabefd25eb88dc80a7b31d05ac380b2cb2f9
+  metadata.gz: 62ac7574f98336ccea36385134d2007029e6e4edb182920c45fefb8f50fcccb7
+  data.tar.gz: b89e554b9961e6038408a29e8ca104aac8b6692a39fa9dddbab0779479e1b2bc
 SHA512:
-  metadata.gz: f384a93b62b93d574c3dae02e8285f77a3ea6fa26c60eb30aa387e7213343e763a00d9a58f33d0caf4acc5f68a4b27e55361beb792127486059e8afeb333053e
-  data.tar.gz: ed8a19309a2b2f042a3f10df60465b56bd5ea9ace1a305cbe595bab507a7606eae99438fe3ce1edbcd653f513bd015aaf19d5e7203c5903278e275dc591e9d15
+  metadata.gz: 15af5338e8d3a4ff0c1601aad011a9b340b2b1b0f93da4d383bfb4b81da58c3dda68ea8e6e03a034b7decf81650f5f6e3b398b564205f5a0a39ffbf134974dde
+  data.tar.gz: 7ba7aa6f6af2a6e61b5b0da249bf084a84d0ef75245438bf091acbdb55e6fcc4c0c8dc904058e8ad0e11ced53cd373e68a4ebaef93867b7cf60f253f4581ded8

data/VERSION

@@ -1 +1 @@
-3.2.6
+3.2.7

data/lib/rdf/cli.rb

@@ -572,7 +572,8 @@ module RDF
     #   @param [Hash{Symbol => Object}] options already set
     #   @return [Array<String>] list of executable commands
     # @overload commands(format: :json, **options)
-    #   @param [:json] format (:json)
+    #   Returns commands as JSON, for API usage.
+    #   @param [:json] format
     #   @param [Hash{Symbol => Object}] options already set
     #   @return [Array{Object}]
     #     Returns an array of commands including the command symbol
@@ -593,7 +594,7 @@ module RDF
         # Subset commands based on filter options
         cmds = COMMANDS.reject do |k, c|
           c.fetch(:filter, {}).any? do |opt, val|
-            options[opt].to_s != val.to_s
+            options.merge(format: format)[opt].to_s != val.to_s
           end
         end
 

data/lib/rdf/format.rb

@@ -23,7 +23,9 @@ module RDF
   #
   # @example Defining a new RDF serialization format class
   #   class RDF::NTriples::Format < RDF::Format
-  #     content_type     'application/n-triples', extension: :nt
+  #     content_type     'application/n-triples',
+  #                      extension: :nt,
+  #                      uri: RDF::URI("http://www.w3.org/ns/formats/N-Triples")
   #     content_encoding 'utf-8'
   #     
   #     reader RDF::NTriples::Reader
@@ -222,6 +224,19 @@ module RDF
       @@file_extensions
     end
 
+    ##
+    # Returns the unique URI for the format.
+    #
+    # @example retrieving a list of supported file format URIs
+    #
+    #     RDF::Format.uris.keys
+    #
+    # @see https://www.w3.org/ns/formats/
+    # @return [Hash{Symbol => URI}]
+    def self.uris
+      @@uris
+    end
+
     ##
     # Returns the set of format symbols for available RDF::Reader subclasses.
     #
@@ -465,6 +480,7 @@ module RDF
     #   @option options [Array<String>]  :aliases (nil)
     #   @option options [Symbol]         :extension  (nil)
     #   @option options [Array<Symbol>]  :extensions (nil)
+    #   @option options [URI]            :uri   (nil)
     #   @return [void]
     #
     # @overload content_type
@@ -504,6 +520,10 @@ module RDF
             @@content_types[aa] << self unless @@content_types[aa].include?(self)
           end
         end
+        # URI identifying this format
+        if uri = options[:uri]
+          @@uris[RDF::URI(uri)] = self
+        end
       end
     end
 
@@ -517,7 +537,7 @@ module RDF
     end
 
     ##
-    # Retrieves or defines file extensions for this RDF serialization format.
+    # Retrieves file extensions for this RDF serialization format.
     #
     # The return is an array where the first element is the cannonical
     # file extension for the format and following elements are alias file extensions.
@@ -527,6 +547,17 @@ module RDF
       @@file_extensions.map {|ext, formats| ext if formats.include?(self)}.compact
     end
 
+    ##
+    # Retrieves any format URI defined for this format..
+    #
+    # @return [URI]
+    def self.uri
+      @@uris.invert[self]
+    end
+    class << self
+      alias_method :to_uri, :uri
+    end
+
   protected
 
     ##
@@ -568,6 +599,7 @@ module RDF
     @@readers          = {} # @private
     @@writers          = {} # @private
     @@subclasses       = [] # @private
+    @@uris             = {} # @private
 
     ##
     # @private

data/lib/rdf/model/uri.rb

@@ -76,6 +76,7 @@ module RDF
     IRI = Regexp.compile("^#{SCHEME}:(?:#{IHIER_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
 
     # Split an IRI into it's component parts
+    # scheme, authority, path, query, fragment
     IRI_PARTS = /^(?:([^:\/?#]+):)?(?:\/\/([^\/?#]*))?([^?#]*)(\?[^#]*)?(#.*)?$/.freeze
 
     # Remove dot expressions regular expressions
@@ -872,6 +873,12 @@ module RDF
       parts = {}
       if matchdata = IRI_PARTS.match(value)
         scheme, authority, path, query, fragment = matchdata[1..-1]
+
+        if Gem.win_platform? && scheme && !authority && scheme.match?(/^[a-zA-Z]$/)
+          # A drive letter, not a scheme
+          scheme, path = nil, "#{scheme}:#{path}"
+        end
+
         userinfo, hostport = authority.to_s.split('@', 2)
         hostport, userinfo = userinfo, nil unless hostport
         user, password = userinfo.to_s.split(':', 2)

data/lib/rdf/nquads.rb

@@ -20,7 +20,10 @@ module RDF
     # @see http://www.w3.org/TR/n-quads/
     # @since  0.4.0
     class Format < RDF::Format
-      content_type     'application/n-quads', extension: :nq, alias: 'text/x-nquads;q=0.2'
+      content_type     'application/n-quads',
+                       extension: :nq,
+                       alias: 'text/x-nquads;q=0.2',
+                       uri: RDF::URI("http://www.w3.org/ns/formats/N-Quads")
       content_encoding 'utf-8'
 
       reader { RDF::NQuads::Reader }

data/lib/rdf/ntriples/format.rb

@@ -16,7 +16,10 @@ module RDF::NTriples
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   # @see http://www.w3.org/TR/n-triples/
   class Format < RDF::Format
-    content_type     'application/n-triples', extension: :nt, alias: 'text/plain;q=0.2'
+    content_type     'application/n-triples',
+                     extension: :nt,
+                     alias: 'text/plain;q=0.2',
+                     uri: RDF::URI("http://www.w3.org/ns/formats/N-Triples")
     content_encoding 'utf-8'
 
     reader { RDF::NTriples::Reader }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header