rdf 3.0.13 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a969744cdc52b4d24c7621d70e0bdcc0cb0453ee5c9f371bc1019bacecce5b27
-  data.tar.gz: b2dc220b847515e8e96f1b1c55be1290b5b948e7f10ced559203d27a0793be41
+  metadata.gz: 2daf8eddad46785b68f11f655491114ece3425f5af8e283ec5372f186fbf0494
+  data.tar.gz: d84668437ad7b0c703bf0cec3a0c2cd50a25f6a81e4e1b9289b87c33b70fe18f
 SHA512:
-  metadata.gz: 28cd11713d9a680ffd9198bff24e123fba6dd489c123808704ed591931c40d1238ff37baab7bac5a9685fafc5d5168e55216b703ccd35c4bf6916853c5cd3c70
-  data.tar.gz: c1b11ad1585b69b65e117e5ccff21a75de10ab63aac1b5228e880fe5ea1fd380f197afdb9ed8534ed0d077477b5ca3b2a9fa6e967c2334c457d17e0620789b20
+  metadata.gz: 30730b50722a1d159fdc4acc7d226253101a28475925451e0dffd599a20b837146a21202d539125aa513ded6dc7de50c290d570a273963052a4820c304a291eb
+  data.tar.gz: 611b837819f8470547ca79cd6d948201e39c288f2e8f2da25f6c39e557abd5efa4b39b3c549d47f09bd75db53af84de3e46fc43f8ebcbc082245556c0ed06b39

data/README.md

@@ -29,7 +29,8 @@ This is a pure-Ruby library for working with [Resource Description Framework
   not modify any of Ruby's core classes or standard library.
 * Based entirely on Ruby's autoloading, meaning that you can generally make
   use of any one part of the library without needing to load up the rest.
-* Compatible with Ruby Ruby >= 2.2.2, Rubinius and JRuby 9.0+.
+* Compatible with Ruby Ruby >= 2.4, Rubinius and JRuby 9.0+.
+  * Note, changes in mapping hashes to keyword arguments for Ruby 2.7+ may require that arguments be passed more explicitly, especially when the first argument is a Hash and there are optional keyword arguments. In this case, Hash argument may need to be explicitly included within `{}` and the optional keyword arguments may need to be specified using `**{}` if there are no keyword arguments.
 * Performs auto-detection of input to select appropriate Reader class if one
   cannot be determined from file characteristics.
 
@@ -189,7 +190,7 @@ Note that no prefixes are loaded automatically, however they can be provided as
         FOAF.name => :name,
         FOAF.mbox => :email,
       }
-    })
+    }, **{})
     
     query.execute(graph) do |solution|
       puts "name=#{solution.name} email=#{solution.email}"

data/VERSION

@@ -1 +1 @@
-3.0.13
+3.1.0

data/lib/rdf.rb

@@ -79,8 +79,8 @@ module RDF
   #
   # @param (see RDF::Resource#initialize)
   # @return [RDF::Resource]
-  def self.Resource(*args, &block)
-    Resource.new(*args, &block)
+  def self.Resource(*args)
+    Resource.new(*args)
   end
 
   ##
@@ -88,8 +88,8 @@ module RDF
   #
   # @param (see RDF::Node#initialize)
   # @return [RDF::Node]
-  def self.Node(*args, &block)
-    Node.new(*args, &block)
+  def self.Node(*args)
+    Node.new(*args)
   end
 
   ##
@@ -97,8 +97,15 @@ module RDF
   #
   # @param (see RDF::URI#initialize)
   # @return [RDF::URI]
-  def self.URI(uri, *args, &block)
-    uri.respond_to?(:to_uri) ? uri.to_uri : URI.new(uri, *args, &block)
+  def self.URI(*args)
+    if args.first.respond_to?(:to_uri)
+      args.first.to_uri
+    elsif args.first.is_a?(Hash)
+      URI.new(**args.first)
+    else
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      URI.new(*args, **opts)
+    end
   end
 
   ##
@@ -106,10 +113,10 @@ module RDF
   #
   # @param (see RDF::Literal#initialize)
   # @return [RDF::Literal]
-  def self.Literal(literal, *args, &block)
+  def self.Literal(literal, **options)
     case literal
       when RDF::Literal then literal
-      else Literal.new(literal, *args, &block)
+      else Literal.new(literal, **options)
     end
   end
 
@@ -119,7 +126,7 @@ module RDF
   # @param (see RDF::Graph#initialize)
   # @return [RDF::Graph]
   def self.Graph(**options, &block)
-    Graph.new(options, &block)
+    Graph.new(**options, &block)
   end
 
   ##
@@ -171,11 +178,11 @@ module RDF
   #   @option options [RDF::Resource]  :graph_name   (nil)
   #   @return [RDF::Statement]
   #
-  def self.Statement(*args)
-    if args.empty?
+  def self.Statement(*args, **options)
+    if args.empty? && options.empty?
       RDF[:Statement]
     else
-      Statement.new(*args)
+      Statement.new(*args, **options)
     end
   end
 

data/lib/rdf/changeset.rb

@@ -42,7 +42,7 @@ module RDF
     # @yieldparam [RDF::Changeset] changes
     # @return [void]
     def self.apply(mutable, **options, &block)
-      self.new(&block).apply(mutable, options)
+      self.new(&block).apply(mutable, **options)
     end
 
     ##

data/lib/rdf/cli.rb

@@ -175,7 +175,7 @@ module RDF
           unless repository.count > 0
             start = Time.new
             count = 0
-            self.parse(argv, opts) do |reader|
+            self.parse(argv, **opts) do |reader|
               reader.each_statement do |statement|
                 count += 1
               end
@@ -240,7 +240,7 @@ module RDF
           out = opts[:output]
           opts = opts.merge(prefixes: {})
           writer_opts = opts.merge(standard_prefixes: true)
-          writer_class.new(out, writer_opts) do |writer|
+          writer_class.new(out, **writer_opts) do |writer|
             writer << repository
           end
         end
@@ -501,7 +501,7 @@ module RDF
       if cmds.any? {|c| COMMANDS[c.to_sym][:parse]}
         start = Time.new
         count = 0
-        self.parse(args, options) do |reader|
+        self.parse(args, **options) do |reader|
           @repository << reader
         end
         secs = Time.new - start
@@ -575,7 +575,7 @@ module RDF
         RDF::Format.each do |format|
           format.cli_commands.each do |command, options|
             options = {lambda: options} unless options.is_a?(Hash)
-            add_command(command, options)
+            add_command(command, **options)
           end
         end
         @commands_loaded = true
@@ -637,13 +637,13 @@ module RDF
         r = RDF::Reader.for(format|| {sample: sample})
         raise ArgumentError, "Unknown format for evaluated input" unless r
         (@readers ||= []) << r
-        r.new(input, options) do |reader|
+        r.new(input, **options) do |reader|
           yield(reader)
         end
       else
         options[:format] = format if format
         files.each do |file|
-          RDF::Reader.open(file, options) do |reader|
+          RDF::Reader.open(file, **options) do |reader|
             (@readers ||= []) << reader.class.to_s
             yield(reader)
           end

data/lib/rdf/format.rb

@@ -122,7 +122,7 @@ module RDF
         sample = case sample
         when Proc then sample.call.to_s
         else sample.dup.to_s
-        end.force_encoding(Encoding::ASCII_8BIT)
+        end.dup.force_encoding(Encoding::ASCII_8BIT)
         # Given a sample, perform format detection across the appropriate formats, choosing the last that matches
         # Return last format that has a positive detection
         formats = formats.select {|f| f.detect(sample)}
@@ -145,10 +145,10 @@ module RDF
     #   @param  [String, RDF::URI] filename
     #   @return [Class]
     #
-    # @overload for(**options)
+    # @overload for(options)
     #   Finds an RDF serialization format class based on various options.
     #
-    #   @param  [Hash{Symbol => Object}] options
+    #   @param  [Hash{Symbol => Object}] options ({})
     #   @option options [String, #to_s]   :file_name      (nil)
     #   @option options [Symbol, #to_sym] :file_extension (nil)
     #   @option options [String, #to_s]   :content_type   (nil)
@@ -164,19 +164,26 @@ module RDF
     #   @yieldreturn [String] another way to provide a sample, allows lazy for retrieving the sample.
     #
     # @return [Class]
-    def self.for(*args, **options, &block)
+    def self.for(*arg, &block)
+      case arg.length
+      when 0 then arg = nil
+      when 1 then arg = arg.first
+      else
+        raise ArgumentError, "Format.for accepts zero or one argument, got #{arg.length}."
+      end
+
+      options =  arg.is_a?(Hash) ? arg : {}
       options = {sample: block}.merge(options) if block_given?
-      formats = case args.first
+      formats = case arg
       when String, RDF::URI
         # Find a format based on the file name
-        self.each(file_name: args.first, **options).to_a
+        self.each(file_name: arg, **options).to_a
       when Symbol
         # Try to find a match based on the full class name
         # We want this to work even if autoloading fails
-        fmt = args.first
-        classes = self.each(options).select {|f| f.symbols.include?(fmt)}
+        classes = self.each(**options).select {|f| f.symbols.include?(arg)}
         if classes.empty?
-          classes = case fmt
+          classes = case arg
           when :ntriples then [RDF::NTriples::Format]
           when :nquads   then [RDF::NQuads::Format]
           else                []
@@ -184,7 +191,7 @@ module RDF
         end
         classes
       else
-        self.each(options.merge(all_if_none: false)).to_a
+        self.each(**options.merge(all_if_none: false)).to_a
       end
 
       # Return the last detected format

data/lib/rdf/mixin/enumerable.rb

@@ -220,7 +220,7 @@ module RDF
     def each_triple
       if block_given?
         each_statement do |statement|
-          yield *statement.to_triple
+          yield(*statement.to_triple)
         end
       end
       enum_triple
@@ -282,7 +282,7 @@ module RDF
     def each_quad
       if block_given?
         each_statement do |statement|
-          yield *statement.to_quad
+          yield(*statement.to_quad)
         end
       end
       enum_quad

data/lib/rdf/mixin/mutable.rb

@@ -37,10 +37,10 @@ module RDF
     # @option options [RDF::Resource] :graph_name
     #   Set set graph name of each loaded statement
     # @return [void]
-     def load(url, graph_name: nil, **options)
+    def load(url, graph_name: nil, **options)
       raise TypeError.new("#{self} is immutable") if immutable?
 
-      Reader.open(url, {base_uri: url}.merge(options)) do |reader|
+      Reader.open(url, base_uri: url, **options) do |reader|
         if graph_name
           statements = []
           reader.each_statement do |statement|

data/lib/rdf/mixin/queryable.rb

@@ -19,7 +19,7 @@ module RDF
     #
     # @example Querying for statements having a given predicate
     #     queryable.query([nil, RDF::Vocab::DOAP.developer, nil])
-    #     queryable.query(predicate: RDF::Vocab::DOAP.developer) do |statement|
+    #     queryable.query({predicate: RDF::Vocab::DOAP.developer}) do |statement|
     #       puts statement.inspect
     #     end
     #
@@ -50,7 +50,7 @@ module RDF
           solutions = RDF::Query::Solutions.new
           block = lambda {|solution| solutions << solution} unless block_given?
           before_query(pattern) if respond_to?(:before_query)
-          query_execute(pattern, options, &block)
+          query_execute(pattern, **options, &block)
           after_query(pattern) if respond_to?(:after_query)
           # Returns the solutions, not an enumerator
           solutions
@@ -85,7 +85,7 @@ module RDF
 
             # Otherwise, we delegate to `#query_pattern`:
             else # pattern.variable?
-              query_pattern(pattern, options, &block)
+              query_pattern(pattern, **options, &block)
           end
           after_query(pattern) if respond_to?(:after_query)
           enum
@@ -116,7 +116,7 @@ module RDF
       # query execution by breaking down the query into its constituent
       # triple patterns and invoking `RDF::Query::Pattern#execute` on each
       # pattern.
-      query.execute(self, options, &block)
+      query.execute(self, **options, &block)
     end
     protected :query_execute
 

data/lib/rdf/model/graph.rb

@@ -211,7 +211,7 @@ module RDF
     # @return [Integer]
     # @see    RDF::Enumerable#count
     def count
-      @data.query(graph_name: graph_name || false).count
+      @data.query({graph_name: graph_name || false}).count
     end
 
     ##
@@ -237,7 +237,7 @@ module RDF
     # @see    RDF::Enumerable#each_statement
     def each(&block)
       if @data.respond_to?(:query)
-        @data.query(graph_name: graph_name || false, &block)
+        @data.query({graph_name: graph_name || false}, &block)
       elsif @data.respond_to?(:each)
         @data.each(&block)
       else

data/lib/rdf/model/list.rb

@@ -59,7 +59,7 @@ module RDF
     def initialize(subject: nil, graph: nil, values: nil, &block)
       @subject = subject || RDF.nil
       @graph   = graph   || RDF::Graph.new
-      is_empty = @graph.query(subject: subject, predicate: RDF.first).empty?
+      is_empty = @graph.query({subject: subject, predicate: RDF.first}).empty?
 
       if subject && is_empty
         # An empty list with explicit subject and value initializers
@@ -115,7 +115,7 @@ module RDF
         list_nodes << li
         rest = nil
         firsts = rests = 0
-        @graph.query(subject: li) do |st|
+        @graph.query({subject: li}) do |st|
           return false unless st.subject.node?
           case st.predicate
           when RDF.first
@@ -136,7 +136,7 @@ module RDF
 
       # All elements other than the head must be referenced exactly once
       return list_nodes.all? do |li|
-        refs = @graph.query(object: li).count
+        refs = @graph.query({object: li}).count
         case refs
         when 0 then li == subject
         when 1 then true
@@ -479,7 +479,7 @@ module RDF
     # @return [Boolean]
     # @see    http://ruby-doc.org/core-2.2.2/Array.html#method-i-empty-3F
     def empty?
-      graph.query(subject: subject, predicate: RDF.first).empty?
+      graph.query({subject: subject, predicate: RDF.first}).empty?
     end
 
     ##
@@ -822,7 +822,7 @@ module RDF
       return enum_statement unless block_given?
 
       each_subject do |subject|
-        graph.query(subject: subject, &block)
+        graph.query({subject: subject}, &block)
       end
     end
     alias_method :to_rdf, :each_statement

data/lib/rdf/model/uri.rb

@@ -141,8 +141,8 @@ module RDF
     #
     # (see #initialize)
     # @return [RDF::URI] an immutable, frozen URI object
-    def self.intern(str, *args)
-      (cache[(str = str.to_s).to_sym] ||= self.new(str, *args)).freeze
+    def self.intern(str, *args, **options)
+      (cache[(str = str.to_s).to_sym] ||= self.new(str, *args, **options)).freeze
     end
 
     ##
@@ -225,11 +225,9 @@ module RDF
       @mutex = Mutex.new
       uri = args.first
       if uri
-        @value = uri.to_s
-        if @value.encoding != Encoding::UTF_8
-          @value.dup.force_encoding(Encoding::UTF_8)
-          @value.freeze
-        end
+        @value = uri.to_s.dup
+        @value.dup.force_encoding(Encoding::UTF_8) if @value.encoding != Encoding::UTF_8
+        @value.freeze
       else
         %w(
           scheme
@@ -441,7 +439,7 @@ module RDF
       end
 
       # Return joined URI
-      RDF::URI.new(joined_parts)
+      RDF::URI.new(**joined_parts)
     end
 
     ##
@@ -509,7 +507,7 @@ module RDF
           case fragment.to_s[0,1]
           when '#'
             # Base ending with '/', fragment beginning with '#'. The fragment wins, we use '#'.
-            res.path = res.path.to_s.sub!(/\/*$/, '')
+            res.path = res.path.to_s.sub(/\/*$/, '')
             # Add fragment
             res.fragment = fragment.to_s.sub(/^#+/,'')
           else
@@ -574,7 +572,7 @@ module RDF
         self
       else
         RDF::URI.new(
-          object.merge(path: '/').
+          **object.merge(path: '/').
           keep_if {|k, v| [:scheme, :authority, :path].include?(k)})
       end
     end
@@ -659,7 +657,7 @@ module RDF
     #
     # @return [RDF::URI]
     def dup
-      self.class.new((@value || @object).dup)
+      self.class.new(@value, **(@object || {}))
     end
 
     ##
@@ -848,7 +846,7 @@ module RDF
         parts[:user] = (user.dup.force_encoding(Encoding::UTF_8) if user)
         parts[:password] = (password.dup.force_encoding(Encoding::UTF_8) if password)
         parts[:host] = (host.dup.force_encoding(Encoding::UTF_8) if host)
-        parts[:port] = (::URI.decode(port).to_i if port)
+        parts[:port] = (URI.decode(port).to_i if port)
         parts[:path] = (path.to_s.dup.force_encoding(Encoding::UTF_8) unless path.empty?)
         parts[:query] = (query[1..-1].dup.force_encoding(Encoding::UTF_8) if query)
         parts[:fragment] = (fragment[1..-1].dup.force_encoding(Encoding::UTF_8) if fragment)
@@ -904,7 +902,7 @@ module RDF
     # Normalized version of user
     # @return [String]
     def normalized_user
-      ::URI.encode(::URI.decode(user), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/) if user
+      URI.encode(URI.decode(user), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/) if user
     end
 
     ##
@@ -930,7 +928,7 @@ module RDF
     # Normalized version of password
     # @return [String]
     def normalized_password
-      ::URI.encode(::URI.decode(password), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/) if password
+      URI.encode(URI.decode(password), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/) if password
     end
 
     HOST_FROM_AUTHORITY_RE = /(?:[^@]+@)?([^:]+)(?::.*)?$/.freeze
@@ -939,7 +937,7 @@ module RDF
     # @return [String]
     def host
       object.fetch(:host) do
-        @object[:host] = ($1 if HOST_FROM_AUTHORITY_RE.match(@object[:authority]))
+        @object[:host] = ($1 if @object[:authority] && HOST_FROM_AUTHORITY_RE.match(@object[:authority]))
       end
     end
 
@@ -967,7 +965,7 @@ module RDF
     # @return [String]
     def port
       object.fetch(:port) do
-        @object[:port] = ($1 if PORT_FROM_AUTHORITY_RE.match(@object[:authority]))
+        @object[:port] = ($1 if @object[:authority] && PORT_FROM_AUTHORITY_RE.match(@object[:authority]))
       end
     end
 
@@ -1182,8 +1180,8 @@ module RDF
         inject(return_type == Hash ? {} : []) do |memo,kv|
           k,v = kv.to_s.split('=', 2)
           next if k.to_s.empty?
-          k = ::URI.decode(k)
-          v = ::URI.decode(v) if v
+          k = URI.decode(k)
+          v = URI.decode(v) if v
           if return_type == Hash
             case memo[k]
             when nil then memo[k] = v
@@ -1295,9 +1293,9 @@ module RDF
     def normalize_segment(value, expr, downcase = false)
       if value
         value = value.dup.force_encoding(Encoding::UTF_8)
-        decoded = ::URI.decode(value)
+        decoded = URI.decode(value)
         decoded.downcase! if downcase
-        ::URI.encode(decoded, /[^(?:#{expr})]/)
+        URI.encode(decoded, /[^(?:#{expr})]/)
       end
     end
 
@@ -1316,6 +1314,27 @@ module RDF
         ""
       end
     end
+
+    # URI encode matching characters in value
+    # From URI gem, as this is now generally deprecated
+    def self.encode(str, expr)
+      str.gsub(expr) do
+        us = $&
+        tmp = ''
+        us.each_byte do |uc|
+          tmp << sprintf('%%%02X', uc)
+        end
+        tmp
+      end.force_encoding(Encoding::US_ASCII)
+    end
+
+    # URI decode escape sequences in value
+    # From URI gem, as this is now generally deprecated
+    def self.decode(str)
+      enc = str.encoding
+      enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
+      str.gsub(PCT_ENCODED) { [$&[1, 2]].pack('H2').force_encoding(enc) }
+    end
   end
 
   # RDF::IRI is a synonym for RDF::URI

data/lib/rdf/nquads.rb

@@ -96,7 +96,7 @@ module RDF
       # @param  [RDF::Term]     object
       # @return [void]
       def write_quad(subject, predicate, object, graph_name)
-        puts format_quad(subject, predicate, object, graph_name, @options)
+        puts format_quad(subject, predicate, object, graph_name, **@options)
       end
 
       ##
@@ -107,7 +107,7 @@ module RDF
       # @return [String]
       # @since  0.4.0
       def format_statement(statement, **options)
-        format_quad(*statement.to_quad, options)
+        format_quad(*statement.to_quad, **options)
       end
 
       ##
@@ -120,8 +120,8 @@ module RDF
       # @param  [Hash{Symbol => Object}] options = ({})
       # @return [String]
       def format_quad(subject, predicate, object, graph_name, **options)
-        s = "%s %s %s " % [subject, predicate, object].map { |value| format_term(value, options) }
-        s += format_term(graph_name, options) + " " if graph_name
+        s = "%s %s %s " % [subject, predicate, object].map { |value| format_term(value, **options) }
+        s += format_term(graph_name, **options) + " " if graph_name
         s + "."
       end
     end # Writer

data/lib/rdf/ntriples/reader.rb

@@ -96,7 +96,7 @@ module RDF::NTriples
     def self.unserialize(input, **options)
       case input
         when nil then nil
-        else self.new(input, {logger: []}.merge(options)).read_value
+        else self.new(input, logger: [], **options).read_value
       end
     end
 
@@ -104,20 +104,20 @@ module RDF::NTriples
     # (see unserialize)
     # @return [RDF::Resource]
     def self.parse_subject(input, **options)
-      parse_uri(input, options) || parse_node(input, options)
+      parse_uri(input, **options) || parse_node(input, **options)
     end
 
     ##
     # (see unserialize)
     # @return [RDF::URI]
-    def self.parse_predicate(input, *options)
+    def self.parse_predicate(input, **options)
       parse_uri(input, intern: true)
     end
 
     ##
     # (see unserialize)
     def self.parse_object(input, **options)
-      parse_uri(input, options) || parse_node(input, options) || parse_literal(input, options)
+      parse_uri(input, **options) || parse_node(input, **options) || parse_literal(input, **options)
     end
 
     ##

data/lib/rdf/ntriples/writer.rb

@@ -208,7 +208,7 @@ module RDF::NTriples
     # @param  [RDF::Term]     object
     # @return [void]
     def write_triple(subject, predicate, object)
-      puts format_triple(subject, predicate, object, @options)
+      puts format_triple(subject, predicate, object, **@options)
     end
 
     ##

data/lib/rdf/query.rb

@@ -90,7 +90,7 @@ module RDF
     #   the resulting solution sequence
     # @see    RDF::Query#execute
     def self.execute(queryable, patterns = {}, options = {}, &block)
-      self.new(patterns, options, &block).execute(queryable, options)
+      self.new(patterns, **options, &block).execute(queryable, **options)
     end
 
     ##
@@ -134,6 +134,12 @@ module RDF
     # @return [Hash]
     attr_reader :options
 
+    ##
+    # Scope the query to named graphs matching value
+    #
+    # @return [RDF::Resource, RDF::Query::Variable, false] graph_name
+    attr_accessor :graph_name
+
     ##
     # Initializes a new basic graph pattern query.
     #
@@ -180,6 +186,7 @@ module RDF
       @options = options.dup
       @solutions = Query::Solutions(solutions)
       graph_name = name if graph_name.nil?
+      @graph_name = graph_name
 
       patterns << @options if patterns.empty?
 
@@ -189,8 +196,6 @@ module RDF
         else patterns
       end
 
-      self.graph_name = graph_name
-
       if block_given?
         case block.arity
           when 1 then block.call(self)
@@ -223,7 +228,7 @@ module RDF
     #   whether this is an optional pattern
     # @return [void] self
     def pattern(pattern, **options)
-      @patterns << Pattern.from(pattern, options)
+      @patterns << Pattern.from(pattern, **options)
       self
     end
 
@@ -235,7 +240,7 @@ module RDF
     # @return [RDF::Query] a copy of `self`
     # @since  0.3.0
     def optimize(**options)
-      self.dup.optimize!(options)
+      self.dup.optimize!(**options)
     end
 
     ##
@@ -294,9 +299,7 @@ module RDF
     #   the resulting solution sequence
     # @see    http://www.holygoat.co.uk/blog/entry/2005-10-25-1
     # @see    http://www.w3.org/TR/sparql11-query/#emptyGroupPattern
-    def execute(queryable, solutions: Solution.new, graph_name: nil, name: nil, **options, &block)
-      options = {bindings: {}}.merge(options)
-
+    def execute(queryable, bindings: {}, solutions: Solution.new, graph_name: nil, name: nil, **options, &block)
       # Use provided solutions to allow for query chaining
       # Otherwise, a quick empty solution simplifies the logic below; no special case for
       # the first pattern
@@ -310,15 +313,14 @@ module RDF
 
       patterns = @patterns
       graph_name = name if graph_name.nil?
-      graph_name = self.graph_name if graph_name.nil?
-      options[:graph_name] = graph_name unless graph_name.nil?
+      @graph_name = graph_name unless graph_name.nil?
 
       # Add graph_name to pattern, if necessary
-      unless graph_name.nil?
+      unless @graph_name.nil?
         if patterns.empty?
-          patterns = [Pattern.new(nil, nil, nil, graph_name: graph_name)]
+          patterns = [Pattern.new(nil, nil, nil, graph_name: @graph_name)]
         else
-          apply_graph_name(graph_name)
+          apply_graph_name(@graph_name)
         end
       end
 
@@ -326,15 +328,15 @@ module RDF
 
         old_solutions, @solutions = @solutions, Query::Solutions()
 
-        options[:bindings].each_key do |variable|
+        bindings.each_key do |variable|
           if pattern.variables.include?(variable)
             unbound_solutions, old_solutions = old_solutions, Query::Solutions()
-            options[:bindings][variable].each do |binding|
+            bindings[variable].each do |binding|
               unbound_solutions.each do |solution|
                 old_solutions << solution.merge(variable => binding)
               end
             end
-            options[:bindings].delete(variable)
+            bindings.delete(variable)
           end
         end
 
@@ -407,38 +409,26 @@ module RDF
     # Is this query scoped to a named graph?
     # @return [Boolean]
     def named?
-      !!options[:graph_name]
+      !!graph_name
     end
     
     # Is this query scoped to the default graph?
     # @return [Boolean]
     def default?
-      options[:graph_name] == false
+      graph_name == false
     end
     
     # Is this query unscoped? This indicates that it can return results from
     # either a named graph or the default graph.
     # @return [Boolean]
     def unnamed?
-      options[:graph_name].nil?
-    end
-
-    # Scope the query to named graphs matching value
-    # @param [RDF::IRI, RDF::Query::Variable] value
-    # @return [RDF::IRI, RDF::Query::Variable]
-    def graph_name=(value)
-      options[:graph_name] = value
-    end
-
-    # Scope of this query, if any
-    # @return [RDF::IRI, RDF::Query::Variable]
-    def graph_name
-      options[:graph_name]
+      graph_name.nil?
     end
 
     # Apply the graph name specified (or configured) to all patterns that have no graph name
     # @param [RDF::IRI, RDF::Query::Variable] graph_name (self.graph_name)
-    def apply_graph_name(graph_name = options[:graph_name])
+    def apply_graph_name(graph_name = nil)
+      graph_name ||= self.graph_name
       patterns.each {|pattern| pattern.graph_name = graph_name if pattern.graph_name.nil?} unless graph_name.nil?
     end
 
@@ -515,8 +505,7 @@ module RDF
     # @return [RDF::Query]
     def dup
       patterns = @patterns.map {|p| p.dup}
-      patterns << @options.merge(solutions: @solutions.dup)
-      Query.new(*patterns)
+      Query.new(patterns, solutions: @solutions.dup, **options)
     end
 
     ##

data/lib/rdf/query/hash_pattern_normalizer.rb

@@ -85,13 +85,14 @@ module RDF; class Query
       #   the string format for anonymous subjects.
       # @return [Hash{Symbol => Object}]
       #   the resulting query pattern as a normalized hash.
-      def normalize!(hash_pattern = {}, options = {})
+      def normalize!(*args)
+        hash_pattern = args.shift
+        options = args.shift || {}
+        anonymous_subject_format = options.fetch(:anonymous_subject_format, '__%s__')
         raise ArgumentError, "invalid hash pattern: #{hash_pattern.inspect}" unless hash_pattern.is_a?(Hash)
         
         counter = RDF::Query::HashPatternNormalizer::Counter.new
         
-        anonymous_subject_format = (options[:anonymous_subject_format] || '__%s__').to_s
-        
         hash_pattern.inject({}) { |acc, pair|
           subject, predicate_to_object = pair
           
@@ -184,7 +185,7 @@ module RDF; class Query
     #   the query pattern as a hash.
     # @return [Hash{Symbol => Object}]
     #   the resulting query pattern as a normalized hash.
-    def normalize!(**hash_pattern)
+    def normalize!(hash_pattern)
       self.class.normalize!(hash_pattern, @options)
     end
   end # RDF::Query::HashPatternNormalizer

data/lib/rdf/query/pattern.rb

@@ -17,7 +17,7 @@ module RDF; class Query
     end
 
     ##
-    # @overload initialize(**options)
+    # @overload initialize(options = {})
     #   @param  [Hash{Symbol => Object}]     options
     #   @option options [Variable, Resource, Symbol, nil] :subject   (nil)
     #   @option options [Variable, URI, Symbol, nil]      :predicate (nil)
@@ -26,7 +26,7 @@ module RDF; class Query
     #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph.
     #   @option options [Boolean]            :optional  (false)
     #
-    # @overload initialize(subject, predicate, object, **options)
+    # @overload initialize(subject, predicate, object, options = {})
     #   @param  [Variable, Resource, Symbol, nil]         subject
     #   @param  [Variable, URI, Symbol, nil]              predicate
     #   @param  [Variable, Termm, Symbol, nil]            object

data/lib/rdf/reader.rb

@@ -88,9 +88,15 @@ module RDF
     #   @yieldreturn [String] another way to provide a sample, allows lazy for retrieving the sample.
     #
     # @return [Class]
-    def self.for(options = {}, &block)
-      options = options.merge(has_reader: true) if options.is_a?(Hash)
-      if format = self.format || Format.for(options, &block)
+    def self.for(*arg, &block)
+      case arg.length
+      when 0 then arg = nil
+      when 1 then arg = arg.first
+      else
+        raise ArgumentError, "Format.for accepts zero or one argument, got #{arg.length}."
+      end
+      arg = arg.merge(has_reader: true) if arg.is_a?(Hash)
+      if format = self.format || Format.for(arg, &block)
         format.reader
       end
     end
@@ -206,7 +212,7 @@ module RDF
         headers['Accept'] ||= (self.format.accept_type + %w(*/*;q=0.1)).join(", ")
       end
 
