fastly_nsq 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e14c6f6e81b0ab2e649f1dccd22288fbe77d67
-  data.tar.gz: 82e1b772253cf8c9d2b9db9871beaf9f3895f95e
+  metadata.gz: 553d58c7ebd2909c851799e269e6ad6d4ef1ad6f
+  data.tar.gz: b99a102f8a6659a3c325c1ae79a9e5c03876745c
 SHA512:
-  metadata.gz: 9e094b21ee8404ff5ba792265c9148820062dbe75ce611c803c57ad02ebdf2bb5d89ee76dd51781b894f98e4d5b2ca48210ef24f1709ae3353dfd67e58d1f202
-  data.tar.gz: 9e3444babd610129939d33d6572549540b42a07f9f9d3bdabd585f4dedd8af5dc17154dcd67bd0cc5c8397b28dbc311ad690a59106aec044ebe49c2113b82de3
+  metadata.gz: cecf8dc69439bdbe7e05cae3fbbce5862ee42fdb947f177e4480bb464f9b7fd925ec099151164833d24ddf3dba51dffa06b270375422a7e7c9dc7f8c104a5d7c
+  data.tar.gz: 92f7c3759578cec172c5ef6851cf9993cf1b5ee33b15baa338918044ca0e3d05f867c2641f66f6946e4ddebdb8f9373fddec7fb3afc39d9eddd50aa56b334e0b

data/fastly_nsq.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock', '~> 3.0'
 
   gem.add_dependency 'concurrent-ruby', '~> 1.0'
-  gem.add_dependency 'nsq-ruby', '~> 2.2'
+  gem.add_dependency 'nsq-ruby', '~> 2.3'
   gem.add_dependency 'priority_queue_cxx', '~> 0.3'
 end

data/lib/fastly_nsq/consumer.rb

@@ -9,13 +9,13 @@ class FastlyNsq::Consumer
 
   def_delegators :connection, :size, :terminate, :connected?, :pop, :pop_without_blocking
 
-  def initialize(topic:, channel:, queue: nil, tls_options: nil, connect_timeout: DEFAULT_CONNECTION_TIMEOUT)
+  def initialize(topic:, channel:, queue: nil, tls_options: nil, connect_timeout: DEFAULT_CONNECTION_TIMEOUT, **options)
     @topic           = topic
     @channel         = channel
     @tls_options     = FastlyNsq::TlsOptions.as_hash(tls_options)
     @connect_timeout = connect_timeout
 
-    @connection = connect(queue)
+    @connection = connect(queue, **options)
   end
 
   def empty?
@@ -26,13 +26,14 @@ class FastlyNsq::Consumer
 
   attr_reader :tls_options
 
-  def connect(queue)
+  def connect(queue, **options)
     Nsq::Consumer.new(
       {
         nsqlookupd: FastlyNsq.lookupd_http_addresses,
         topic: topic,
         channel: channel,
         queue: queue,
+        **options,
       }.merge(tls_options),
     )
   end

data/lib/fastly_nsq/listener.rb

@@ -11,7 +11,8 @@ class FastlyNsq::Listener
   attr_reader :preprocessor, :topic, :processor, :priority, :channel, :logger, :consumer
 
   def initialize(topic:, processor:, preprocessor: FastlyNsq.preprocessor, channel: FastlyNsq.channel, consumer: nil,
-                 logger: FastlyNsq.logger, priority: DEFAULT_PRIORITY, connect_timeout: DEFAULT_CONNECTION_TIMEOUT)
+                 logger: FastlyNsq.logger, priority: DEFAULT_PRIORITY, connect_timeout: DEFAULT_CONNECTION_TIMEOUT,
+                 **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)
@@ -26,7 +27,8 @@ class FastlyNsq::Listener
     @consumer = consumer || FastlyNsq::Consumer.new(topic: topic,
                                                     connect_timeout: connect_timeout,
                                                     channel: channel,
-                                                    queue: FastlyNsq::Feeder.new(self, priority))
+                                                    queue: FastlyNsq::Feeder.new(self, priority),
+                                                    **consumer_options)
 
     FastlyNsq.manager.add_listener(self)
   end

data/lib/fastly_nsq/version.rb

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

data/spec/listener_spec.rb

@@ -15,6 +15,18 @@ 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
+        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)
+      end
+    end
+
     describe 'with FastlyNsq.channel set' do
       let!(:default_channel) { FastlyNsq.channel }
       before { FastlyNsq.channel = 'fnsq' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -133,14 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: priority_queue_cxx
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fastly NSQ Adapter