json-rpc 0.1.5 → 0.1.6

data/lib/json-rpc.rb

@@ -13,11 +13,13 @@ module JsonRpc
       request = Rpc::parse env
       status = Rpc::validate request
       result = Rpc::route request, self
-
-    rescue Rpc::Error => e
+    rescue Exception, Rpc::Error => e
+      ecb.call(e) if ecb
+     unless e.is_a?(Rpc::Error)
+        e = Rpc::error :internal_error
+      end
       status = e.status
       result = e.result
-      ecb.call(e) if ecb
     end
 
     header = {'Content-Type' => Rpc::ContentType}

data/test/functional/#app-mixed.ru#

@@ -0,0 +1,75 @@
+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 initialize
+    @simple = SimpleApp.new
+    @simple.methods.find{ |name| name.to_s =~ /^rpc_/}.each do |name|
+      self.
+    end
+  end
+
+  def method_missing method, *args
+    result = Rpc::AsyncResult.new
+    EventMachine::next_tick do
+      e = catch(:Error) {
+        result.reply SimpleApp.new.send(method, *args)
+        result.succeed
+        nil
+      }
+      result.failed e[:code], e[:msg] if e
+    end
+    result
+  end
+
+end
+
+map '/rpc-sync' do
+  run SimpleApp.new
+end
+
+map '/rpc-async' do
+  run AsyncApp.new
+end
+

data/test/functional/app-mixed.ru

@@ -44,68 +44,61 @@ class AsyncApp
   alias :call :rpc_call
 
   def rpc_sum a, b
-    result = Rpc::AsyncResult.new
-    EventMachine::next_tick do
-      result.reply a + b
-      result.succeed
+    wrap_async do
+      a + b
     end
-    result
   end
 
   def rpc_true
-    result = Rpc::AsyncResult.new
-    EventMachine::next_tick do
-      result.reply true
-      result.succeed
+    wrap_async do
+      true
     end
-    result
   end
 
   def rpc_false
-    result = Rpc::AsyncResult.new
-    EventMachine::next_tick do
-      result.reply false
-      result.succeed
+    wrap_async do
+      false
     end
-    result
   end
 
   def rpc_array
-    result = Rpc::AsyncResult.new
-    EventMachine::next_tick do
-      result.reply [1,2,3]
-      result.succeed
+    wrap_async do
+      [1,2,3]
     end
-    result
   end
 
   def rpc_empty_array
-    result = Rpc::AsyncResult.new
-    EventMachine::next_tick do
-      result.reply []
-      result.succeed
+    wrap_async do
+      []
     end
-    result
   end
 
   def rpc_hash
-    result = Rpc::AsyncResult.new
-    EventMachine::next_tick do
-      result.reply("a" => "Apple", "b" => "Banana")
-      result.succeed
+    wrap_async do
+      {"a" => "Apple", "b" => "Banana"}
     end
-    result
   end
 
   def rpc_repeat *params
+    wrap_async do
+      params
+    end
+  end
+
+  private
+
+  def wrap_async &block
     result = Rpc::AsyncResult.new
     EventMachine::next_tick do
-      result.reply params
-      result.succeed
+      e = catch(:Error) {
+        result.reply block.call result
+        result.succeed
+        nil
+      }
+      result.failed e[:code], e[:msg] if e
     end
     result
   end
-
 end
 
 map '/rpc-sync' do

data/test/functional/rpc-test.rb

@@ -1,22 +1,29 @@
 require 'test/unit'
-require 'net/http'
-require 'uri'
-require 'cgi'
+require 'mechanize'
 require 'json'
 require 'pp'
-
+require 'cgi'
 
 class RpcTest < Test::Unit::TestCase
 
+  attr_reader :session
+
   def initialize *args
     @rpc_path = self.is_a?(SyncTest) ? '/rpc-sync' : '/rpc-async'
-    @rpc_url = URI.parse('http://localhost:4242')
+    @rpc_url = 'http://localhost:4242'
+    @get_off = @post_off = false
+    new_session
     super *args
   end
 
+  attr_accessor :post_off, :get_off
+
   def call method_rpc, *params, &blk
+    types = []
+    types.push :get unless @get_off
+    types.push :post unless @post_off
     if blk
-      [:get, :post].each do |method_http|
+      types.each do |method_http|
         blk.call rpc_call(method_http, method_rpc, *params)
       end
     else
@@ -24,6 +31,13 @@ class RpcTest < Test::Unit::TestCase
     end
   end
 
+  def new_session session = nil
+    session = Mechanize.new unless session
+    priv_session = @session
+    @session = session
+    priv_session
+  end
+
   private
   def rpc_call method_http, method_rpc, *params
     rpc_request =  {
@@ -32,18 +46,19 @@ class RpcTest < Test::Unit::TestCase
       :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
+    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("&")
+      rpc_request[:params] = rpc_request[:params].to_json
+      res = @session.get(@rpc_url + @rpc_path, rpc_request)
+    when :post
+      res = @session.post(@rpc_url + @rpc_path, rpc_request.to_json)
+       # req = Net::HTTP::Post.new(@rpc_path)
+       # req.body = rpc_request.to_json
+       # http.request(req)
+    else
+      raise "Unknown HTTP method #{method_http}"
     end
 
     JSON::parse(res.body)

metadata

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