jimson 0.7.0 → 0.7.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 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
 
 * Major enhancements

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/jimson/client.rb

@@ -159,11 +159,11 @@ module Jimson
     end
 
     def method_missing(sym, *args, &block)
-      self[sym, args]
+      @helper.process_call(sym, args) 
     end
 
     def [](method, *args)
-      @helper.process_call(method, args.flatten) 
+      @helper.process_call(method, args) 
     end
 
   end

data/spec/client_spec.rb

@@ -24,27 +24,37 @@ module Jimson
 
     describe "#[]" do
       before(:each) do
-        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)
       end
 
-      context "when using an array of args" do
-        it "sends a request with the correct method and args" do
-          @client['foo', [1,2,3]].should == 42
-        end
-      end
-      context "when using a splat for args" do
+      context "when sending positional arguments" do
         it "sends a request with the correct method and args" do
+          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['foo', 1, 2, 3].should == 42
         end
+
+        context "when one of the args is an array" do
+          it "sends a request with the correct method and args" do
+            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['foo', [1, 2], 3].should == 42
+          end
+        end
       end
     end
 
@@ -74,6 +84,22 @@ module Jimson
           client.foo(1,2,3).should == 42
         end
       end
+
+      context "when one of the parameters is an array" do
+        it "sends a correct JSON-RPC request (array is preserved) and returns the result" do
+          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)
+          client.foo([1,2],3).should == 42
+        end
+      end
     end
 
     describe "sending a batch request" do

data/spec/router_spec.rb

@@ -59,7 +59,7 @@ module Jimson
           namespace 'foo', RouterBarHandler.new
         end
 
-        router.jimson_methods.should == ['hi', 'foo.bye']
+        router.jimson_methods.sort.should == ['hi', 'foo.bye'].sort
       end
     end
 

data/spec/server_spec.rb

@@ -20,6 +20,10 @@ module Jimson
           a + b + c
         end
 
+        def car(array)
+          array.first
+        end
+
         def notify_hello(*args)
           # notification, doesn't do anything
         end
@@ -96,6 +100,24 @@ module Jimson
                            }
           end
 
+          it "handles an array in the parameters" do
+            req = {
+                    'jsonrpc' => '2.0',
+                    'method'  => 'car',
+                    'params'  => [['a', 'b']],
+                    'id'      => 1
+                  }
+            post_json(req)
+
+            last_response.should be_ok
+            resp = MultiJson.decode(last_response.body)
+            resp.should == {
+                             'jsonrpc' => '2.0',
+                             'result'  => 'a',
+                             'id'      => 1
+                           }
+          end
+
           it "handles bignums" do
             req = {
                     'jsonrpc' => '2.0',
@@ -368,7 +390,7 @@ module Jimson
             resp = MultiJson.decode(last_response.body)
             resp['jsonrpc'].should == '2.0'
             resp['id'].should == 1
-            expected = ['get_data', 'notify_hello', 'subtract', 'sum', 'ugly_method', 'update', 'system.isAlive', 'system.listMethods', 'other.multiply']
+            expected = ['get_data', 'notify_hello', 'subtract', 'sum', 'car', 'ugly_method', 'update', 'system.isAlive', 'system.listMethods', 'other.multiply']
             (resp['result'] - expected).should == []
           end
         end

metadata

@@ -1,134 +1,120 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jimson
-version: !ruby/object:Gem::Version
-  version: 0.7.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.7.1
 platform: ruby
-authors:
-- Chris Kite
+authors: 
+  - Chris Kite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 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
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.2.3
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.3
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
+
+date: 2012-08-16 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: blankslate
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.1.2.3
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rest-client
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.6.3
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: multi_json
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.1.0
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rack
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "1.3"
+    type: :runtime
+    version_requirements: *id004
 description: 
 email: 
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- README.md
-files:
-- VERSION
-- LICENSE.txt
-- CHANGELOG.rdoc
-- README.md
-- Rakefile
-- lib/jimson/request.rb
-- lib/jimson/router.rb
-- lib/jimson/response.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
-- spec/client_spec.rb
-- spec/handler_spec.rb
-- spec/server_spec.rb
+
+extra_rdoc_files: 
+  - README.md
+files: 
+  - VERSION
+  - LICENSE.txt
+  - CHANGELOG.rdoc
+  - README.md
+  - Rakefile
+  - lib/jimson.rb
+  - lib/jimson/request.rb
+  - lib/jimson/router.rb
+  - lib/jimson/response.rb
+  - lib/jimson/server.rb
+  - lib/jimson/client.rb
+  - lib/jimson/handler.rb
+  - lib/jimson/router/map.rb
+  - lib/jimson/client/error.rb
+  - lib/jimson/server/error.rb
+  - spec/spec_helper.rb
+  - spec/router_spec.rb
+  - spec/client_spec.rb
+  - spec/handler_spec.rb
+  - spec/server_spec.rb
 homepage: http://www.github.com/chriskite/jimson
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+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
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+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/router_spec.rb
-- spec/client_spec.rb
-- spec/handler_spec.rb
-- spec/server_spec.rb
+test_files: 
+  - spec/spec_helper.rb
+  - spec/router_spec.rb
+  - spec/client_spec.rb
+  - spec/handler_spec.rb
+  - spec/server_spec.rb