fastly_nsq 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 553d58c7ebd2909c851799e269e6ad6d4ef1ad6f
-  data.tar.gz: b99a102f8a6659a3c325c1ae79a9e5c03876745c
+  metadata.gz: e9571195fbffa3a39f6492fc49347bd85c1bfaac
+  data.tar.gz: 90ca9fe5c3e90bcf601d6c6eace43dfa8ebd0b05
 SHA512:
-  metadata.gz: cecf8dc69439bdbe7e05cae3fbbce5862ee42fdb947f177e4480bb464f9b7fd925ec099151164833d24ddf3dba51dffa06b270375422a7e7c9dc7f8c104a5d7c
-  data.tar.gz: 92f7c3759578cec172c5ef6851cf9993cf1b5ee33b15baa338918044ca0e3d05f867c2641f66f6946e4ddebdb8f9373fddec7fb3afc39d9eddd50aa56b334e0b
+  metadata.gz: 083ea4782ca2fbae00c977a8df145eb2aedceeab334e465fb8d76313582121bb2ee0aab174b96a12f64d012866e5be392ab67507d23428a5da30952cc3c7577a
+  data.tar.gz: 07a6dcdeb0ae6cd14750a3b9556beaac9937452ca329f895315d1915da2ff1f26638cb3e5cd67cb97e3a22b376506de7cd38f788449ae20ba2c96f9ea136e659

data/lib/fastly_nsq.rb

@@ -12,7 +12,9 @@ module FastlyNsq
   ConnectionFailed = Class.new(StandardError)
 
   class << self
-    attr_accessor :channel, :preprocessor
+    attr_accessor :channel
+    attr_accessor :preprocessor
+    attr_accessor :max_attempts
     attr_writer :logger
 
     def listen(topic, processor, **options)

data/lib/fastly_nsq/consumer.rb

@@ -6,14 +6,16 @@ class FastlyNsq::Consumer
   DEFAULT_CONNECTION_TIMEOUT = 5 # seconds
 
   attr_reader :channel, :topic, :connection, :connect_timeout
+  attr_reader :max_attempts
 
   def_delegators :connection, :size, :terminate, :connected?, :pop, :pop_without_blocking
 
-  def initialize(topic:, channel:, queue: nil, tls_options: nil, connect_timeout: DEFAULT_CONNECTION_TIMEOUT, **options)
+  def initialize(topic:, channel:, queue: nil, tls_options: nil, connect_timeout: DEFAULT_CONNECTION_TIMEOUT, max_attempts: FastlyNsq.max_attempts, **options)
     @topic           = topic
     @channel         = channel
     @tls_options     = FastlyNsq::TlsOptions.as_hash(tls_options)
     @connect_timeout = connect_timeout
+    @max_attempts    = max_attempts
 
     @connection = connect(queue, **options)
   end
@@ -33,6 +35,7 @@ class FastlyNsq::Consumer
         topic: topic,
         channel: channel,
         queue: queue,
+        max_attempts: max_attempts,
         **options,
       }.merge(tls_options),
     )

data/lib/fastly_nsq/listener.rb

@@ -9,25 +9,28 @@ class FastlyNsq::Listener
   def_delegators :consumer, :connected?
 
   attr_reader :preprocessor, :topic, :processor, :priority, :channel, :logger, :consumer
+  attr_reader :max_attempts
 
   def initialize(topic:, processor:, preprocessor: FastlyNsq.preprocessor, channel: FastlyNsq.channel, consumer: nil,
                  logger: FastlyNsq.logger, priority: DEFAULT_PRIORITY, connect_timeout: DEFAULT_CONNECTION_TIMEOUT,
-                 **consumer_options)
+                 max_attempts: FastlyNsq.max_attempts, **consumer_options)
 
     raise ArgumentError, "processor #{processor.inspect} does not respond to #call" unless processor.respond_to?(:call)
     raise ArgumentError, "priority #{priority.inspect} must be a Integer" unless priority.is_a?(Integer)
 
     @channel      = channel
     @logger       = logger
+    @max_attempts = max_attempts
     @preprocessor = preprocessor
+    @priority     = priority
     @processor    = processor
     @topic        = topic
-    @priority     = priority
 
     @consumer = consumer || FastlyNsq::Consumer.new(topic: topic,
                                                     connect_timeout: connect_timeout,
                                                     channel: channel,
                                                     queue: FastlyNsq::Feeder.new(self, priority),
+                                                    max_attempts: max_attempts,
                                                     **consumer_options)
 
     FastlyNsq.manager.add_listener(self)

data/lib/fastly_nsq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastlyNsq
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/listener_spec.rb

@@ -15,15 +15,19 @@ RSpec.describe FastlyNsq::Listener do
   subject { described_class.new(topic: topic, channel: channel, processor: processor) }
 
   describe '#initialize' do
-    describe 'max_attempts' do
-      it 'can be passed to the consumer' do
-        listener = described_class.new topic: topic,
-                                       processor: processor,
-                                       channel: channel,
-                                       max_attempts: 5
+    describe 'with FastlyNsq.max_attempts set' do
+      let!(:default_max_attempts) { FastlyNsq.max_attempts }
+      before { FastlyNsq.max_attempts = 19 }
+      after { FastlyNsq.max_attempts = default_max_attempts }
+
+      it 'defaults to FastlyNsq.max_attempts' do
+        listener = described_class.new(topic: topic, processor: processor, channel: channel)
+        expect(listener.max_attempts).to eq(FastlyNsq.max_attempts)
+
         expect { listener }.to eventually(be_connected).within(5)
+
         nsq_connection = listener.consumer.connection.connections.values.first # whoa
-        expect(nsq_connection.instance_variable_get(:@max_attempts)).to eq(5)
+        expect(nsq_connection.instance_variable_get(:@max_attempts)).to eq(FastlyNsq.max_attempts)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tommy O'Neil