basicjrpc 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63441e02504044beac3160b3098b6d04e1d0d714
-  data.tar.gz: 58d5a87b69db8a4b7f46156ead1aafc2ab24de4e
+  metadata.gz: 4f5025616b2381b62821c3fe4a2d2a843fe2835e
+  data.tar.gz: f03a80fd40f834d7a7599f68e4390ae2869cb261
 SHA512:
-  metadata.gz: e1813a1011e50d6fbb6ed09dbe81cc190b28cde2f79a17fa8282a9588b2612386674712780b1d7b70471aac88ea83de2e91236d565ded91c4ed405f925977fbb
-  data.tar.gz: 89594388c67ec881fcf1d808adea5a93ae4696eeb19b8b5bcfdee11afe922cbf30b28cb8c201d6aa308e02e5ccf553b0afb2cbdd7108d8c2254143b077f026c9
+  metadata.gz: c4a6b2d864f0b9499723989880b9954521c333f842e9bc5c9789d3480f66cdd3e01fe7a271a4b1158d4dd97f3dcf5dd727e43c30c8c6c27af3d67ce0cdb66ca5
+  data.tar.gz: 03f8a11227cf890094488191ecca52dbe6408fb4c8d5634c6133886e8f3a7ff35835ff8e7cbfae7b8ca7c0dd07f84094e3f81b69a91bca19997773f6a90a6809

data/basicjrpc.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency 'redis'
+  spec.add_runtime_dependency 'nsq'
   spec.add_runtime_dependency 'oj'  
   spec.add_runtime_dependency 'require_all'
 end

data/lib/basicjrpc.rb

@@ -13,7 +13,7 @@ module BasicJRPC
     end
     
     def self.debug
-      defined?(@@debug) ? @@debug : false
+      @@debug || false
     end
   end
 end

data/lib/basicjrpc/client.rb

@@ -3,7 +3,7 @@ module BasicJRPC
   # Responding Client
   class Client
     def initialize(queue, timeout = 5)
-      @redis = Redis.new(host: "redis")
+      @nsq_producer = Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: queue)
       @queue = queue
       @payload = {}
       @timeout = timeout
@@ -17,11 +17,9 @@ module BasicJRPC
       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]) 
-      }
+      @nsq_producer.write(Oj.dump(payload))
+
+      return Oj.load(Nsq::Consumer.new(nsqlookupd: 'dockerlb:4161',topic: payload[:message_id], channel: 'client').pop)
     end
   end
 
@@ -30,7 +28,7 @@ module BasicJRPC
     def send_request payload
       payload[:message_id] = SecureRandom.uuid
       payload[:response] = true
-      @redis.rpush(@queue, Oj.dump(payload))
+      @nsq_producer.write(Oj.dump(payload))
     end
   end
   

data/lib/basicjrpc/server.rb

@@ -4,21 +4,20 @@ module BasicJRPC
     def initialize queue, injected_class
       @injected_class = injected_class
       @queue = queue
-      @redis = Redis.new(host: "redis")
+      @nsq_consumer = Nsq::Consumer.new(nsqlookupd: 'dockerlb:4161', topic: @queue, channel: 'server')
     end
     
     def listen
       puts "Listening..."
       while true
-        payload = @redis.blpop(@queue)[1]
-        payload = Oj.load(payload)
-        puts "Processing message #{payload.method_name} #{payload.method_arguments}" if BasicJRPC::Config.debug
+        payload = Oj.load(@nsq_consumer.pop)
+        puts "Processing message #{payload.method_name} #{payload.method_arguments}"
         
         # Should always return a data object
         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
+        Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: payload.message_id).write(Oj.dump(response)) if payload.response
       end
     end
     

data/lib/basicjrpc/version.rb

@@ -1,3 +1,3 @@
 module BasicJRPC
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Martin Simpson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: nsq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="