rdf 3.1.13 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a8a5a69a203cf83628099c927675bbc4abe122bd8568bb69fa06bae0cbcb94b
-  data.tar.gz: eba5377c635a6b05c25cd2b88107521c494d557dbfde6c0de5dbe52646ee1401
+  metadata.gz: 4482866c0eb2c223af0f3a88f1eba8e1e2126c238c1136ff992a795de5047699
+  data.tar.gz: 38e58d5e2bab26f76b55affe2cb362aff85afb49c7692056837b69d34cad6081
 SHA512:
-  metadata.gz: 51af08617cb541333344b88a968c2d5699439baa7a4263154f7ccbdce06b635491b1cb93b9fb0e4dbca8711d9b71926ff22b60ab92f3f0cad9e205f86d1a3177
-  data.tar.gz: 8abc461f8937d46d3e75634764bc8bbaaf6f54ba07e39fa94c1400b62a59f20436ffd07c50a428aea7c2a01e292acbedb8f94bd5d07560e2523a00fef19174d1
+  metadata.gz: 464c0043d3238fc3c4b077dfe6144a145b2c636b0e7de53ea6e8ce7ea96d2fd196b88053b1974d939650295416a2e4f07d298009d06d3a0320c297caf7883309
+  data.tar.gz: 0b27d632fe51c621bd50c27c2b7ecf5da91cd615e4e39ddf82e9f65517bddadcba4adb387a33807f8f2f0851b3a1d3c0429ccf41f4ec1610371c57fe28bd0709

data/README.md

@@ -398,16 +398,16 @@ from BNode identity (i.e., they each entail the other)
 
 ## Dependencies
 
-* [Ruby](https://ruby-lang.org/) (>= 2.2)
+* [Ruby](https://ruby-lang.org/) (>= 2.6)
 * [LinkHeader][] (>= 0.0.8)
-* Soft dependency on [RestClient][] (>= 1.7)
+* Soft dependency on [RestClient][] (>= 2.1)
 
 ## Installation
 
 The recommended installation method is via [RubyGems](https://rubygems.org/).
 To install the latest official release of RDF.rb, do:
 
-    % [sudo] gem install rdf             # Ruby 2+
+    % [sudo] gem install rdf             # Ruby 2.6+
 
 ## Download
 

data/VERSION

@@ -1 +1 @@
-3.1.13
+3.2.3

data/lib/rdf/model/literal/double.rb

@@ -43,6 +43,7 @@ module RDF; class Literal
       # Can't use simple %f transformation due to special requirements from
       # N3 tests in representation
       @string = case
+        when @object.nil?      then 'NaN'
         when @object.nan?      then 'NaN'
         when @object.infinite? then @object.to_s[0...-'inity'.length].upcase
         when @object.zero?     then '0.0E0'

data/lib/rdf/model/literal/numeric.rb

@@ -11,6 +11,9 @@ module RDF; class Literal
     # @return [Integer] `-1`, `0`, or `1`
     # @since  0.3.0
     def <=>(other)
+      # If lexically invalid, use regular literal testing
+      return super unless self.valid? && (!other.respond_to?(:valid?) || other.valid?)
+
       case other
         when ::Numeric
           to_d <=> other
@@ -30,11 +33,10 @@ module RDF; class Literal
     # @since  0.3.0
     def ==(other)
       # If lexically invalid, use regular literal testing
-      return super unless self.valid?
+      return super unless self.valid? && (!other.respond_to?(:valid?) || other.valid?)
 
       case other
       when Literal::Numeric
-        return super unless other.valid?
         (cmp = (self <=> other)) ? cmp.zero? : false
       when RDF::URI, RDF::Node
         # Interpreting SPARQL data-r2/expr-equal/eq-2-2, numeric can't be compared with other types

data/lib/rdf/model/literal.rb

@@ -166,12 +166,12 @@ module RDF
       @object   = value.freeze
       @string   = lexical if lexical
       @string   = value if !defined?(@string) && value.is_a?(String)
-      @string   = @string.encode(Encoding::UTF_8).freeze if @string
-      @object   = @string if @string && @object.is_a?(String)
+      @string   = @string.encode(Encoding::UTF_8).freeze if instance_variable_defined?(:@string)
+      @object   = @string if instance_variable_defined?(:@string) && @object.is_a?(String)
       @language = language.to_s.downcase.to_sym if language
       @datatype = RDF::URI(datatype).freeze if datatype
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)
-      @datatype ||= @language ? RDF.langString : RDF::URI("http://www.w3.org/2001/XMLSchema#string")
+      @datatype ||= instance_variable_defined?(:@language) && @language ? RDF.langString : RDF::URI("http://www.w3.org/2001/XMLSchema#string")
     end
 
     ##
@@ -179,7 +179,7 @@ module RDF
     #
     # @return [String]
     def value
-      @string || to_s
+      instance_variable_defined?(:@string) && @string || to_s
     end
 
     ##
@@ -308,6 +308,37 @@ module RDF
     end
     alias_method :===, :==
 
+    ##
+    # Compares `self` to `other` for sorting purposes (with type check).
+    #
+    # @param  [Object]  other
+    # @return [Integer] `-1`, `0`, or `1`
+    def <=>(other)
+      case other
+      when Literal
+        case
+        when self.eql?(other)
+          0
+        when self.language? && other.language?
+          # Literals with languages can compare if languages are identical
+          self.to_s <=> other.to_s
+        when self.simple? && other.simple?
+          self.to_s <=> other.to_s
+        when !self.valid?
+          type_error("#{self.inspect} is invalid") || 0
+        when !other.valid?
+          type_error("#{other.inspect} is invalid") || 0
+        when self.comperable_datatype2?(other)
+          self.object <=> other.object
+        else
+          type_error("#{self.inspect} and #{other.inspect} are not comperable") || 0
+        end
+      when String
+        self.simple? && self.value <=> other
+      else 1
+      end
+    end
+
     ##
     # Returns `true` if this is a plain literal. A plain literal
     # may have a language, but may not have a datatype. For
@@ -399,6 +430,26 @@ module RDF
       end
     end
 
+    ##
+    # Returns `true` if the literals are comperable.
+    #
+    # Used for <=> operator.
+    #
+    # @return [Boolean]
+    def comperable_datatype2?(other)
+      case self
+      when RDF::Literal::Numeric, RDF::Literal::Boolean
+        case other
+        when RDF::Literal::Numeric, RDF::Literal::Boolean
+          true
+        else
+          false
+        end
+      else
+        self.datatype == other.datatype
+      end
+    end
+
     ##
     # Converts this literal into its canonical lexical representation.
     #

data/lib/rdf/model/statement.rb

@@ -301,7 +301,7 @@ module RDF
     # @see RDF::Literal#==
     # @see RDF::Query::Variable#==
     def eql?(other)
-      other.is_a?(Statement) && self == other && (self.graph_name || false) == (other.graph_name || false)
+      other.is_a?(Statement) && self.to_a.eql?(other.to_a) && (self.graph_name || false) == (other.graph_name || false)
     end
 
     ##

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`.
     #
@@ -621,16 +625,26 @@ module RDF
     end
 
     ##
-    # Returns a qualified name (QName) for this URI based on available vocabularies, if possible.
+    # Returns a qualified name (QName) as a tuple of `[prefix, suffix]` for this URI based on available vocabularies, if possible.
     #
     # @example
     #   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]
-    #
-    # @return [Array(Symbol, Symbol)] or `nil` if no QName found
-    def qname
-      if self.to_s =~ %r([:/#]([^:/#]*)$)
+    #   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. 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|
+          return [prefix, self.to_s[uri.length..-1].to_sym] if self.start_with?(uri)
+        end
+      elsif self.to_s =~ %r([:/#]([^:/#]*)$)
         local_name = $1
         vocab_uri  = local_name.empty? ? self.to_s : self.to_s[0...-(local_name.length)]
         Vocabulary.each do |vocab|
@@ -653,11 +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`
-    def pname
-      (q = self.qname) ? q.join(":") : to_s
+    # @see #qname
+    # @see https://www.w3.org/TR/rdf-sparql-query/#prefNames
+    def pname(prefixes: nil)
+      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/nquads.rb

@@ -69,9 +69,9 @@ module RDF
 
           begin
             unless blank? || read_comment
-              subject   = read_uriref || read_node || read_embTriple || fail_subject
+              subject   = read_uriref || read_node || read_quotedTriple || fail_subject
               predicate = read_uriref(intern: true) || fail_predicate
-              object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+              object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
               graph_name    = read_uriref || read_node
               if validate? && !read_eos
                 log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)

data/lib/rdf/ntriples/reader.rb

@@ -213,7 +213,7 @@ module RDF::NTriples
       begin
         read_statement
       rescue RDF::ReaderError
-        value = read_uriref || read_node || read_literal || read_embTriple
+        value = read_uriref || read_node || read_literal || read_quotedTriple
         log_recover
         value
       end
@@ -229,9 +229,9 @@ module RDF::NTriples
 
         begin
           unless blank? || read_comment
-            subject   = read_uriref || read_node || read_embTriple || fail_subject
+            subject   = read_uriref || read_node || read_quotedTriple || fail_subject
             predicate = read_uriref(intern: true) || fail_predicate
-            object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+            object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
 
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
@@ -247,11 +247,11 @@ module RDF::NTriples
 
     ##
     # @return [RDF::Statement]
-    def read_embTriple
+    def read_quotedTriple
       if @options[:rdfstar] && match(ST_START)
-        subject   = read_uriref || read_node || read_embTriple || fail_subject
+        subject   = read_uriref || read_node || read_quotedTriple || fail_subject
         predicate = read_uriref(intern: true) || fail_predicate
-        object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+        object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
         if !match(ST_END)
           log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
         end

data/lib/rdf/ntriples/writer.rb

@@ -227,7 +227,7 @@ module RDF::NTriples
     # @param  [RDF::Statement] statement
     # @param  [Hash{Symbol => Object}] options ({})
     # @return [String]
-    def format_embTriple(statement, **options)
+    def format_quotedTriple(statement, **options)
       "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
     ##

data/lib/rdf/query/pattern.rb

@@ -59,6 +59,12 @@ module RDF; class Query
       super
     end
 
+    ##
+    # Create a new pattern from the quads, recursivly dupping sub-patterns.
+    def dup
+      self.class.from(self.to_quad.map {|t| t.is_a?(RDF::Query::Pattern) ? t.dup : t})
+    end
+
     ##
     # Any additional options for this pattern.
     #

data/lib/rdf/reader.rb

@@ -647,7 +647,7 @@ module RDF
     ##
     # @return [String]
     def readline
-      @line = @line_rest || @input.readline
+      @line = instance_variable_defined?(:@line_rest) && @line_rest || @input.readline
       @line, @line_rest = @line.split("\r", 2)
       @line = String.new if @line.nil? # not frozen
       @line.chomp!

data/lib/rdf/repository.rb

@@ -243,17 +243,20 @@ module RDF
     #
     # @see RDF::Repository
     module Implementation
-      require 'hamster'
       DEFAULT_GRAPH = false
+      
+      ##
+      # @deprecated moved to {RDF::Transaction::SerializedTransaction}
+      SerializedTransaction = RDF::Transaction::SerializedTransaction
 
       ##
       # @private
       def self.extend_object(obj)
         obj.instance_variable_set(:@data, obj.options.delete(:data) || 
-                                          Hamster::Hash.new)
+                                          Hash.new)
         obj.instance_variable_set(:@tx_class, 
                                   obj.options.delete(:transaction_class) || 
-                                  SerializedTransaction)
+                                  RDF::Transaction::SerializedTransaction)
         super
       end
 
@@ -263,7 +266,6 @@ module RDF
       def supports?(feature)
         case feature.to_sym
         when :graph_name       then @options[:with_graph_name]
-        when :inference        then false  # forward-chaining inference
         when :validity         then @options.fetch(:with_validity, true)
         when :literal_equality then true
         when :atomic_write     then true
@@ -381,7 +383,7 @@ module RDF
       ##
       # @see RDF::Dataset#isolation_level
       def isolation_level
-        :serializable
+        :snapshot
       end
 
       ##
@@ -471,7 +473,7 @@ module RDF
       # @private
       # @see RDF::Mutable#clear
       def clear_statements
-        @data = @data.clear
+        @data = @data.class.new
       end
 
       ##
@@ -513,14 +515,11 @@ module RDF
         unless statement_in?(data, statement)
           s, p, o, c = statement.to_quad
           c ||= DEFAULT_GRAPH
-          
-          return data.put(c) do |subs|
-            (subs || Hamster::Hash.new).put(s) do |preds|
-              (preds || Hamster::Hash.new).put(p) do |objs|
-                (objs || Hamster::Hash.new).put(o, statement.options)
-              end
-            end
-          end
+
+          data          = data.has_key?(c)       ? data.dup       : data.merge(c => {})
+          data[c]       = data[c].has_key?(s)    ? data[c].dup    : data[c].merge(s => {})
+          data[c][s]    = data[c][s].has_key?(p) ? data[c][s].dup : data[c][s].merge(p => {})
+          data[c][s][p] = data[c][s][p].merge(o => statement.options)
         end
         data
       end
@@ -529,93 +528,18 @@ module RDF
       # @private
       # @return [Hamster::Hash] a new, updated hamster hash 
       def delete_from(data, statement)
-        if statement_in?(data, statement)
+        if has_statement_in?(data, statement)
           s, p, o, g = statement.to_quad
           g = DEFAULT_GRAPH unless supports?(:graph_name)
           g ||= DEFAULT_GRAPH
 
-          os   = data[g][s][p].delete(o)
-          ps   = os.empty? ? data[g][s].delete(p) : data[g][s].put(p, os)
-          ss   = ps.empty? ? data[g].delete(s)    : data[g].put(s, ps)
-          return ss.empty? ? data.delete(g) : data.put(g, ss)
+          os   = data[g][s][p].dup.delete_if {|k,v| k == o}
+          ps   = os.empty? ? data[g][s].dup.delete_if {|k,v| k == p} : data[g][s].merge(p => os)
+          ss   = ps.empty? ? data[g].dup.delete_if    {|k,v| k == s} : data[g].merge(s => ps)
+          return ss.empty? ? data.dup.delete_if       {|k,v| k == g} : data.merge(g => ss)
         end
         data
       end
-
-      ##
-      # A transaction for the Hamster-based `RDF::Repository::Implementation` 
-      # with full serializability.
-      # 
-      # @todo refactor me!
-      # @see RDF::Transaction
-      class SerializedTransaction < Transaction
-        ##
-        # @see Transaction#initialize
-        def initialize(*args, **options, &block)
-          super(*args, **options, &block)
-          @base_snapshot = @snapshot
-        end
-        
-        ##
-        # Inserts the statement to the transaction's working snapshot.
-        #
-        # @see Transaction#insert_statement
-        def insert_statement(statement)
-          @snapshot = @snapshot.class
-            .new(data: @snapshot.send(:insert_to, 
-                                      @snapshot.send(:data), 
-                                      process_statement(statement)))
-        end
-
-        ##
-        # Deletes the statement from the transaction's working snapshot.
-        #
-        # @see Transaction#insert_statement
-        def delete_statement(statement)
-          @snapshot = @snapshot.class
-            .new(data: @snapshot.send(:delete_from, 
-                                      @snapshot.send(:data), 
-                                      process_statement(statement)))
-        end
-
-        ##
-        # @see RDF::Dataset#isolation_level
-        def isolation_level
-          :serializable
-        end
-        
-        ##
-        # @note this is a simple object equality check.
-        # 
-        # @see RDF::Transaction#mutated?
-        def mutated?
-          !@snapshot.send(:data).equal?(repository.send(:data))
-        end
-        
-        ##
-        # Replaces repository data with the transaction's snapshot in a safely 
-        # serializable fashion.
-        # 
-        # @note this transaction uses a pessimistic merge strategy which 
-        #   fails the transaction if any data has changed in the repository
-        #   since transaction start time. However, the specific guarantee is 
-        #   softer: multiple concurrent conflicting transactions will not 
-        #   succeed. We may choose to implement a less pessimistic merge 
-        #   strategy as a non-breaking change.
-        # 
-        # @raise [TransactionError] when the transaction can't be merged.
-        # @see Transaction#execute
-        def execute
-          raise TransactionError, 'Cannot execute a rolled back transaction. ' \
-                                  'Open a new one instead.' if @rolledback
-
-          raise TransactionError, 'Error merging transaction. Repository' \
-                                  'has changed during transaction time.' unless 
-            repository.send(:data).equal? @base_snapshot.send(:data)
-
-          repository.send(:data=, @snapshot.send(:data))
-        end
-      end
     end # Implementation
   end # Repository
 end # RDF

data/lib/rdf/transaction.rb

@@ -247,7 +247,7 @@ module RDF
     # @raise [TransactionError] if the transaction can't be applied
     def execute
       raise TransactionError, 'Cannot execute a rolled back transaction. ' \
-                              'Open a new one instead.' if @rolledback
+                              'Open a new one instead.' if instance_variable_defined?(:@rolledback) && @rolledback
       @changes.apply(@repository)
     end
 
@@ -322,7 +322,81 @@ module RDF
     end
 
     public
-    
+
+    ##
+    # A transaction with full serializability.
+    # 
+    # @todo refactor me!
+    # @see RDF::Transaction
+    class SerializedTransaction < Transaction
+      ##
+      # @see Transaction#initialize
+      def initialize(*args, **options, &block)
+        super(*args, **options, &block)
+        @base_snapshot = @snapshot
+      end
+      
+      ##
+      # Inserts the statement to the transaction's working snapshot.
+      #
+      # @see Transaction#insert_statement
+      def insert_statement(statement)
+        @snapshot = @snapshot.class
+          .new(data: @snapshot.send(:insert_to, 
+                                    @snapshot.send(:data), 
+                                    process_statement(statement)))
+      end
+
+      ##
+      # Deletes the statement from the transaction's working snapshot.
+      #
+      # @see Transaction#insert_statement
+      def delete_statement(statement)
+        @snapshot = @snapshot.class
+          .new(data: @snapshot.send(:delete_from, 
+                                    @snapshot.send(:data), 
+                                    process_statement(statement)))
+      end
+
+      ##
+      # @see RDF::Dataset#isolation_level
+      def isolation_level
+        :serializable
+      end
+      
+      ##
+      # @note this is a simple object equality check.
+      # 
+      # @see RDF::Transaction#mutated?
+      def mutated?
+        !@snapshot.send(:data).equal?(repository.send(:data))
+      end
+      
+      ##
+      # Replaces repository data with the transaction's snapshot in a safely 
+      # serializable fashion.
+      # 
+      # @note this transaction uses a pessimistic merge strategy which 
+      #   fails the transaction if any data has changed in the repository
+      #   since transaction start time. However, the specific guarantee is 
+      #   softer: multiple concurrent conflicting transactions will not 
+      #   succeed. We may choose to implement a less pessimistic merge 
+      #   strategy as a non-breaking change.
+      # 
+      # @raise [TransactionError] when the transaction can't be merged.
+      # @see Transaction#execute
+      def execute
+        raise TransactionError, 'Cannot execute a rolled back transaction. ' \
+                                'Open a new one instead.' if instance_variable_defined?(:@rolledback) && @rolledback
+
+        raise TransactionError, 'Error merging transaction. Repository' \
+                                'has changed during transaction time.' unless 
+          repository.send(:data).equal? @base_snapshot.send(:data)
+
+        repository.send(:data=, @snapshot.send(:data))
+      end
+    end # SerializedTransaction
+
     ##
     # An error class for transaction failures.
     # 

data/lib/rdf/util/file.rb

@@ -98,7 +98,7 @@ module RDF; module Util
               headers:      response.headers
             }
 
-            remote_document = RemoteDocument.new(response.body, document_options)
+            RemoteDocument.new(response.body, document_options)
           when 300..399
             # Document base is redirected location
             # Location may be relative
@@ -215,7 +215,7 @@ module RDF; module Util
             headers:      response.headers
           }
 
-          remote_document = RemoteDocument.new(response.body, document_options)
+          RemoteDocument.new(response.body, document_options)
         else
           raise IOError, "<#{base_uri}>: #{response.status}"
         end

data/lib/rdf/util/logger.rb

@@ -17,17 +17,20 @@ module RDF; module Util
     # @param [Hash{Symbol => Object}] options
     # @option options [Logger, #<<] :logger
     # @return [Logger, #write, #<<]
-    def logger(**options)
-      logger = options.fetch(:logger, @logger)
-      logger = @options[:logger] if logger.nil? && @options
+    def logger(logger: nil, **options)
+      # Guard against undefined instance variables, which may be a warning if used.
+      @options = {} unless instance_variable_defined?(:@options) || frozen?
+      logger ||= @logger if instance_variable_defined?(:@logger)
+      logger = @options[:logger] if logger.nil? && instance_variable_defined?(:@options) && @options
       if logger.nil?
         # Unless otherwise specified, use $stderr
