jimson 0.9.0 → 0.13.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8a755a4bd134103ffcc9794d845c4bf6f97060060d7c4909a68c5c106fbb09df
+  data.tar.gz: e82997e74c772975dc46f337fb0660ca71b718e4364836c480dbb6b2fcf9e2f5
+SHA512:
+  metadata.gz: b707a76bb0a4f229d6c54be74caed765d2452255b0c4f91d35f2cc56aa199af6168a6361ee23a203defe161e87ac1acafb76f9aaf396f96ecc054727ec2bce25
+  data.tar.gz: bcb8e158d88406523d0243b94507d3c6d45ad011ab7e637a60186275cf203c1218a61003e3714c5a062121d6330efa5ce2b875429160562f1842c389565860c1

data/{CHANGELOG.rdoc → CHANGELOG.md}

@@ -1,23 +1,63 @@
-== 0.9.0 / 2012-08-22
+# 0.13.0 / 2021-05-10
+
+* Major enhancements
+
+  * Added option to use strings as id instead of an int
+
+# 0.12.0 / 2021-05-05
+
+* Major enhancements
+
+  * Add ability to specify custom content type
+  * Add support for named parameters
+  * Add Router :ns_sep option for custom namespace
+  * made it possible to overwrite advanced RestClient values, like ssl_ca_file
+
+* Minor enhancements
+
+  * Unified Bignum and Fixnum to Integer
+  * Add data returned to invalid response exception
+  * Fix json variable name on invalid json response
+
+# 0.11.0 / 2016-03-13
+
+* Minor enhancements
+
+  * Update dependency versions for Ruby 2.*
+  * Remove Gemfile.lock
+
+# 0.10.0 / 2013-06-28
+
+* Minor enhancements
+
+  * Update dependency versions
+
+# 0.9.1 / 2012-09-18
+
+* Bug fixes
+
+  * Allow opts to be passed to Server.with_routes
+
+# 0.9.0 / 2012-08-22
 
 * Minor enhancements
 
   * Add show_errors option to server, which will cause application errors to include the error name and the first line of the backtrace
 
-== 0.8.0 / 2012-08-17
+# 0.8.0 / 2012-08-17
 
 * Major enhancements
 
   * Add namespaced method calls to client (e.g. 'client[:foo].sum(1,2,3) # calls foo.sum')
   * Add Server.with_routes to quickly created a routed server
 
-== 0.7.1 / 2012-08-16
+# 0.7.1 / 2012-08-16
 
 * Bug fixes
 
   * Fix handling of array params in client, which were erroneously being flattened
 
-== 0.7.0 / 2012-04-13
+# 0.7.0 / 2012-04-13
 
 * Major enhancements
 
@@ -27,13 +67,13 @@
 
   * Fix deprecation warning about RDoc task in Rakefile
 
-== 0.6.0 / 2012-03-14
+# 0.6.0 / 2012-03-14
 
 * Minor enhancements
 
   * Add ability to pass options to Rack and RestClient
 
-== 0.5.0 / 2012-03-06
+# 0.5.0 / 2012-03-06
 
 * Major enhancements
 
@@ -43,37 +83,37 @@
 
   * Allow BigNum in 'id' field of request and response
 
-== 0.3.1 / 2011-08-11
+# 0.3.1 / 2011-08-11
 
 * Minor enhancements
 
   * Refactor the way the server is intantiated/started to work better with config.ru
 
-== 0.3.0 / 2011-08-11
+# 0.3.0 / 2011-08-11
 
 * Major enhancements
 
   * Replace eventmachine-httpserver with rack for more cross-platform goodness
 
-== 0.2.3 / 2011-08-01
+# 0.2.3 / 2011-08-01
 
 * Bug fixes
 
   * Fix argument error in client error handling
 
-== 0.2.2 / 2011-07-28
+# 0.2.2 / 2011-07-28
 
 * Bug fixes
 
   * Fix invalid local variable error in client error handling
 
-== 0.2.1 / 2011-07-27
+# 0.2.1 / 2011-07-27
 
 * Bug fixes
 
   * Fix error in client handling some errors caused by errant 'new' keyword
 
-== 0.2.0 / 2011-07-20
+# 0.2.0 / 2011-07-20
 
 * Major enhancements
 

data/README.md

@@ -1,29 +1,41 @@
 # Jimson
+
 ### JSON-RPC 2.0 Client and Server for Ruby
-![next build status](https://secure.travis-ci.org/chriskite/jimson.png?branch=next)
+
+[![Build Status](https://github.com/chriskite/jimson/actions/workflows/ruby.yml/badge.svg?branch=main)](https://github.com/chriskite/jimson/actions/workflows/ruby.yml)
 
 ## Client: Quick Start
-    require 'jimson'
-    client = Jimson::Client.new("http://www.example.com:8999") # the URL for the JSON-RPC 2.0 server to connect to
-    result = client.sum(1,2) # call the 'sum' method on the RPC server and save the result '3'
+
+```ruby
+require 'jimson'
+client = Jimson::Client.new("http://www.example.com:8999") # the URL for the JSON-RPC 2.0 server to connect to
+result = client.sum(1,2) # call the 'sum' method on the RPC server and save the result '3'
+```
 
 ## Server: Quick Start
-    require 'jimson'
 
-    class MyHandler
-      extend Jimson::Handler 
+```ruby
+require 'jimson'
 
-      def sum(a,b)
-        a + b
-      end
-    end
+class MyHandler
+  extend Jimson::Handler
 
-    server = Jimson::Server.new(MyHandler.new)
-    server.start # serve with webrick on http://0.0.0.0:8999/
+  def sum(a,b)
+    a + b
+  end
+end
+
+server = Jimson::Server.new(MyHandler.new)
+server.start # serve with webrick on http://0.0.0.0:8999/
+```
 
 ## JSON Engine
+
 Jimson uses multi\_json, so you can load the JSON library of your choice in your application and Jimson will use it automatically.
 
 For example, require the 'json' gem in your application:
-    require 'json'
+
+```ruby
+require 'json'
+```
 

data/Rakefile

@@ -1,26 +1,26 @@
+$:.unshift(File.dirname(__FILE__) + '/lib/')
+require 'jimson/version'
 require 'rubygems'
 require 'rake'
 require 'rspec/core/rake_task'
 
+gem 'rubygems-tasks', '~> 0.2'
+require 'rubygems/tasks'
+
+Gem::Tasks.new
+
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:rspec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
 task :default => :rspec
 
 require 'rdoc/task'
 
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "jimson #{version}"
+  rdoc.title = "jimson #{Jimson::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/jimson/client.rb

@@ -12,13 +12,17 @@ module Jimson
       rand(10**12)
     end
 
-    def initialize(url, opts = {}, namespace = nil)
+    def initialize(url, opts = {}, namespace = nil, client_opts = {})
+      URI.parse(url) # for the sake of validating the url
       @url = url
-      URI.parse(@url) # for the sake of validating the url
-      @batch = []
       @opts = opts
+      @opts[:id_type] ||= :int # Possible id types: :int, :string
       @namespace = namespace
-      @opts[:content_type] = 'application/json'
+      @client_opts = client_opts
+
+      @batch = []
+      @headers = opts.slice( * opts.keys - [:id_type] )
+      @headers[:content_type] ||= 'application/json'
     end
 
     def process_call(sym, args)
@@ -43,11 +47,11 @@ module Jimson
         'jsonrpc' => JSON_RPC_VERSION,
         'method'  => namespaced_method,
         'params'  => args,
-        'id'      => self.class.make_id
+        'id'      => format_post_id(self.class.make_id)
       })
-      resp = RestClient.post(@url, post_data, @opts)
+      resp = RestClient::Request.execute(@client_opts.merge(:method => :post, :url => @url, :payload => post_data, :headers => @headers))
       if resp.nil? || resp.body.nil? || resp.body.empty?
-        raise Client::Error::InvalidResponse.new
+        raise Client::Error::InvalidResponse.new(resp)
       end
 
       return resp.body
@@ -55,9 +59,9 @@ module Jimson
 
     def send_batch_request(batch)
       post_data = MultiJson.encode(batch)
-      resp = RestClient.post(@url, post_data, @opts)
+      resp = RestClient::Request.execute(@client_opts.merge(:method => :post, :url => @url, :payload => post_data, :headers => @headers))
       if resp.nil? || resp.body.nil? || resp.body.empty?
-        raise Client::Error::InvalidResponse.new
+        raise Client::Error::InvalidResponse.new(resp)
       end
 
       return resp.body
@@ -72,7 +76,7 @@ module Jimson
     end
 
     def process_single_response(data)
-      raise Client::Error::InvalidResponse.new if !valid_response?(data)
+      raise Client::Error::InvalidResponse.new(data) if !valid_response?(data)
 
       if !!data['error']
         code = data['error']['code']
@@ -93,17 +97,17 @@ module Jimson
       return false if data.has_key?('error') && data.has_key?('result')
 
       if data.has_key?('error')
-        if !data['error'].is_a?(Hash) || !data['error'].has_key?('code') || !data['error'].has_key?('message') 
+        if !data['error'].is_a?(Hash) || !data['error'].has_key?('code') || !data['error'].has_key?('message')
           return false
         end
 
-        if !data['error']['code'].is_a?(Fixnum) || !data['error']['message'].is_a?(String)
+        if !data['error']['code'].is_a?(Integer) || !data['error']['message'].is_a?(String)
           return false
         end
       end
 
       return true
-      
+
       rescue
         return false
     end
@@ -116,30 +120,38 @@ module Jimson
     end
 
     def send_batch
-      batch = @batch.map(&:first) # get the requests 
+      batch = @batch.map(&:first) # get the requests
       response = send_batch_request(batch)
 
       begin
         responses = MultiJson.decode(response)
       rescue
-        raise Client::Error::InvalidJSON.new(json)
+        raise Client::Error::InvalidJSON.new(response)
       end
 
       process_batch_response(responses)
       @batch = []
     end
 
+    def format_post_id(id)
+      if @opts[:id_type] == :string 
+        id.to_s
+      else
+        id
+      end
+    end
+
   end
 
   class BatchClient < BlankSlate
-    
+
     def initialize(helper)
       @helper = helper
     end
 
     def method_missing(sym, *args, &block)
       request = Jimson::Request.new(sym.to_s, args)
-      @helper.push_batch_request(request) 
+      @helper.push_batch_request(request)
     end
 
   end
@@ -148,7 +160,7 @@ module Jimson
     reveal :instance_variable_get
     reveal :inspect
     reveal :to_s
-    
+
     def self.batch(client)
       helper = client.instance_variable_get(:@helper)
       batch_client = BatchClient.new(helper)
@@ -156,12 +168,13 @@ module Jimson
       helper.send_batch
     end
 
-    def initialize(url, opts = {}, namespace = nil)
-      @url, @opts, @namespace = url, opts, namespace
-      @helper = ClientHelper.new(url, opts, namespace)
+    def initialize(url, opts = {}, namespace = nil, client_opts = {})
+      @url, @opts, @namespace, @client_opts = url, opts, namespace, client_opts
+      @helper = ClientHelper.new(url, opts, namespace, client_opts)
     end
 
     def method_missing(sym, *args, &block)
+      args = args.first if args.size == 1 && args.first.is_a?(Hash)
       @helper.process_call(sym, args) 
     end
 

data/lib/jimson/client/error.rb

@@ -2,8 +2,8 @@ module Jimson
   class Client
     module Error
       class InvalidResponse < StandardError
-        def initialize()
-          super('Invalid or empty response from server.')
+        def initialize(response = nil)
+          super("Invalid or empty response from server:\n#{response.inspect}")
         end
       end
 

data/lib/jimson/router.rb

@@ -11,8 +11,8 @@ module Jimson
                           :jimson_methods,
                           :strip_method_namespace
 
-    def initialize
-      @map = Map.new
+    def initialize(opts = {})
+      @map = Map.new(opts)
     end
 
     def draw(&block)

data/lib/jimson/router/map.rb

@@ -7,8 +7,10 @@ module Jimson
     #
     class Map
 
-      def initialize
+      def initialize(opts = {})
         @routes = {}
+        @opts = opts
+        @ns_sep = opts[:ns_sep] || '.'
       end
 
       #
@@ -28,7 +30,7 @@ module Jimson
           @routes[ns.to_s] = handler
         else
           # passed a block for nested namespacing
-          map = Jimson::Router::Map.new
+          map = Jimson::Router::Map.new(@opts)
           @routes[ns.to_s] = map
           map.instance_eval &block
         end
@@ -38,11 +40,11 @@ module Jimson
       # Return the handler for a (possibly namespaced) method name
       #
       def handler_for_method(method)
-        parts = method.split('.')
-        ns = (method.index('.') == nil ? '' : parts.first)
+        parts = method.split(@ns_sep)
+        ns = (method.index(@ns_sep) == nil ? '' : parts.first)
         handler = @routes[ns]
         if handler.is_a?(Jimson::Router::Map)
-          return handler.handler_for_method(parts[1..-1].join('.'))
+          return handler.handler_for_method(parts[1..-1].join(@ns_sep))
         end
         handler
       end
@@ -51,7 +53,7 @@ module Jimson
       # Strip off the namespace part of a method and return the bare method name
       #
       def strip_method_namespace(method)
-        method.split('.').last
+        method.split(@ns_sep).last
       end
 
       #
@@ -59,7 +61,7 @@ module Jimson
       #
       def jimson_methods
         arr = @routes.keys.map do |ns|
-          prefix = (ns == '' ? '' : "#{ns}.")
+          prefix = (ns == '' ? '' : "#{ns}#{@ns_sep}")
           handler = @routes[ns]
           if handler.is_a?(Jimson::Router::Map)
             handler.jimson_methods

data/lib/jimson/server.rb

@@ -27,15 +27,15 @@ module Jimson
 
     JSON_RPC_VERSION = '2.0'
 
-    attr_accessor :router, :host, :port, :opts
+    attr_accessor :router, :host, :port, :show_errors, :opts
 
     #
     # Create a Server with routes defined
     #
-    def self.with_routes(&block)
+    def self.with_routes(opts = {}, &block)
       router = Router.new
       router.send(:draw, &block)
-      self.new(router)
+      self.new(router, opts)
     end
 
     #
@@ -45,6 +45,7 @@ module Jimson
     # * :host - the hostname or ip to bind to
     # * :port - the port to listen on
     # * :server - the rack handler to use, e.g. 'webrick' or 'thin'
+    # * :show_errors - true or false, send backtraces in error responses?
     #
     # Remaining options are forwarded to the underlying Rack server.
     #
@@ -132,7 +133,7 @@ module Jimson
                          'jsonrpc' => [String],
                          'method'  => [String], 
                          'params'  => [Hash, Array],
-                         'id'      => [String, Fixnum, Bignum, NilClass]
+                         'id'      => [String, Integer, NilClass]
                        }
       
       return false if !request.is_a?(Hash)

data/lib/jimson/version.rb

@@ -0,0 +1,3 @@
+module Jimson
+  VERSION = '0.13.0'
+end

data/spec/client_spec.rb

@@ -5,8 +5,8 @@ module Jimson
     BOILERPLATE = {'jsonrpc' => '2.0', 'id' => 1}
 
     before(:each) do
-      @resp_mock = mock('http_response')
-      ClientHelper.stub!(:make_id).and_return(1)
+      @resp_mock = double('http_response')
+      ClientHelper.stub(:make_id).and_return(1)
     end
 
     after(:each) do
@@ -36,7 +36,7 @@ module Jimson
            'id'      => 1
           })
           response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-          RestClient.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {:content_type => 'application/json'}).and_return(@resp_mock)
           @resp_mock.should_receive(:body).at_least(:once).and_return(response)
           @client[:foo].sum(1, 2, 3).should == 42
         end
@@ -50,11 +50,25 @@ module Jimson
              'id'      => 1
             })
             response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-            RestClient.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+            RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {:content_type => 'application/json'}).and_return(@resp_mock)
             @resp_mock.should_receive(:body).at_least(:once).and_return(response)
             @client[:foo][:bar].sum(1, 2, 3).should == 42
           end
         end
+
+        it "sends the id as string" do
+          expected = MultiJson.encode({
+           'jsonrpc' => '2.0',
+           'method'  => 'foo.sum',
+           'params'  => [1,2,3],
+           'id'      => "1"
+          })
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {:content_type => 'application/json'}).and_return(@resp_mock)
+          @resp_mock.should_receive(:body).at_least(:once).and_return(response)
+          client = Client.new(SPEC_URL, {id_type: :string})
+          client[:foo].sum(1, 2, 3).should == 42
+        end
       end
 
       context "when sending positional arguments" do
