jsonrpc-client 0.0.5 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cdc0de17501cfe5b82fa8ab093a3f55e2c396ac2
+  data.tar.gz: c24326d048f05722dcf4dd67918b4d971aa7f284
+SHA512:
+  metadata.gz: 9310e8fd0f4ba0fe44f7e0337147ae88468297bf8a39f0c91c2c5fa3e06f6a75839eb763fa816da4df360428c9cc3574cf1f3bf1a7a26c6f5da8d0b65801cc1b
+  data.tar.gz: 4aad59795552a01e3d3957d9571dc2a995b781a0c190eef4e18cf2641ab27fdd32073cc077969c9c61891b08a4e01c37cd192aadbebfc6e9fc9ee9accb5f4a6a

data/lib/jsonrpc/client.rb

@@ -24,6 +24,28 @@ module JSONRPC
 
   @decode_options = {}
 
+  class Helper
+    def initialize(options)
+      @options = options
+      @options[:content_type] ||= 'application/json'
+    end
+
+    def options(additional_options = nil)
+      if additional_options
+        additional_options.merge(@options)
+      else
+        @options
+      end
+    end
+
+    def connection
+      @options[:connection] || ::Faraday.new { |connection|
+        connection.response :logger, ::JSONRPC.logger
+        connection.adapter ::Faraday.default_adapter
+      }
+    end
+  end
+
   class Base < BasicObject
     JSON_RPC_VERSION = '2.0'
 
@@ -33,8 +55,7 @@ module JSONRPC
 
     def initialize(url, opts = {})
       @url = ::URI.parse(url).to_s
-      @opts = opts
-      @opts[:content_type] ||= 'application/json'
+      @helper = ::JSONRPC::Helper.new(opts)
     end
 
     def to_s
@@ -79,10 +100,7 @@ module JSONRPC
   private
     def send_batch_request(batch)
       post_data = ::MultiJson.encode(batch)
-      resp = ::Faraday.new { |connection|
-        connection.response :logger, ::JSONRPC.logger
-        connection.adapter ::Faraday.default_adapter
-      }.post(@url, post_data, @opts)
+      resp = @helper.connection.post(@url, post_data, @helper.options)
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise ::JSONRPC::Error::InvalidResponse.new
       end
@@ -148,10 +166,7 @@ module JSONRPC
         'params'  => args,
         'id'      => ::JSONRPC::Base.make_id
       })
-      resp = ::Faraday.new { |connection|
-        connection.response :logger, ::JSONRPC.logger
-        connection.adapter ::Faraday.default_adapter
-      }.post(@url, post_data, (options || {}).merge(@opts))
+      resp = @helper.connection.post(@url, post_data, @helper.options(options))
 
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise ::JSONRPC::Error::InvalidResponse.new

data/lib/jsonrpc/version.rb

@@ -1,3 +1,3 @@
 module JSONRPC
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/spec/client_spec.rb

@@ -5,8 +5,8 @@ module JSONRPC
     BOILERPLATE = {'jsonrpc' => '2.0', 'id' => 1}
 
     before(:each) do
-      @resp_mock = mock('http_response')
-      Base.stub!(:make_id).and_return(1)
+      @resp_mock = double('http_response')
+      Base.stub(:make_id).and_return(1)
     end
 
     after(:each) do
@@ -104,7 +104,7 @@ module JSONRPC
           {"jsonrpc" => "2.0", "result" => ["hello", 5], "id" => "9"}
         ])
 
-        Base.stub!(:make_id).and_return('1', '2', '5', '9')
+        Base.stub(:make_id).and_return('1', '2', '5', '9')
         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,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: jsonrpc-client
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Pavel Forkert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   name: faraday
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple JSON-RPC 2.0 client implementation
 email:
 - fxposter@gmail.com
@@ -82,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -98,33 +89,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/fxposter/jsonrpc-client
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -23030267990398906
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -23030267990398906
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: JSON-RPC 2.0 client
 test_files:
 - spec/client_spec.rb