rdf 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2224a9a63fc05ccc786d780252f85ae706edd75f44ee7b459fedc824e53a9098
-  data.tar.gz: 7768cfaff9ccfc49f4f96fcf896b084250a8d973277d113c87b8e90a5d7c818d
+  metadata.gz: 4482866c0eb2c223af0f3a88f1eba8e1e2126c238c1136ff992a795de5047699
+  data.tar.gz: 38e58d5e2bab26f76b55affe2cb362aff85afb49c7692056837b69d34cad6081
 SHA512:
-  metadata.gz: bb59046c5aaa422b005d58b1f25eb8d9e2acd967116c55d2e657abb269256c1dc1c2706ebf555a82ddc3f1e3bddba23ce3d0f0f6581a5180ae7d9989764aee5b
-  data.tar.gz: 13592fb59a53b641a970abc239e3c561e4c2ba1f2c85a1a7fe2003a897dd8305f3127fba4106a330a0fadff0083d66bc0d1d8572c30504eba369902d7fefec42
+  metadata.gz: 464c0043d3238fc3c4b077dfe6144a145b2c636b0e7de53ea6e8ce7ea96d2fd196b88053b1974d939650295416a2e4f07d298009d06d3a0320c297caf7883309
+  data.tar.gz: 0b27d632fe51c621bd50c27c2b7ecf5da91cd615e4e39ddf82e9f65517bddadcba4adb387a33807f8f2f0851b3a1d3c0429ccf41f4ec1610371c57fe28bd0709

data/VERSION

@@ -1 +1 @@
-3.2.2
+3.2.3

data/lib/rdf/model/uri.rb

@@ -111,6 +111,10 @@ module RDF
       tag tel turn turns tv urn javascript
     ).freeze
 
+    # Characters in a PName which must be escaped
+    PN_ESCAPE_CHARS      = /[~\.\-!\$&'\(\)\*\+,;=\/\?\#@%_]/.freeze
+    PN_ESCAPES           = /\\#{PN_ESCAPE_CHARS}/.freeze
+    
     ##
     # Cache size may be set through {RDF.config} using `uri_cache_size`.
     #
@@ -627,10 +631,14 @@ module RDF
     #   RDF::URI('http://www.w3.org/2000/01/rdf-schema#').qname       #=> [:rdfs, nil]
     #   RDF::URI('http://www.w3.org/2000/01/rdf-schema#label').qname  #=> [:rdfs, :label]
     #   RDF::RDFS.label.qname                                         #=> [:rdfs, :label]
+    #   RDF::Vocab::DC.title.qname(
+    #     prefixes: {dcterms: 'http://purl.org/dc/terms/'})           #=> [:dcterms, :title]
+    #
+    # @note within this software, the term QName is used to describe the tuple of prefix and suffix for a given IRI, where the prefix identifies some defined vocabulary. This somewhat contrasts with the notion of a [Qualified Name](https://www.w3.org/TR/2006/REC-xml-names11-20060816/#ns-qualnames) from XML, which are a subset of Prefixed Names.
     #
     # @param [Hash{Symbol => String}] prefixes
     #   Explicit set of prefixes to look for matches, defaults to loaded vocabularies.
-    # @return [Array(Symbol, Symbol)] or `nil` if no QName found
+    # @return [Array(Symbol, Symbol)] or `nil` if no QName found. The suffix component will not have [reserved characters](https://www.w3.org/TR/turtle/#reserved) escaped.
     def qname(prefixes: nil)
       if prefixes
         prefixes.each do |prefix, uri|
@@ -659,13 +667,25 @@ module RDF
     end
 
     ##
-    # Returns a string version of the QName or the full IRI
+    # Returns a Prefixed Name (PName) or the full IRI with any [reserved characters](https://www.w3.org/TR/turtle/#reserved) in the suffix escaped.
+    #
+    # @example Using a custom prefix for creating a PNname.
+    #   RDF::URI('http://purl.org/dc/terms/creator').
+    #     pname(prefixes: {dcterms: 'http://purl.org/dc/terms/'})
+    #     #=> "dcterms:creator"
     #
     # @param [Hash{Symbol => String}] prefixes
     #   Explicit set of prefixes to look for matches, defaults to loaded vocabularies.
     # @return [String] or `nil`
+    # @see #qname
+    # @see https://www.w3.org/TR/rdf-sparql-query/#prefNames
     def pname(prefixes: nil)
-      (q = self.qname(prefixes: prefixes)) ? q.join(":") : to_s
+      q = self.qname(prefixes: prefixes)
+      return self.to_s unless q
+      prefix, suffix = q
+      suffix = suffix.to_s.gsub(PN_ESCAPE_CHARS) {|c| "\\#{c}"} if
+        suffix.to_s.match?(PN_ESCAPE_CHARS)
+      [prefix, suffix].join(":")
     end
 
     ##

data/lib/rdf/vocabulary.rb

@@ -53,8 +53,7 @@ module RDF
   #       "rdfs:subClassOf" => "http://example/SuperClass"
   #   end
   #
-  # @see http://www.w3.org/TR/curie/
-  # @see http://en.wikipedia.org/wiki/QName
+  # @see https://www.w3.org/TR/rdf-sparql-query/#prefNames
   class Vocabulary
     extend ::Enumerable
 
@@ -379,15 +378,20 @@ module RDF
       alias_method :__properties__, :properties
 
       ##
-      # Attempt to expand a Compact IRI/PName/QName using loaded vocabularies
+      # Attempt to expand a Compact IRI/PName using loaded vocabularies
       #
       # @param [String, #to_s] pname
+      # The local-part of the PName will will have [reserved character escapes](https://www.w3.org/TR/turtle/#reserved) unescaped.
       # @return [Term]
-      # @raise [KeyError] if pname suffix not found in identified vocabulary
+      # @raise [KeyError] if pname suffix not found in identified vocabulary.
       # @raise [ArgumentError] if resulting URI is not valid
       def expand_pname(pname)
         return pname unless pname.is_a?(String) || pname.is_a?(Symbol)
         prefix, suffix = pname.to_s.split(":", 2)
+        # Unescape escaped PN_ESCAPE_CHARS
+        if suffix.match?(/\\#{RDF::URI::PN_ESCAPE_CHARS}/)
+          suffix = suffix.gsub(RDF::URI::PN_ESCAPES) {|matched| matched[1..-1]}
+        end
         if prefix == "rdf"
           RDF[suffix]
         elsif vocab_detail = RDF::Vocabulary.vocab_map[prefix.to_sym]
@@ -417,9 +421,10 @@ module RDF
       end
 
       ##
-      # Return the Vocabulary term associated with a  URI
+      # Return the Vocabulary term associated with a URI
       #
-      # @param [RDF::URI] uri
+      # @param [RDF::URI, String] uri
+      #   If `uri` has is a pname in a locded vocabulary, the suffix portion of the PName will have escape characters unescaped before resolving against the vocabulary.
       # @return [Vocabulary::Term]
       def find_term(uri)
         uri = RDF::URI(uri)
@@ -428,7 +433,8 @@ module RDF
           if vocab.ontology == uri
             vocab.ontology
           else
-            vocab[uri.to_s[vocab.to_uri.to_s.length..-1].to_s]
+            suffix = uri.to_s[vocab.to_uri.to_s.length..-1].to_s
+            vocab[suffix]
           end
         end
       end
@@ -643,12 +649,31 @@ module RDF
       alias_method :__name__, :name
 
       ##
-      # Returns a suggested CURIE/PName prefix for this vocabulary class.
+      # Returns a suggested vocabulary prefix for this vocabulary class.
       #
       # @return [Symbol]
       # @since  0.3.0
       def __prefix__
-        __name__.split('::').last.downcase.to_sym
+        instance_variable_defined?(:@__prefix__) ?
+          @__prefix__ :
+          __name__.split('::').last.downcase.to_sym
+      end
+
+      ##
+      # Sets the vocabulary prefix to use for this vocabulary..
+      #
+      # @example Overriding a standard vocabulary prefix.
+      #   RDF::Vocab::DC.__prefix__ = :dcterms
+      #   RDF::Vocab::DC.title.pname #=> 'dcterms:title'
+      #
+      # @param [Symbol] prefix
+      # @return [Symbol]
+      # @since  3.2.3
+      def __prefix__=(prefix)
+        params = RDF::Vocabulary.vocab_map[__prefix__]
+        @__prefix__ = prefix.to_sym
+        RDF::Vocabulary.register(@__prefix__, self, **params)
+        @__prefix__
       end
 
     protected

metadata

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