em_remote_call 0.0.4 → 0.0.5

data/lib/em_remote_call/client.rb

@@ -8,7 +8,10 @@ module EM::RemoteCall
     end
     
     define_method name do |*method_opts, &callb|
-      return unless self.class.remote_connection
+      remote_connection =
+        (self.class.respond_to?(:remote_connection) && self.class.remote_connection) ||
+        (self.respond_to?(:remote_connection)       && self.remote_connection)
+      return unless remote_connection
       
       callback = EM::RemoteCall::Deferrable.new
       callback.callback(&callb) if callb
@@ -23,7 +26,7 @@ module EM::RemoteCall
         :deferrable_id => callback.object_id                  # store the callbacks object_id to retrieve it later
       }
       
-      self.class.remote_connection.call call
+      remote_connection.call call
       return callback
     end
   end

data/lib/em_remote_call/server.rb

@@ -23,11 +23,7 @@ class EM::RemoteCall::Call
   end
   
   def call(&callb)
-    if @argument
-      @instance.__send__ @method, @argument, &callb
-    else
-      @instance.__send__ @method, &callb
-    end
+    @argument ? @instance.__send__(@method, @argument, &callb) : @instance.__send__(@method, &callb)
   end
 end
 

data/lib/em_remote_call/version.rb

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

data/spec/integration_spec.rb

@@ -28,7 +28,10 @@ class ServerTrack < Track
     "started #{id}"
   end
   def raise_hell
-    EM.next_tick{raise 'foobar'}
+    raise 'foobar'
+  end
+  def self.some_class_meth
+    yield
   end
 end
 
@@ -37,6 +40,11 @@ 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
+  
+  class << self
+    extend EM::RemoteCall
+    remote_method :some_class_meth, :class_name => 'ServerTrack'
+  end
 end
 
 class EMController
@@ -94,4 +102,13 @@ describe EM::RemoteCall do
       end
     end
   end
+  describe "client side class method" do
+    it "should work :)" do
+      test_on_client do
+        callb = mock(:callb)
+        callb.should_receive(:foo)
+        ClientTrack.some_class_meth{callb.foo}
+      end
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Niko Dittmann