simplerpc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7738bfae026e0fe2ddedbbd75dcc5013d834c1
-  data.tar.gz: 493f8b4edf16ccd8e4ff094f6a32686837f8e7d0
+  metadata.gz: 35e03bbef72aa8b10a3ce67964e8ad2ae5a0a59d
+  data.tar.gz: b961f842f95b6b1e9b784bbb287c9a493b9ccb0c
 SHA512:
-  metadata.gz: 7681f57a2e91e9dda12e9ceab903b4215a06e39a76bd8dbe3964570cf35a20039aa6333212b5fc532b97997c209c8218d843e56ef59c15b9b7024e8986ab5184
-  data.tar.gz: d588acf4a236dd980f04b612523414c24d3a319ba1d4c7b93b547420538cba8001b2048536ee698bcd41c66dfc8ae28279b310ce0eebd977d051a83421a864a3
+  metadata.gz: c681277ce02e0857e4feb5e7ac937bb13fa28d6f7451914eecfcf46968631c35d2c491210aa89a4cb97bc0fefe3f15ed40ad0e8a492cd57f28a635505c329ed7
+  data.tar.gz: de1c8efba094eea904384d94478f8d891387631cf8bd93684174ef389fa7e7f6c2155fab8bb4c4f5a72ad67c198606ce76a311d494844a6de411da607e23b96c

data/lib/simplerpc/client.rb

@@ -99,7 +99,8 @@ module SimpleRPC
   private
     # Connect to the server
     def _connect
-      @s = TCPSocket.open( @hostname, @port)
+      @s = TCPSocket.open( @hostname, @port )
+      raise "Failed to connect" if not @s
     end
 
     # Receive data from the server

data/lib/simplerpc/server.rb

@@ -11,15 +11,15 @@ module SimpleRPC
 
     # Create a new server for a given proxy object
     #
-    # proxy:: The object to proxy the API for---any ruby object
+    # obj:: The object to proxy the API for---any ruby object
     # port:: The port to listen on
     # hostname:: The ip of the interface to listen on, or nil for all
     # serialiser:: The serialiser to use
     # threaded:: Should the server support multiple clients at once?
     # timeout:: Socket timeout
-    def initialize(proxy, port, hostname=nil, serialiser=Serialiser.new, threaded=false, timeout = nil)
-      @proxy = proxy
-      @port = port
+    def initialize(obj, port, hostname=nil, serialiser=Serialiser.new, threaded=false, timeout=nil)
+      @obj      = obj 
+      @port     = port
       @hostname = hostname
 
       # What format to use.
@@ -60,11 +60,11 @@ module SimpleRPC
             thread = Thread.new(id, @m, @s.accept){|id, m, c|  
               handle_client(c)
 
-              puts "#{id} closing 1"
+              # puts "#{id} closing 1"
               m.synchronize{
                 @clients.delete(id)
               }
-              puts "#{id} closing 2"
+              # puts "#{id} closing 2"
             }
 
             # Add to the client list
@@ -109,14 +109,14 @@ module SimpleRPC
       m, arity = recv(c)
 
       # Check the call is valid for the proxy object
-      valid_call = (@proxy.respond_to?(m) and @proxy.method(m).arity == arity)
+      valid_call = (@obj.respond_to?(m) and @obj.method(m).arity == arity)
 
       send(c, valid_call)
 
       # Make the call if valid and send the result back
       if valid_call then
         args = recv(c)
-        send(c, @proxy.send(m, *args) )
+        send(c, @obj.send(m, *args) )
       end
 
       c.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplerpc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Stephen Wattam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies: []
 description: A very simple and fast RPC library
 email: stephenwattam@gmail.com
@@ -17,9 +17,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/simplerpc/client.rb
-- lib/simplerpc/server.rb
 - lib/simplerpc/socket_protocol.rb
 - lib/simplerpc/serialiser.rb
+- lib/simplerpc/server.rb
 - LICENSE
 homepage: http://stephenwattam.com/projects/simplerpc
 licenses: