sparql 0.1.1 → 0.3.0

data/AUTHORS

@@ -1,3 +1,3 @@
-* Gregg Kellogg <gregg@kellogg-assoc.com>
+* Gregg Kellogg <gregg@greggkellogg.net>
 * Arto Bendiken <arto.bendiken@gmail.com>
 * Pius Uzamere <pius@alum.mit.edu>

data/README.markdown

@@ -192,7 +192,7 @@ To install the latest official release of the `SPARQL` gem, do:
 
 To get a local working copy of the development repository, do:
 
-    % git clone git://github.com/gkellogg/sparql.git
+    % git clone git://github.com/ruby-rdf/sparql.git
 
 ## Mailing List
 
@@ -200,7 +200,7 @@ To get a local working copy of the development repository, do:
 
 ## Authors
 
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
 * [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
 * [Pius Uzamere](http://github.com/pius) - <http://pius.me/>
 
@@ -243,7 +243,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [PDD]:              http://unlicense.org/#unlicensing-contributions
 [Backports]:        http://rubygems.org/gems/backports
 [Linked Data]:      http://rubygems.org/gems/linkeddata
-[SPARQL doc]:       http://rubydoc.info/github/gkellogg/sparql/frames
+[SPARQL doc]:       http://rubydoc.info/github/ruby-rdf/sparql/frames
 [SPARQL XML]:       http://www.w3.org/TR/rdf-sparql-XMLres/
 [SPARQL JSON]:      http://www.w3.org/TR/rdf-sparql-json-res/
 [SPARQL Protocol]:  http://www.w3.org/TR/rdf-sparql-protocol/

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.3.0

data/bin/sparql

@@ -11,9 +11,10 @@ require 'getoptlong'
 
 def run(input, options = {})
   if options[:debug]
-    puts "input graph:\n#{options[:graph].dump(:n3)}\n" if options[:graph]
+    puts "input graph:\n#{options[:graph].dump(:ttl, :standard_prefixes => true)}\n" if options[:graph]
     puts "query:\n#{input}\n"
   end
+  options[:graph] ||= RDF::Repository.new
 
   if options[:verbose]
     puts ("\nSPARQL:\n" + input) 
@@ -22,18 +23,19 @@ def run(input, options = {})
   query = if options[:sse]
     SPARQL::Algebra.parse(input, {:debug => options[:debug]})
   else
-    SPARQL::Grammar.parse(input, options)
+    # Only do grammar debugging if we're generating SSE
+    SPARQL::Grammar.parse(input, options.merge(:debug => options.has_key?(:to_sse)))
   end
 
-  if options[:to_sse]
-    puts ("\nSSE:\n" + query.to_sse)
-  else
-    res = query.execute(options[:graph])
+  puts ("\nSSE:\n" + query.to_sse) if options[:debug] || options[:to_sse]
+
+  unless options[:to_sse]
+    res = query.execute(options[:graph], :debug => options[:debug])
     puts res.inspect if options[:verbose]
     puts case res
-    when RDF::Graph then res.dump(:ttl, :base_uri => query.base_uri, :prefixes => query.prefixes)
+    when RDF::Graph   then res.dump(:ttl, :base_uri => query.base_uri, :prefixes => query.prefixes, :standard_prefixes => true)
     when RDF::Literal then res.inspect
-    else                 res.map {|s| s.bindings.map {|k,v| "#{k}: #{v}"}}.join("\n")
+    else                   res.map {|s| s.bindings.map {|k,v| "#{k}: #{v}"}}.join("\n")
     end
   end
 end

data/lib/sparql.rb

@@ -67,6 +67,13 @@ module SPARQL
     query = self.parse(query, options)
     queryable = queryable || RDF::Repository.new
     
+    case options.fetch(:debug, nil)
+    when TrueClass
+      puts query.to_sxp
+    when Array
+      options[:debug] << query.to_sxp
+    end
+
     if options.has_key?(:load_datasets)
       queryable = queryable.class.new
       [options[:default_graph_uri]].flatten.each do |uri|

data/lib/sparql/algebra/operator/dataset.rb

@@ -49,6 +49,7 @@ module SPARQL; module Algebra
           load_opts = {
             :headers => {"Accept" => ACCEPTS}
           }
+          load_opts[:debug] = options.fetch(:debug, nil)
           case ds
           when Array
             # Format is (named <uri>), only need the URI part

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2012-05-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70212556937120 !ruby/object:Gem::Requirement
+  requirement: &70303058490440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70212556937120
+  version_requirements: *70303058490440
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70212556936660 !ruby/object:Gem::Requirement
+  requirement: &70303058489780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212556936660
+  version_requirements: *70303058489780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70212556936200 !ruby/object:Gem::Requirement
+  requirement: &70303058489140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70212556936200
+  version_requirements: *70303058489140
 - !ruby/object:Gem::Dependency
   name: sxp
-  requirement: &70212556935740 !ruby/object:Gem::Requirement
+  requirement: &70303058488380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,21 +56,21 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70212556935740
+  version_requirements: *70303058488380
 - !ruby/object:Gem::Dependency
   name: sparql-client
-  requirement: &70212556935280 !ruby/object:Gem::Requirement
+  requirement: &70303058487660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212556935280
+  version_requirements: *70303058487660
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &70212556934820 !ruby/object:Gem::Requirement
+  requirement: &70303058486880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70212556934820
+  version_requirements: *70303058486880
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70212556934360 !ruby/object:Gem::Requirement
+  requirement: &70303058471320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70212556934360
+  version_requirements: *70303058471320
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70212556933900 !ruby/object:Gem::Requirement
+  requirement: &70303058470380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *70212556933900
+  version_requirements: *70303058470380
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70212556933440 !ruby/object:Gem::Requirement
+  requirement: &70303058469520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70212556933440
+  version_requirements: *70303058469520
 - !ruby/object:Gem::Dependency
   name: linkeddata
-  requirement: &70212556932980 !ruby/object:Gem::Requirement
+  requirement: &70303058468620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70212556932980
+  version_requirements: *70303058468620
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &70212556932460 !ruby/object:Gem::Requirement
+  requirement: &70303058467640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70212556932460
+  version_requirements: *70303058467640
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &70212556931940 !ruby/object:Gem::Requirement
+  requirement: &70303058466820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70212556931940
+  version_requirements: *70303058466820
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70212556931400 !ruby/object:Gem::Requirement
+  requirement: &70303058465960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *70212556931400
+  version_requirements: *70303058465960
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70212556930880 !ruby/object:Gem::Requirement
+  requirement: &70303058465200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70212556930880
+  version_requirements: *70303058465200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212556930400 !ruby/object:Gem::Requirement
+  requirement: &70303058464360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70212556930400
+  version_requirements: *70303058464360
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &70212556929900 !ruby/object:Gem::Requirement
+  requirement: &70303058463780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *70212556929900
+  version_requirements: *70303058463780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70212556929440 !ruby/object:Gem::Requirement
+  requirement: &70303058448580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,7 +199,7 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70212556929440
+  version_requirements: *70303058448580
 description: ! "\n    Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL
   Algebra processing\n    and includes SPARQL Client for accessing remote repositories."
 email: public-rdf-ruby@w3.org
@@ -280,7 +280,7 @@ files:
 - lib/sparql/results.rb
 - lib/sparql/version.rb
 - lib/sparql.rb
-homepage: http://github.com/gkellogg/sparql
+homepage: http://github.com/ruby-rdf/sparql
 licenses:
 - Public Domain
 post_install_message: