tripod 0.8 → 0.9.1

data/lib/tripod/resource.rb

@@ -37,11 +37,11 @@ module Tripod::Resource
   #
   # @return [ Resource ] A new +Resource+
   def initialize(uri, opts={})
-    if opts.is_a?(String)
-      graph_uri = opts
-    else
+    if opts.is_a?(Hash)
       graph_uri = opts.fetch(:graph_uri, nil)
       ignore_graph = opts.fetch(:ignore_graph, false)
+    else
+      graph_uri = opts
     end
 
     raise Tripod::Errors::UriNotSet.new('uri missing') unless uri

data/lib/tripod/sparql_client.rb

@@ -16,8 +16,8 @@ module Tripod::SparqlClient
     # @return [ RestClient::Response ]
     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
+      params = {:query => sparql}.merge(extra_params).to_query
+      request_url = Tripod.query_endpoint
       streaming_opts = {:accept => accept_header, :timeout_seconds => Tripod.timeout_seconds}
       streaming_opts.merge!(_response_limit_options(response_limit_bytes)) if Tripod.response_limit_bytes
 
@@ -27,7 +27,7 @@ module Tripod::SparqlClient
         Tripod.logger.debug "TRIPOD: Streaming fron url: #{request_url}"
         Tripod.logger.debug "TRIPOD: Streaming opts: #{streaming_opts.inspect}"
 
-        Tripod::Streaming.get_data(request_url, streaming_opts)
+        Tripod::Streaming.get_data(request_url, params, streaming_opts)
       }
 
       if Tripod.cache_store # if a cache store is configured

data/lib/tripod/streaming.rb

@@ -8,7 +8,7 @@ module Tripod
     #  :accept => "*/*"
     #  :timeout_seconds = 10
     #  :response_limit_bytes = nil
-    def self.get_data(request_url, opts={})
+    def self.get_data(request_url, payload, opts={})
 
       accept = opts[:accept] || "*/*"
       timeout_in_seconds = opts[:timeout_seconds] || 10
@@ -25,7 +25,7 @@ module Tripod
       request_start_time = Time.now if Tripod.logger.debug?
 
       begin
-        http.request_get(uri.request_uri, 'Accept' => accept) do |res|
+        http.request_post(uri.request_uri, payload, 'Accept' => accept) do |res|
 
           response_duration = Time.now - request_start_time if Tripod.logger.debug?
 
@@ -37,6 +37,7 @@ module Tripod
           res.read_body do |seg|
             total_bytes += seg.size
             response_string += seg.to_s
+            # raise Tripod::Errors::Timeout.new
             # if there's a limit, stop when we reach it
             raise Tripod::Errors::SparqlResponseTooLarge.new if limit_in_bytes && (total_bytes > limit_in_bytes)
           end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.8"
+  VERSION = "0.9.1"
 end

data/spec/tripod/sparql_client_spec.rb

@@ -26,7 +26,8 @@ describe Tripod::SparqlClient 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)}",
+            Tripod.query_endpoint,
+            "query=#{CGI.escape(query)}",
             {
               accept: "application/sparql-results+json",
               timeout_seconds: Tripod.timeout_seconds,
@@ -42,7 +43,7 @@ describe Tripod::SparqlClient do
             )
 
             expect(Tripod::Streaming).to have_received(:get_data).with(
-              kind_of(String), hash_including(response_limit_bytes: 1024)
+              kind_of(String), kind_of(String), hash_including(response_limit_bytes: 1024)
             )
           end
         end
@@ -54,7 +55,7 @@ describe Tripod::SparqlClient do
             )
 
             expect(Tripod::Streaming).to have_received(:get_data).with(
-              kind_of(String), hash_including(:response_limit_bytes)
+              kind_of(String), kind_of(String), hash_including(:response_limit_bytes)
             )
           end
         end
@@ -66,7 +67,7 @@ describe Tripod::SparqlClient do
             )
 
             expect(Tripod::Streaming).to have_received(:get_data).with(
-              kind_of(String), hash_not_including(:response_limit_bytes)
+              kind_of(String), kind_of(String), hash_not_including(:response_limit_bytes)
             )
           end
         end

data/spec/tripod/streaming_spec.rb

@@ -3,60 +3,54 @@ require "spec_helper"
 describe Tripod::Streaming do
 
   let(:url) { 'http://example.com' }
+  let(:query) { 'select * where {?s ?p ?o}' }
   let(:response_length) { 64.kilobytes }
 
   before do
     WebMock.enable!
-    stub_http_request(:get, url).with(:headers => {'Accept' => "*/*"}).to_return(:body => ("0" * response_length))
+    stub_http_request(:post, url).with(:body => query, :headers => {'Accept' => "*/*"}).to_return(:body => ("0" * response_length))
   end
 
   describe ".get_data" do
     it "should make a request to the url passed in" do
-      Tripod::Streaming.get_data(url)
+      Tripod::Streaming.get_data(url, query)
     end
 
     context "with timeout option" do
       it "should set the read_timeout to that value" do
         Net::HTTP.any_instance.should_receive(:read_timeout=).with(28)
-        Tripod::Streaming.get_data(url, :timeout_seconds => 28)
+        Tripod::Streaming.get_data(url, query, :timeout_seconds => 28)
       end
     end
 
     context "with no timeout option" do
       it "should set the read_timeout to the default (10s)" do
         Net::HTTP.any_instance.should_receive(:read_timeout=).with(10)
-        Tripod::Streaming.get_data(url)
+        Tripod::Streaming.get_data(url, query)
       end
     end
 
     context "with an accept header option" do
       it "should use that header for the request " do
-        stub_http_request(:get, url).with(:headers => {'Accept' => "application/json"})
-        Tripod::Streaming.get_data(url, :accept => 'application/json')
+        stub_http_request(:post, url).with(:body => query, :headers => {'Accept' => "application/json"})
+        Tripod::Streaming.get_data(url, query, :accept => 'application/json')
       end
     end
 
     # these tests actually download remote resources (from jQuery's CDN) to test the streaming bits
     # TODO: move this out so it doesn't run with the normal rake task??
     context "streaming" do
-      before { WebMock.disable! }
-
       context "with no limit" do
-
         it "should return the full body" do
-          full_response_length = RestClient.get('http://code.jquery.com/jquery-1.9.1.js').body.length
-          response = Tripod::Streaming.get_data('http://code.jquery.com/jquery-1.9.1.js')
-          response.length.should == full_response_length
+          response = Tripod::Streaming.get_data(url, query, :no_response_limit => true)
+          response.length.should == response_length
         end
       end
 
       context "with a limit" do
         it "should raise an exception if it's bigger than the limit" do
-          unlimited_response = Tripod::Streaming.get_data('http://code.jquery.com/jquery-1.9.1.js')
-          unlimited_response.length.should > 48.kilobytes
-
           lambda {
-            Tripod::Streaming.get_data('http://code.jquery.com/jquery-1.9.1.js', :response_limit_bytes => 32.kilobytes)
+            Tripod::Streaming.get_data(url, query, :response_limit_bytes => 32.kilobytes)
           }.should raise_error(Tripod::Errors::SparqlResponseTooLarge)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70287154647860 !ruby/object:Gem::Requirement
+  requirement: &70143888872280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154647860
+  version_requirements: *70143888872280
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70287154647280 !ruby/object:Gem::Requirement
+  requirement: &70143888884780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154647280
+  version_requirements: *70143888884780
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70287154646820 !ruby/object:Gem::Requirement
+  requirement: &70143888894220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154646820
+  version_requirements: *70143888894220
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70287154646240 !ruby/object:Gem::Requirement
+  requirement: &70143888891840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154646240
+  version_requirements: *70143888891840
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70287154645760 !ruby/object:Gem::Requirement
+  requirement: &70143888888600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154645760
+  version_requirements: *70143888888600
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70287154645080 !ruby/object:Gem::Requirement
+  requirement: &70143888912920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154645080
+  version_requirements: *70143888912920
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70287154644500 !ruby/object:Gem::Requirement
+  requirement: &70143888909880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154644500
+  version_requirements: *70143888909880
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70287154643580 !ruby/object:Gem::Requirement
+  requirement: &70143888923020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70287154643580
+  version_requirements: *70143888923020
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70287154643100 !ruby/object:Gem::Requirement
+  requirement: &70143888919800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154643100
+  version_requirements: *70143888919800
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70287154642500 !ruby/object:Gem::Requirement
+  requirement: &70143888937040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70287154642500
+  version_requirements: *70143888937040
 description: RDF ruby ORM
 email:
 - ric@swirrl.com