json-rpc 0.1.2 → 0.1.4

data/README.md

@@ -38,8 +38,6 @@ class AsyncApp
   AsyncResponse = [-1, {}, []].freeze
   def call env
     result = rpc_call(env)
-    env['async.callback'].call result
-    AsyncResponse
   end
 
   def rpc_sum a, b
@@ -56,7 +54,8 @@ end
 Test it works:
 
 ~~~~~~ {sh}
-$ curl "http://localhost:3000/rpc?jsonrpc=2.0&method=sum&params=%5B21%2C21%5D"
+$ thin -R example.ru -p 4242 -d start
+$ curl "http://localhost:4242/rpc?jsonrpc=2.0&method=sum&params=%5B21%2C21%5D"
 {"jsonrpc":"2.0","id":0,"result":42}
 ~~~~~~
 

data/lib/json-rpc.rb

@@ -20,7 +20,15 @@ module JsonRpc
       ecb.call(e) if ecb
     end
 
-    [status, {'Content-Type' => Rpc::ContentType}, result]
+    header = {'Content-Type' => Rpc::ContentType}
+
+    if result.is_a?(Rpc::AsyncResult)
+      result.status = status
+      result.header = header
+      return [-1, {}, result]
+    end
+
+    [status, header, result]
   end
 
   module Rpc
@@ -43,10 +51,15 @@ module JsonRpc
         @status, @code, @msg, @msg_debug = status, code, msg, msg_debug
       end
       def result
-        res = {"jsonrpc" => "2.0", "id" => id,
-          "error" => {"code" => code, "message" => msg}
+        res = {
+          "id" => id,
+          "jsonrpc" => "2.0",
+          "error" => {
+            "code" => code,
+            "message" => msg
+          }
         }
-        res.delete_if { |k, v| v == nil}
+        res.delete_if { |k, v| v == nil }
         res.to_json
       end
       def to_s
@@ -73,14 +86,14 @@ module JsonRpc
         case env["REQUEST_METHOD"]
         when "POST"
           JSON.parse(env["rack.input"].read)
-        when "GET"
+        when /^(GET|HEAD)$/
           req = Rack::Request.new(env)
           obj = req.params
           obj["id"] = obj["id"].to_i
           obj["params"] = obj["params"] ? JSON::parse(obj["params"]) : []
           obj
         else
-          raise error :invalid_request, nil, "invalid params: #{obj.inspect}"
+          raise error :invalid_request, nil, "unsupported method #{env["REQUEST_METHOD"]} params: #{obj.inspect}"
         end
 
       rescue JSON::ParserError => e
@@ -114,12 +127,34 @@ module JsonRpc
       include EventMachine::Deferrable
 
       attr_reader :response
-      attr_accessor :id
+      attr_accessor :id, :status, :header
+
+      def initialize env = nil
+        @env = env
+        @status = 200
+        @header = {}
+        @header_sent = false
+      end
+
+      def send_header
+        raise "You should pass env to AsyncResult.new()" unless @env
+        @env['async.callback'].call([@status, @header, self]) unless @header_sent
+        @header_sent = true
+      end
 
       def reply obj
+        send_header unless @callback
         @callback.call(Rpc::forge_response(obj, @id))
       end
 
+      def failed error_code = :internal_error, msg = nil
+        e = Rpc::error(error_code, id, msg)
+        @status = e.status
+        send_header
+        @callback.call(e.result)
+        succeed
+      end
+
       #FIXME thin specific
       def each &blk
         @callback = blk

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Helios Technologies Ltd.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 +02:00
+date: 2011-06-27 00:00:00 +02:00
 default_executable: 
 dependencies: []