@@ -66,7 +80,7 @@ module Jimson
            'id'      => 1
           })
           response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-          RestClient.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {:content_type => 'application/json'}).and_return(@resp_mock)
           @resp_mock.should_receive(:body).at_least(:once).and_return(response)
           @client['foo', 1, 2, 3].should == 42
         end
@@ -80,7 +94,7 @@ module Jimson
              'id'      => 1
             })
             response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-            RestClient.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+            RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {:content_type => 'application/json'}).and_return(@resp_mock)
             @resp_mock.should_receive(:body).at_least(:once).and_return(response)
             @client['foo', [1, 2], 3].should == 42
           end
@@ -100,7 +114,7 @@ module Jimson
         end
         it "sends a valid JSON-RPC request and returns the result" do
           response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-          RestClient.should_receive(:post).with(SPEC_URL, @expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: @expected, headers: {: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
@@ -108,11 +122,27 @@ module Jimson
 
         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)
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: @expected, headers: {: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
+
+        it "sends a valid JSON-RPC request with custom content_type" do
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: @expected, headers: {: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
+        end
+
+        it "adds RestClient::Request parameters if given" do
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: @expected, headers: {:content_type => 'application/json-rpc', :timeout => 10000}, ssl_ca_file: 'myca.pem').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'}, '', {ssl_ca_file: 'myca.pem'})
+          client.foo(1,2,3).should == 42
+        end
       end
 
       context "when one of the parameters is an array" do
@@ -124,12 +154,44 @@ module Jimson
             'id'      => 1
           })
           response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
-          RestClient.should_receive(:post).with(SPEC_URL, expected, {:content_type => 'application/json'}).and_return(@resp_mock)
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {: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
         end
       end
+      
+      context "when one of the parameters is a hash" do
+        it "sends a correct JSON-RPC request (array is preserved with hash) and returns the results" do
+          expected = MultiJson.encode({
+            'jsonrpc' => '2.0',
+            'method'  => 'foo',
+            'params'  => [1,{'bar' => 'baz'},3],
+            'id'      => 1
+          })
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {: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, {'bar' => 'baz'}, 3).should == 42
+        end
+      end
+      
+      context "when using named parameters" do
+        it "sends a correct JSON-RPC request (named parameters are preserved) and returns the result" do
+          expected = MultiJson.encode({
+            'jsonrpc' => '2.0',
+            'method'  => 'foo',
+            'params'  => {'bar' => 'baz'},
+            'id'      => 1 
+          })
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {: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({'bar' => 'baz'}).should == 42
+        end
+      end
     end
 
     describe "sending a batch request" do
@@ -138,7 +200,7 @@ module Jimson
           {"jsonrpc" => "2.0", "method" => "sum", "params" => [1,2,4], "id" => "1"},
           {"jsonrpc" => "2.0", "method" => "subtract", "params" => [42,23], "id" => "2"},
           {"jsonrpc" => "2.0", "method" => "foo_get", "params" => [{"name" => "myself"}], "id" => "5"},
-          {"jsonrpc" => "2.0", "method" => "get_data", "id" => "9"} 
+          {"jsonrpc" => "2.0", "method" => "get_data", "id" => "9"}
         ])
 
         response = MultiJson.encode([
@@ -148,10 +210,10 @@ module Jimson
           {"jsonrpc" => "2.0", "result" => ["hello", 5], "id" => "9"}
         ])
 
-        ClientHelper.stub!(:make_id).and_return('1', '2', '5', '9')
-        RestClient.should_receive(:post).with(SPEC_URL, batch, {:content_type => 'application/json'}).and_return(@resp_mock)
+        ClientHelper.stub(:make_id).and_return('1', '2', '5', '9')
+        RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: batch, headers: {:content_type => 'application/json'}, ssl_ca_file: 'myca.pem').and_return(@resp_mock)
         @resp_mock.should_receive(:body).at_least(:once).and_return(response)
-        client = Client.new(SPEC_URL)
+        client = Client.new(SPEC_URL, {}, '', {ssl_ca_file: 'myca.pem'})
 
         sum = subtract = foo = data = nil
         Jimson::Client.batch(client) do |batch|
@@ -161,14 +223,14 @@ module Jimson
           data = batch.get_data
         end
 
-        sum.succeeded?.should be_true
-        sum.is_error?.should be_false
+        sum.succeeded?.should be true
+        sum.is_error?.should be false
         sum.result.should == 7
 
         subtract.result.should == 19
 
-        foo.is_error?.should be_true
-        foo.succeeded?.should be_false
+        foo.is_error?.should be true
+        foo.succeeded?.should be false
         foo.error['code'].should == -32601
 
         data.result.should == ['hello', 5]
@@ -179,9 +241,9 @@ module Jimson
       context "when an error occurs in the Jimson::Client code" do
         it "tags the raised exception with Jimson::Client::Error" do
           client_helper = ClientHelper.new(SPEC_URL)
-          ClientHelper.stub!(:new).and_return(client_helper)
+          ClientHelper.stub(:new).and_return(client_helper)
           client = Client.new(SPEC_URL)
-          client_helper.stub!(:send_single_request).and_raise "intentional error"
+          client_helper.stub(:send_single_request).and_raise "intentional error"
           lambda { client.foo }.should raise_error(Jimson::Client::Error)
         end
       end

data/spec/router_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 module Jimson
   describe Router do
 
-    let(:router) { Router.new }
+    let(:router) { Router.new(opts) }
+    let(:opts) { {} }
 
     class RouterFooHandler
       extend Jimson::Handler
@@ -44,7 +45,7 @@ module Jimson
       end
 
       context 'when given nested namespaces' do
-        it 'takes a block with a DSL to set the root and namespaces' do
+        before {
           router.draw do
             root RouterFooHandler
             namespace 'ns1' do
@@ -52,22 +53,43 @@ module Jimson
               namespace 'ns2', RouterBarHandler
             end
           end
-
-          router.handler_for_method('hi').should be_a(RouterFooHandler)
-          router.handler_for_method('ns1.hi').should be_a(RouterBazHandler)
-          router.handler_for_method('ns1.ns2.hi').should be_a(RouterBarHandler)
+        }
+        context 'default ns_sep' do
+          it 'takes a block with a DSL to set the root and namespaces' do
+            router.handler_for_method('hi').should be_a(RouterFooHandler)
+            router.handler_for_method('ns1.hi').should be_a(RouterBazHandler)
+            router.handler_for_method('ns1.ns2.hi').should be_a(RouterBarHandler)
+          end
+        end
+        context 'custom ns_sep' do
+          let(:opts) { {ns_sep: '::'} }
+          it 'takes a block with a DSL to set the root and namespaces' do
+            router.handler_for_method('hi').should be_a(RouterFooHandler)
+            router.handler_for_method('ns1::hi').should be_a(RouterBazHandler)
+            router.handler_for_method('ns1::ns2::hi').should be_a(RouterBarHandler)
+          end
         end
+
       end
     end
 
     describe '#jimson_methods' do
-      it 'returns an array of namespaced method names from all registered handlers' do
+      before {
         router.draw do
           root RouterFooHandler
           namespace 'foo', RouterBarHandler
         end
-
-        router.jimson_methods.sort.should == ['hi', 'foo.bye'].sort
+      }
+      context 'default ns_sep' do
+        it 'returns an array of namespaced method names from all registered handlers' do
+          router.jimson_methods.sort.should == ['hi', 'foo.bye'].sort
+        end
+      end
+      context 'custom ns_sep' do
+        let(:opts) { {ns_sep: '::'} }
+        it 'returns an array of namespaced method names from all registered handlers' do
+          router.jimson_methods.sort.should == ['hi', 'foo::bye'].sort
+        end
       end
     end
 

data/spec/server_spec.rb

@@ -118,7 +118,7 @@ module Jimson
                            }
           end
 
-          it "handles bignums" do
+          it "handles integer" do
             req = {
                     'jsonrpc' => '2.0',
                     'method'  => 'subtract',
@@ -279,7 +279,7 @@ module Jimson
                               'jsonrpc' => '2.0',
                               'error'   => {
                                               'code' => -32099,
-                                              'message' => "Server application error: RuntimeError at /home/chris/repos/jimson/spec/server_spec.rb:40:in `ugly_method'"
+                                              'message' => "Server application error: RuntimeError at #{__FILE__}:40:in `ugly_method'"
                                             },
                               'id'      => 1
                             }
@@ -450,6 +450,17 @@ module Jimson
                            'id'      => 1
                          }
         end
+
+        context "when opts are given" do
+          it "passes the opts to the new server" do
+            app = Server.with_routes(:show_errors => true) do
+              root TestHandler.new
+              namespace 'foo', OtherHandler.new
+            end
+
+            app.show_errors.should be true
+          end
+        end
       end
   end
 end

metadata

@@ -1,134 +1,194 @@
 --- !ruby/object:Gem::Specification
 name: jimson
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.13.0
 platform: ruby
 authors:
 - Chris Kite
-autorequire: 
+- Gilbert
+- Bodo Tasche
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2.3
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2.3
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-description: 
-email: 
+        version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.2
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- VERSION
+- CHANGELOG.md
 - LICENSE.txt
-- CHANGELOG.rdoc
 - README.md
 - Rakefile
+- lib/jimson.rb
+- lib/jimson/client.rb
+- lib/jimson/client/error.rb
+- lib/jimson/handler.rb
 - lib/jimson/request.rb
-- lib/jimson/router.rb
 - lib/jimson/response.rb
+- lib/jimson/router.rb
 - lib/jimson/router/map.rb
 - lib/jimson/server.rb
-- lib/jimson/client/error.rb
-- lib/jimson/client.rb
-- lib/jimson/handler.rb
 - lib/jimson/server/error.rb
-- lib/jimson.rb
-- spec/spec_helper.rb
-- spec/router_spec.rb
+- lib/jimson/version.rb
 - spec/client_spec.rb
 - spec/handler_spec.rb
+- spec/router_spec.rb
 - spec/server_spec.rb
-homepage: http://www.github.com/chriskite/jimson
-licenses: []
-post_install_message: 
+- spec/spec_helper.rb
+homepage: https://github.com/bitboxer/jimson.git
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.21
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.2
+signing_key:
+specification_version: 4
 summary: JSON-RPC 2.0 client and server
 test_files:
-- spec/spec_helper.rb
 - spec/router_spec.rb
 - spec/client_spec.rb
 - spec/handler_spec.rb
+- spec/spec_helper.rb
 - spec/server_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.9.0