sparql-client 0.1.1.1 → 0.3.0

data/README

@@ -1,12 +1,11 @@
-SPARQL Client for RDF.rb
-========================
+#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://github.com/bendiken/sparql-client>
 
-Features
---------
+##Features
 
 * Executes queries against any SPARQL 1.0-compatible endpoints over HTTP.
 * Provides a query builder [DSL][] for `ASK`, `SELECT`, `DESCRIBE` and
@@ -18,8 +17,7 @@ Features
 * Supports accessing endpoints as read-only [`RDF::Repository`][RDF::Repository]
   instances.
 
-Examples
---------
+##Examples
 
     require 'sparql/client'
     
@@ -56,8 +54,7 @@ Examples
     
     puts result.inspect   #=> true or false
 
-Documentation
--------------
+##Documentation
 
 <http://sparql.rubyforge.org/client/>
 
@@ -65,23 +62,20 @@ Documentation
   * {SPARQL::Client::Query}
   * {SPARQL::Client::Repository}
 
-Dependencies
-------------
+##Dependencies
 
 * [Ruby](http://ruby-lang.org/) (>= 1.8.7) or (>= 1.8.1 with [Backports][])
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
 * [JSON](http://rubygems.org/gems/json_pure) (>= 1.4.2)
 
-Installation
-------------
+##Installation
 
 The recommended installation method is via [RubyGems](http://rubygems.org/).
 To install the latest official release of the `SPARQL::Client` gem, do:
 
     % [sudo] gem install sparql-client
 
-Download
---------
+##Download
 
 To get a local working copy of the development repository, do:
 
@@ -92,19 +86,16 @@ follows:
 
     % wget http://github.com/bendiken/sparql-client/tarball/master
 
-Mailing List
-------------
+##Mailing List
 
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-Authors
--------
+##Authors
 
 * [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
 * [Ben Lavender](http://github.com/bhuga) - <http://bhuga.net/>
 
-Contributors
-------------
+##Contributors
 
 * [Christoph Badura](http://github.com/b4d) - <http://github.com/b4d>
 * [James Hetherington](http://github.com/jamespjh) - <http://twitter.com/jamespjh>
@@ -115,9 +106,9 @@ Contributors
 * [Thamaraiselvan Poomalai](http://github.com/selvan) - <http://softonaut.blogspot.com/>
 * [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
 * [Michael Sokol](http://github.com/mikaa123) - <http://sokolmichael.com/>
+* [Yves Raimond](http://github.com/moustaki) - <http://moustaki.org/>
 
-Contributing
-------------
+##Contributing
 
 * Do your best to adhere to the existing coding conventions and idioms.
 * Don't use hard tabs, and don't leave trailing whitespace on any line.
@@ -131,8 +122,7 @@ Contributing
   of thumb, additions larger than about 15 lines of code), we need an
   explicit [public domain dedication][PDD] on record from you.
 
-Resources
----------
+##Resources
 
 * <http://sparql.rubyforge.org/client/>
 * <http://github.com/bendiken/sparql-client>
@@ -141,8 +131,7 @@ Resources
 * <http://raa.ruby-lang.org/project/sparql-client/>
 * <http://www.ohloh.net/p/rdf>
 
-License
--------
+##License
 
 This is free and unencumbered public domain software. For more information,
 see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.

data/VERSION

@@ -1 +1 @@
-0.1.1.1
+0.3.0

data/lib/sparql/client/query.rb

@@ -1,4 +1,3 @@
-
 module SPARQL; class Client
   ##
   # A SPARQL query builder.
@@ -154,6 +153,17 @@ module SPARQL; class Client
 
     alias_method :order_by, :order
 
+    ##
+    # @param  [Array<Symbol, String>] variables
+    # @return [Query]
+    # @see    http://www.w3.org/TR/sparql11-query/#groupby
+    def group(*variables)
+      options[:group_by] = variables
+      self
+    end
+
+    alias_method :group_by, :group
+
     ##
     # @return [Query]
     # @see    http://www.w3.org/TR/rdf-sparql-query/#modDistinct
@@ -226,7 +236,7 @@ module SPARQL; class Client
     ##
     # @private
     def filter(string)
-      (options[:filters] ||= []) << string
+      ((options[:filters] ||= []) << string) if string and not string.empty
       self
     end
 
@@ -292,7 +302,12 @@ module SPARQL; class Client
         when :select, :describe
           buffer << 'DISTINCT' if options[:distinct]
           buffer << 'REDUCED'  if options[:reduced]
+          buffer << '( COUNT'    if options[:count]
           buffer << (values.empty? ? '*' : values.map { |v| serialize_value(v[1]) }.join(' '))
+          if options[:count]
+            var = options[:count]
+            buffer << 'AS ' + (var.is_a?(String) ? var : "?#{var}") + ' )'
+          end
         when :construct
           buffer << '{'
           buffer += serialize_patterns(options[:template])
@@ -317,6 +332,11 @@ module SPARQL; class Client
         buffer << '}'
       end
 
+      if options[:group_by]
+        buffer << 'GROUP BY'
+        buffer += options[:group_by].map { |var| var.is_a?(String) ? var : "?#{var}" }
+      end
+
       if options[:order_by]
         buffer << 'ORDER BY'
         buffer += options[:order_by].map { |var| var.is_a?(String) ? var : "?#{var}" }

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
-  prerelease: 
+  prerelease:
+  version: 0.3.0
 platform: ruby
 authors:
 - Arto Bendiken
 - Ben Lavender
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.5
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.1
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.5
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.10.0
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
+    none: false
+  prerelease: false
+  type: :development
 description: SPARQL client for RDF.rb.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -119,34 +119,35 @@ files:
 - README
 - UNLICENSE
 - VERSION
+- lib/sparql/client.rb
 - lib/sparql/client/query.rb
 - lib/sparql/client/repository.rb
 - lib/sparql/client/version.rb
-- lib/sparql/client.rb
 homepage: http://github.com/ruby-rdf/sparql-client
 licenses:
 - Public Domain
-post_install_message: 
+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
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: sparql
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: SPARQL client for RDF.rb.
 test_files: []
 has_rdoc: false
+...