thrift-amqp 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ad28b0f2b399a9849386fa2f3498884b6dfc59
-  data.tar.gz: 613972cd7aebe6456d59d789ff61b6b15494f97f
+  metadata.gz: a39a5e783d243c6a1f4f5a595a6fdcf1fa2552e5
+  data.tar.gz: 4ed02c44bd570c34389a04ae5faa90aa2fec01a2
 SHA512:
-  metadata.gz: 8628a3a69199564f22cfbef12e1425b48ba01acaa2386a1b1c39f19cd788fc6638e435098974fa24b97f3e7a7ef49c96b5cf7efe3d0a7ce313af83da4240f999
-  data.tar.gz: 93097eb1622f65fd459a2a789477db607a6b324652c4773d2e4900146b958be76a87c474568cb371575e52652e09283a457910c4e6a9be3467892ce27b4593fd
+  metadata.gz: 68ef35270696f943921db74310a8524ecb4e8a2cebdab831542604f61fd43a57e1b18ba945de7ec358c45a5035d8228a581bf91d5933646dcb4a89ed01619b9d
+  data.tar.gz: 942a385f3975fcbd85e1990cab57ffe0d2f3ae3a5a6d474e559c5123ff1be8a0935de28f15371d409cdab63a0c0f76b3cd4986e207dfd175a0a59b0630a396f5

data/lib/thrift/amqp/client.rb

@@ -7,20 +7,43 @@ require 'securerandom'
 
 module Thrift
   class AMQPClientTransport < BaseTransport
-    def initialize(amqp_uri, exchange_name, routing_key)
+    class << self
+      def from_channel(channel, exchange_name, routing_key)
+        new(nil, exchange_name, routing_key, channel: channel)
+      end
+    end
+
+    def initialize(amqp_uri, exchange_name, routing_key, opts = {})
       @outbuf = Bytes.empty_byte_buffer
       @inbuf_r, @inbuf_w = IO.pipe(binmode: true)
       @inbuf_w.set_encoding('binary')
-      @conn = Bunny.new(amqp_uri)
 
-      @exchange_name, @routing_key = exchange_name, routing_key
+      if opts[:channel]
+        @channel = opts[:channel]
+      else
+        @conn = Bunny.new(amqp_uri)
+      end
+
+      @opened = false
+      @handle_conn_lifecycle = opts[:channel].nil?
+      @exchange_name = exchange_name
+      @routing_key = routing_key
     end
 
     def open
       return if open?
 
-      @conn.start
-      @channel = @conn.create_channel
+      if @channel.nil? || !@channel.open?
+        unless @conn
+          raise TransportException.new(
+            TransportException::NOT_OPEN, 'channel cosed'
+          )
+        end
+
+        @conn.start
+        @channel = @conn.create_channel
+      end
+
       @service_exchange = @channel.exchange(@exchange_name)
       @reply_queue = @channel.queue('', auto_delete: true, exclusive: true)
 
@@ -28,18 +51,20 @@ module Thrift
         @inbuf_w << Bytes.force_binary_encoding(payload)
         @channel.acknowledge(delivery_info.delivery_tag, false)
       end
+      @opened = true
     end
 
 
     def close
       if open?
         @reply_queue.delete
-        @channel.close
+        @channel.close if @handle_conn_lifecycle
+        @opened = false
       end
     end
 
     def open?
-      @channel && @channel.open?
+      @opened && @channel && @channel.open?
     end
 
     def read(sz)
@@ -66,7 +91,7 @@ module Thrift
     protected
 
     def generate_uuid
-       SecureRandom.hex(13)
+      SecureRandom.hex(13)
     end
   end
 end

data/lib/thrift/amqp/version.rb

@@ -1,5 +1,5 @@
 module Thrift
   module AMQP
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift-amqp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alexis Montagne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler