gorg_service 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a373eae1c1f417da46ab05ed254a6282f8db2c
-  data.tar.gz: b67c38dcea30bac3b29d3857db22794f190f7b00
+  metadata.gz: 2085fe592d8c8996fba362f5ab27ed073fc286d7
+  data.tar.gz: a7b351d69fbddb9bfea3d4ec5e680eb938bdaeea
 SHA512:
-  metadata.gz: ac47bf636d8e2cabf1d8dfcdff4344460df2f9e6b8f533dff63bd122b91ac4d87d822dbdcd8e74cb29889352703481fcc4a1f6e20602af3b7ef6563ef4128e17
-  data.tar.gz: 097c3a1bebe68f1ddf315e09b1461a8d2fa677e4b09936146a4413d25ae8e893ffa5a627ac2f84daef00d02c74fd1eef1efda48d35677116be392b3d333278f6
+  metadata.gz: ae04c871818975d33b1eff5391ce1b677c71b04d2977dbaa4bb4b31fda8d9d53da4e4c39dbfd560f406cecfe48bc62d7700ca2df91627639ff4b09d4db10778a
+  data.tar.gz: f97f7c4cb4d13b0134044eb64ee7f1134e2a0f711b034a643ba7b83b8ec43966d8ff2e9d46f32f7b5ed9885812ba60c67a76e1edd763022b15c4073c52f538f3

data/lib/gorg_service.rb

@@ -12,7 +12,7 @@ class GorgService
 
     #Connection shared across Consumers and Producers (thread safe)
     def connection
-      @bunny_session||=Bunny.new(
+      @bunny_session||=GorgService.configuration.rabbitmq_client_class.new(
           :hostname => GorgService.configuration.rabbitmq_host,
           :port => GorgService.configuration.rabbitmq_port,
           :user => GorgService.configuration.rabbitmq_user,

data/lib/gorg_service/configuration.rb

@@ -17,7 +17,8 @@ class GorgService
   # Hold configuration of GorgService in instance variables
   class Configuration
     
-    attr_accessor :application_name,
+    attr_accessor :rabbitmq_client_class,
+                  :application_name,
                   :application_id,
                   :rabbitmq_host,
                   :rabbitmq_port,
@@ -34,6 +35,7 @@ class GorgService
 
 
     def initialize
+      @rabbitmq_client_class   = Bunny
       @logger                  = Logger.new(STDOUT)
       @application_name        = "GorgService"
       @application_id          = "gs" 

data/lib/gorg_service/consumer/message_handler/base.rb

@@ -57,6 +57,10 @@ class GorgService
             MessageRouter.register_route(routing_key, self)
           end
 
+          def reset_listen_to!
+            MessageRouter.delete_routes_of(self)
+          end
+
         end
       end
     end

data/lib/gorg_service/consumer/message_router.rb

@@ -22,6 +22,10 @@ class GorgService
           routes[routing_key]=message_handler
         end
 
+        def delete_routes_of(message_handler)
+          routes.reject!{|_k,v|v==message_handler}
+        end
+
         def listened_keys
           routes.keys
         end

data/lib/gorg_service/message.rb

@@ -144,7 +144,7 @@ class GorgService
             routing_key: delivery_info[:routing_key],
             id: properties[:message_id],
             reply_to: properties[:reply_to],
-            correlation_id: properties[:correlatio_to],
+            correlation_id: properties[:correlation_id],
             sender_id: properties[:app_id],
             content_type: properties[:content_type],
             content_encoding: properties[:content_encoding],

data/lib/gorg_service/rspec/bunny_cleaner.rb

@@ -0,0 +1,72 @@
+class BunnyCleaner
+
+  class Session
+    def initialize(*args, &block)
+      @target=Bunny::Session.new(*args,&block)
+    end
+
+    def method_missing(method, *args, &block)
+      @target.send(method, *args, &block)
+    end
+
+    def self.method_missing(method, *args, &block)
+      Bunny::Session.send(method, *args, &block)
+    end
+
+    def create_channel(*args,&block)
+      ch=@target.create_channel(*args,&block)
+      BunnyCleaner.registered_channels<<ch
+      ch
+    end
+  end
+
+
+  def initialize(*args, &block)
+    @target=Session.new(*args, &block)
+  end
+
+  def method_missing(method, *args, &block)
+    @target.send(method, *args, &block)
+  end
+
+  def self.method_missing(method, *args, &block)
+    Bunny.send(method, *args, &block)
+  end
+
+  class << self
+    def registered_channels
+      @registered_channels||=[]
+    end
+
+    def cleaning(&block)
+      begin
+        init_cleaning
+        block.call
+      ensure
+        clean
+      end
+    end
+
+
+    def clean
+      connections=[]
+      @registered_channels.each do |ch|
+        c=ch.connection
+        connections<<c
+        c.start unless c.status == :open
+
+        c.with_channel do |chan|
+          ch.queues.keys.each{|q| c.queue_exists?(q)&&chan.queue_delete(q) }
+          ch.exchanges.keys.each{|ex| c.exchange_exists?(ex)&&chan.exchange_delete(ex) }
+        end
+      end
+      connections.uniq.each{|c|c.stop}
+    end
+
+    def init_cleaning
+      registered_channels.clear
+    end
+
+  end
+
+end

data/lib/gorg_service/rspec/log_message_handler.rb

@@ -0,0 +1,30 @@
+class LogMessageHandler < GorgService::Consumer::MessageHandler::Base
+  def initialize(msg)
+    GorgService.logger.debug "Message received in LogMessageHandler"
+    self.class.messages<<msg
+  end
+
+  def self.messages
+    @@messages||=[]
+  end
+
+  def self.has_received_error?(type)
+    messages.any?{|m| m.errors.any?{|x| x.type==type}}
+  end
+
+  def self.has_received_hardfail?
+    self.has_received_error?("harderror")
+  end
+
+  def self.has_received_hardfail?
+    self.has_received_error?("softerror")
+  end
+
+  def self.has_received_a_message_with_routing_key?(routing_key)
+    messages.any?{|m| m.routing_key==routing_key}
+  end
+
+  def self.reset
+    @@messages=nil
+  end
+end

data/lib/gorg_service/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 class GorgService
-  VERSION = "5.1.0"
+  VERSION = "5.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gorg_service
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Alexandre Narbonne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -178,6 +178,8 @@ files:
 - lib/gorg_service/message/json_schema.rb
 - lib/gorg_service/producer.rb
 - lib/gorg_service/rabbitmq_env_builder.rb
+- lib/gorg_service/rspec/bunny_cleaner.rb
+- lib/gorg_service/rspec/log_message_handler.rb
 - lib/gorg_service/version.rb
 homepage: https://github.com/Zooip/gorg_service
 licenses: