jimson 0.1.0 → 0.2.0

data/CHANGELOG.rdoc

@@ -0,0 +1,5 @@
+== 0.2.0 / 2011-07-20
+
+* Major enhancements
+
+  * Replace patron with rest-client for JRuby compatibility in the client

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/jimson.rb

@@ -1,11 +1,6 @@
 require 'rubygems'
-require 'jimson/request'
-require 'jimson/response'
-require 'jimson/server_error'
 require 'jimson/server'
-require 'jimson/client_error'
 require 'jimson/client'
 
 module Jimson
-  JSON_RPC_VERSION = '2.0'
 end

data/lib/jimson/client.rb

@@ -1,17 +1,20 @@
-require 'patron'
+require 'rest-client'
+require 'jimson/server_error'
+require 'jimson/client_error'
+require 'jimson/request'
+require 'jimson/response'
 
 module Jimson
   class ClientHelper
+    JSON_RPC_VERSION = '2.0'
 
     def self.make_id
       rand(10**12)
     end
 
     def initialize(url)
-      @http = Patron::Session.new
-      uri = URI(url)
-      @path = uri.path
-      @http.base_url = "#{uri.scheme}://#{uri.host}:#{uri.port}"
+      @url = url
+      URI.parse(@url) # for the sake of validating the url
       @batch = []
     end
 
@@ -29,12 +32,12 @@ module Jimson
 
     def send_single_request(method, args)
       post_data = {
-                    'jsonrpc' => '2.0',
+                    'jsonrpc' => JSON_RPC_VERSION,
                     'method'  => method,
                     'params'  => args,
                     'id'      => self.class.make_id
                   }.to_json
-      resp = @http.post(@path, post_data)
+      resp = RestClient.post(@url, post_data, :content_type => 'application/json')
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Jimson::ClientError::InvalidResponse.new
       end
@@ -47,7 +50,7 @@ module Jimson
 
     def send_batch_request(batch)
       post_data = batch.to_json
-      resp = @http.post(@path, post_data)
+      resp = RestClient.post(@url, post_data, :content_type => 'application/json')
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Jimson::ClientError::InvalidResponse.new
       end
@@ -84,7 +87,7 @@ module Jimson
     def valid_response?(data)
       return false if !data.is_a?(Hash)
 
-      return false if data['jsonrpc'] != '2.0'
+      return false if data['jsonrpc'] != JSON_RPC_VERSION
 
       return false if !data.has_key?('id')
 

data/lib/jimson/server.rb

@@ -2,11 +2,14 @@ require 'eventmachine'
 require 'evma_httpserver'
 require 'logger'
 require 'json'
+require 'jimson/server_error'
 
 module Jimson
   class HttpServer < EM::Connection
     include EM::HttpServer
 
+    JSON_RPC_VERSION = '2.0'
+
     def self.handler=(handler)
       @@handler = handler
     end
@@ -76,7 +79,7 @@ module Jimson
         return false if request.has_key?(key) && !types.any? { |type| request[key].is_a?(type) }
       end
 
-      return false if request['jsonrpc'] != '2.0'
+      return false if request['jsonrpc'] != JSON_RPC_VERSION
       
       true
     end
@@ -93,6 +96,8 @@ module Jimson
         raise Jimson::ServerError::MethodNotFound.new 
       rescue ArgumentError
         raise Jimson::ServerError::InvalidParams.new
+      rescue
+        raise Jimson::ServerError::ApplicationError.new($!)
       end
 
       response = success_response(request, result)

data/lib/jimson/server_error.rb

@@ -47,6 +47,12 @@ module Jimson
       end
     end
 
+    class ApplicationError < Generic
+      def initialize(err)
+        super(-32099, "The application being served raised an error: #{err}")
+      end
+    end
+
     CODES = {
               -32700 => ParseError,
               -32600 => InvalidRequest,

data/spec/client_spec.rb

@@ -3,9 +3,6 @@ module Jimson
     BOILERPLATE = {'jsonrpc' => '2.0', 'id' => 1}
 
     before(:each) do
-      @http_mock = mock('http')
-      Patron::Session.stub!(:new).and_return(@http_mock)
-      @http_mock.should_receive(:base_url=).with(SPEC_URL)
       @resp_mock = mock('http_response')
       ClientHelper.stub!(:make_id).and_return(1)
     end
@@ -25,7 +22,7 @@ module Jimson
         end
         it "sends a valid JSON-RPC request and returns the result" do
           response = BOILERPLATE.merge({'result' => 42}).to_json
-          @http_mock.should_receive(:post).with('', @expected).and_return(@resp_mock)
+          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
@@ -50,7 +47,7 @@ module Jimson
         ].to_json
 
         ClientHelper.stub!(:make_id).and_return('1', '2', '5', '9')
-        @http_mock.should_receive(:post).with('', batch).and_return(@resp_mock)
+        RestClient.should_receive(:post).with(SPEC_URL, batch, {:content_type => 'application/json'}).and_return(@resp_mock)
         @resp_mock.should_receive(:body).at_least(:once).and_return(response)
         client = Client.new(SPEC_URL)
 

data/spec/server_spec.rb

@@ -12,8 +12,7 @@ module Jimson
                                         'id'      => nil
                                       }
       before(:each) do
-        @sess = Patron::Session.new
-        @sess.base_url = SPEC_URL
+        @url = SPEC_URL
       end
 
       describe "receiving a request with positional parameters" do
@@ -25,7 +24,7 @@ module Jimson
                     'params'  => [24, 20],
                     'id'      => 1
                   }
-            resp = JSON.parse(@sess.post('/', req.to_json).body)
+            resp = JSON.parse(RestClient.post(@url, req.to_json).body)
             resp.should == {
                              'jsonrpc' => '2.0',
                              'result'  => 4,
@@ -44,7 +43,7 @@ module Jimson
                     'params'  => {'subtrahend'=> 20, 'minuend' => 24},
                     'id'      => 1
                   }
-            resp = JSON.parse(@sess.post('/', req.to_json).body)
+            resp = JSON.parse(RestClient.post(@url, req.to_json).body)
             resp.should == {
                              'jsonrpc' => '2.0',
                              'result'  => 4,
@@ -62,7 +61,7 @@ module Jimson
                     'method'  => 'update',
                     'params'  => [1,2,3,4,5]
                   }
-            resp = @sess.post('/', req.to_json).body
+            resp = RestClient.post(@url, req.to_json).body
             resp.should be_empty
           end
         end
@@ -75,7 +74,7 @@ module Jimson
                   'method'  => 'foobar',
                   'id'      => 1
                 }
-          resp = JSON.parse(@sess.post('/', req.to_json).body)
+          resp = JSON.parse(RestClient.post(@url, req.to_json).body)
           resp.should == {
                             'jsonrpc' => '2.0',
                             'error'   => {
@@ -95,7 +94,7 @@ module Jimson
                   'params'  => [1,2,3],
                   'id'      => 1
                 }
-          resp = JSON.parse(@sess.post('/', req.to_json).body)
+          resp = JSON.parse(RestClient.post(@url, req.to_json).body)
           resp.should == {
                             'jsonrpc' => '2.0',
                             'error'   => {
@@ -115,7 +114,7 @@ module Jimson
                   'id'      => 1
                 }.to_json
           req += '}' # make the json invalid
-          resp = JSON.parse(@sess.post('/', req).body)
+          resp = JSON.parse(RestClient.post(@url, req).body)
           resp.should == {
                             'jsonrpc' => '2.0',
                             'error'   => {
@@ -134,7 +133,7 @@ module Jimson
                     'jsonrpc' => '2.0',
                     'method'  => 1 # method as int is invalid
                   }.to_json
-            resp = JSON.parse(@sess.post('/', req).body)
+            resp = JSON.parse(RestClient.post(@url, req).body)
             resp.should == INVALID_RESPONSE_EXPECTATION 
           end
         end
@@ -142,7 +141,7 @@ module Jimson
         context "when the request is an empty batch" do
           it "returns an error response" do
             req = [].to_json
-            resp = JSON.parse(@sess.post('/', req).body)
+            resp = JSON.parse(RestClient.post(@url, req).body)
             resp.should == INVALID_RESPONSE_EXPECTATION
           end
         end
@@ -150,7 +149,7 @@ module Jimson
         context "when the request is an invalid batch" do
           it "returns an error response" do
             req = [1,2].to_json
-            resp = JSON.parse(@sess.post('/', req).body)
+            resp = JSON.parse(RestClient.post(@url, req).body)
             resp.should == [INVALID_RESPONSE_EXPECTATION, INVALID_RESPONSE_EXPECTATION] 
           end
         end
@@ -167,7 +166,7 @@ module Jimson
                       {'jsonrpc' => '2.0', 'method' => 'foo.get', 'params' => {'name' => 'myself'}, 'id' => '5'},
                       {'jsonrpc' => '2.0', 'method' => 'get_data', 'id' => '9'} 
                    ].to_json
-            resp = JSON.parse(@sess.post('/', reqs).body)
+            resp = JSON.parse(RestClient.post(@url, reqs).body)
             resp.should == [
                     {'jsonrpc' => '2.0', 'result' => 7, 'id' => '1'},
                     {'jsonrpc' => '2.0', 'result' => 19, 'id' => '2'},
@@ -192,7 +191,7 @@ module Jimson
                       'params'  => [1,2,3,4,5]
                     }
                   ]
-            resp = @sess.post('/', req.to_json).body
+            resp = RestClient.post(@url, req.to_json).body
             resp.should be_empty
           end
         end

data/spec/spec_helper.rb

@@ -1,18 +1,12 @@
 require 'rubygems'
 $:.unshift(File.dirname(__FILE__) + '/../lib/')
-require 'jimson'
+require 'jimson/server'
+require 'jimson/client'
 require 'open-uri'
 require 'json'
-require 'patron'
-require 'fakeweb'
 
 SPEC_URL = 'http://localhost:8999'
 
-
-def fake_response(json)
-  FakeWeb.register_uri(:post, SPEC_URL, :body => json)
-end
-
 pid = Process.spawn(File.dirname(__FILE__) + '/em_helper.rb')
 
 RSpec.configure do |config|

metadata

@@ -2,7 +2,7 @@
 name: jimson
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Kite
@@ -10,18 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -05:00
+date: 2011-07-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: patron
+  name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.12
+        version: 1.6.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency