jimson 0.5.0 → 0.6.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.6.0 / 2012-03-14
+
+* Minor enhancements
+
+  * Add ability to pass options to Rack and RestClient
+
 == 0.5.0 / 2012-03-06
 
 * Major enhancements

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/jimson/client.rb

@@ -12,10 +12,12 @@ module Jimson
       rand(10**12)
     end
 
-    def initialize(url)
+    def initialize(url, opts={})
       @url = url
       URI.parse(@url) # for the sake of validating the url
       @batch = []
+      @opts = opts
+      @opts[:content_type] = 'application/json'
     end
 
     def process_call(sym, args)
@@ -41,7 +43,7 @@ module Jimson
         'params'  => args,
         'id'      => self.class.make_id
       })
-      resp = RestClient.post(@url, post_data, :content_type => 'application/json')
+      resp = RestClient.post(@url, post_data, @opts)
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Client::Error::InvalidResponse.new
       end
@@ -51,7 +53,7 @@ module Jimson
 
     def send_batch_request(batch)
       post_data = MultiJson.encode(batch)
-      resp = RestClient.post(@url, post_data, :content_type => 'application/json')
+      resp = RestClient.post(@url, post_data, @opts)
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Client::Error::InvalidResponse.new
       end
@@ -152,8 +154,8 @@ module Jimson
       helper.send_batch
     end
 
-    def initialize(url)
-      @helper = ClientHelper.new(url)
+    def initialize(url, opts={})
+      @helper = ClientHelper.new(url, opts)
     end
 
     def method_missing(sym, *args, &block)

data/lib/jimson/server.rb

@@ -26,7 +26,7 @@ module Jimson
 
     JSON_RPC_VERSION = '2.0'
 
-    attr_accessor :handler, :host, :port
+    attr_accessor :handler, :host, :port, :opts
 
     #
     # +handler+ is an instance of the class to expose as a JSON-RPC server
@@ -36,23 +36,24 @@ module Jimson
     # * :port - the port to listen on
     # * :server - the rack handler to use, e.g. 'webrick' or 'thin'
     #
+    # Remaining options are forwarded to the underlying Rack server.
+    #
     def initialize(handler, opts = {})
       @handler = handler
-      @host = opts[:host] || '0.0.0.0'
-      @port = opts[:port] || 8999
-      @server = opts[:server] || 'webrick'
+      @host = opts.delete(:host) || '0.0.0.0'
+      @port = opts.delete(:port) || 8999
+      @opts = opts
     end
 
     #
     # Starts the server so it can process requests
     #
     def start
-      Rack::Server.start(
-        :server => @server,
+      Rack::Server.start(opts.merge(
         :app    => self,
         :Host   => @host,
         :Port   => @port
-      )
+      ))
     end
 
     #

data/spec/client_spec.rb

@@ -65,6 +65,14 @@ module Jimson
           client = Client.new(SPEC_URL)
           client.foo(1,2,3).should == 42
         end
+
+        it "sends a valid JSON-RPC request with custom options" do
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
+          RestClient.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
+        end
       end
     end
 

data/spec/server_spec.rb

@@ -42,7 +42,7 @@ module Jimson
                                         'id'      => nil
                                       }
       def app
-        Server.new(TestHandler.new)
+        Server.new(TestHandler.new, :environment => "production")
       end
 
       def post_json(hash)
@@ -53,6 +53,10 @@ module Jimson
         @url = SPEC_URL
       end
 
+      it "exposes the given options" do
+        app.opts.should == { :environment => "production" }
+      end
+
       describe "receiving a request with positional parameters" do
         context "when no errors occur" do
           it "returns a response with 'result'" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimson
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &12957520 !ruby/object:Gem::Requirement
+  requirement: &18659080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *12957520
+  version_requirements: *18659080
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &12956740 !ruby/object:Gem::Requirement
+  requirement: &18658140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *12956740
+  version_requirements: *18658140
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &12955960 !ruby/object:Gem::Requirement
+  requirement: &18657580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12955960
+  version_requirements: *18657580
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12955120 !ruby/object:Gem::Requirement
+  requirement: &18656860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *12955120
+  version_requirements: *18656860
 description: 
 email: 
 executables: []