tripod 0.5.0 → 0.5.1

data/lib/tripod/sparql_client.rb

@@ -16,35 +16,33 @@ module Tripod::SparqlClient
     # @return [ RestClient::Response ]
     def self.query(sparql, accept_header, extra_params={})
 
-      begin
-        if defined?(Rails)
-          Rails.logger.debug "TRIPOD: About to run query:"
-          Rails.logger.debug sparql
-        end
+      params = {:query => sparql}.merge(extra_params)
+      request_url = Tripod.query_endpoint + '?' + params.to_query
+      streaming_opts = {:accept => accept_header, :timeout_seconds => Tripod.timeout_seconds}
+      streaming_opts.merge!(:response_limit_bytes => Tripod.response_limit_bytes) if Tripod.response_limit_bytes
 
-        params = {:query => sparql}.merge(extra_params)
-        request_url = Tripod.query_endpoint + '?' + params.to_query
-        streaming_opts = {:accept => accept_header, :timeout_seconds => Tripod.timeout_seconds}
-        streaming_opts.merge!(:response_limit_bytes => Tripod.response_limit_bytes) if Tripod.response_limit_bytes
-
-        # Hash.to_query from active support core extensions
-        stream_data = -> {
-          Tripod::Streaming.get_data(request_url, streaming_opts)
-        }
-
-        if Tripod.cache_store # if a cache store is configured
-          # SHA-2 the key to keep the it within the small limit for many cache stores (e.g. Memcached is 250bytes)
-          # Note: SHA2's are pretty certain to be unique http://en.wikipedia.org/wiki/SHA-2.
-          key = 'SPARQL-QUERY-' + Digest::SHA2.hexdigest([extra_params, accept_header, sparql].join(" "))
-          Tripod.cache_store.fetch(key, &stream_data)
-        else
-          stream_data.call()
+      # Hash.to_query from active support core extensions
+      stream_data = -> {
+        if defined?(Rails)
+          Rails.logger.debug "TRIPOD: About to run query: #{sparql}"
+          Rails.logger.debug "TRIPOD: Straming fron url: #{request_url}"
+          Rails.logger.debug "TRIPOD: Streaming opts: #{streaming_opts.inspect}"
         end
 
-      rescue RestClient::BadRequest => e
-        # just re-raise as a BadSparqlRequest Exception
-        raise Tripod::Errors::BadSparqlRequest.new(e.http_body, e)
+        response = Tripod::Streaming.get_data(request_url, streaming_opts)
+        Rails.logger.debug "TRIPOD: response: #{response}" if defined?(Rails)
+        response
+      }
+
+      if Tripod.cache_store # if a cache store is configured
+        # SHA-2 the key to keep the it within the small limit for many cache stores (e.g. Memcached is 250bytes)
+        # Note: SHA2's are pretty certain to be unique http://en.wikipedia.org/wiki/SHA-2.
+        key = 'SPARQL-QUERY-' + Digest::SHA2.hexdigest([extra_params, accept_header, sparql].join(" "))
+        Tripod.cache_store.fetch(key, &stream_data)
+      else
+        stream_data.call()
       end
+
     end
 
     # Runs a SELECT +query+ against the endpoint. Returns a Hash of the results.

data/lib/tripod/streaming.rb

@@ -23,6 +23,11 @@ module Tripod
       response_string = ""
 
       http.request_get(uri.request_uri, 'Accept' => accept) do |res|
+
+        Rails.logger.debug "TRIPOD: response code: #{res.code}" if defined?(Rails)
+
+        raise Tripod::Errors::BadSparqlRequest.new(res.body) if res.code.to_s != "200"
+
         res.read_body do |seg|
           total_bytes += seg.size
           response_string += seg.to_s

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/tripod/sparql_client_spec.rb

@@ -2,11 +2,23 @@ require "spec_helper"
 
 describe Tripod::SparqlClient do
   describe Data do
+
     let(:data) { 'some-data-goes-here' }
 
     describe "Query#query" do
+
+      let(:query) { "SELECT * WHERE {?s ?p ?o}" }
+      let(:bad_query) { "SELECT * WHERE ?s ?p ?o}" }
+
+      before do
+        p = Person.new('http://example.com/id/garry')
+        p.name = "garry"
+        p.save!
+        p
+      end
+
       it "should use Tripod::Streaming to get the data" do
-        query = "SELECT * WHERE {?s ?p ?o}"
+
         Tripod::Streaming.should_receive(:get_data).with(
           Tripod.query_endpoint + "?query=#{CGI.escape(query)}",
           {
@@ -17,6 +29,18 @@ describe Tripod::SparqlClient do
         ).and_return("some data")
         Tripod::SparqlClient::Query.query(query, "application/sparql-results+json")
       end
+
+      it "should execute the query and return the format requested" do
+        JSON.parse(Tripod::SparqlClient::Query.query(query, "application/sparql-results+json"))["results"]["bindings"].length > 0
+      end
+
+      context "with a bad query" do
+        it "should raise a bad request error" do
+          lambda {
+            Tripod::SparqlClient::Query.query(bad_query, "application/sparql-results+json")
+          }.should raise_error
+        end
+      end
     end
 
     describe "Data#append" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70308451617140 !ruby/object:Gem::Requirement
+  requirement: &70266811885900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451617140
+  version_requirements: *70266811885900
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70308451616420 !ruby/object:Gem::Requirement
+  requirement: &70266811901040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451616420
+  version_requirements: *70266811901040
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70308451632020 !ruby/object:Gem::Requirement
+  requirement: &70266811900040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451632020
+  version_requirements: *70266811900040
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70308451631020 !ruby/object:Gem::Requirement
+  requirement: &70266811898540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451631020
+  version_requirements: *70266811898540
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70308451627060 !ruby/object:Gem::Requirement
+  requirement: &70266811898000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451627060
+  version_requirements: *70266811898000
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70308451625140 !ruby/object:Gem::Requirement
+  requirement: &70266811897200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451625140
+  version_requirements: *70266811897200
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70308451624460 !ruby/object:Gem::Requirement
+  requirement: &70266811895920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451624460
+  version_requirements: *70266811895920
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70308451639760 !ruby/object:Gem::Requirement
+  requirement: &70266811894100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451639760
+  version_requirements: *70266811894100
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70308451637040 !ruby/object:Gem::Requirement
+  requirement: &70266811908240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451637040
+  version_requirements: *70266811908240
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70308451634220 !ruby/object:Gem::Requirement
+  requirement: &70266811906460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70308451634220
+  version_requirements: *70266811906460
 description: RDF ruby ORM
 email:
 - ric@swirrl.com