jsonrpc-client 0.0.3 → 0.0.4

data/lib/jsonrpc/client.rb

@@ -6,6 +6,14 @@ require 'jsonrpc/error'
 require 'jsonrpc/version'
 
 module JSONRPC
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger
+    @logger
+  end
+
   class Base < BasicObject
     JSON_RPC_VERSION = '2.0'
 
@@ -61,7 +69,10 @@ module JSONRPC
   private
     def send_batch_request(batch)
       post_data = ::MultiJson.encode(batch)
-      resp = ::Faraday.post(@url, post_data, @opts)
+      resp = ::Faraday.new { |connection|
+        connection.response :logger, ::JSONRPC.logger
+        connection.adapter ::Faraday.default_adapter
+      }.post(@url, post_data, @opts)
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise ::JSONRPC::Error::InvalidResponse.new
       end
@@ -127,7 +138,11 @@ module JSONRPC
         'params'  => args,
         'id'      => ::JSONRPC::Base.make_id
       })
-      resp = ::Faraday.post(@url, post_data, (options || {}).merge(@opts))
+      resp = ::Faraday.new { |connection|
+        connection.response :logger, ::JSONRPC.logger
+        connection.adapter ::Faraday.default_adapter
+      }.post(@url, post_data, (options || {}).merge(@opts))
+
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise ::JSONRPC::Error::InvalidResponse.new
       end

data/lib/jsonrpc/version.rb

@@ -1,3 +1,3 @@
 module JSONRPC
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/client_spec.rb

@@ -39,14 +39,14 @@ module JSONRPC
 
       context "when using an array of args" do
         it "sends a request with the correct method and args" do
-          Faraday.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+          Faraday::Connection.any_instance.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json'}).and_return(@resp_mock)
           @client.invoke('foo', [1, 2, 3]).should == 42
         end
       end
 
       context "with headers" do
         it "adds additional headers" do
-          Faraday.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json', "X-FOO" => "BAR"}).and_return(@resp_mock)
+          Faraday::Connection.any_instance.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json', "X-FOO" => "BAR"}).and_return(@resp_mock)
           @client.invoke('foo', [1, 2, 3], "X-FOO" => "BAR").should == 42
         end
       end
@@ -64,7 +64,7 @@ module JSONRPC
         end
         it "sends a valid JSON-RPC request and returns the result" do
           response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-          Faraday.should_receive(:post).with(SPEC_URL, @expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+          Faraday::Connection.any_instance.should_receive(:post).with(SPEC_URL, @expected, {:content_type => 'application/json'}).and_return(@resp_mock)
           @resp_mock.should_receive(:body).at_least(:once).and_return(response)
           client = Client.new(SPEC_URL)
           client.foo(1,2,3).should == 42
@@ -72,7 +72,7 @@ module JSONRPC
 
         it "sends a valid JSON-RPC request with custom options" do
           response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-          Faraday.should_receive(:post).with(SPEC_URL, @expected, {:content_type => 'application/json', :timeout => 10000}).and_return(@resp_mock)
+          Faraday::Connection.any_instance.should_receive(:post).with(SPEC_URL, @expected, {:content_type => 'application/json', :timeout => 10000}).and_return(@resp_mock)
           @resp_mock.should_receive(:body).at_least(:once).and_return(response)
           client = Client.new(SPEC_URL, :timeout => 10000)
           client.foo(1,2,3).should == 42
@@ -80,7 +80,7 @@ module JSONRPC
 
         it "sends a valid JSON-RPC request with custom content_type" do
           response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-          Faraday.should_receive(:post).with(SPEC_URL, @expected, {:content_type => 'application/json-rpc', :timeout => 10000}).and_return(@resp_mock)
+          Faraday::Connection.any_instance.should_receive(:post).with(SPEC_URL, @expected, {:content_type => 'application/json-rpc', :timeout => 10000}).and_return(@resp_mock)
           @resp_mock.should_receive(:body).at_least(:once).and_return(response)
           client = Client.new(SPEC_URL, :timeout => 10000, :content_type => 'application/json-rpc')
           client.foo(1,2,3).should == 42
@@ -105,7 +105,7 @@ module JSONRPC
         ])
 
         Base.stub!(:make_id).and_return('1', '2', '5', '9')
-        Faraday.should_receive(:post).with(SPEC_URL, batch, {:content_type => 'application/json'}).and_return(@resp_mock)
+        Faraday::Connection.any_instance.should_receive(:post).with(SPEC_URL, batch, {:content_type => 'application/json'}).and_return(@resp_mock)
         @resp_mock.should_receive(:body).at_least(:once).and_return(response)
         client = Client.new(SPEC_URL)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonrpc-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4087716180061062466
+      hash: 2230552126118589928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4087716180061062466
+      hash: 2230552126118589928
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24