ruby_rabbitmq_janus 2.2.0.pre.179 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc2b31862c0708c674e7a21f98ae77061baaa722
-  data.tar.gz: 2b771ef4c51d25bde097b7e4ced7e2b94f99932d
+  metadata.gz: 7f34cad1c72e7d7cb5737f806b66824a28f2ec84
+  data.tar.gz: ca95c3126aaf6f29cbb7b8c9dfcd4d7312a876bb
 SHA512:
-  metadata.gz: a24227cb75c670aa8ec50c8954787b05ad66adf2706533f305556fb1ffa6f63c34e9f77f2e894bfc2d2f440aba7619f9082b519ffae4d73e433364a4556636ae
-  data.tar.gz: da9961ca948a7d237d7266911ed4e2234b8d926d4fa264aa411caa0363875a7ecd0962ce59a0f4e79243ed84d7f3bd1a4f4b75876516e5a064573da6d492a8be
+  metadata.gz: 077915cb4fb54a3d028202f4c953c105584c9c228c97fa54410ad1e47e37bb730fe0867ea26b5facfa49b0cd5e2450b85ba16266037728e4bd9664e84ae8f9d5
+  data.tar.gz: 61b33fab6237bb0b9c59d71d9b7fe48d87d1c14c5691f9048b26e24c4499748aa4233b634e21940f4d1a00eabfbef3ebceebfb7d4d716c8a730efbec1c3b06a2

data/lib/rrj/errors/janus/processus/keepalive/initializer.rb

@@ -18,12 +18,6 @@ module RubyRabbitmqJanus
           end
         end
 
-        class ID2ref < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
-          def initialize(thread_id)
-            super "No thread with ID : #{thread_id}"
-          end
-        end
-
         class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
           def initialize
             super 'Error return session number'

data/lib/rrj/errors/rabbit/publish/publisher.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# :reek:IrresponsibleModule
-#
 module RubyRabbitmqJanus
   module Errors
     module Rabbit
@@ -26,12 +24,6 @@ module RubyRabbitmqJanus
             super 'Error for publish message'
           end
         end
-
-        class Testcorrelation < RubyRabbitmqJanus::Errors::Rabbit::BasePublish
-          def initialize(message, propertie)
-            super "Response correlation ID mismatch (#{message} != #{propertie})", :fatal
-          end
-        end
       end
     end
   end

data/lib/rrj/janus/processus/keepalive/keepalive_initializer.rb

@@ -26,7 +26,7 @@ module RubyRabbitmqJanus
         def self.thread(thread)
           ObjectSpace._id2ref(thread)
         rescue RangeError
-          raise Errors::Janus::KeepaliveInitializer::ID2Ref, thread
+          Tools::Log.instance.fatal "No thread with ID : #{thread}"
         end
 
         # Give a session Integer  his gem is instantiate.

data/lib/rrj/janus/processus/keepalive/keepalive_thread.rb

@@ -34,9 +34,9 @@ module RubyRabbitmqJanus
         # Restart session
         def restart_session
           Tools::Log.instance.warn 'Restart session ...'
-          janus = find_model
-          send_messages_restart
-          janus.set(session: @session)
+          @session = response_session
+          response_keepalive
+          find_model.set(session: @session)
         rescue
           raise Errors::Janus::KeepaliveThread::RestartSession
         end
@@ -76,11 +76,6 @@ module RubyRabbitmqJanus
 
         attr_reader :instance
 
-        def send_messages_restart
-          @session = response_session
-          response_keepalive
-        end
-
         def prepare_kill_thread
           @session = @message = nil
           KeepaliveThread.instance_method(:kill).bind(self).call

data/lib/rrj/rabbit/publish/publisher.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/GuardClause
-
 module RubyRabbitmqJanus
   module Rabbit
     module Publisher
@@ -39,8 +37,12 @@ module RubyRabbitmqJanus
 
         def subscribe_to_queue
           reply.subscribe do |_delivery_info, propertie, payload|
-            test_correlation(m_correlation, p_correlation(propertie)) do
+            propertie_correlation = p_correlation(propertie)
+            if m_correlation.eql?(propertie_correlation)
               synchronize(payload)
+            else
+              Tools::Log.instance.error 'Response correlation ID mismatch (' \
+                "#{m_correlation}!=#{propertie_correlation})"
             end
           end
         end
@@ -53,14 +55,6 @@ module RubyRabbitmqJanus
           propertie.correlation_id
         end
 
-        def test_correlation(m_cor, p_cor)
-          if m_cor.eql?(p_cor)
-            yield
-          else
-            raise Errors::Rabbit::Publish::TestCorrelation, m_cor, p_cor
-          end
-        end
-
         def synchronize(payload)
           lock.synchronize do
             responses.push(JSON.parse(payload))
@@ -73,7 +67,6 @@ module RubyRabbitmqJanus
     end
   end
 end
-# rubocop:enable Style/GuardClause
 
 require 'rrj/rabbit/publish/admin'
 require 'rrj/rabbit/publish/exclusive'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.179
+  version: 2.2.0
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -612,9 +612,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13