sparql-client 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWRmNDMzMmY0MmFhNTI2MDc1NTdkNmM5YTk3YWJlYjhlOGI5NzM4OQ==
+  data.tar.gz: !binary |-
+    Y2I2MTVhNDhlYzU3MDI0YWRmNjJjM2ZkOGI5NGI4ZTAyN2RiMWU0Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjBlOTRmOTViNzY1ZGE5ZjVkMGI2NWMzM2MzNzVhNjNjNDMwYTRmMjVkYWQ4
+    MjBkNjRjNDAxNWFkNTA1MDYwMTczNTU4NzkzMmVjZGJjYWUwMmE4YjRkYzQw
+    Zjg2M2M0ODI5ODBiZjVlZmNhZjY3ZjU2ZGVkZWI1OGFjMWJhNmI=
+  data.tar.gz: !binary |-
+    ODMyN2MzNjk0NWQyMzMwYmViNDNhYTgxODJhOGM3YjRkM2UwMjdlODA4ZDlk
+    MGVhNzk4NTY3NWUzN2U3OTkzZjIzMzc2MWYwNDI0MzNhMTI1MDBhNGQwYjNh
+    Y2E2NjM3YWU0MzBlY2UwYjY4NGY4N2YyM2VjMWM1YTEwNzQyMzI=

data/CREDITS

@@ -7,3 +7,4 @@
 * Thamaraiselvan Poomalai <p.thamarai@gmail.com>
 * Michael Sokol <mikaa123@gmail.com>
 * Yves Raimond <yves.raimond@bbc.co.uk>
+* Thomas Feron <tho.feron@gmail.com>

data/README

@@ -1,10 +1,12 @@
 #SPARQL Client for RDF.rb
 
 This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
-[![Build Status](https://secure.travis-ci.org/ruby-rdf/sparql-client.png?branch=master)](http://travis-ci.org/ruby-rdf/sparql-client)
 
 * <http://ruby-rdf.github.com/sparql-client/>
 
+[![Gem Version](https://badge.fury.io/rb/sparql-client.png)](http://badge.fury.io/rb/sparql-client)
+[![Build Status](https://travis-ci.org/ruby-rdf/sparql-client.png?branch=master)](http://travis-ci.org/ruby-rdf/sparql-client)
+
 ##Features
 
 * Executes queries against any SPARQL 1.0-compatible endpoint over HTTP.
@@ -21,21 +23,21 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 ##Examples
 
     require 'sparql/client'
-    
+
     sparql = SPARQL::Client.new("http://dbpedia.org/sparql")
 
 ### Executing a boolean query and outputting the result
 
     # ASK WHERE { ?s ?p ?o }
     result = sparql.ask.whether([:s, :p, :o]).true?
-    
+
     puts result.inspect   #=> true or false
 
 ### Executing a tuple query and iterating over the returned solutions
 
     # SELECT * WHERE { ?s ?p ?o } OFFSET 100 LIMIT 10
     query = sparql.select.where([:s, :p, :o]).offset(100).limit(10)
-    
+
     query.each_solution do |solution|
       puts solution.inspect
     end
@@ -44,7 +46,7 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 
     # CONSTRUCT { ?s ?p ?o } WHERE { ?s ?p ?o } LIMIT 10
     query = sparql.construct([:s, :p, :o]).where([:s, :p, :o]).limit(10)
-    
+
     query.each_statement do |statement|
       puts statement.inspect
     end
@@ -52,7 +54,7 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 ### Executing an arbitrary textual SPARQL query string
 
     result = sparql.query("ASK WHERE { ?s ?p ?o }")
-    
+
     puts result.inspect   #=> true or false
 
 ##Documentation
@@ -107,6 +109,7 @@ follows:
 * [Thamaraiselvan Poomalai](http://github.com/selvan) - <http://softonaut.blogspot.com/>
 * [Michael Sokol](http://github.com/mikaa123) - <http://sokolmichael.com/>
 * [Yves Raimond](http://github.com/moustaki) - <http://moustaki.org/>
+* [Thomas Feron](http://github.com/thoferon) - <http://github.com/thoferon>
 
 ##Contributing
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/sparql/client.rb

@@ -505,7 +505,7 @@ module SPARQL
           request['Content-Type'] = 'application/sparql-' + (@op || :query).to_s
           request.body = query.to_s
         when '1.0'
-          request.set_form_data(:query => query.to_s)
+          request.set_form_data((@op || :query) => query.to_s)
         else
           raise ArgumentError, "unknown SPARQL protocol version: #{self.options[:protocol].inspect}"
       end

data/lib/sparql/client/query.rb

@@ -83,6 +83,7 @@ module SPARQL; class Client
     # @yield  [query]
     # @yieldparam [Query]
     def initialize(form = :ask, options = {}, &block)
+      @subqueries = []
       @form = form.respond_to?(:to_sym) ? form.to_sym : form.to_s.to_sym
       super([], options, &block)
     end
@@ -136,8 +137,10 @@ module SPARQL; class Client
     # @param  [Array<RDF::Query::Pattern, Array>] patterns
     # @return [Query]
     # @see    http://www.w3.org/TR/sparql11-query/#GraphPattern
-    def where(*patterns)
+    def where(*patterns_queries)
+      subqueries, patterns = patterns_queries.partition {|pq| pq.is_a? SPARQL::Client::Query}
       @patterns += build_patterns(patterns)
+      @subqueries += subqueries
       self
     end
 
@@ -341,6 +344,11 @@ module SPARQL; class Client
           buffer << 'GRAPH ' + SPARQL::Client.serialize_value(options[:graph])
           buffer << '{'
         end
+
+        @subqueries.each do |sq|
+          buffer << "{ #{sq.to_s} } ."
+        end
+
         buffer += serialize_patterns(patterns)
         if options[:optionals]
           options[:optionals].each do |patterns|

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Arto Bendiken
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -96,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -128,27 +115,26 @@ files:
 homepage: http://ruby-rdf.github.com/sparql-client/
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SPARQL client for RDF.rb.
 test_files: []
 has_rdoc: false