basicjrpc 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdcef5f3800242109be9129475df1d062568488a
-  data.tar.gz: 0d8663d9b0603cd6552976570dcc5107b6698321
+  metadata.gz: 7930f78b3478426590b09c94e7fc74eb76b9ccde
+  data.tar.gz: d41ba8345db35635b569fd567246a99480cd4eab
 SHA512:
-  metadata.gz: d3e3c2b3102d42cdda1752a8f68ce5fc63604389663e26764ce2e63b52edbad47122172be684306ffce910ae8cd449e802c854b55c5c803ea14105722c9d8338
-  data.tar.gz: 87c4b8c493eecc3bb3cd09fcf662ffbea6a95d70c369e4d81d4166f79424d5ac909270de7c4af7db82b44abaf12ef185a8c7a4c3e8512d2c178076b11167a956
+  metadata.gz: 7d54fdabe946a4ad92d167d79554ae97cf059425d201464334ce738254f6d9d43771bf3f500fbb01ccd5d9d152170ea1467b2f59f49d2d07512216b0ea6bec16
+  data.tar.gz: 64166ea2d92d8d4f630afb8f7411045c054b75d110c57a8d537e36898669264c2bc8b3691682a43fc88429c2e1a7d6072cda7bf1492fc5814566322f01782879

data/lib/basicjrpc/client.rb

@@ -5,20 +5,22 @@ module BasicJRPC
     def initialize(queue, timeout = 5)
       @redis = Redis.new(host: "redis")
       @queue = queue
-      @payload = nil
+      @payload = {}
       @timeout = timeout
     end
     
     def method_missing(m, *args, &block)
-      send_request(Payload.new(m, args))
+      send_request({ method_name: m, method_arguments: *args })
     end
     
     def send_request payload
-      payload.response_requested = true
+      payload[:message_id] = SecureRandom.uuid
+      payload[:response] = true
+      
       @redis.rpush(@queue, Oj.dump(payload))
       
       Timeout::timeout(@timeout) {
-        return Oj.load(@redis.blpop(payload.message_id)[1]) 
+        return Oj.load(@redis.blpop(payload[:message_id])[1]) 
       }
     end
   end
@@ -26,7 +28,8 @@ module BasicJRPC
   # Fire And Forget Client
   class FAFClient < Client
     def send_request payload
-      payload.response_requested = false
+      payload[:message_id] = SecureRandom.uuid
+      payload[:response] = true
       @redis.rpush(@queue, Oj.dump(payload))
     end
   end

data/lib/basicjrpc/hash.rb

@@ -0,0 +1,5 @@
+class Hash
+  def method_missing(sym,*)
+    fetch(sym){fetch(sym.to_s){super}}
+  end
+end

data/lib/basicjrpc/server.rb

@@ -12,10 +12,10 @@ module BasicJRPC
       while true
         payload = @redis.blpop(@queue)[1]
         payload = Oj.load(payload)
-        puts "Processing message #{payload.method_name} #{payload.args}" if BasicJRPC::Config.debug
+        puts "Processing message #{payload.method_name} #{payload.method_arguments}" if BasicJRPC::Config.debug
         
         # Should always return a data object
-        response = @injected_class.send(payload.method_name, *payload.args)
+        response = @injected_class.send(payload.method_name, *payload.method_arguments)
           
         # Bounce the response back if response is requested
         @redis.rpush(payload.message_id, Oj.dump(response)) if payload.response_requested

data/lib/basicjrpc/version.rb

@@ -1,3 +1,3 @@
 module BasicJRPC
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Martin Simpson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ files:
 - bin/setup
 - lib/basicjrpc.rb
 - lib/basicjrpc/client.rb
-- lib/basicjrpc/client/payload.rb
+- lib/basicjrpc/hash.rb
 - lib/basicjrpc/server.rb
 - lib/basicjrpc/version.rb
 homepage: http://www.martin-simpson.net

data/lib/basicjrpc/client/payload.rb

@@ -1,17 +0,0 @@
-module BasicJRPC
-  class Client
-    
-    class Payload
-      attr_reader :message_id, :method_name, :args
-      attr_accessor :response_requested
-      
-      def initialize(method_name, args)
-        @message_id = SecureRandom.uuid
-        @method_name = method_name
-        @args = args
-      end
-        
-    end
-    
-  end
-end