farcall 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ccf7c600e32b64b16b3ee5e278064bef7214274
-  data.tar.gz: 2e7fc842321b53483a09b02caf9cc9c8fc8af85f
+  metadata.gz: 963744c3ea9c75aceaed2bd2add46e9d6a39e88d
+  data.tar.gz: 1debec27b99b58d68314425b47999c12499e1e39
 SHA512:
-  metadata.gz: 611fea3359ae86917d1625f8b1daf79e78c4cf20421a8ee64d3e679a00fbe0007a8bd79a551fb9e24bf6d38e3eea47dc9e77ac92927cb05c7c66f51d0ae8749e
-  data.tar.gz: 4010ab7cf9dbe52c2e4ca519c3df823a5ea104ff7783118340e576ebd2551c0866b20967c55b82e0a8a23e00a7314a73362efb433db6da9f092a8386c1388afe
+  metadata.gz: 2ddc0f4b278c77c6671ab8f612355729de473b309389dc208ff1d51753907d0abac92aa3f7bda719cff39975134018123d032c7700c231e4be464d0e4218e0a0
+  data.tar.gz: 6fdf6349dbd2644641d8ccc3aed7bb0716bf2b7f40545cf02dc7b3a4384dead4f197dd03e55fa8c6ee8e0b466d6987591f565b28a208dfcf8c2a346ae4bd9215

data/lib/farcall/endpoint.rb

@@ -30,10 +30,11 @@ module Farcall
           abort :format_error, $!
         end
       }
-      @send_lock                  = Mutex.new
-      @receive_lock               = Mutex.new
 
-      @waiting = {}
+      @send_lock    = Mutex.new
+      @receive_lock = Mutex.new
+      @handlers     = {}
+      @waiting      = {}
     end
 
     # The provided block will be called if endpoint functioning will be aborted.
@@ -123,14 +124,32 @@ module Farcall
       result
     end
 
-    # Process remote commands. Not that provider have precedence at the moment.
-    # Provided block will be executed on every remote command taking parameters
-    # |name, args, kwargs|. Whatever block returns will be passed to a calling party.
-    # The same any exception that the block might raise would be send back to caller.
+    # Process remote commands. Provided block will be executed on every remote command
+    # taking parameters |name, args, kwargs|. Whatever block returns will be passed to a calling
+    # party. The same any exception that the block might raise would be send back to caller.
+    #
+    # this block will be called onlly of there wes no `provider` specified and no #on handler set
+    # for the command being executed.
+    #
     def on_remote_call &block
       @on_remote_call = block
     end
 
+    alias on_command on_remote_call
+
+    # Set handler to perform the named command. Block will be called when the remote party calls
+    # with parameters passed from the remote. The block returned value will be passed back to
+    # the caller.
+    #
+    # The provider if set is calling instead.
+    #
+    # If the block raises the exception it will be reported to the caller as an error (depending
+    # on it's platofrm, will raise exception on its end or report error)
+    def on(name, &block)
+      @handlers[name.to_s] = block
+    end
+
+
     # Get the Farcall::RemoteInterface connnected to this endpoint. Any subsequent calls with
     # return the same instance.
     def remote
@@ -175,6 +194,8 @@ module Farcall
                          args << fixed
                        end
                        @provider.send :remote_call, cmd.to_sym, args
+                     elsif (h = @handlers[cmd.to_s])
+                       h.call args, kwargs
                      elsif @on_remote_call
                        @on_remote_call.call cmd, args, kwargs
                      end

data/lib/farcall/version.rb

@@ -1,3 +1,3 @@
 module Farcall
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/endpoint_spec.rb

@@ -17,7 +17,7 @@ class TestProvider < Farcall::Provider
   end
 
   def get_hash
-    { 'foo' => 'bar', 'bardd' => 'buzz', 'last' => 'item', 'bar' => 'test'}
+    { 'foo' => 'bar', 'bardd' => 'buzz', 'last' => 'item', 'bar' => 'test' }
   end
 
   private
@@ -33,7 +33,7 @@ class StringProvider < Farcall::Provider
   end
 
   def provide_hash
-    { 'bar' => 'test', 'foo' => 'bar'}
+    { 'bar' => 'test', 'foo' => 'bar' }
   end
 
   def value
@@ -44,6 +44,21 @@ end
 describe 'endpoint' do
   include Farcall
 
+  it 'runs on commands' do
+    tc = Farcall::LocalConnection.new
+
+    ea = Farcall::Endpoint.new tc.a
+    eb = Farcall::Endpoint.new tc.b
+
+    ea.on('command_one') { |args, kwargs|
+      { 'return_one': [args, kwargs] }
+    }
+    rs = eb.remote.command_one("uno", 'due', tre: 3)
+    rs.return_one[0].should == ['uno', 'due']
+    rs.return_one[1].should == { 'tre' => 3}
+
+  end
+
   it 'should do RPC call with provider/interface' do
     tc = Farcall::LocalConnection.new
 
@@ -72,6 +87,7 @@ describe 'endpoint' do
     expect(-> { i.abort() }).to raise_error Farcall::RemoteError, /NoMethodError/
     expect(-> { i.doncallpublic() }).to raise_error Farcall::RemoteError, /NoMethodError/
     expect(-> { i.initialize(1) }).to raise_error Farcall::RemoteError, /NoMethodError/
+    expect(-> { i.endpoint.call(:class, 1) }).to raise_error Farcall::RemoteError, /NoMethodError/
   end
 
   def check_protocol format

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farcall
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - sergeych