sparql-client 2.1.0 → 3.1.1

data/lib/sparql/client/repository.rb

@@ -1,4 +1,4 @@
-module SPARQL; class Client
+class SPARQL::Client
   ##
   # A read-only repository view of a SPARQL endpoint.
   #
@@ -10,14 +10,13 @@ module SPARQL; class Client
     ##
     # @param [URI, #to_s]    uri
     #   Endpoint of this repository
-    # @param [String, #to_s] title (nil)
     # @param [Hash{Symbol => Object}] options passed to RDF::Repository
     def initialize(uri: nil, **options, &block)
       raise ArgumentError, "uri is a required parameter" unless uri
       @options = options.merge(uri: uri)
-      @update_client = SPARQL::Client.new(options.delete(:update_endpoint), options) if options[:update_endpoint]
-      @client  = SPARQL::Client.new(uri, options)
-      super(@options, &block)
+      @update_client = SPARQL::Client.new(options.delete(:update_endpoint), **options) if options[:update_endpoint]
+      @client  = SPARQL::Client.new(uri, **options)
+      super(**@options, &block)
     end
 
     ##
@@ -38,6 +37,30 @@ module SPARQL; class Client
       client.construct([:s, :p, :o]).where([:s, :p, :o]).each_statement(&block)
     end
 
+    ##
+    # Iterates the given block for each RDF statement.
+    #
+    # If no block was given, returns an enumerator.
+    #
+    # The order in which statements are yielded is undefined.
+    #
+    # @overload each_statement
+    #   @yield  [statement]
+    #     each statement
+    #   @yieldparam  [RDF::Statement] statement
+    #   @yieldreturn [void] ignored
+    #   @return [void]
+    #
+    # @overload each_statement
+    #   @return [Enumerator<RDF::Statement>]
+    def each_statement(&block)
+      if block_given?
+        # Invoke {#each} in the containing class:
+        each(&block)
+      end
+      enum_statement
+    end
+
     ##
     # @private
     # @see RDF::Enumerable#supports?
@@ -48,6 +71,7 @@ module SPARQL; class Client
         when :graph_name  then false
         when :inference   then false  # forward-chaining inference
         when :validity    then false
+        when :literal_equality then true
         else false
       end
     end
@@ -91,7 +115,7 @@ module SPARQL; class Client
     # @see    RDF::Repository#each_subject?
     def each_subject(&block)
       if block_given?
-        client.select(:s, :distinct => true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:s]) }
+        client.select(:s, distinct: true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:s]) }
       end
       enum_subject
     end
@@ -105,7 +129,7 @@ module SPARQL; class Client
     # @see    RDF::Repository#each_predicate?
     def each_predicate(&block)
       if block_given?
-        client.select(:p, :distinct => true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:p]) }
+        client.select(:p, distinct: true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:p]) }
       end
       enum_predicate
     end
@@ -119,7 +143,7 @@ module SPARQL; class Client
     # @see    RDF::Repository#each_object?
     def each_object(&block)
       if block_given?
-        client.select(:o, :distinct => true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:o]) }
+        client.select(:o, distinct: true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:o]) }
       end
       enum_object
     end
@@ -151,13 +175,11 @@ module SPARQL; class Client
     # @see    RDF::Repository#count?
     def count
       begin
-        binding = client.query("SELECT (COUNT(*) AS ?count) WHERE { ?s ?p ?o }").first.to_hash
+        binding = client.query("SELECT (COUNT(*) AS ?count) WHERE { ?s ?p ?o }").first.to_h
         binding[:count].value.to_i rescue 0
       rescue SPARQL::Client::MalformedQuery => e
         # SPARQL 1.0 does not include support for aggregate functions:
-        count = 0
-        each_statement { count += 1 } # TODO: optimize this
-        count
+        each_statement.count
       end
     end
 
@@ -238,10 +260,12 @@ module SPARQL; class Client
     # @return [void] ignored
     # @see    RDF::Queryable#query
     # @see    RDF::Query#execute
-    def query_execute(query, options = {}, &block)
+    def query_execute(query, **options, &block)
       return nil unless block_given?
-      q = SPARQL::Client::Query.select(query.variables).where(*query.patterns)
-      client.query(q, options).each do |solution|
+      q = SPARQL::Client::Query.
+        select(query.variables, **{}).
+        where(*query.patterns)
+      client.query(q, **options).each do |solution|
         yield solution
       end
     end
@@ -251,7 +275,7 @@ module SPARQL; class Client
     #
     # @example
     #     repository.query([nil, RDF::DOAP.developer, nil])
-    #     repository.query(:predicate => RDF::DOAP.developer)
+    #     repository.query({predicate: RDF::DOAP.developer})
     #
     # @todo This should use basic SPARQL query mechanism.
     #
@@ -260,7 +284,7 @@ module SPARQL; class Client
     # @yield  [statement]
     # @yieldparam [Statement]
     # @return [Enumerable<Statement>]
-    def query_pattern(pattern, options = {}, &block)
+    def query_pattern(pattern, **options, &block)
       pattern = pattern.dup
       pattern.subject   ||= RDF::Query::Variable.new
       pattern.predicate ||= RDF::Query::Variable.new
@@ -321,4 +345,4 @@ module SPARQL; class Client
     end
 
   end
-end; end
+end

data/lib/sparql/client/update.rb

@@ -12,12 +12,12 @@ class SPARQL::Client
     #   insert_data(data)
     #
     # @example INSERT DATA \{ GRAPH <http://example.org/> \{\}\}
-    #   insert_data(RDF::Graph.new, :graph => 'http://example.org/')
+    #   insert_data(RDF::Graph.new, graph: 'http://example.org/')
     #   insert_data(RDF::Graph.new).graph('http://example.org/')
     #
     # @param (see InsertData#initialize)
-    def self.insert_data(*arguments)
-      InsertData.new(*arguments)
+    def self.insert_data(*arguments, **options)
+      InsertData.new(*arguments, **options)
     end
 
     ##
@@ -30,12 +30,12 @@ class SPARQL::Client
     #   delete_data(data)
     #
     # @example DELETE DATA \{ GRAPH <http://example.org/> \{\}\}
-    #   delete_data(RDF::Graph.new, :graph => 'http://example.org/')
+    #   delete_data(RDF::Graph.new, graph: 'http://example.org/')
     #   delete_data(RDF::Graph.new).graph('http://example.org/')
     #
     # @param (see DeleteData#initialize)
-    def self.delete_data(*arguments)
-      DeleteData.new(*arguments)
+    def self.delete_data(*arguments, **options)
+      DeleteData.new(*arguments, **options)
     end
 
     ##
@@ -53,12 +53,12 @@ class SPARQL::Client
     #   load(RDF::URI(http://example.org/data.rdf), into: RDF::URI(http://example.org/data.rdf))
     #
     # @param (see Load#initialize)
-    def self.load(*arguments)
-      Load.new(*arguments)
+    def self.load(*arguments, **options)
+      Load.new(*arguments, **options)
     end
 
     ##
-    # Load statements into the graph
+    # Clear the graph
     #
     # @example CLEAR GRAPH <http://example.org/data.rdf>
     #   clear.graph(RDF::URI(http://example.org/data.rdf))
@@ -81,8 +81,8 @@ class SPARQL::Client
     #   clear(:all, silent: true)
     #
     # @param (see Clear#initialize)
-    def self.clear(*arguments)
-      Clear.new(*arguments)
+    def self.clear(*arguments, **options)
+      Clear.new(*arguments, **options)
     end
 
     ##
@@ -96,8 +96,8 @@ class SPARQL::Client
     #   create(RDF::URI(http://example.org/data.rdf), silent: true)
     #
     # @param (see Create#initialize)
-    def self.create(*arguments)
-      Create.new(*arguments)
+    def self.create(*arguments, **options)
+      Create.new(*arguments, **options)
     end
 
     ##
@@ -124,15 +124,15 @@ class SPARQL::Client
     #   drop(:all, silent: true)
     #
     # @param (see Drop#initialize)
-    def self.drop(*arguments)
-      Drop.new(*arguments)
+    def self.drop(*arguments, **options)
+      Drop.new(*arguments, **options)
     end
 
     class Operation
       attr_reader :options
 
-      def initialize(*arguments)
-        @options = arguments.last.is_a?(Hash) ? arguments.pop.dup : {}
+      def initialize(*arguments, **options)
+        @options = options.dup
         unless arguments.empty?
           send(arguments.shift, *arguments)
         end
@@ -155,7 +155,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#insertData
+    # @see https://www.w3.org/TR/sparql11-update/#insertData
     class InsertData < Operation
       # @return [RDF::Enumerable]
       attr_reader :data
@@ -171,9 +171,9 @@ class SPARQL::Client
       #   
       # @param [Array<RDF::Statement>, RDF::Enumerable] data
       # @param  [Hash{Symbol => Object}] options
-      def initialize(data, options = {})
+      def initialize(data, **options)
         @data = data
-        super(options)
+        super(**options)
       end
 
       ##
@@ -205,7 +205,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#deleteData
+    # @see https://www.w3.org/TR/sparql11-update/#deleteData
     class DeleteData < Operation
       # @return [RDF::Enumerable]
       attr_reader :data
@@ -221,9 +221,9 @@ class SPARQL::Client
       #   
       # @param [Array<RDF::Statement>, RDF::Enumerable] data
       # @param  [Hash{Symbol => Object}] options
-      def initialize(data, options = {})
+      def initialize(data, **options)
         @data = data
-        super(options)
+        super(**options)
       end
 
       ##
@@ -247,17 +247,17 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#deleteInsert
+    # @see https://www.w3.org/TR/sparql11-update/#deleteInsert
     class DeleteInsert < Operation
       attr_reader :insert_graph
       attr_reader :delete_graph
       attr_reader :where_graph
 
-      def initialize(_delete_graph, _insert_graph = nil, _where_graph = nil, options = {})
+      def initialize(_delete_graph, _insert_graph = nil, _where_graph = nil, **options)
         @delete_graph = _delete_graph
         @insert_graph = _insert_graph
         @where_graph = _where_graph
-        super(options)
+        super(**options)
       end
 
       ##
@@ -301,7 +301,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#load
+    # @see https://www.w3.org/TR/sparql11-update/#load
     class Load < Operation
       attr_reader :from
       attr_reader :into
@@ -324,11 +324,10 @@ class SPARQL::Client
       # @param  [Hash{Symbol => Object}] options
       # @option [RDF::URI] :into
       # @option [Boolean] :silent
-      def initialize(from, options = {})
-        options = options.dup
+      def initialize(from, into: nil,**options)
         @from = RDF::URI(from)
-        @into = RDF::URI(options.delete(:into)) if options[:into]
-        super(options)
+        @into = RDF::URI(into) if into
+        super(**options)
       end
 
       ##
@@ -351,7 +350,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#clear
+    # @see https://www.w3.org/TR/sparql11-update/#clear
     class Clear < Operation
       attr_reader :uri
 
@@ -415,14 +414,14 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#create
+    # @see https://www.w3.org/TR/sparql11-update/#create
     class Create < Operation
       attr_reader :uri
 
       # @param  [Hash{Symbol => Object}] options
-      def initialize(uri, options = {})
+      def initialize(uri, **options)
         @uri = RDF::URI(uri)
-        super(options)
+        super(**options)
       end
 
       def to_s
@@ -434,7 +433,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#drop
+    # @see https://www.w3.org/TR/sparql11-update/#drop
     class Drop < Clear
       def to_s
         query_text = 'DROP '
@@ -451,7 +450,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#copy
+    # @see https://www.w3.org/TR/sparql11-update/#copy
     class Copy < Operation
       def to_s
         # TODO
@@ -459,7 +458,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#move
+    # @see https://www.w3.org/TR/sparql11-update/#move
     class Move < Operation
       def to_s
         # TODO
@@ -467,7 +466,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#add
+    # @see https://www.w3.org/TR/sparql11-update/#add
     class Add < Operation
       def to_s
         # TODO

data/lib/sparql/client/version.rb

@@ -1,4 +1,4 @@
-module SPARQL; class Client
+class SPARQL::Client
   module VERSION
     FILE = File.expand_path('../../../../VERSION', __FILE__)
     MAJOR, MINOR, TINY, EXTRA = File.read(FILE).chomp.split('.')
@@ -16,4 +16,4 @@ module SPARQL; class Client
     # @return [Array(Integer, Integer, Integer)]
     def self.to_a() [MAJOR, MINOR, TINY] end
   end
-end; end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Arto Bendiken
 - Ben Lavender
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -18,112 +18,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sparql
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rdf-spec
+  name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
 - !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: '1.15'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: |-
   Executes SPARQL queries and updates against a remote SPARQL 1.0 or 1.1 endpoint,
                               or against a local repository. Generates SPARQL queries using a simple DSL.
@@ -144,11 +144,11 @@ files:
 - lib/sparql/client/repository.rb
 - lib/sparql/client/update.rb
 - lib/sparql/client/version.rb
-homepage: http://ruby-rdf.github.com/sparql-client/
+homepage: https://github.com/ruby-rdf/sparql-client/
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,16 +156,15 @@ 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: []
-rubyforge_project: sparql-client
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: SPARQL client for RDF.rb.
 test_files: []