tripod 0.7.23 → 0.7.24

data/Gemfile

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "rspec", "~> 2.12"
+  gem "rspec", "~> 2.14"
   gem "webmock"
 end

data/lib/tripod/sparql_client.rb

@@ -14,12 +14,12 @@ module Tripod::SparqlClient
     # @param [ String ] accept_header The accept header to send with the request
     # @param [ Hash ] any extra params to send with the request
     # @return [ RestClient::Response ]
-    def self.query(sparql, accept_header, extra_params={})
+    def self.query(sparql, accept_header, extra_params={}, response_limit_bytes = :default)
 
       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
+      streaming_opts.merge!(_response_limit_options(response_limit_bytes)) if Tripod.response_limit_bytes
 
       # Hash.to_query from active support core extensions
       stream_data = -> {
@@ -56,6 +56,16 @@ module Tripod::SparqlClient
       JSON.parse(query_response)["results"]["bindings"]
     end
 
+    def self._response_limit_options(response_limit_bytes)
+      case response_limit_bytes
+      when Integer
+        {response_limit_bytes: response_limit_bytes}
+      when :default
+        {response_limit_bytes: Tripod.response_limit_bytes}
+      when :no_response_limit
+        {}
+      end
+    end
   end
 
   module Update
@@ -74,7 +84,7 @@ module Tripod::SparqlClient
           :url => Tripod.update_endpoint,
           :timeout => Tripod.timeout_seconds,
           :payload => sparql,
-          :headers => { 
+          :headers => {
             :content_type => 'application/sparql-update'
           }
         )

data/lib/tripod/streaming.rb

@@ -7,7 +7,7 @@ module Tripod
     # opts
     #  :accept => "*/*"
     #  :timeout_seconds = 10
-    #  :limit_bytes = nil
+    #  :response_limit_bytes = nil
     def self.get_data(request_url, opts={})
 
       accept = opts[:accept] || "*/*"

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.7.23"
+  VERSION = "0.7.24"
 end

data/spec/tripod/sparql_client_spec.rb

@@ -17,17 +17,59 @@ describe Tripod::SparqlClient do
         p
       end
 
-      it "should use Tripod::Streaming to get the data" do
-
-        Tripod::Streaming.should_receive(:get_data).with(
-          Tripod.query_endpoint + "?query=#{CGI.escape(query)}",
-          {
-            accept: "application/sparql-results+json",
-            timeout_seconds: Tripod.timeout_seconds,
-            response_limit_bytes: Tripod.response_limit_bytes
-          }
-        ).and_return("some data")
-        Tripod::SparqlClient::Query.query(query, "application/sparql-results+json")
+      describe "using Tripod::Streaming to get the data" do
+        before(:each) do
+          Tripod::Streaming.stub(get_data: "some data")
+        end
+
+        example do
+          Tripod::SparqlClient::Query.query(query, "application/sparql-results+json")
+
+          expect(Tripod::Streaming).to have_received(:get_data).with(
+            Tripod.query_endpoint + "?query=#{CGI.escape(query)}",
+            {
+              accept: "application/sparql-results+json",
+              timeout_seconds: Tripod.timeout_seconds,
+              response_limit_bytes: Tripod.response_limit_bytes
+            }
+          )
+        end
+
+        context "with an integer response limit (number of bytes)" do
+          it "uses the limit" do
+            Tripod::SparqlClient::Query.query(
+              query, "application/sparql-results+json", {}, 1024
+            )
+
+            expect(Tripod::Streaming).to have_received(:get_data).with(
+              kind_of(String), hash_including(response_limit_bytes: 1024)
+            )
+          end
+        end
+
+        context "with a :default response limit" do
+          it "uses the Tripod response limit" do
+            Tripod::SparqlClient::Query.query(
+              query, "application/sparql-results+json", {}, :default
+            )
+
+            expect(Tripod::Streaming).to have_received(:get_data).with(
+              kind_of(String), hash_including(:response_limit_bytes)
+            )
+          end
+        end
+
+        context "with a :no_response_limit response limit" do
+          it "doesn't pass a limit" do
+            Tripod::SparqlClient::Query.query(
+              query, "application/sparql-results+json", {}, :no_response_limit
+            )
+
+            expect(Tripod::Streaming).to have_received(:get_data).with(
+              kind_of(String), hash_not_including(:response_limit_bytes)
+            )
+          end
+        end
       end
 
       it "should execute the query and return the format requested" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.7.23
+  version: 0.7.24
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70241410836880 !ruby/object:Gem::Requirement
+  requirement: &70219995371320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410836880
+  version_requirements: *70219995371320
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70241410851460 !ruby/object:Gem::Requirement
+  requirement: &70219995370780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410851460
+  version_requirements: *70219995370780
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70241410849600 !ruby/object:Gem::Requirement
+  requirement: &70219995370360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410849600
+  version_requirements: *70219995370360
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70241410846180 !ruby/object:Gem::Requirement
+  requirement: &70219995369820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410846180
+  version_requirements: *70219995369820
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70241410860620 !ruby/object:Gem::Requirement
+  requirement: &70219995369400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410860620
+  version_requirements: *70219995369400
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70241410859520 !ruby/object:Gem::Requirement
+  requirement: &70219995368940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410859520
+  version_requirements: *70219995368940
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70241410858340 !ruby/object:Gem::Requirement
+  requirement: &70219995368520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410858340
+  version_requirements: *70219995368520
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70241410857500 !ruby/object:Gem::Requirement
+  requirement: &70219995368020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70241410857500
+  version_requirements: *70219995368020
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70241410856080 !ruby/object:Gem::Requirement
+  requirement: &70219995367600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410856080
+  version_requirements: *70219995367600
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70241410868200 !ruby/object:Gem::Requirement
+  requirement: &70219995367060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70241410868200
+  version_requirements: *70219995367060
 description: RDF ruby ORM
 email:
 - ric@swirrl.com