lib/basquiat/adapters/rabbitmq/configuration.rb in basquiat-1.2.0 vs lib/basquiat/adapters/rabbitmq/configuration.rb in basquiat-1.3.0.pre.1

@@ -1,51 +1,66 @@
 module Basquiat
   module Adapters
     class RabbitMq
+      # Responsible for dealing with the overall configuration of the RabbitMQ adapter
       class Configuration
         using Basquiat::HashRefinements
 
         def initialize
-          @options = { failover:  { default_timeout: 5, max_retries: 5 },
-                       servers:   [{ host: 'localhost', port: 5672 }],
+          @options = { connection:
+                                  { hosts: ['localhost'],
+                                    port:  5672,
+                                    auth:  { user: 'guest', password: 'guest' }
+                                  },
                        queue:     {
-                           name:    Basquiat.configuration.queue_name,
-                           options: { durable: true } },
+                         name:    Basquiat.configuration.queue_name,
+                         durable: true,
+                         options: {} },
                        exchange:  {
-                           name:    Basquiat.configuration.exchange_name,
-                           options: { durable: true } },
+                         name:    Basquiat.configuration.exchange_name,
+                         durable: true,
+                         options: {} },
                        publisher: { confirm: true, persistent: false },
-                       auth:      { user: 'guest', password: 'guest' },
+                       consumer:  { prefetch: 1000, manual_ack: true },
                        requeue:   { enabled: false } }
         end
 
         def base_options
           @options
         end
 
-        def merge_user_options(user_opts)
+        # Merges the user supplied options with the base ones
+        # @param user_opts [Hash{Symbol=>Object}]
+        # @option user_opts [Hash{Symbol=>Object}] :connection see {Connection#initialize}
+        # @option user_opts [Hash{Symbol=>Object}] :queue
+        # @option user_opts [Hash{Symbol=>Object}] :exchange
+        # @option user_opts [Hash{Symbol=>Object}] :publisher
+        # @option user_opts [Hash{Symbol=>Object}] :requeue
+        # @return [Hash] the configuration option hash
+        def merge_user_options(**user_opts)
           @options.merge!(user_opts)
         end
 
+        # @return [Hash] the connection options
         def connection_options
-          { servers:  @options[:servers],
-            failover: @options[:failover],
-            auth:     @options[:auth] }
+          @options[:connection]
         end
 
+        # @return [Hash] the session options
         def session_options
           { exchange:  @options[:exchange],
             publisher: @options[:publisher],
+            consumer:  @options[:consumer],
             queue:     @options[:queue] }.deep_merge(strategy.session_options)
         end
 
+        # @return [BaseStrategy] the requeue strategy or {BasicAcknowledge} if none is configured
         def strategy
-          return BasicAcknowledge unless @options[:requeue][:enabled]
-          @strategy ||= RabbitMq.strategies.fetch(@options[:requeue][:strategy].to_sym)
-          @strategy.setup(@options[:requeue][:options] || {})
+          requeue = @options[:requeue]
+          return AutoAcknowledge unless requeue[:enabled]
+          @strategy ||= RabbitMq.strategy(requeue[:strategy].to_sym)
+          @strategy.setup(requeue[:options] || {})
           @strategy
-        rescue KeyError
-          fail Basquiat::Errors::StrategyNotRegistered.new(@options[:requeue][:strategy])
         end
       end
     end
   end
 end