barrister-amqp 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c06cedf7afd42e8b3f300be62da1abe0c3adff
-  data.tar.gz: 4d4c8fd93a937b7d9eea6f3a7b0b83049077467a
+  metadata.gz: 5d666f62d0f15f879db33946493805770f7ebdfe
+  data.tar.gz: 08092e239d1262a62d7acfde0469794733b362b3
 SHA512:
-  metadata.gz: 08986cbb2aaf996b1051560ec31187d1907091cf85bcc9f1fd0d1d48caaf3899e0bd585bd9fdbafd7d152be6b41d877db175a57fca15e386ddb8707a03fb6e80
-  data.tar.gz: cba7f4b7705efb61530e0385a342c3d95d854f108ff05072f927e5119581f2ae5406137aa459bd09f44dd846cbe25a3627be2dbb2c0f28a2135a840de3bae78d
+  metadata.gz: b1a1b715eebd09298c9cc83be12a21761eb4005d266a02f4d739c5256d2d9e31b02169de9007fd9acf2c88db2ab2191af0ce37af224405d58388076e04402923
+  data.tar.gz: 5af09b06d43e9564c4fac114759f341a19a79b9e43a91bf0d772ae0538ea51a4475b99479100de5bf983739b03f58c4d22e33985670d8d5ca7436315a3343d0f

data/lib/barrister/amqp.rb

@@ -3,16 +3,31 @@ require 'bunny'
 
 module Barrister
   module Amqp
+    Wrapper = Struct.new(:message) do
+      def wrap
+        {
+          "id"      => Barrister.rand_str(22),
+          "message" => JSON.generate(message, { :ascii_only=>true })
+        }
+      end
+
+      def unwrap
+        message
+      end
+    end
+
+    Config = OpenStruct.new(debug: false, wrapper: Wrapper)
+
     class Transport
       # NOTE: transport needs to implement request method for the Barrister::Client to
       # send requests to the server
       def initialize(service_name, options={})
         conn = Bunny.new ENV.fetch('AMQP_URL') #"Please set AMQP_URL to something like: amqp://user:password@host:port/vhost"
         conn.start
-        @ch = conn.create_channel
-        @service_q = @ch.queue(service_name, auto_delete: false)
-        @reply_q   = @ch.queue('', exclusive: true)
-        @x = @ch.default_exchange
+        @ch             = conn.create_channel
+        @service_q      = @ch.queue(service_name, auto_delete: false)
+        @reply_q        = @ch.queue('', exclusive: true)
+        @x              = @ch.default_exchange
         @response_table = Hash.new { |h,k| h[k] = Queue.new }
 
         @reply_q.subscribe(block: false) do |delivery_info, properties, payload|
@@ -21,14 +36,18 @@ module Barrister
       end
 
       def request(message)
-        @x.publish(JSON.generate(message, { :ascii_only=>true }), { correlation_id: message['id'], reply_to: @reply_q.name, routing_key: @service_q.name})
+        enveloppe = Config.wrapper.new(message).wrap
+        # NOTE message could be an array
+        print "[AMQP TRANSPORT --->] \n #{enveloppe} \n" if Config.debug
+        @x.publish(enveloppe['message'], { correlation_id: enveloppe['id'], reply_to: @reply_q.name, routing_key: @service_q.name})
 
-        response = @response_table[message['id']].pop
-        @response_table.delete message['id']
+        response = @response_table[enveloppe['id']].pop
+        @response_table.delete enveloppe['id']
 
         begin
-          puts "got response: #{JSON.parse(response)}"
-          JSON.parse(response)
+          JSON.parse(response).tap do |resp|
+            print "[AMQP TRANSPORT <---] \n #{resp} \n" if Config.debug
+          end
         rescue JSON::ParserError => e
           raise RpcException.new(-32000, "Bad response #{e.message}")
         end
@@ -62,7 +81,8 @@ module Barrister
 
       def start
         @service_q.subscribe(block: true) do |delivery_info, properties, payload|
-          puts "handle #{payload}"
+          payload = Config.wrapper.new(payload).unwrap
+          puts "handling payload:  #{payload}" if Config.debug
           @x.publish(@server.handle_json(payload), { routing_key: properties.reply_to, correlation_id: properties.correlation_id })
         end
       end

data/lib/barrister/amqp/version.rb

@@ -1,5 +1,5 @@
 module Barrister
   module Amqp
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barrister-amqp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - gregory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny