sparql 0.1.0 → 0.1.1

data/README.markdown

@@ -120,16 +120,31 @@ a full set of RDF formats.
 
 ### Adding SPARQL content negotiation to a classic Sinatra application
 
-    #!/usr/bin/env ruby -rubygems
+    # Sinatra example
+    #
+    # Call as http://localhost:4567/sparql?query=uri,
+    # where `uri` is the URI of a SPARQL query, or
+    # a URI-escaped SPARQL query, for example:
+    #   http://localhost:4567/?query=SELECT%20?s%20?p%20?o%20WHERE%20%7B?s%20?p%20?o%7D
     require 'sinatra'
     require 'sinatra/sparql'
-    
-    repository = RDF::Repository.new do |graph|
-      graph << [RDF::Node.new, RDF::DC.title, "Hello, world!"]
-    end
-
-    get '/sparql' do
-      SPARQL.execute("SELECT * WHERE { ?s ?p ?o }", repository)
+    require 'uri'
+
+    get '/' do
+    settings.sparql_options.replace(:standard_prefixes => true)
+      repository = RDF::Repository.new do |graph|
+        graph << [RDF::Node.new, RDF::DC.title, "Hello, world!"]
+      end
+      if params["query"]
+        query = params["query"].to_s.match(/^http:/) ? RDF::Util::File.open_file(params["query"]) : ::URI.decode(params["query"].to_s)
+        SPARQL.execute(query, repository)
+      else
+        settings.sparql_options.merge!(:prefixes => {
+          :ssd => "http://www.w3.org/ns/sparql-service-description#",
+          :void => "http://rdfs.org/ns/void#"
+        })
+        service_description(:repo => repository)
+      end
     end
 
 ## Documentation
@@ -158,7 +173,13 @@ Full documentation available on [Rubydoc.info][SPARQL doc]
 * [SXP](https://rubygems.org/gems/sxp) (>= 0.0.15)
 * [Builder](https://rubygems.org/gems/builder) (>= 3.0.0)
 * [JSON](https://rubygems.org/gems/json) (>= 1.5.1)
-* Soft dependency on [Linked Data][]
+* Soft dependency on [Linked Data][] (>= 0.3.5)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.3.3)
+  Falls back to REXML for XML parsing Builder for XML serializing. Nokogiri is much more efficient
+* Soft dependency on [Equivalent XML](https://rubygems.org/gems/equivalent-xml) (>= 0.2.9)
+  Equivalent XML performs more efficient comparisons of XML Literals when Nokogiri is included
+* Soft dependency on [Rack][] (>= 1.3.2)
+* Soft dependency on [Sinatra][] (>= 1.4.1)
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/sparql/results.rb

@@ -17,8 +17,8 @@ module SPARQL
       require 'json' unless defined?(::JSON)
       
       bindings = self.map do |solution|
-        variable_names.map do |n|
-          case s = solution[n]
+        variable_names.inject({}) do |memo, n|
+          memo.merge case s = solution[n]
           when RDF::URI
             {n => {:type => "uri", :value => s.to_s }}
           when RDF::Node
@@ -32,8 +32,8 @@ module SPARQL
               {n => {:type => "literal", :value => s.to_s }}
             end
           end
-        end.compact
-      end.flatten
+        end
+      end
 
       {
         :head     => { :vars => variable_names },
@@ -177,6 +177,7 @@ module SPARQL
       end
       fmt = RDF::Format.for(format ? format.to_sym : {:content_type => content_type})
       fmt ||= RDF::NTriples::Format
+      puts "fmt: #{fmt.inspect}, format: #{format.inspect}, content_type: #{content_type}"
       format ||= fmt.to_sym
       content_type ||= fmt.content_type.first
       results = solutions.dump(format, options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2012-03-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &2165243520 !ruby/object:Gem::Requirement
+  requirement: &70212556937120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2165243520
+  version_requirements: *70212556937120
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2165242720 !ruby/object:Gem::Requirement
+  requirement: &70212556936660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165242720
+  version_requirements: *70212556936660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2165241340 !ruby/object:Gem::Requirement
+  requirement: &70212556936200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165241340
+  version_requirements: *70212556936200
 - !ruby/object:Gem::Dependency
   name: sxp
-  requirement: &2165240320 !ruby/object:Gem::Requirement
+  requirement: &70212556935740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *2165240320
+  version_requirements: *70212556935740
 - !ruby/object:Gem::Dependency
   name: sparql-client
-  requirement: &2165237360 !ruby/object:Gem::Requirement
+  requirement: &70212556935280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2165237360
+  version_requirements: *70212556935280
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &2165236080 !ruby/object:Gem::Requirement
+  requirement: &70212556934820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2165236080
+  version_requirements: *70212556934820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2165234460 !ruby/object:Gem::Requirement
+  requirement: &70212556934360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2165234460
+  version_requirements: *70212556934360
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2165232960 !ruby/object:Gem::Requirement
+  requirement: &70212556933900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *2165232960
+  version_requirements: *70212556933900
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2165230920 !ruby/object:Gem::Requirement
+  requirement: &70212556933440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2165230920
+  version_requirements: *70212556933440
 - !ruby/object:Gem::Dependency
   name: linkeddata
-  requirement: &2165224020 !ruby/object:Gem::Requirement
+  requirement: &70212556932980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2165224020
+  version_requirements: *70212556932980
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &2165221300 !ruby/object:Gem::Requirement
+  requirement: &70212556932460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2165221300
+  version_requirements: *70212556932460
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &2165218280 !ruby/object:Gem::Requirement
+  requirement: &70212556931940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *2165218280
+  version_requirements: *70212556931940
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &2165215280 !ruby/object:Gem::Requirement
+  requirement: &70212556931400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *2165215280
+  version_requirements: *70212556931400
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165202460 !ruby/object:Gem::Requirement
+  requirement: &70212556930880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2165202460
+  version_requirements: *70212556930880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165199020 !ruby/object:Gem::Requirement
+  requirement: &70212556930400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2165199020
+  version_requirements: *70212556930400
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &2165196200 !ruby/object:Gem::Requirement
+  requirement: &70212556929900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *2165196200
+  version_requirements: *70212556929900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2165194600 !ruby/object:Gem::Requirement
+  requirement: &70212556929440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,7 +199,7 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2165194600
+  version_requirements: *70212556929440
 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
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: SPARQL library for Ruby.