jsonrpc-client 0.0.1 → 0.0.2

data/lib/jsonrpc/client.rb

@@ -104,8 +104,8 @@ module JSONRPC
       invoke(method, args)
     end
 
-    def invoke(method, args)
-      resp = send_single_request(method.to_s, args)
+    def invoke(method, args, options = nil)
+      resp = send_single_request(method.to_s, args, options)
 
       begin
         data = ::MultiJson.decode(resp)
@@ -120,14 +120,14 @@ module JSONRPC
     end
 
     private
-    def send_single_request(method, args)
+    def send_single_request(method, args, options)
       post_data = ::MultiJson.encode({
         'jsonrpc' => JSON_RPC_VERSION,
         'method'  => method,
         'params'  => args,
         'id'      => ::JSONRPC::Base.make_id
       })
-      resp = ::Faraday.post(@url, post_data, @opts)
+      resp = ::Faraday.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.1'
+  VERSION = '0.0.2'
 end

data/spec/client_spec.rb

@@ -23,24 +23,33 @@ module JSONRPC
     end
 
     describe "#invoke" do
-      before(:each) do
-        expected = MultiJson.encode({
+      let(:expected) { MultiJson.encode({
          'jsonrpc' => '2.0',
          'method'  => 'foo',
          'params'  => [1,2,3],
          'id'      => 1
         })
+      }
+
+      before(:each) do
         response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-        Faraday.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)
       end
 
       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)
           @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)
+          @client.invoke('foo', [1, 2, 3], "X-FOO" => "BAR").should == 42
+        end
+      end
     end
 
     describe "sending a single request" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonrpc-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-10 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: 1153313721096096844
+      hash: 1716510995999299040
 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: 1153313721096096844
+      hash: 1716510995999299040
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24