sparql-client 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24eb08925822a40dafa2fd3ddb20b5812bb0541f
-  data.tar.gz: ecd254327832d34c3f6fea043d28fc7e17dab96d
+  metadata.gz: 38ac883367777a453e1af010eb241ee4c14ee3dc
+  data.tar.gz: 2b251fa756f8adb385e95394bb1497d917021340
 SHA512:
-  metadata.gz: a8bc568e26de651c7d2402ecec14505328099fe72bd340e5b375df1b2db75cd194f230a0915a617b9255310ac07a87e60ba3ee10ca46197f8ec03687ae1995b4
-  data.tar.gz: 4610e805ad5058e162ba2b58f4c60b9af78fd61e1474d4a32d74fe45373435dbc78493a81ce558be83cfdc76dcb05d3112478d5217e70f58e739058698fbd1f4
+  metadata.gz: 7a3044448b1e7e7bb252de265834bf76bedae8deafa28a1861a49d1b08e6ec9fd62d54e3c19b70a39cd76cd595e8e8d8524287aeb6ad751eff080e1ddeac5ec6
+  data.tar.gz: f4839f05b1441be9bde48f8e411d85ecd86c433b670da202c8a0ca0a3f62f6c931470438ca7f213cf6aacc144581806058f03380db418d875934208df7956693

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/sparql/client.rb

@@ -293,7 +293,12 @@ module SPARQL
       case @url
       when RDF::Queryable
         require 'sparql' unless defined?(::SPARQL::Grammar)
-        SPARQL.execute(query, @url, options)
+        begin
+          SPARQL.execute(query, @url, options)
+        rescue SPARQL::MalformedQuery
+          $stderr.puts "error running #{query}: #{$!}"
+          raise
+        end
       else
         parse_response(response(query, options), options)
       end
@@ -315,7 +320,7 @@ module SPARQL
       case @url
       when RDF::Queryable
         require 'sparql' unless defined?(::SPARQL::Grammar)
-        SPARQL.execute(query, @url, options)
+        SPARQL.execute(query, @url, options.merge(update: true))
       else
         parse_response(response(query, options), options)
       end

data/lib/sparql/client/repository.rb

@@ -25,31 +25,6 @@ module SPARQL; class Client
       @update_client || @client
     end
 
-    ##
-    # Queries `self` using the given basic graph pattern (BGP) query,
-    # yielding each matched solution to the given block.
-    #
-    # Overrides Queryable::query_execute to use SPARQL::Client::query
-    #
-    # @param  [RDF::Query] query
-    #   the query to execute
-    # @param  [Hash{Symbol => Object}] options ({})
-    #   Any other options passed to `query.execute`
-    # @yield  [solution]
-    # @yieldparam  [RDF::Query::Solution] solution
-    # @yieldreturn [void] ignored
-    # @return [void] ignored
-    # @see    RDF::Queryable#query
-    # @see    RDF::Query#execute
-    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|
-        yield solution
-      end
-    end
-
-    ##
     # Enumerates each RDF statement in this repository.
     #
     # @yield  [statement]
@@ -171,8 +146,8 @@ module SPARQL; class Client
     # @see    RDF::Repository#count?
     def count
       begin
-        binding = client.query("SELECT COUNT(*) WHERE { ?s ?p ?o }").first.to_hash
-        binding[binding.keys.first].value.to_i
+        binding = client.query("SELECT (COUNT(*) AS ?count) WHERE { ?s ?p ?o }").first.to_hash
+        binding[:count].value.to_i rescue 0
       rescue SPARQL::Client::MalformedQuery => e
         # SPARQL 1.0 does not include support for aggregate functions:
         count = 0
@@ -193,35 +168,6 @@ module SPARQL; class Client
       client.ask.whether([:s, :p, :o]).false?
     end
 
-    ##
-    # Queries `self` for RDF statements matching the given `pattern`.
-    #
-    # @example
-    #     repository.query([nil, RDF::DOAP.developer, nil])
-    #     repository.query(:predicate => RDF::DOAP.developer)
-    #
-    # @fixme This should use basic SPARQL query mechanism.
-    #
-    # @param  [Pattern] pattern
-    # @see    RDF::Queryable#query_pattern
-    # @yield  [statement]
-    # @yieldparam [Statement]
-    # @return [Enumerable<Statement>]
-    def query_pattern(pattern, &block)
-      pattern = pattern.dup
-      pattern.subject   ||= RDF::Query::Variable.new
-      pattern.predicate ||= RDF::Query::Variable.new
-      pattern.object    ||= RDF::Query::Variable.new
-      pattern.initialize!
-      query = client.construct(pattern).where(pattern)
-
-      if block_given?
-        query.each_statement(&block)
-      else
-        query.solutions.to_a.extend(RDF::Enumerable, RDF::Queryable)
-      end
-    end
-
     ##
     # Returns `false` to indicate that this is a read-only repository.
     #
@@ -254,6 +200,59 @@ module SPARQL; class Client
 
     protected
 
+    ##
+    # Queries `self` using the given basic graph pattern (BGP) query,
+    # yielding each matched solution to the given block.
+    #
+    # Overrides Queryable::query_execute to use SPARQL::Client::query
+    #
+    # @param  [RDF::Query] query
+    #   the query to execute
+    # @param  [Hash{Symbol => Object}] options ({})
+    #   Any other options passed to `query.execute`
+    # @yield  [solution]
+    # @yieldparam  [RDF::Query::Solution] solution
+    # @yieldreturn [void] ignored
+    # @return [void] ignored
+    # @see    RDF::Queryable#query
+    # @see    RDF::Query#execute
+    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|
+        yield solution
+      end
+    end
+
+    ##
+    # Queries `self` for RDF statements matching the given `pattern`.
+    #
+    # @example
+    #     repository.query([nil, RDF::DOAP.developer, nil])
+    #     repository.query(:predicate => RDF::DOAP.developer)
+    #
+    # @fixme This should use basic SPARQL query mechanism.
+    #
+    # @param  [Pattern] pattern
+    # @see    RDF::Queryable#query_pattern
+    # @yield  [statement]
+    # @yieldparam [Statement]
+    # @return [Enumerable<Statement>]
+    def query_pattern(pattern, &block)
+      pattern = pattern.dup
+      pattern.subject   ||= RDF::Query::Variable.new
+      pattern.predicate ||= RDF::Query::Variable.new
+      pattern.object    ||= RDF::Query::Variable.new
+      pattern.initialize!
+      query = client.construct(pattern).where(pattern)
+
+      if block_given?
+        query.each_statement(&block)
+      else
+        query.solutions.to_a.extend(RDF::Enumerable, RDF::Queryable)
+      end
+    end
+
     ##
     # Deletes the given RDF statements from the underlying storage.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -47,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,6 +57,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement