jimson 0.7.1 → 0.8.0

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 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
 
 * Bug fixes

data/Rakefile

@@ -14,11 +14,7 @@ end
 
 task :default => :rspec
 
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rake/rdoctask'
-end
+require 'rdoc/task'
 
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

data/lib/jimson/client.rb

@@ -12,11 +12,12 @@ module Jimson
       rand(10**12)
     end
 
-    def initialize(url, opts={})
+    def initialize(url, opts = {}, namespace = nil)
       @url = url
       URI.parse(@url) # for the sake of validating the url
       @batch = []
       @opts = opts
+      @namespace = namespace
       @opts[:content_type] = 'application/json'
     end
 
@@ -37,9 +38,10 @@ module Jimson
     end
 
     def send_single_request(method, args)
+      namespaced_method = @namespace.nil? ? method : "#@namespace#{method}"
       post_data = MultiJson.encode({
         'jsonrpc' => JSON_RPC_VERSION,
-        'method'  => method,
+        'method'  => namespaced_method,
         'params'  => args,
         'id'      => self.class.make_id
       })
@@ -154,8 +156,9 @@ module Jimson
       helper.send_batch
     end
 
-    def initialize(url, opts={})
-      @helper = ClientHelper.new(url, opts)
+    def initialize(url, opts = {}, namespace = nil)
+      @url, @opts, @namespace = url, opts, namespace
+      @helper = ClientHelper.new(url, opts, namespace)
     end
 
     def method_missing(sym, *args, &block)
@@ -163,6 +166,11 @@ module Jimson
     end
 
     def [](method, *args)
+      if method.is_a?(Symbol)
+        # namespace requested
+        new_ns = @namespace.nil? ? "#{method}." : "#@namespace#{method}."
+        return Client.new(@url, @opts, new_ns)
+      end
       @helper.process_call(method, args) 
     end
 

data/lib/jimson/router/map.rb

@@ -15,6 +15,7 @@ module Jimson
       # Set the root handler, i.e. the handler used for a bare method like 'foo'
       #
       def root(handler)
+        handler = handler.new if handler.is_a?(Class)
         @routes[''] = handler
       end
 
@@ -23,6 +24,7 @@ module Jimson
       #
       def namespace(ns, handler = nil, &block)
         if !!handler
+          handler = handler.new if handler.is_a?(Class)
           @routes[ns.to_s] = handler
         else
           # passed a block for nested namespacing

data/lib/jimson/server.rb

@@ -29,6 +29,15 @@ module Jimson
 
     attr_accessor :router, :host, :port, :opts
 
+    #
+    # Create a Server with routes defined
+    #
+    def self.with_routes(&block)
+      router = Router.new
+      router.send(:draw, &block)
+      self.new(router)
+    end
+
     #
     # +router_or_handler+ is an instance of Jimson::Router or extends Jimson::Handler
     #

data/spec/client_spec.rb

@@ -27,6 +27,36 @@ module Jimson
         @client = Client.new(SPEC_URL)
       end
 
+      context "when using a symbol to specify a namespace" do
+        it "sends the method prefixed with the namespace in the request" do
+          expected = MultiJson.encode({
+           'jsonrpc' => '2.0',
+           'method'  => 'foo.sum',
+           '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].sum(1, 2, 3).should == 42
+        end
+
+        context "when the namespace is nested" do
+          it "sends the method prefixed with the full namespace in the request" do
+            expected = MultiJson.encode({
+             'jsonrpc' => '2.0',
+             'method'  => 'foo.bar.sum',
+             '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][:bar].sum(1, 2, 3).should == 42
+          end
+        end
+      end
+
       context "when sending positional arguments" do
         it "sends a request with the correct method and args" do
           expected = MultiJson.encode({

data/spec/router_spec.rb

@@ -21,33 +21,41 @@ module Jimson
       end
     end
 
+    class RouterBazHandler
+      extend Jimson::Handler
+
+      def meh 
+        'mehkayla'
+      end
+    end
+
 
     describe '#draw' do
       context 'when given non-nested namespaces' do
         it 'takes a block with a DSL to set the root and namespaces' do
           router.draw do
-            root 'foo'
-            namespace 'ns', 'bar'
+            root RouterFooHandler
+            namespace 'ns', RouterBarHandler
           end
 
-          router.handler_for_method('hi').should == 'foo'
-          router.handler_for_method('ns.hi').should == 'bar'
+          router.handler_for_method('hi').should be_a(RouterFooHandler)
+          router.handler_for_method('ns.hi').should be_a(RouterBarHandler)
         end
       end
 
       context 'when given nested namespaces' do
         it 'takes a block with a DSL to set the root and namespaces' do
           router.draw do
-            root 'foo'
+            root RouterFooHandler
             namespace 'ns1' do
-              root 'blah'
-              namespace 'ns2', 'bar'
+              root RouterBazHandler
+              namespace 'ns2', RouterBarHandler
             end
           end
 
-          router.handler_for_method('hi').should == 'foo'
-          router.handler_for_method('ns1.hi').should == 'blah'
-          router.handler_for_method('ns1.ns2.hi').should == 'bar'
+          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
@@ -55,8 +63,8 @@ module Jimson
     describe '#jimson_methods' do
       it 'returns an array of namespaced method names from all registered handlers' do
         router.draw do
-          root RouterFooHandler.new
-          namespace 'foo', RouterBarHandler.new
+          root RouterFooHandler
+          namespace 'foo', RouterBarHandler
         end
 
         router.jimson_methods.sort.should == ['hi', 'foo.bye'].sort

data/spec/server_spec.rb

@@ -395,5 +395,33 @@ module Jimson
           end
         end
       end
+
+      describe ".with_routes" do
+        it "creates a server with a router by passing the block to Router#draw" do
+          app = Server.with_routes do
+            root TestHandler.new
+            namespace 'foo', OtherHandler.new
+          end
+
+          # have to make a new Rack::Test browser since this server is different than the normal one
+          browser = Rack::Test::Session.new(Rack::MockSession.new(app))
+
+          req = {
+                  'jsonrpc' => '2.0',
+                  'method'  => 'foo.multiply',
+                  'params'  => [2, 3],
+                  'id'      => 1
+                }
+          browser.post '/', MultiJson.encode(req), {'Content-Type' => 'application/json'}
+
+          browser.last_response.should be_ok
+          resp = MultiJson.decode(browser.last_response.body)
+          resp.should == {
+                           'jsonrpc' => '2.0',
+                           'result'  => 6,
+                           'id'      => 1
+                         }
+        end
+      end
   end
 end

metadata

@@ -1,120 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jimson
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  version: 0.7.1
 platform: ruby
-authors: 
-  - Chris Kite
+authors:
+- Chris Kite
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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
+date: 2012-08-17 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'
 description: 
 email: 
 executables: []
-
 extensions: []
-
-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
+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
 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.15
+rubygems_version: 1.8.21
 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