jimson 0.3.0 → 0.3.1

data/CHANGELOG.rdoc

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

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/jimson/server.rb

@@ -1,13 +1,13 @@
 require 'rack'
 require 'rack/request'
 require 'rack/response'
-require 'rack/showexceptions'
 require 'json'
-require 'jimson/http_server'
 
 module Jimson
   class Server
     
+    JSON_RPC_VERSION = '2.0'
+
     attr_accessor :handler, :host, :port
 
     #
@@ -20,7 +20,6 @@ module Jimson
     #
     def initialize(handler, opts = {})
       @handler = handler
-      @app = Jimson::HttpServer.new(@handler)
       @host = opts[:host] || '0.0.0.0'
       @port = opts[:port] || 8999
       @server = opts[:server] || 'webrick'
@@ -32,11 +31,139 @@ module Jimson
     def start
       Rack::Server.start(
         :server => @server,
-        :app    => @app,
+        :app    => self,
         :Host   => @host,
         :Port   => @port
       )
     end
 
+    #
+    # Entry point for Rack
+    #
+    def call(env)
+      req = Rack::Request.new(env)
+      resp = Rack::Response.new
+      return resp.finish if !req.post?
+      resp.write process(req.body.read)
+      resp.finish
+    end
+
+    def process(content)
+      begin
+        request = parse_request(content)
+        if request.is_a?(Array)
+          raise Jimson::ServerError::InvalidRequest.new if request.empty?
+          response = request.map { |req| handle_request(req) }
+        else
+          response = handle_request(request)
+        end
+      rescue Jimson::ServerError::ParseError, Jimson::ServerError::InvalidRequest => e
+        response = error_response(e)
+      rescue Jimson::ServerError::Generic => e
+        response = error_response(e, request)
+      rescue StandardError, Exception
+        response = error_response(Jimson::ServerError::InternalError.new)
+      end
+
+      response.compact! if response.is_a?(Array)
+
+      return nil if response.nil? || (response.respond_to?(:empty?) && response.empty?)
+
+      response.to_json
+    end
+
+    def handle_request(request)
+      response = nil
+      begin
+        if !validate_request(request)
+          response = error_response(Jimson::ServerError::InvalidRequest.new)
+        else
+          response = create_response(request)
+        end
+      rescue Jimson::ServerError::Generic => e
+        response = error_response(e, request)
+      end
+
+      response
+    end
+
+    def validate_request(request)
+      required_keys = %w(jsonrpc method)
+      required_types = {
+                         'jsonrpc' => [String],
+                         'method'  => [String], 
+                         'params'  => [Hash, Array],
+                         'id'      => [String, Fixnum, NilClass]
+                       }
+      
+      return false if !request.is_a?(Hash)
+
+      required_keys.each do |key|
+        return false if !request.has_key?(key)
+      end
+
+      required_types.each do |key, types|
+        return false if request.has_key?(key) && !types.any? { |type| request[key].is_a?(type) }
+      end
+
+      return false if request['jsonrpc'] != JSON_RPC_VERSION
+      
+      true
+    end
+
+    def create_response(request)
+      params = request['params']
+      begin
+        if params.is_a?(Hash)
+          result = @handler.send(request['method'], params)
+        else
+          result = @handler.send(request['method'], *params)
+        end
+      rescue NoMethodError
+        raise Jimson::ServerError::MethodNotFound.new 
+      rescue ArgumentError
+        raise Jimson::ServerError::InvalidParams.new
+      rescue
+        raise Jimson::ServerError::ApplicationError.new($!)
+      end
+
+      response = success_response(request, result)
+
+      # A Notification is a Request object without an "id" member.
+      # The Server MUST NOT reply to a Notification, including those 
+      # that are within a batch request.
+      response = nil if !request.has_key?('id')
+
+      response 
+    end
+
+    def error_response(error, request = nil)
+      resp = {
+               'jsonrpc' => JSON_RPC_VERSION,
+               'error'   => error.to_h,
+             }
+      if !!request && request.has_key?('id')
+        resp['id'] = request['id'] 
+      else
+        resp['id'] = nil
+      end
+
+      resp
+    end
+
+    def success_response(request, result)
+      {
+        'jsonrpc' => JSON_RPC_VERSION,
+        'result'  => result,  
+        'id'      => request['id']
+      }
+    end
+
+    def parse_request(post)
+      data = JSON.parse(post)
+      rescue 
+        raise Jimson::ServerError::ParseError.new 
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimson
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &17785440 !ruby/object:Gem::Requirement
+  requirement: &12229180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *17785440
+  version_requirements: *12229180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17780040 !ruby/object:Gem::Requirement
+  requirement: &12228700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *17780040
+  version_requirements: *12228700
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &17779580 !ruby/object:Gem::Requirement
+  requirement: &12225120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *17779580
+  version_requirements: *12225120
 description: 
 email: 
 executables: []
@@ -62,7 +62,6 @@ files:
 - lib/jimson/server_error.rb
 - lib/jimson/response.rb
 - lib/jimson/request.rb
-- lib/jimson/http_server.rb
 - lib/jimson/client.rb
 - spec/server_spec.rb
 - spec/client_spec.rb

data/lib/jimson/http_server.rb

@@ -1,138 +0,0 @@
-require 'jimson/server_error'
-
-module Jimson
-  class HttpServer
-
-    JSON_RPC_VERSION = '2.0'
-
-    def initialize(handler)
-      @handler = handler
-    end
-
-    def call(env)
-      req = Rack::Request.new(env)
-      resp = Rack::Response.new
-      return resp.finish if !req.post?
-      resp.write process(req.body.read)
-      resp.finish
-    end
-
-    def process(content)
-      begin
-        request = parse_request(content)
-        if request.is_a?(Array)
-          raise Jimson::ServerError::InvalidRequest.new if request.empty?
-          response = request.map { |req| handle_request(req) }
-        else
-          response = handle_request(request)
-        end
-      rescue Jimson::ServerError::ParseError, Jimson::ServerError::InvalidRequest => e
-        response = error_response(e)
-      rescue Jimson::ServerError::Generic => e
-        response = error_response(e, request)
-      rescue StandardError, Exception
-        response = error_response(Jimson::ServerError::InternalError.new)
-      end
-
-      response.compact! if response.is_a?(Array)
-
-      return nil if response.nil? || (response.respond_to?(:empty?) && response.empty?)
-
-      response.to_json
-    end
-
-    def handle_request(request)
-      response = nil
-      begin
-        if !validate_request(request)
-          response = error_response(Jimson::ServerError::InvalidRequest.new)
-        else
-          response = create_response(request)
-        end
-      rescue Jimson::ServerError::Generic => e
-        response = error_response(e, request)
-      end
-
-      response
-    end
-
-    def validate_request(request)
-      required_keys = %w(jsonrpc method)
-      required_types = {
-                         'jsonrpc' => [String],
-                         'method'  => [String], 
-                         'params'  => [Hash, Array],
-                         'id'      => [String, Fixnum, NilClass]
-                       }
-      
-      return false if !request.is_a?(Hash)
-
-      required_keys.each do |key|
-        return false if !request.has_key?(key)
-      end
-
-      required_types.each do |key, types|
-        return false if request.has_key?(key) && !types.any? { |type| request[key].is_a?(type) }
-      end
-
-      return false if request['jsonrpc'] != JSON_RPC_VERSION
-      
-      true
-    end
-
-    def create_response(request)
-      params = request['params']
-      begin
-        if params.is_a?(Hash)
-          result = @handler.send(request['method'], params)
-        else
-          result = @handler.send(request['method'], *params)
-        end
-      rescue NoMethodError
-        raise Jimson::ServerError::MethodNotFound.new 
-      rescue ArgumentError
-        raise Jimson::ServerError::InvalidParams.new
-      rescue
-        raise Jimson::ServerError::ApplicationError.new($!)
-      end
-
-      response = success_response(request, result)
-
-      # A Notification is a Request object without an "id" member.
-      # The Server MUST NOT reply to a Notification, including those 
-      # that are within a batch request.
-      response = nil if !request.has_key?('id')
-
-      response 
-    end
-
-    def error_response(error, request = nil)
-      resp = {
-               'jsonrpc' => JSON_RPC_VERSION,
-               'error'   => error.to_h,
-             }
-      if !!request && request.has_key?('id')
-        resp['id'] = request['id'] 
-      else
-        resp['id'] = nil
-      end
-
-      resp
-    end
-
-    def success_response(request, result)
-      {
-        'jsonrpc' => JSON_RPC_VERSION,
-        'result'  => result,  
-        'id'      => request['id']
-      }
-    end
-
-    def parse_request(post)
-      data = JSON.parse(post)
-      rescue 
-        raise Jimson::ServerError::ParseError.new 
-    end
-
-  end
-end