json-rpc 0.1.4 → 0.1.5

data/README.md

@@ -37,7 +37,7 @@ class AsyncApp
   include JsonRpc
   AsyncResponse = [-1, {}, []].freeze
   def call env
-    result = rpc_call(env)
+    rpc_call(env)
   end
 
   def rpc_sum a, b

data/lib/json-rpc.rb

@@ -23,6 +23,7 @@ module JsonRpc
     header = {'Content-Type' => Rpc::ContentType}
 
     if result.is_a?(Rpc::AsyncResult)
+      result.env = env
       result.status = status
       result.header = header
       return [-1, {}, result]
@@ -53,7 +54,7 @@ module JsonRpc
       def result
         res = {
           "id" => id,
-          "jsonrpc" => "2.0",
+          "jsonrpc" => Version,
           "error" => {
             "code" => code,
             "message" => msg
@@ -117,8 +118,7 @@ module JsonRpc
     end
 
     def self.forge_response result, id = nil
-      return nil if id == nil
-      {"jsonrpc" => "2.0", "id" => id, "result" => result}.to_json
+      {"jsonrpc" => Version, "id" => id.to_i, "result" => result}.to_json
     end
 
     # The class RpcDeferrable is useful helps you to build a Json Rpc server
@@ -127,7 +127,7 @@ module JsonRpc
       include EventMachine::Deferrable
 
       attr_reader :response
-      attr_accessor :id, :status, :header
+      attr_accessor :id, :status, :header, :env
 
       def initialize env = nil
         @env = env

data/test/functional/app-mixed.ru

@@ -0,0 +1,118 @@
+require 'pp'
+$: << File::join(File::dirname(__FILE__), "../../")
+require 'lib/json-rpc'
+
+class SimpleApp
+  include JsonRpc
+  alias :call :rpc_call
+
+  def rpc_sum a, b
+    a + b
+  end
+
+  def rpc_true
+    true
+  end
+
+  def rpc_false
+    false
+  end
+
+  def rpc_array
+    [1,2,3]
+  end
+
+  def rpc_empty_array
+    []
+  end
+
+  def rpc_hash
+    {
+      "a" => "Apple",
+      "b" => "Banana"
+    }
+  end
+
+  def rpc_repeat *params
+    params
+  end
+
+end
+
+class AsyncApp
+  include JsonRpc
+  alias :call :rpc_call
+
+  def rpc_sum a, b
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      result.reply a + b
+      result.succeed
+    end
+    result
+  end
+
+  def rpc_true
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      result.reply true
+      result.succeed
+    end
+    result
+  end
+
+  def rpc_false
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      result.reply false
+      result.succeed
+    end
+    result
+  end
+
+  def rpc_array
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      result.reply [1,2,3]
+      result.succeed
+    end
+    result
+  end
+
+  def rpc_empty_array
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      result.reply []
+      result.succeed
+    end
+    result
+  end
+
+  def rpc_hash
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      result.reply("a" => "Apple", "b" => "Banana")
+      result.succeed
+    end
+    result
+  end
+
+  def rpc_repeat *params
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      result.reply params
+      result.succeed
+    end
+    result
+  end
+
+end
+
+map '/rpc-sync' do
+  run SimpleApp.new
+end
+
+map '/rpc-async' do
+  run AsyncApp.new
+end
+

data/test/functional/rpc-test.rb

@@ -0,0 +1,51 @@
+require 'test/unit'
+require 'net/http'
+require 'uri'
+require 'cgi'
+require 'json'
+require 'pp'
+
+
+class RpcTest < Test::Unit::TestCase
+
+  def initialize *args
+    @rpc_path = self.is_a?(SyncTest) ? '/rpc-sync' : '/rpc-async'
+    @rpc_url = URI.parse('http://localhost:4242')
+    super *args
+  end
+
+  def call method_rpc, *params, &blk
+    if blk
+      [:get, :post].each do |method_http|
+        blk.call rpc_call(method_http, method_rpc, *params)
+      end
+    else
+      rpc_call :get, method_rpc, *params
+    end
+  end
+
+  private
+  def rpc_call method_http, method_rpc, *params
+    rpc_request =  {
+      :jsonrpc => "2.0",
+      :method => method_rpc,
+      :params => params,
+    }
+
+    res = Net::HTTP.start(@rpc_url.host, @rpc_url.port) do |http|
+      case method_http
+      when :get
+        rpc_request[:params] = CGI::escape(rpc_request[:params].to_json)
+        http.get @rpc_path + "?" + rpc_request.map{|a,b| "#{a}=#{b}"}.join("&")
+      when :post
+        req = Net::HTTP::Post.new(@rpc_path)
+        req.body = rpc_request.to_json
+        http.request(req)
+        else
+        raise "Unknown HTTP method #{method_http}"
+      end
+    end
+
+    JSON::parse(res.body)
+  end
+end

data/test/functional/test-mixed.rb

@@ -0,0 +1,63 @@
+require 'rpc-test'
+
+module MixedTest
+  def test_true
+    call("true") { |obj|
+      assert_equal true, obj["result"]
+    }
+  end
+
+  def test_false
+    call("false") { |obj|
+      assert_equal false, obj["result"]
+    }
+  end
+
+  def test_empty_array
+    call("empty_array") { |obj|
+      assert_equal [], obj["result"]
+    }
+  end
+
+  def test_array
+    call("array") { |obj|
+      assert_equal [1,2,3], obj["result"]
+    }
+  end
+
+  def test_hash
+    call("hash") { |obj|
+      exp_result = {
+        "a" => "Apple",
+        "b" => "Banana"
+      }
+      assert_equal exp_result, obj["result"]
+    }
+  end
+
+  def test_repeat_one
+    call("repeat", 42) { |obj|
+      assert_equal [42], obj["result"]
+    }
+  end
+
+  def test_repeat_two
+    call("repeat", 21, 21) { |obj|
+      assert_equal [21, 21], obj["result"]
+    }
+  end
+
+  def test_repeat_hash
+    call("repeat", "a" => "Apple", "b" => "Banana") { |obj|
+      assert_equal(["a" => "Apple", "b" => "Banana"], obj["result"])
+    }
+  end
+end
+
+class SyncTest < RpcTest
+  include MixedTest
+end
+
+class AsyncTest < RpcTest
+  include MixedTest
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Helios Technologies Ltd.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 +02:00
+date: 2011-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,10 @@ extra_rdoc_files: []
 
 files: 
 - lib/json-rpc.rb
-- test/test_rpc_module.rb
+- test/unit/test_rpc_module.rb
+- test/functional/test-mixed.rb
+- test/functional/app-mixed.ru
+- test/functional/rpc-test.rb
 - example/async_app.ru
 - example/rack_app.ru
 - README.md