ruby_rabbitmq_janus 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47210929d2091a11e4fe5430763ba83bee5d5306
-  data.tar.gz: 95733e7ac3ceac85f893f761440ba68447a1f51c
+  metadata.gz: 76490748dbcbce0d3606a8d84fefd42800e8d97e
+  data.tar.gz: 69035df3de8ca318aa87713b33dbfa59162b6b59
 SHA512:
-  metadata.gz: efc53b14b7d13c1ce73c0f3da5e8c666a47c7e1f7065d529776c2c30e5d2680343311c1185826fe1372e8c0854c22d1c6e53301460aff704349dbabc3bd989c1
-  data.tar.gz: c146be172fc950ae710b5e78725e11c8770ec58155856352c7b35355362a8ee8e4763802d92d06719260ab77340f965a0cc615bbbb7225a7c44f0cd9ff3cf458
+  metadata.gz: 24ad5159c111dfbe7bb519e1bd8fac05bd910a36ab0842bb913ba0c2fe1a7e336dfa902a133087a1d01f1b568362bef0a4a06568acf8372191edb784ea0fb773
+  data.tar.gz: 94a3ad0f6ba5eb0c3949b48f9b3a7cfb5b9332248a917ef59726fabd42714b45567ca10805788feb836fd17ddc88e48127b67db85fff7c386a56942466f387c0

data/lib/rrj/info.rb

@@ -5,7 +5,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'

data/lib/rrj/init.rb

@@ -34,7 +34,7 @@ module RubyRabbitmqJanus
     #
     # @example Create a instance to this gem
     #   @rrj = RubyRabbitmqJanus::RRJ.new
-    #   => #<RubyRabbitmqJanus::RRJ:0x007 @session=123, @transaction=nil>
+    #   => #<RubyRabbitmqJanus::RRJ:0x007 @session=123>
     def initialize
       Tools::Log.instance
       Tools::Config.instance
@@ -43,8 +43,6 @@ module RubyRabbitmqJanus
       # Create an session while time opening
       @session = Janus::Concurrencies::Keepalive.instance.session
       Tools::Log.instance.info "Create an session janus with id : #{@session}"
-
-      @transaction = nil
     rescue => error
       raise Errors::InstanciateGemFailed, error
     end
@@ -123,10 +121,11 @@ module RubyRabbitmqJanus
     #
     # @since 1.0.0
     def message_admin(type, options = { 'replace' => {}, 'add' => {} })
-      @transaction = Janus::Transactions::Admin.new(@session,
-                                                    true,
-                                                    handle?(options))
-      @transaction.connect { Janus::Messages::Admin.new(type, options) }
+      Janus::Transactions::Admin.new(@session,
+                                     true,
+                                     handle?(options)).connect do
+                                       Janus::Messages::Admin.new(type, options)
+                                     end
     rescue => error
       raise Errors::TransactionAdminFailed, error
     end
@@ -149,8 +148,9 @@ module RubyRabbitmqJanus
     #   Give a object response to janus server
     #
     # @since 1.0.0
-    def message_handle(type, options = { 'replace' => {}, 'add' => {} })
-      @transaction.publish_message_handle(type, options)
+    def message_handle(type, transaction,
+                       options = { 'replace' => {}, 'add' => {} })
+      transaction.publish_message_handle(type, options)
     rescue => error
       raise Errors::TransactionMessageFailed, error
     end
@@ -163,16 +163,16 @@ module RubyRabbitmqJanus
     # @yield Sending requests to Janus.
     #
     # @example Start a transaction with janus with a exclusive queue
-    #   @rrj.start_handle(true) do
-    #     @rrj.message_handle('peer:trickle')
+    #   @rrj.start_handle(true) do |transaction|
+    #     @rrj.message_handle('peer:trickle', transaction)
     #   end
     #
     # @see #message_handle
     #
     # @since 1.0.0
     def start_handle(exclusive = false)
-      @transaction = Janus::Transactions::Handle.new(@session, exclusive)
-      @transaction.connect { yield }
+      transaction = Janus::Transactions::Handle.new(@session, exclusive)
+      transaction.connect { yield(transaction) }
     rescue => error
       raise Errors::TransactionHandleFailed, error
     end
@@ -202,18 +202,15 @@ module RubyRabbitmqJanus
     #
     # @since 1.0.0
     def handle_message_simple(type, options = { 'replace' => {}, 'add' => {} })
-      @transaction = Janus::Transactions::Handle.new(session?(options),
-                                                     false,
-                                                     handle?(options))
-      @transaction.connect { message_handle(type, options) }
+      transaction = Janus::Transactions::Handle.new(session?(options),
+                                                    false, handle?(options))
+      transaction.connect { message_handle(type, transaction, options) }
     rescue => error
       raise Errors::TransactionHandleFailed, error
     end
 
     private
 
-    attr_accessor :transaction
-
     def use_current_session?(option)
       { 'session_id' => @session } unless option.key?('session_id')
     end

data/spec/support/examples_request.rb

@@ -36,24 +36,20 @@ end
 
 # Handle request
 shared_examples 'message_handle should match json schema' do
-  let(:message) { @gateway.message_handle(@type, @options) }
-
   it do
-    @gateway.start_handle(true) do
-      expect(message.to_json).to match_json_schema(@type)
+    @gateway.start_handle(true) do |transaction|
+      m = @gateway.message_handle(@type, transaction, @options)
+      expect(m.to_json).to match_json_schema(@type)
     end
   end
 end
 
 shared_examples 'message_handle should match json empty' do
-  let(:message) do
-    options = options.nil? ? { replace: {}, add: {} } : options
-    @gateway.message_handle(@type, options)
-  end
-
   it do
-    @gateway.start_handle(false) do
-      expect(message.to_json).to eq('{}')
+    @gateway.start_handle(false) do |transaction|
+      options = options.nil? ? { replace: {}, add: {} } : options
+      m = @gateway.message_handle(@type, transaction, options)
+      expect(m.to_json).to eq('{}')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler