jimson 0.4.0 → 0.5.0

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 0.5.0 / 2012-03-06
+
+* Major enhancements
+
+  * Switch to MultiJson from json gem
+
+* Bug fixes
+
+  * Allow BigNum in 'id' field of request and response
+
 == 0.3.1 / 2011-08-11
 
 * Minor enhancements

data/README.md

@@ -1,5 +1,6 @@
 # Jimson
 ### JSON-RPC 2.0 Client and Server for Ruby
+![next build status](https://secure.travis-ci.org/chriskite/jimson.png?branch=next)
 
 ## Client: Quick Start
     require 'jimson'
@@ -19,3 +20,10 @@
 
     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'
+

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/jimson/client.rb

@@ -1,11 +1,6 @@
 require 'blankslate'
-module Jimson
-  class Client < BlankSlate
-  end
-end
-
+require 'multi_json'
 require 'rest-client'
-require 'jimson/client/error'
 require 'jimson/request'
 require 'jimson/response'
 
@@ -27,7 +22,7 @@ module Jimson
       resp = send_single_request(sym.to_s, args)
 
       begin
-        data = JSON.parse(resp)
+        data = MultiJson.decode(resp)
       rescue
         raise Client::Error::InvalidJSON.new(resp)
       end
@@ -40,12 +35,12 @@ module Jimson
     end
 
     def send_single_request(method, args)
-      post_data = {
-                    'jsonrpc' => JSON_RPC_VERSION,
-                    'method'  => method,
-                    'params'  => args,
-                    'id'      => self.class.make_id
-                  }.to_json
+      post_data = MultiJson.encode({
+        'jsonrpc' => JSON_RPC_VERSION,
+        'method'  => method,
+        'params'  => args,
+        'id'      => self.class.make_id
+      })
       resp = RestClient.post(@url, post_data, :content_type => 'application/json')
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Client::Error::InvalidResponse.new
@@ -55,7 +50,7 @@ module Jimson
     end
 
     def send_batch_request(batch)
-      post_data = batch.to_json
+      post_data = MultiJson.encode(batch)
       resp = RestClient.post(@url, post_data, :content_type => 'application/json')
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Client::Error::InvalidResponse.new
@@ -121,7 +116,7 @@ module Jimson
       response = send_batch_request(batch)
 
       begin
-        responses = JSON.parse(response)
+        responses = MultiJson.decode(response)
       rescue
         raise Client::Error::InvalidJSON.new(json)
       end
@@ -171,3 +166,5 @@ module Jimson
 
   end
 end
+
+require 'jimson/client/error'

data/lib/jimson/handler.rb

@@ -18,7 +18,7 @@ module Jimson
     def jimson_exposed_methods
       @jimson_exposed_methods ||= []
       @jimson_excluded_methods ||= []
-      (jimson_default_methods - @jimson_excluded_methods + @jimson_exposed_methods).sort.map(&:to_sym)
+      (jimson_default_methods - @jimson_excluded_methods + @jimson_exposed_methods).sort
     end
 
   end

data/lib/jimson/request.rb

@@ -18,7 +18,7 @@ module Jimson
     end
 
     def to_json(*a)
-      self.to_h.to_json(*a)
+      MultiJson.encode(self.to_h)
     end
 
   end

data/lib/jimson/server.rb

@@ -1,7 +1,7 @@
 require 'rack'
 require 'rack/request'
 require 'rack/response'
-require 'json'
+require 'multi_json'
 require 'jimson/handler'
 require 'jimson/server/error'
 
@@ -87,7 +87,7 @@ module Jimson
 
       return nil if response.nil? || (response.respond_to?(:empty?) && response.empty?)
 
-      response.to_json
+      MultiJson.encode(response)
     end
 
     def handle_request(request)
@@ -111,7 +111,7 @@ module Jimson
                          'jsonrpc' => [String],
                          'method'  => [String], 
                          'params'  => [Hash, Array],
-                         'id'      => [String, Fixnum, NilClass]
+                         'id'      => [String, Fixnum, Bignum, NilClass]
                        }
       
       return false if !request.is_a?(Hash)
@@ -163,7 +163,7 @@ module Jimson
         method.gsub!(sys_regex, '')
       end
 
-      method = method.to_sym
+      method = method.to_s
 
       if !handler.class.jimson_exposed_methods.include?(method) \
          || !handler.respond_to?(method)
@@ -202,7 +202,7 @@ module Jimson
     end
 
     def parse_request(post)
-      data = JSON.parse(post)
+      data = MultiJson.decode(post)
       rescue 
         raise Server::Error::ParseError.new 
     end

data/spec/client_spec.rb

@@ -24,13 +24,13 @@ module Jimson
 
     describe "#[]" do
       before(:each) do
