em_remote_call 0.0.5 → 0.0.6

data/lib/em_remote_call/server.rb

@@ -33,8 +33,17 @@ module EM::RemoteCall::Server
   def json_parsed(hash)
     remote_call = EM::RemoteCall::Call.new hash[:instance], hash[:method].to_sym, hash[:argument]
     
-    remote_call.call do |blk_value|
-      send_data({:deferrable_id => hash[:deferrable_id], :success => blk_value})
+    ret = remote_call.call do |result|
+      send_data({:deferrable_id => hash[:deferrable_id], :success => result})
+    end
+    
+    if ret.is_a? EM::Deferrable
+      ret.callback do |result|
+        send_data({:deferrable_id => hash[:deferrable_id], :success => result})
+      end
+      ret.errback do |result|
+        send_data({:deferrable_id => hash[:deferrable_id], :error => result})
+      end
     end
     
   rescue => e

data/lib/em_remote_call/version.rb

@@ -1,3 +1,3 @@
 module EmRemoteCall
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/integration_spec.rb

@@ -30,6 +30,12 @@ class ServerTrack < Track
   def raise_hell
     raise 'foobar'
   end
+  def with_deferrable(outcome = 'succeed') # does not take a block
+    d = EventMachine::DefaultDeferrable.new
+    d.send outcome
+    return d
+  end
+  
   def self.some_class_meth
     yield
   end
@@ -40,6 +46,7 @@ class ClientTrack < Track
   remote_method :init_track_on_server, :class_name => 'ServerTrack', :calls => :new
   remote_method :play,                 :class_name => 'ServerTrack', :find_by => :id
   remote_method :raise_hell,           :class_name => 'ServerTrack', :find_by => :id
+  remote_method :with_deferrable,      :class_name => 'ServerTrack', :find_by => :id
   
   class << self
     extend EM::RemoteCall
@@ -111,4 +118,43 @@ describe EM::RemoteCall do
       end
     end
   end
+  describe "with a deferrable" do
+    describe "on success" do
+      describe "with a block" do
+        it "should use the block as callback" do
+          test_on_client do
+            callb = mock(:callb)
+            callb.should_receive(:foo).with()
+            c = ClientTrack.new
+            c.init_track_on_server({})
+            c.with_deferrable(:succeed){ callb.foo }
+          end
+        end
+      end
+      describe "with callback" do
+        it "should use callback" do
+          test_on_client do
+            callb = mock(:callb)
+            callb.should_receive(:foo).with()
+            c = ClientTrack.new
+            c.init_track_on_server({})
+            play_call = c.with_deferrable(:succeed)
+            play_call.callback{ callb.foo }
+          end
+        end
+      end
+    end
+    describe "on error" do
+      it "should use errback" do
+        test_on_client do
+          callb = mock(:callb)
+          callb.should_receive(:foo).with()
+          c = ClientTrack.new
+          c.init_track_on_server({})
+          play_call = c.with_deferrable(:fail)
+          play_call.errback{ callb.foo }
+        end
+      end
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Niko Dittmann
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +01:00
+date: 2010-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency