bug_bunny 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074005f6739a5a8486230e47edbce60b9719f5e15f35d9ab3ed95d91eaf28a47
-  data.tar.gz: 39f1d8afb65be6ff2b86e0461c16c93e0ff6ae6cbe629668ba8e6601fe898e80
+  metadata.gz: 8fccb3590fd16133119a7e2cea4c05002964846ac5a35e0714925f2d87115a06
+  data.tar.gz: 839ab64bb406eebee8e59f99c010c640a033dab15cd0f531e66f0fbc1e201c82
 SHA512:
-  metadata.gz: 88e99f4d71b1bb78599cf7a1750218cf5fde2e9ccb010c1aa671d1ba5e1ffe011a9bc70c39fe284b150d6fb497827e94766a82085a3758308990e57eb0f0b5da
-  data.tar.gz: 66acaa871a7f5adabf4135c3b84216f71072be0f9bc7f76c4e42247dde064709596c78b88fed32c9bd24bc47a6ba737d54bc7c3396509f4dae61f06c69d026fd
+  metadata.gz: 4be8016e660aec70394814ffc85ecba71759aeb94df817abac412c201685ebee89c447fdd76b9904dfb5d2bc5f73e208ed0eed2d9bbc016a307c09978254c76e
+  data.tar.gz: 741552a099ae0aadb5717cb46fc4ff24c77c9f31f7dae677131dc158f784a75bca1a739bb6cf65eba42bff84fba853d25a2df54ca0d5884a23f679fa72c679b0

data/lib/bug_bunny/exception.rb

@@ -3,6 +3,7 @@ module BugBunny
   # Ayuda a atrapar cualquier error de la gema con un solo 'rescue BugBunny::Error'.
   class Error < ::StandardError; end
   class PublishError < Error; end
+  class Connection < Error; end
 
   module ResponseError
     class Base < Error; end

data/lib/bug_bunny/publisher.rb

@@ -52,7 +52,7 @@ module BugBunny
     include ActiveModel::Attributes
 
     attribute :message
-    attribute :pool
+    attribute :connection
     attribute :routing_key, :string
     attribute :persistent, :boolean, default: false
     attribute :content_type, :string, default: "application/json"
@@ -66,25 +66,19 @@ module BugBunny
     attribute :expiration, :integer, default: -> { 1.day.in_milliseconds } #ms
     attribute :exchange_name, :string
     attribute :exchange_type, :string, default: 'direct'
-    attr_accessor :type
-
+    attribute :type, :string
     attribute :action, :string
-    attribute :arguments, default: {}
 
     def publish!
-      pool.with do |conn|
-        app = Rabbit.new(connection: conn)
-        app.build_exchange(name: exchange_name, type: exchange_type)
-        app.publish!(message, publish_opts)
-      end
+      app = Rabbit.new(connection: connection)
+      app.build_exchange(name: exchange_name, type: exchange_type)
+      app.publish!(message, publish_opts)
     end
 
     def publish_and_consume!
-      pool.with do |conn|
-        app = Rabbit.new(connection: conn)
-        app.build_exchange(name: exchange_name, type: exchange_type)
-        app.publish_and_consume!(message, publish_opts)
-      end
+      app = Rabbit.new(connection: connection)
+      app.build_exchange(name: exchange_name, type: exchange_type)
+      app.publish_and_consume!(message, publish_opts)
     end
 
     def publish_opts
@@ -101,14 +95,13 @@ module BugBunny
         expiration: expiration }
     end
 
-    def type
-      return if action.blank?
-
-      self.type = format(action, arguments)
-    end
-
     def initialize(attrs = {})
       super(attrs)
+      if attrs[:action].present?
+        args = attrs[:arguments] || {}
+
+        self.type = format(attrs[:action], args)
+      end
       self.routing_key ||= self.class::ROUTING_KEY
     end
   end

data/lib/bug_bunny/rabbit.rb

@@ -303,6 +303,10 @@ module BugBunny
       )
 
       bunny.tap(&:start)
+    rescue Timeout::Error, Bunny::ConnectionError => e
+      # Timeout::Error (para el timeout de conexión TCP) se captura separadamente.
+      # Bunny::ConnectionError cubre TCPConnectionFailed, AuthenticationFailure, AccessRefused, etc.
+      raise BugBunny::Error::Connection, e.message
     end
   end
 end

data/lib/bug_bunny/resource.rb

@@ -21,16 +21,18 @@ module BugBunny
     end
 
     class ExchangeScope
-      attr_reader :exchange_name, :klass
+      attr_reader :exchange_name, :routing_key, :klass
 
-      def initialize(klass, exchange_name)
+      def initialize(klass, exchange_name, routing_key = nil)
         @klass = klass
         @exchange_name = exchange_name
+        @routing_key = routing_key
       end
 
       def method_missing(method_name, *args, **kwargs, &block)
         if @klass.respond_to?(method_name, true)
           kwargs[:exchange] = @exchange_name
+          kwargs[:routing_key] = @routing_key if @routing_key.present?
           @klass.execute(method_name.to_sym, *args, **kwargs, &block)
         else
           super
@@ -103,7 +105,7 @@ module BugBunny
 
       return self if persisted? && changes.empty?
 
-      obj = self.class.publisher.send(action, exchange: current_exchange, message: changes_to_send)
+      obj = self.class.publisher.send(action, exchange: current_exchange, routing_key: current_routing_key, message: changes_to_send)
 
       assign_attributes(obj) # refresco el objeto
       self.persisted = true
@@ -119,7 +121,7 @@ module BugBunny
       return self unless persisted?
 
       # Llamada al PUBLISHER sin el argumento 'box'
-      self.class.publisher.send(destroy_action.to_sym, exchange: current_exchange, id: id)
+      self.class.publisher.send(destroy_action.to_sym, exchange: current_exchange, routing_key: current_routing_key, id: id)
 
       self.persisted = false
       true
@@ -132,20 +134,28 @@ module BugBunny
       self.class.current_exchange
     end
 
-    def self.for_exchange(exchange_name)
+    def current_routing_key
+      self.class.current_routing_key
+    end
+
+    def self.for_exchange(exchange_name, routing_key = nil)
       raise ArgumentError, 'Exchange name must be specified.' if exchange_name.blank?
 
-      ExchangeScope.new(self, exchange_name)
+      ExchangeScope.new(self, exchange_name, routing_key)
     end
 
     def self.execute(name, *args, **kwargs, &block)
       original_exchange = Thread.current[:bugbunny_current_exchange]
       Thread.current[:bugbunny_current_exchange] = kwargs[:exchange]
+      original_routing_key = Thread.current[:bugbunny_current_routing_key]
+      Thread.current[:bugbunny_current_routing_key] = kwargs[:routing_key]
       begin
         kwargs.delete(:exchange)
+        kwargs.delete(:routing_key)
         send(name, *args, **kwargs, &block)
       ensure
         Thread.current[:bugbunny_current_exchange] = original_exchange
+        Thread.current[:bugbunny_current_routing_key] = original_routing_key
       end
     end
 
@@ -153,12 +163,16 @@ module BugBunny
       Thread.current[:bugbunny_current_exchange]
     end
 
+    def self.current_routing_key
+      Thread.current[:bugbunny_current_routing_key]
+    end
+
     def self.all
       where
     end
 
     def self.where(query = {})
-      body = publisher.send(index_action.to_sym, exchange: current_exchange, message: query)
+      body = publisher.send(index_action.to_sym, exchange: current_exchange, routing_key: current_routing_key, message: query)
       instances = []
 
       body.each do |obj|
@@ -171,7 +185,7 @@ module BugBunny
     end
 
     def self.find(id)
-      obj = publisher.send(show_action.to_sym, exchange: current_exchange, id: id)
+      obj = publisher.send(show_action.to_sym, exchange: current_exchange, routing_key: current_routing_key, id: id)
       return if obj.blank?
 
       instance = new

data/lib/bug_bunny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BugBunny
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bug_bunny
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - gabix