-        expected = {
-                     'jsonrpc' => '2.0',
-                     'method'  => 'foo',
-                     'params'  => [1,2,3],
-                     'id'      => 1
-                   }.to_json
-        response = BOILERPLATE.merge({'result' => 42}).to_json
+        expected = MultiJson.encode({
+         'jsonrpc' => '2.0',
+         'method'  => 'foo',
+         'params'  => [1,2,3],
+         '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)
         @resp_mock.should_receive(:body).at_least(:once).and_return(response)
         @client = Client.new(SPEC_URL)
@@ -51,15 +51,15 @@ module Jimson
     describe "sending a single request" do
       context "when using positional parameters" do
         before(:each) do
-          @expected = {
+          @expected = MultiJson.encode({
                        'jsonrpc' => '2.0',
                        'method'  => 'foo',
                        'params'  => [1,2,3],
                        'id'      => 1
-                     }.to_json
+          })
         end
         it "sends a valid JSON-RPC request and returns the result" do
-          response = BOILERPLATE.merge({'result' => 42}).to_json
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
           RestClient.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)
@@ -70,19 +70,19 @@ module Jimson
 
     describe "sending a batch request" do
       it "sends a valid JSON-RPC batch request and puts the results in the response objects" do
-        batch = [
-            {"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"} 
-        ].to_json
-
-        response = [
-            {"jsonrpc" => "2.0", "result" => 7, "id" => "1"},
-            {"jsonrpc" => "2.0", "result" => 19, "id" => "2"},
-            {"jsonrpc" => "2.0", "error" => {"code" => -32601, "message" => "Method not found."}, "id" => "5"},
-            {"jsonrpc" => "2.0", "result" => ["hello", 5], "id" => "9"}
-        ].to_json
+        batch = MultiJson.encode([
+          {"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"} 
+        ])
+
+        response = MultiJson.encode([
+          {"jsonrpc" => "2.0", "result" => 7, "id" => "1"},
+          {"jsonrpc" => "2.0", "result" => 19, "id" => "2"},
+          {"jsonrpc" => "2.0", "error" => {"code" => -32601, "message" => "Method not found."}, "id" => "5"},
+          {"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)

data/spec/handler_spec.rb

@@ -31,29 +31,29 @@ module Jimson
 
     describe "#jimson_expose" do
       it "exposes a method even if it was defined on Object" do
-        foo.class.jimson_exposed_methods.should include(:to_s)
+        foo.class.jimson_exposed_methods.should include('to_s')
       end
     end
 
     describe "#jimson_exclude" do
       context "when a method was not explicitly exposed" do
         it "excludes the method" do
-          foo.class.jimson_exposed_methods.should_not include(:hi)
+          foo.class.jimson_exposed_methods.should_not include('hi')
         end
       end
       context "when a method was explicitly exposed" do
         it "does not exclude the method" do
-          foo.class.jimson_exposed_methods.should include(:bye)
+          foo.class.jimson_exposed_methods.should include('bye')
         end
       end
     end
 
     describe "#jimson_exposed_methods" do
       it "doesn't include methods defined on Object" do
-        foo.class.jimson_exposed_methods.should_not include(:object_id)
+        foo.class.jimson_exposed_methods.should_not include('object_id')
       end
       it "includes methods defined on the extending class but not on Object" do
-        foo.class.jimson_exposed_methods.should include(:so_exposed)
+        foo.class.jimson_exposed_methods.should include('so_exposed')
       end
     end
 

data/spec/server_spec.rb

@@ -46,7 +46,7 @@ module Jimson
       end
 
       def post_json(hash)
-        post '/', hash.to_json, {'Content-Type' => 'application/json'}
+        post '/', MultiJson.encode(hash), {'Content-Type' => 'application/json'}
       end
       
       before(:each) do
@@ -65,13 +65,31 @@ module Jimson
             post_json(req)
 
             last_response.should be_ok
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == {
                              'jsonrpc' => '2.0',
                              'result'  => 4,
                              'id'      => 1
                            }
           end
+
+          it "handles bignums" do
+            req = {
+                    'jsonrpc' => '2.0',
+                    'method'  => 'subtract',
+                    'params'  => [24, 20],
+                    'id'      => 123456789_123456789_123456789
+                  }
+            post_json(req)
+
+            last_response.should be_ok
+            resp = MultiJson.decode(last_response.body)
+            resp.should == {
+                             'jsonrpc' => '2.0',
+                             'result'  => 4,
+                             'id'      => 123456789_123456789_123456789
+                           }
+          end
         end
       end
 
@@ -87,7 +105,7 @@ module Jimson
             post_json(req)
             
             last_response.should be_ok
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == {
                              'jsonrpc' => '2.0',
                              'result'  => 4,
@@ -120,7 +138,7 @@ module Jimson
                 }
           post_json(req)
 
-          resp = JSON.parse(last_response.body)
+          resp = MultiJson.decode(last_response.body)
           resp.should == {
                             'jsonrpc' => '2.0',
                             'error'   => {
@@ -141,7 +159,7 @@ module Jimson
                 }
           post_json(req)
 
-          resp = JSON.parse(last_response.body)
+          resp = MultiJson.decode(last_response.body)
           resp.should == {
                             'jsonrpc' => '2.0',
                             'error'   => {
@@ -163,7 +181,7 @@ module Jimson
                 }
           post_json(req)
 
-          resp = JSON.parse(last_response.body)
+          resp = MultiJson.decode(last_response.body)
           resp.should == {
                             'jsonrpc' => '2.0',
                             'error'   => {
@@ -177,15 +195,15 @@ module Jimson
 
       describe "receiving invalid JSON" do
         it "returns an error response" do
-          req = {
-                  'jsonrpc' => '2.0',
-                  'method'  => 'foobar',
-                  'id'      => 1
-                }.to_json
+          req = MultiJson.encode({
+            'jsonrpc' => '2.0',
+            'method'  => 'foobar',
+            'id'      => 1
+          })
           req += '}' # make the json invalid
           post '/', req, {'Content-type' => 'application/json'}
 
-          resp = JSON.parse(last_response.body)
+          resp = MultiJson.decode(last_response.body)
           resp.should == {
                             'jsonrpc' => '2.0',
                             'error'   => {
@@ -205,7 +223,7 @@ module Jimson
                     'method'  => 1 # method as int is invalid
                   }
             post_json(req)
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == INVALID_RESPONSE_EXPECTATION 
           end
         end
@@ -214,7 +232,7 @@ module Jimson
           it "returns an error response" do
             req = []
             post_json(req)
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == INVALID_RESPONSE_EXPECTATION
           end
         end
@@ -223,7 +241,7 @@ module Jimson
           it "returns an error response" do
             req = [1,2]
             post_json(req)
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == [INVALID_RESPONSE_EXPECTATION, INVALID_RESPONSE_EXPECTATION] 
           end
         end
@@ -241,7 +259,7 @@ module Jimson
                       {'jsonrpc' => '2.0', 'method' => 'get_data', 'id' => '9'} 
                    ]
             post_json(reqs)
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == [
                     {'jsonrpc' => '2.0', 'result' => 7, 'id' => '1'},
                     {'jsonrpc' => '2.0', 'result' => 19, 'id' => '2'},
@@ -284,7 +302,7 @@ module Jimson
             post_json(req)
 
             last_response.should be_ok
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == {
                              'jsonrpc' => '2.0',
                              'result'  => true,
@@ -303,7 +321,7 @@ module Jimson
             post_json(req)
 
             last_response.should be_ok
-            resp = JSON.parse(last_response.body)
+            resp = MultiJson.decode(last_response.body)
             resp.should == {
                              'jsonrpc' => '2.0',
                              'result'  => ['subtract', 'sum', 'notify_hello', 'update', 'get_data'].sort,

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 $:.unshift(File.dirname(__FILE__) + '/../lib/')
 require 'jimson/server'
 require 'jimson/client'
-require 'json'
+require 'bundler/setup'
+require 'multi_json'
 
 SPEC_URL = 'http://localhost:8999'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimson
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &13756100 !ruby/object:Gem::Requirement
+  requirement: &12957520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *13756100
+  version_requirements: *12957520
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &13755420 !ruby/object:Gem::Requirement
+  requirement: &12956740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *13755420
+  version_requirements: *12956740
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &13754820 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &12955960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *13754820
+  version_requirements: *12955960
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &13754200 !ruby/object:Gem::Requirement
+  requirement: &12955120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *13754200
+  version_requirements: *12955120
 description: 
 email: 
 executables: []
@@ -67,18 +67,18 @@ files:
 - CHANGELOG.rdoc
 - README.md
 - Rakefile
-- lib/jimson.rb
-- lib/jimson/server/error.rb
-- lib/jimson/handler.rb
-- lib/jimson/server.rb
+- lib/jimson/request.rb
 - lib/jimson/response.rb
+- lib/jimson/server.rb
 - lib/jimson/client/error.rb
-- lib/jimson/request.rb
 - lib/jimson/client.rb
+- lib/jimson/handler.rb
+- lib/jimson/server/error.rb
+- lib/jimson.rb
+- spec/spec_helper.rb
+- spec/client_spec.rb
 - spec/handler_spec.rb
 - spec/server_spec.rb
-- spec/client_spec.rb
-- spec/spec_helper.rb
 homepage: http://www.github.com/chriskite/jimson
 licenses: []
 post_install_message: 
@@ -99,12 +99,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: JSON-RPC 2.0 client and server
 test_files:
+- spec/spec_helper.rb
+- spec/client_spec.rb
 - spec/handler_spec.rb
 - spec/server_spec.rb
-- spec/client_spec.rb
-- spec/spec_helper.rb