sparql-client 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDg1MzljNzgxZjQ1N2NhZDYyMzdmN2FkMDZlNTIzNmNjMTE4YTE5ZA==
-  data.tar.gz: !binary |-
-    MTRlMmZhYmVlMmI3MzdiMzlmNzUwMjYyYjcwYzE5ZTU0MWVhMGZmOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGYxMDJjM2EwYTRiZjhmNTEzNjVjZTNhODNlZDM2N2QwYThmYjRhZmFkNTUy
-    YjJjZjQ2MjQ0NGQyYjM4MjgxYmM0NTI2ZmZlZGRlYWRjYTRiYzNkYjU1YmY4
-    NmQ3YTAxN2YxNDZlZmRjMTgwMDY0NmRmYjVjMjRlMjY4YTVlYzU=
-  data.tar.gz: !binary |-
-    YTY4MjMyY2Q1MDQ1YzFlMDE5ZjJlOTViYjZjYmQ2N2FmMjM1ZDgzMjM0NmY5
-    MWVlZGE2OTZjZDE0ZWQ0NmU5ZWY4ZDA2MDc4YmViOGI4ZDA3YmIwNzA0YTYz
-    YTVjYTljMzRjYzA4ZTBjYzBlZmRjNmM1MTQ4NGIwMWM1ZGQwM2E=
+SHA1:
+  metadata.gz: 2d31d814fef5e463320af4f8bd59b3975142abf0
+  data.tar.gz: 201eb51ea4db458cc6efe7ed1387f6c2ab17e1dc
+SHA512:
+  metadata.gz: e01c39d5d56685eda053d1440a20b5286fa524276fd28993d5982b9ee1c93a4f756042d7d7e1ede8549a529b6d5f455df198d9caa99ffd31393f78ae7808cc5f
+  data.tar.gz: 066041570ba8b15393f9d036cf042feaaa8146e31105a63abc8b5e9e7a302ff468b4429d248ceea209e6697d1f581f1a2daadd5422cfa1cb2dc25b9c71863195

data/README

@@ -9,7 +9,8 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 
 ##Features
 
-* Executes queries against any SPARQL 1.0-compatible endpoint over HTTP.
+* Executes queries against any SPARQL 1.0/1.1-compatible endpoint over HTTP,
+  or against an `RDF::Queryable` instance, using the `SPARQL` gem.
 * Provides a query builder [DSL][] for `ASK`, `SELECT`, `DESCRIBE` and
   `CONSTRUCT` queries.
 * Includes preliminary support for some SPARQL 1.1 Update operations.
@@ -22,10 +23,18 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 
 ##Examples
 
+### Querying a remote SPARQL endpoint
     require 'sparql/client'
 
     sparql = SPARQL::Client.new("http://dbpedia.org/sparql")
 
+### Querying a `RDF::Repository` instance
+
+    require 'rdf/trig'
+    repository = RDF::Repository.load("http://example/dataset.trig")
+
+    sparql = SPARQL::Client.new(repository)
+
 ### Executing a boolean query and outputting the result
 
     # ASK WHERE { ?s ?p ?o }
@@ -69,6 +78,7 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
 * [Net::HTTP::Persistent](http://rubygems.org/gems/net-http-persistent) (>= 1.4)
 * [JSON](http://rubygems.org/gems/json_pure) (>= 1.4)
+* Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (>= 1.0)
 
 ##Installation
 

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/sparql/client.rb

@@ -9,6 +9,7 @@ module SPARQL
   # @see http://www.w3.org/TR/sparql11-query/
   # @see http://www.w3.org/TR/sparql11-protocol/
   # @see http://www.w3.org/TR/sparql11-results-json/
+  # @see http://www.w3.org/TR/sparql11-results-csv-tsv/
   class Client
     autoload :Query,      'sparql/client/query'
     autoload :Repository, 'sparql/client/repository'
@@ -21,19 +22,23 @@ module SPARQL
 
     RESULT_JSON = 'application/sparql-results+json'.freeze
     RESULT_XML  = 'application/sparql-results+xml'.freeze
+    RESULT_CSV  = 'text/csv'.freeze
+    RESULT_TSV  = 'text/tab-separated-values'.freeze
     RESULT_BOOL = 'text/boolean'.freeze                           # Sesame-specific
     RESULT_BRTR = 'application/x-binary-rdf-results-table'.freeze # Sesame-specific
     ACCEPT_JSON = {'Accept' => RESULT_JSON}.freeze
     ACCEPT_XML  = {'Accept' => RESULT_XML}.freeze
+    ACCEPT_CSV  = {'Accept' => RESULT_CSV}.freeze
+    ACCEPT_TSV  = {'Accept' => RESULT_TSV}.freeze
     ACCEPT_BRTR = {'Accept' => RESULT_BRTR}.freeze
 
     DEFAULT_PROTOCOL = 1.0
     DEFAULT_METHOD   = :post
 
     ##
-    # The SPARQL endpoint URL.
+    # The SPARQL endpoint URL, or an RDF::Queryable instance, to use the native SPARQL engine.
     #
-    # @return [RDF::URI]
+    # @return [RDF::URI, RDF::Queryable]
     attr_reader :url
 
     ##
@@ -49,17 +54,27 @@ module SPARQL
     attr_reader :options
 
     ##
-    # @param  [String, #to_s]          url
+    # Initialize a new sparql client, either using the URL of
+    # a SPARQL endpoint or an `RDF::Queryable` instance to use
+    # the native SPARQL gem.
+    #
+    # @param  [String, RDF::Queryable, #to_s]          url
+    #   URL of endpoint, or queryable object.
     # @param  [Hash{Symbol => Object}] options
     # @option options [Symbol] :method (DEFAULT_METHOD)
     # @option options [Number] :protocol (DEFAULT_PROTOCOL)
     # @option options [Hash] :headers
     def initialize(url, options = {}, &block)
-      @url, @options = RDF::URI.new(url.to_s), options.dup
-      @headers = {
-        'Accept' => [RESULT_JSON, RESULT_XML, RDF::Format.content_types.keys.map(&:to_s)].join(', ')
-      }.merge(@options.delete(:headers) || {})
-      @http = http_klass(@url.scheme)
+      case url
+      when RDF::Queryable
+        @url, @options = url, options.dup
+      else
+        @url, @options = RDF::URI.new(url.to_s), options.dup
+        @headers = {
+          'Accept' => [RESULT_JSON, RESULT_XML, "#{RESULT_TSV};p=0.8", "#{RESULT_CSV};p=0.2", RDF::Format.content_types.keys.map(&:to_s)].join(', ')
+        }.merge(@options.delete(:headers) || {})
+        @http = http_klass(@url.scheme)
+      end
 
       if block_given?
         case block.arity
@@ -190,10 +205,19 @@ module SPARQL
     # @example `CLEAR ALL`
     #   client.clear(:all)
     #
-    # @param  [Symbol, #to_sym] what
-    # @param  [Hash{Symbol => Object}] options
-    # @option options [Boolean] :silent
-    # @return [void] `self`
+    # @overload clear(what, *arguments)
+    #   @param  [Symbol, #to_sym] what
+    #   @param  [Array] arguments splat of other arguments to {Update::Clear}.
+    #   @option options [Boolean] :silent
+    #   @return [void] `self`
+    #
+    # @overload clear(what, *arguments, options = {})
+    #   @param  [Symbol, #to_sym] what
+    #   @param  [Array] arguments splat of other arguments to {Update::Clear}.
+    #   @param  [Hash{Symbol => Object}] options
+    #   @option options [Boolean] :silent
+    #   @return [void] `self`
+    #
     # @see    http://www.w3.org/TR/sparql11-update/#clear
     def clear(what, *arguments)
       self.update(Update::Clear.new(what, *arguments))
@@ -229,7 +253,13 @@ module SPARQL
     # @see    http://www.w3.org/TR/sparql11-protocol/#query-operation
     def query(query, options = {})
       @op = :query
-      parse_response(response(query, options), options)
+      case @url
+      when RDF::Queryable
+        require 'sparql' unless defined?(:SPARQL)
+        SPARQL.execute(query, @url, options)
+      else
+        parse_response(response(query, options), options)
+      end
     end
 
     ##
@@ -243,7 +273,13 @@ module SPARQL
     # @see    http://www.w3.org/TR/sparql11-protocol/#update-operation
     def update(query, options = {})
       @op = :update
-      parse_response(response(query, options), options)
+      case @url
+      when RDF::Queryable
+        require 'sparql' unless defined?(:SPARQL)
+        SPARQL.execute(query, @url, options)
+      else
+        parse_response(response(query, options), options)
+      end
       self
     end
 
@@ -285,6 +321,10 @@ module SPARQL
           self.class.parse_json_bindings(response.body, nodes)
         when RESULT_XML
           self.class.parse_xml_bindings(response.body, nodes)
+        when RESULT_CSV
+          self.class.parse_csv_bindings(response.body, nodes)
+        when RESULT_TSV
+          self.class.parse_tsv_bindings(response.body, nodes)
         else
           parse_rdf_serialization(response, options)
       end

data/lib/sparql/client/query.rb

@@ -134,7 +134,8 @@ module SPARQL; class Client
     end
 
     ##
-    # @param  [Array<RDF::Query::Pattern, Array>] patterns
+    # @param  [Array<RDF::Query::Pattern, Array>] patterns_queries
+    #   splat of zero or more patterns followed by zero or more queries.
     # @return [Query]
     # @see    http://www.w3.org/TR/sparql11-query/#GraphPattern
     def where(*patterns_queries)
@@ -263,6 +264,7 @@ module SPARQL; class Client
     def true?
       case result
         when TrueClass, FalseClass then result
+        when RDF::Literal::Boolean then result.true?
         when Enumerable then !result.empty?
         else false
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,93 +10,95 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.8'
-description: SPARQL client for RDF.rb.
+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.
 email: public-rdf-ruby@w3.org
 executables: []
 extensions: []
@@ -122,16 +124,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sparql
+rubyforge_project: sparql-client
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4