-        logger = (@options || options)[:logger] = IOWrapper.new($stderr)
+        logger = IOWrapper.new($stderr)
 
         # Reset log_statistics so that it's not inherited across different instances
         logger.log_statistics.clear if logger.respond_to?(:log_statistics)
       end
-      logger = (@options || options)[:logger] = ::Logger.new(::File.open(::File::NULL, "w"))  unless logger # Incase false was used, which is frozen
+      logger = ::Logger.new(::File.open(::File::NULL, "w"))  unless logger # Incase false was used, which is frozen
+      @options[:logger] ||= logger if instance_variable_defined?(:@options)
       logger.extend(LoggerBehavior) unless logger.is_a?(LoggerBehavior)
       logger
     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
 
@@ -70,7 +69,7 @@ module RDF
       # @return [Enumerator]
       def each(&block)
         if self.equal?(Vocabulary)
-          if @vocabs
+          if instance_variable_defined?(:@vocabs) && @vocabs
             @vocabs.select(&:name).each(&block)
           else
             # This is needed since all vocabulary classes are defined using
@@ -356,7 +355,7 @@ module RDF
       def ontology(*args)
         case args.length
         when 0
-          @ontology
+          @ontology if instance_variable_defined?(:@ontology)
         else
           uri, options = args
           URI.cache.delete(uri.to_s.to_sym)  # Clear any previous entry
@@ -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
@@ -507,7 +513,7 @@ module RDF
         end
 
         # Also include the ontology, if it's not also a property
-        @ontology.each_statement(&block) if @ontology && @ontology != self
+        @ontology.each_statement(&block) if self.ontology && self.ontology != self
       end
 
       ##
@@ -574,6 +580,7 @@ module RDF
           term_defs
         end
 
+        #require 'byebug'; byebug
         # Pass over embedded_defs with anonymous references, once
         embedded_defs.each do |term, attributes|
           attributes.each do |ak, avs|
@@ -642,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
@@ -1234,16 +1260,16 @@ module RDF
           values = values.map do |value|
             if value.is_a?(Literal) && %w(: comment definition notation note editorialNote).include?(k.to_s)
               "%(#{value.to_s.gsub('(', '\(').gsub(')', '\)')}).freeze"
-            # elsif value.is_a?(RDF::Vocabulary::Term)
-            #  value.to_ruby(indent: indent + "  ")
+            elsif value.node? && value.is_a?(RDF::Vocabulary::Term)
+              "#{value.to_ruby(indent: indent + "  ")}.freeze"
             elsif value.is_a?(RDF::Term)
               "#{value.to_s.inspect}.freeze"
             elsif value.is_a?(RDF::List)
               list_elements = value.map do |u|
                 if u.uri?
                   "#{u.to_s.inspect}.freeze"
-                # elsif u.respond_to?(:to_ruby)
-                #  u.to_ruby(indent: indent + "  ")
+                elsif u.node? && u.respond_to?(:to_ruby)
+                  u.to_ruby(indent: indent + "  ")
                 else
                   "#{u.to_s.inspect}.freeze"
                 end

data/lib/rdf/writer.rb

@@ -516,7 +516,7 @@ module RDF
         when RDF::Literal   then format_literal(term, **options)
         when RDF::URI       then format_uri(term, **options)
         when RDF::Node      then format_node(term, **options)
-        when RDF::Statement then format_embTriple(term, **options)
+        when RDF::Statement then format_quotedTriple(term, **options)
         else nil
       end
     end
@@ -574,7 +574,7 @@ module RDF
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_embTriple(value, **options)
+    def format_quotedTriple(value, **options)
       raise NotImplementedError.new("#{self.class}#format_statement") # override in subclasses
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.13
+  version: 3.2.3
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -32,76 +32,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.8
-- !ruby/object:Gem::Dependency
-  name: hamster
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -122,14 +108,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -150,14 +136,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -178,28 +164,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework
   (RDF) data.
 email: public-rdf-ruby@w3.org
@@ -296,14 +282,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.