sparql-client 0.3.0 → 0.3.1

data/README

@@ -3,7 +3,7 @@
 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>
+* <http://ruby-rdf.github.com/sparql-client/>
 
 ##Features
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/sparql/client/query.rb

@@ -236,7 +236,7 @@ module SPARQL; class Client
     ##
     # @private
     def filter(string)
-      ((options[:filters] ||= []) << string) if string and not string.empty
+      ((options[:filters] ||= []) << string) if string and not string.empty?
       self
     end
 
@@ -300,13 +300,14 @@ module SPARQL; class Client
       buffer = [form.to_s.upcase]
       case form
         when :select, :describe
-          buffer << 'DISTINCT' if options[:distinct]
+          only_count = values.empty? and options[:count]
+          buffer << 'DISTINCT' if options[:distinct] and not only_count
           buffer << 'REDUCED'  if options[:reduced]
-          buffer << '( COUNT'    if options[:count]
-          buffer << (values.empty? ? '*' : values.map { |v| serialize_value(v[1]) }.join(' '))
+          buffer << ((values.empty? and not options[:count]) ? '*' : values.map { |v| serialize_value(v[1]) }.join(' '))
           if options[:count]
-            var = options[:count]
-            buffer << 'AS ' + (var.is_a?(String) ? var : "?#{var}") + ' )'
+            options[:count].each do |var, count|
+              buffer << '( COUNT(' + (options[:distinct] ? 'DISTINCT ' : '') + (var.is_a?(String) ? var : "?#{var}") + ') AS ' + (count.is_a?(String) ? count : "?#{count}") + ' )'
+            end
           end
         when :construct
           buffer << '{'

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.3.0
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Arto Bendiken
 - Ben Lavender
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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,35 +119,34 @@ 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
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   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
-...