-      Util::File.open_file(filename, options) do |file|
+      Util::File.open_file(filename, **options) do |file|
         format_options = options.dup
         format_options[:content_type] ||= file.content_type if
           file.respond_to?(:content_type) &&
@@ -229,7 +235,7 @@ module RDF
         options[:filename] ||= filename
 
         if reader
-          reader.new(file, options, &block)
+          reader.new(file, **options, &block)
         else
           raise FormatError, "unknown RDF format: #{format_options.inspect}#{"\nThis may be resolved with a require of the 'linkeddata' gem." unless Object.const_defined?(:LinkedData)}"
         end

data/lib/rdf/repository.rb

@@ -119,9 +119,9 @@ module RDF
     # @yieldparam [Repository]
     # @return [void]
     def self.load(urls, **options, &block)
-      self.new(options) do |repository|
+      self.new(**options) do |repository|
         Array(urls).each do |url|
-          repository.load(url, options)
+          repository.load(url, **options)
         end
 
         if block_given?
@@ -411,7 +411,7 @@ module RDF
             end
           end
         else
-          enum_for(:query_pattern, pattern, options)
+          enum_for(:query_pattern, pattern, **options)
         end
       end
 
@@ -512,8 +512,8 @@ module RDF
       class SerializedTransaction < Transaction
         ##
         # @see Transaction#initialize
-        def initialize(*)
-          super
+        def initialize(*args, **options, &block)
+          super(*args, **options, &block)
           @base_snapshot = @snapshot
         end
         

data/lib/rdf/transaction.rb

@@ -24,7 +24,7 @@ module RDF
   #   repository = RDF::Repository.new
   #
   #   RDF::Transaction.begin(repository) do |tx|
-  #     tx.query(predicate: RDF::Vocab::DOAP.developer) do |statement|
+  #     tx.query({predicate: RDF::Vocab::DOAP.developer}) do |statement|
   #       puts statement.inspect
   #     end
   #   end

data/lib/rdf/util/file.rb

@@ -319,7 +319,7 @@ module RDF; module Util
           url_no_frag_or_query.query = nil
           url_no_frag_or_query.fragment = nil
           options[:encoding] ||= Encoding::UTF_8
-          Kernel.open(url_no_frag_or_query, "r", options) do |file|
+          Kernel.open(url_no_frag_or_query, "r", **options) do |file|
             document_options = {
               base_uri:     filename_or_url.to_s,
               charset:      file.external_encoding.to_s,
@@ -430,7 +430,7 @@ module RDF; module Util
           end if body.respond_to?(:unicode_normalized?)
         end
 
-        super(body, "r:#{encoding}")
+        super(body).set_encoding encoding
       end
 
       ##

data/lib/rdf/util/logger.rb

@@ -38,7 +38,7 @@ module RDF; module Util
     # @option options [Logger, #<<] :logger
     # @return [Hash{Symbol => Integer}]
     def log_statistics(**options)
-      logger(options).log_statistics
+      logger(**options).log_statistics
     end
 
     ##
@@ -84,7 +84,7 @@ module RDF; module Util
     #   @return [void]
     #   @raise Raises the provided exception class using the first element from args as the message component, if `:exception` option is provided.
     def log_error(*args, level: :error, **options, &block)
-      logger = self.logger(options)
+      logger = self.logger(**options)
       return if logger.recovering
       logger.recovering = true
       logger_common(*args, level: level, **options, &block)
@@ -96,7 +96,7 @@ module RDF; module Util
     # @option options [Logger, #<<] :logger
     # @return [Boolean]
     def log_recovering?(**options)
-      self.logger(options).recovering
+      self.logger(**options).recovering
     end
 
     ##
@@ -135,7 +135,7 @@ module RDF; module Util
     #   @yieldreturn [String] added to message
     #   @return [void]
     def log_recover(*args, level: :info, **options, &block)
-      logger = self.logger(options)
+      logger = self.logger(**options)
       logger.recovering = false
       return if args.empty? && !block_given?
       logger_common(*args, level: level, **options, &block)
@@ -192,7 +192,7 @@ module RDF; module Util
     #   # Return the current log depth
     #   @return [Integer]
     def log_depth(**options, &block)
-      self.logger(options).log_depth(&block)
+      self.logger(**options).log_depth(&block)
     end
 
   private
@@ -218,7 +218,7 @@ module RDF; module Util
     #   @yieldreturn [String] added to message
     #   @return [void]
     def logger_common(*args, level:, **options)
-      logger = self.logger(options)
+      logger = self.logger(**options)
       logger.log_statistics[level] = logger.log_statistics[level].to_i + 1
       # Some older code uses integer level numbers
       level = LOGGER_COMMON_LEVELS_REVERSE.fetch(level) if level.is_a?(Integer)

data/lib/rdf/vocab/rdfv.rb

@@ -33,6 +33,12 @@ module RDF
       isDefinedBy: %(rdf:).freeze,
       subClassOf: "rdfs:Container".freeze,
       type: "rdfs:Class".freeze
+    term :CompoundLiteral,
+      comment: %(A class representing a compound literal.).freeze,
+      label: "CompoundLiteral".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      subClassOf: "rdfs:Class".freeze,
+      type: "rdfs:Class".freeze
     term :List,
       comment: %(The class of RDF Lists.).freeze,
       label: "List".freeze,
@@ -59,6 +65,13 @@ module RDF
       type: "rdfs:Class".freeze
 
     # Property definitions
+    property :direction,
+      comment: %(The direction component of a CompoundLiteral.).freeze,
+      domain: "rdf:CompoundLiteral".freeze,
+      label: "direction".freeze,
+      range: "rdfs:Resource".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      type: "rdf:Property".freeze
     property :first,
       comment: %(The first item in the subject RDF list.).freeze,
       domain: "rdf:List".freeze,
@@ -73,6 +86,13 @@ module RDF
       range: "rdfs:Resource".freeze,
       isDefinedBy: %(rdf:).freeze,
       type: "rdf:Property".freeze
+    property :language,
+      comment: %(The language component of a CompoundLiteral.).freeze,
+      domain: "rdf:CompoundLiteral".freeze,
+      label: "language".freeze,
+      range: "rdfs:Resource".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      type: "rdf:Property".freeze
     property :predicate,
       comment: %(The predicate of the subject RDF statement.).freeze,
       domain: "rdf:Statement".freeze,
@@ -117,6 +137,11 @@ module RDF
       "rdfs:seeAlso": %(http://www.w3.org/TR/rdf11-concepts/#section-html).freeze,
       subClassOf: "rdfs:Literal".freeze,
       type: "rdfs:Datatype".freeze
+    property :JSON,
+      comment: %(The datatype of RDF literals storing JSON content.).freeze,
+      label: "JSON".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      type: "rdfs:Datatype".freeze
     term :PlainLiteral,
       comment: %(The class of plain \(i.e. untyped\) literal values, as used in RIF and OWL 2).freeze,
       label: "PlainLiteral".freeze,

data/lib/rdf/vocabulary.rb

@@ -873,8 +873,8 @@ module RDF
       #
       # @param (see #initialize)
       # @return [RDF::URI] an immutable, frozen URI object
-      def self.intern(str, *args)
-        (URI.cache[(str = str.to_s).to_sym] ||= self.new(str, *args)).freeze
+      def self.intern(str, *args, **options)
+        (URI.cache[(str = str.to_s).to_sym] ||= self.new(str, *args, **options)).freeze
       end
 
       ##
@@ -1001,7 +1001,7 @@ module RDF
               when :domainIncludes, :rangeIncludes
                 RDF::Vocabulary.find_term("http://schema.org/#{p}")
               when :broader, :definition, :exactMatch, :hasTopConcept, :inScheme,
-                   :member, :narrower, :related, :altLabel, :definition, :editorialNote,
+                   :member, :narrower, :related, :altLabel, :editorialNote,
                    :notation, :note, :prefLabel
                 RDF::Vocabulary.find_term("http://www.w3.org/2004/02/skos/core##{p}")
               else

data/lib/rdf/writer.rb

@@ -79,7 +79,7 @@ module RDF
     #   @param  [String] filename
     #   @return [Class]
     #
-    # @overload for(**options)
+    # @overload for(options = {})
     #   Finds an RDF writer class based on various options.
     #
     #   @param  [Hash{Symbol => Object}] options
@@ -89,9 +89,15 @@ module RDF
     #   @return [Class]
     #
     # @return [Class]
-    def self.for(options = {})
-      options = options.merge(has_writer: true) if options.is_a?(Hash)
-      if format = self.format || Format.for(options)
+    def self.for(*arg, &block)
+      case arg.length
+      when 0 then arg = nil
+      when 1 then arg = arg.first
+      else
+        raise ArgumentError, "Format.for accepts zero or one argument, got #{arg.length}."
+      end
+      arg = arg.merge(has_writer: true) if arg.is_a?(Hash)
+      if format = self.format || Format.for(arg)
         format.writer
       end
     end
@@ -505,11 +511,11 @@ module RDF
     # @since  0.3.0
     def format_term(term, **options)
       case term
-        when String       then format_literal(RDF::Literal(term, options), options)
-        when RDF::List    then format_list(term, options)
-        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 String       then format_literal(RDF::Literal(term, **options), **options)
+        when RDF::List    then format_list(term, **options)
+        when RDF::Literal then format_literal(term, **options)
+        when RDF::URI     then format_uri(term, **options)
+        when RDF::Node    then format_node(term, **options)
         else nil
       end
     end
@@ -553,7 +559,7 @@ module RDF
     # @abstract
     # @since  0.2.3
     def format_list(value, **options)
-      format_term(value.subject, options)
+      format_term(value.subject, **options)
     end
 
   protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.1.0
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
@@ -108,98 +108,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework
   (RDF) data.
 email: public-rdf-ruby@w3.org
@@ -295,14 +295,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.