rdf 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbddc1758793b9251e0f2e6570a5a222bf32aa39fcc2e73d1d454b84af90062a
-  data.tar.gz: 4ad7cca943663997855d26d6a741138c0bad7ad3258d8a8fa081e701d5657785
+  metadata.gz: 932836f4b2fae338cfabd3acc588c98b035868f4d8ec5a1d92fbd035ef25f23f
+  data.tar.gz: 7b173b18ff4586198f5554083d12df3147d3a1f1cb363078ee0d3e92dcb6b9aa
 SHA512:
-  metadata.gz: 587ff46cfde46b088a9b5994a350bffffc189c96e26a6c9c426ae204b731872858c6b80379a36b3b17c69192b47b81f67b005bd728fd858a0db385f44e70e09e
-  data.tar.gz: 0a048848ce6db55add239882c35a2e0df981ec9ea0afbd3070f1cde536168382d00177a6d2467e196d69ee14a816367c29133263d39c921b5876af63b4dd1d19
+  metadata.gz: f7833c0a0177907b32702d1ccf8b34b26e0f3c78525f46b35277995e7bb377e1bbe7cf28d01a189d42ae29515c58e7b80ab70e2068fc6d9eb379460e15ab0496
+  data.tar.gz: 5afb152c0526dc5efd5784a2e2496f52f1668bef49ba942885981cfefe1c485326f68c76456bb2c13720c396454558218a4fbe6585372c36a2a7c3cbfc9f2540

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.4

data/lib/rdf.rb

@@ -4,6 +4,7 @@ require 'date'
 require 'time'
 
 require 'rdf/version'
+require 'rdf/extensions'
 
 module RDF
   # RDF mixins
@@ -197,7 +198,7 @@ module RDF
   # @return [#to_s] property
   # @return [URI]
   def self.[](property)
-    property.to_s =~ %r{_\d+} ? RDF::URI("#{to_uri}#{property}") : RDF::RDFV[property]
+    property.to_s.match?(%r{_\d+}) ? RDF::URI("#{to_uri}#{property}") : RDF::RDFV[property]
   end
 
   ##
@@ -227,7 +228,7 @@ module RDF
   def self.method_missing(property, *args, &block)
     if args.empty?
       # Special-case rdf:_n for all integers
-      RDF_N_REGEXP.match(property) ? RDF::URI("#{to_uri}#{property}") : RDF::RDFV.send(property)
+      RDF_N_REGEXP.match?(property) ? RDF::URI("#{to_uri}#{property}") : RDF::RDFV.send(property)
     else
       super
     end

data/lib/rdf/extensions.rb

@@ -0,0 +1,22 @@
+##
+# This file provides compatibility monkeypatches to standard library classes
+# Implementation taken from MIT-licensed https://github.com/marcandre/backports
+#
+
+# https://github.com/marcandre/backports/blob/master/lib/backports/2.4.0/regexp/match.rb
+unless Regexp.method_defined? :match?
+  class Regexp
+    def match?(*args)
+      !match(*args).nil?
+    end
+  end
+end
+
+# https://github.com/marcandre/backports/blob/master/lib/backports/2.4.0/string/match.rb
+unless String.method_defined? :match?
+  class String
+    def match?(*args)
+      !match(*args).nil?
+    end
+  end
+end

data/lib/rdf/model/list.rb

@@ -100,11 +100,12 @@ module RDF
 
     ##
     # Validate the list ensuring that
+    # * each node is referenced exactly once (except for the head, which may have no reference)
     # * rdf:rest values are all BNodes are nil
     # * each subject has exactly one value for `rdf:first` and
     #   `rdf:rest`.
     # * The value of `rdf:rest` must be either a BNode or `rdf:nil`.
-    # * All other properties are ignored.
+    # * only the list head may have any other properties
     # @return [Boolean]
     def valid?
       li = subject
@@ -123,12 +124,25 @@ module RDF
             rest = st.object
             return false unless rest.node? || rest == RDF.nil
             rests += 1
+          when RDF.type
+          else
+            # It may have no other properties
+            return false unless li == subject
           end
         end
         return false unless firsts == 1 && rests == 1
         li = rest
       end
-      true
+
+      # All elements other than the head must be referenced exactly once
+      return list_nodes.all? do |li|
+        refs = @graph.query(object: li).count
+        case refs
+        when 0 then li == subject
+        when 1 then true
+        else        false
+        end
+      end
     end
 
     # @!attribute [r] subject

data/lib/rdf/model/literal.rb

@@ -363,7 +363,7 @@ module RDF
       return false if language? && language.to_s !~ /^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/
       return false if datatype? && datatype.invalid?
       grammar = self.class.const_get(:GRAMMAR) rescue nil
-      grammar.nil? || !!(value =~ grammar)
+      grammar.nil? || value.match?(grammar)
     end
 
     ##

data/lib/rdf/model/uri.rb

@@ -1006,7 +1006,7 @@ module RDF
     def path=(value)
       if value
         # Always lead with a slash
-        value = "/#{value}" if host && value.to_s =~ /^[^\/]/
+        value = "/#{value}" if host && value.to_s.match?(/^[^\/]/)
         object[:path] = value.to_s.force_encoding(Encoding::UTF_8)
       else
         object[:path] = nil

data/lib/rdf/nquads.rb

@@ -36,7 +36,7 @@ module RDF
       # @param [String] sample Beginning several bytes (about 1K) of input.
       # @return [Boolean]
       def self.detect(sample)
-        !!sample.match(%r(
+        sample.match?(%r(
           (?:\s*(?:<[^>]*>) | (?:_:\w+))                          # Subject
           \s*
           (?:\s*<[^>]*>)                                          # Predicate
@@ -46,8 +46,8 @@ module RDF
           (?:\s*(?:<[^>]*>) | (?:_:\w+))                          # Graph Name
           \s*\.
         )x) && !(
-          sample.match(%r(@(base|prefix|keywords)|\{)) ||         # Not Turtle/N3/TriG
-          sample.match(%r(<(html|rdf))i)                          # Not HTML or XML
+          sample.match?(%r(@(base|prefix|keywords)|\{)) ||         # Not Turtle/N3/TriG
+          sample.match?(%r(<(html|rdf))i)                          # Not HTML or XML
         )
       end
 

data/lib/rdf/ntriples/format.rb

@@ -32,7 +32,7 @@ module RDF::NTriples
     # @param [String] sample Beginning several bytes (about 1K) of input.
     # @return [Boolean]
     def self.detect(sample)
-      !!sample.match(%r(
+      sample.match?(%r(
         (?:(?:<[^>]*>) | (?:_:\w+))                             # Subject
         \s*
         (?:<[^>]*>)                                             # Predicate
@@ -40,8 +40,8 @@ module RDF::NTriples
         (?:(?:<[^>]*>) | (?:_:\w+) | (?:"[^"\n]*"(?:^^|@\S+)?)) # Object
         \s*\.
       )x) && !(
-        sample.match(%r(@(base|prefix|keywords)|\{)) ||         # Not Turtle/N3/TriG
-        sample.match(%r(<(html|rdf))i)                          # Not HTML or XML
+        sample.match?(%r(@(base|prefix|keywords)|\{)) ||         # Not Turtle/N3/TriG
+        sample.match?(%r(<(html|rdf))i)                          # Not HTML or XML
       ) && !RDF::NQuads::Format.detect(sample)
     end
 

data/lib/rdf/ntriples/reader.rb

@@ -154,6 +154,14 @@ module RDF::NTriples
       end
     end
 
+    # cache constants to optimize escaping the escape chars in self.unescape
+    ESCAPE_CHARS_ESCAPED = ESCAPE_CHARS.each_with_object({}) do |escape, memo|
+      memo[escape.inspect[1...-1]] = escape
+    end.freeze
+    ESCAPE_CHARS_ESCAPED_REGEXP = Regexp.union(
+      ESCAPE_CHARS_ESCAPED.keys
+    ).freeze
+
     ##
     # @param  [String] string
     # @return [String]
@@ -161,15 +169,26 @@ module RDF::NTriples
     # @see    http://blog.grayproductions.net/articles/understanding_m17n
     # @see    http://yehudakatz.com/2010/05/17/encodings-unabridged/
     def self.unescape(string)
-      string = string.dup.force_encoding(Encoding::UTF_8)
+      # Note: avoiding copying the input string when no escaping is needed
+      # greatly reduces the number of allocations and the processing time.
+      unless string.encoding == Encoding::UTF_8
+        string = string.dup.force_encoding(Encoding::UTF_8)
+      end
+
+      has_escape_chars = ESCAPE_CHARS_ESCAPED_REGEXP.match?(string)
+      has_uchar = UCHAR.match?(string)
 
-      # Decode \t|\n|\r|\"|\\ character escapes:
-      ESCAPE_CHARS.each { |escape| string.gsub!(escape.inspect[1...-1], escape) }
+      string = string.dup if has_escape_chars || has_uchar
+
+      # Decode \t|\n|\r|\"|\\ character escapes using Regexp:
+      string.gsub!(ESCAPE_CHARS_ESCAPED_REGEXP) do
+        ESCAPE_CHARS_ESCAPED.fetch($~[0])
+      end if has_escape_chars
 
       # Decode \uXXXX and \UXXXXXXXX code points:
       string.gsub!(UCHAR) do
         [($1 || $2).hex].pack('U*')
-      end
+      end if has_uchar
 
       string
     end

data/lib/rdf/ntriples/writer.rb

@@ -56,7 +56,7 @@ module RDF::NTriples
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
     def self.escape(string, encoding = nil)
       ret = case
-        when string =~ ESCAPE_PLAIN # a shortcut for the simple case
+        when string.match?(ESCAPE_PLAIN) # a shortcut for the simple case
           string
         when string.ascii_only?
           StringIO.open do |buffer|
@@ -164,7 +164,7 @@ module RDF::NTriples
     # @return [String]
     # @raise  [ArgumentError] if `value` is not an `RDF::Statement` or `RDF::Term`
     def self.serialize(value)
-      writer = self.new
+      writer = (@serialize_writer_memo ||= self.new)
       case value
         when nil then nil
         when FalseClass then value.to_s
@@ -256,7 +256,7 @@ module RDF::NTriples
     def format_uri(uri, **options)
       string = uri.to_s
       iriref = case
-        when string =~ ESCAPE_PLAIN_U # a shortcut for the simple case
+        when string.match?(ESCAPE_PLAIN_U) # a shortcut for the simple case
           string
         when string.ascii_only? || (encoding && encoding != Encoding::ASCII)
           StringIO.open do |buffer|

data/lib/rdf/query/solution.rb

@@ -24,7 +24,7 @@ class RDF::Query
     # Undefine all superfluous instance methods:
     undef_method(*instance_methods.
                   map(&:to_s).
-                  select {|m| m =~ /^\w+$/}.
+                  select {|m| m.match?(/^\w+$/)}.
                   reject {|m| %w(object_id dup instance_eval inspect to_s private_methods class should should_not pretty_print).include?(m) || m[0,2] == '__'}.
                   map(&:to_sym))
 

data/lib/rdf/reader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RDF
   ##
   # The base class for RDF parsers.
@@ -610,7 +611,8 @@ module RDF
     def readline
       @line = @line_rest || @input.readline
       @line, @line_rest = @line.split("\r", 2)
-      @line = @line.to_s.chomp
+      @line = String.new if @line.nil? # not frozen
+      @line.chomp!
       begin
         @line.encode!(encoding)
       rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError, Encoding::ConverterNotFoundError

data/lib/rdf/util/file.rb

@@ -290,7 +290,7 @@ module RDF; module Util
       filename_or_url = $1 if filename_or_url.to_s.match(/^file:(.*)$/)
       remote_document = nil
 
-      if filename_or_url.to_s =~ /^https?/
+      if filename_or_url.to_s.match?(/^https?/)
         base_uri = filename_or_url.to_s
 
         remote_document = self.http_adapter(!!options[:use_net_http]).

data/lib/rdf/util/logger.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require 'logger'
+require 'delegate'
 
 module RDF; module Util
   ##
@@ -8,6 +9,9 @@ module RDF; module Util
   # Modules must provide `@logger`, which returns an instance of `Logger`, or something responding to `#<<`. Logger may also be specified using an `@options` hash containing a `:logger` entry.
   # @since 2.0.0
   module Logger
+    # The IOWrapper class is used to store per-logger state while wrapping an IO such as $stderr.
+    IOWrapper = DelegateClass(IO)
+
     ##
     # Logger instance, found using `options[:logger]`, `@logger`, or `@options[:logger]`
     # @param [Hash{Symbol => Object}] options
@@ -18,7 +22,7 @@ module RDF; module Util
       logger = @options[:logger] if logger.nil? && @options
       if logger.nil?
         # Unless otherwise specified, use $stderr
-        logger = (@options || options)[:logger] = $stderr
+        logger = (@options || options)[: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)

data/lib/rdf/vocabulary.rb

@@ -620,7 +620,7 @@ module RDF
     # Undefine all superfluous instance methods:
     undef_method(*instance_methods.
                   map(&:to_s).
-                  select {|m| m =~ /^\w+$/}.
+                  select {|m| m.match?(/^\w+$/)}.
                   reject {|m| %w(object_id dup instance_eval inspect to_s class send public_send).include?(m) || m[0,2] == '__'}.
                   map(&:to_sym))
 
@@ -892,7 +892,7 @@ module RDF
       # @since 0.3.9
       def valid?
         # Validate relative to RFC3987
-        node? || RDF::URI::IRI.match(to_s) || false
+        node? || RDF::URI::IRI.match?(to_s) || false
       end
 
       ##
@@ -927,7 +927,7 @@ module RDF
       # Is this neither a class, property or datatype term?
       # @return [Boolean]
       def other?
-        Array(self.type).none? {|t| t.to_s =~ /(Class|Property|Datatype|Restriction)/}
+        Array(self.type).none? {|t| t.to_s.match?(/(Class|Property|Datatype|Restriction)/)}
       end
 
       ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -218,6 +218,7 @@ files:
 - lib/rdf.rb
 - lib/rdf/changeset.rb
 - lib/rdf/cli.rb
+- lib/rdf/extensions.rb
 - lib/rdf/format.rb
 - lib/rdf/mixin/countable.rb
 - lib/rdf/mixin/durable.rb