fastly_nsq 1.17.1 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6973f2a953a18f9f5b63d6e7225c94264f56485b4632a409c820b5b61f91b050
-  data.tar.gz: 1a8f39f1085191666a6ebccff53a8c6f691fad4770bea6a48affc8f7998a878b
+  metadata.gz: 437c12c3efcf9025c66afa729cc9c3e9ae741712343d27b363cfa76168127f37
+  data.tar.gz: 9021787ce6740794c19f607eaefac99967457cf1b2920016fbc9a404009ed47b
 SHA512:
-  metadata.gz: da7997c5cdc6b8cb7d5feeacb0feab24c062076c92b8a3b23ddb49416d5a1fe57d0c241a68b20b5aed15c3a2c6cad89015557268dd2827fa49a7c63236de6300
-  data.tar.gz: 007a732d613f15d099e28f301db5537d35cfe7675d45f46946526eb275b5196496520a1b2f0aaf3c011414b0b55eafa19218f5f71cf6a9fb42ea59678fc11b1b
+  metadata.gz: 222ed5a9d8427dbb31ca9860feca33f31699483c2694c38be62cf1682e8cfaba09150228806af7fad11f20535315b798d00c95f7dd9e851c9897a3454a967861
+  data.tar.gz: 56c5e41343492893194f74fe61317d157bc4d27c7b53e2fc69180271d73da0de8cfca47bec5317b333bcfd1262b82b325184e0458f791df3966e9d53aef4c417

data/.env

@@ -1,4 +1,4 @@
-NSQD_TCP_ADDRESS=127.0.0.1:4150
 NSQD_HTTP_ADDRESS=127.0.0.1:4151
-NSQLOOKUPD_TCP_ADDRESS=127.0.0.1:4160
 NSQLOOKUPD_HTTP_ADDRESS=127.0.0.1:4161
+NSQD_CONSUMERS=127.0.0.1:4150
+NSQD_PRODUCERS=127.0.0.1:4150

data/.github/workflows/ruby.yml

@@ -0,0 +1,30 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Start NSQ
+      run: docker-compose up -d
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.standard.yml

@@ -0,0 +1 @@
+ruby_version: 2.7

data/ChangeLog.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v1.18.0](https://github.com/fastly/fastly_nsq/tree/v1.18.0) (2022-03-04)
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.17.1...v1.18.0)
+
+**Merged pull requests:**
+
+- Configurable NSQDs for Consumers and Producers [\#105](https://github.com/fastly/fastly_nsq/pull/105)
+
 ## [v1.17.1](https://github.com/fastly/fastly_nsq/tree/v1.17.1) (2022-02-23)
 [Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.17.0...v1.17.1)
 

data/README.md

@@ -1,4 +1,4 @@
-# fastly_nsq [![Build Status](https://travis-ci.org/fastly/fastly_nsq.svg?branch=main)](https://travis-ci.org/fastly/fastly_nsq)
+# fastly_nsq [![Build Status](https://travis-ci.com/fastly/fastly_nsq.svg?branch=main)](https://travis-ci.com/fastly/fastly_nsq)
 
 NSQ adapter and testing objects
 for using the NSQ messaging system
@@ -12,9 +12,9 @@ We also include fakes
 to make testing easier.
 
 This library is dependent
-on the [`nsq-ruby`] gem.
+on the [`nsq-ruby-fastly`] gem.
 
-[`nsq-ruby`]: https://github.com/wistia/nsq-ruby
+[`nsq-ruby-fastly`]: https://github.com/fastly/nsq-ruby
 
 Please use [GitHub Issues] to report bugs.
 
@@ -34,6 +34,65 @@ and `bundle install`.
 
 ## Usage
 
+### Connections
+
+NSQD cconnections can be discovered via nsqlookupd's or
+specified explicity for consumers and producers.
+
+#### Using nsqlookup:
+
+Set the ENV variable to a comma sepearated string of lookups:
+
+```
+ENV['NSQLOOKUPD_HTTP_ADDRESS'] = "lookup01:1234,lookup01:1234"
+```
+
+Or configure them directly:
+
+```
+FastlyNsq.configure do |config|
+  config.lookupd_http_addresses = ["lookup01:1234", "lookup02:1234"]
+end
+```
+
+#### Using nsqd directly:
+
+NSQD connections can be specified for consumers and producers. Being able to set
+different sets for consumers and producers facilitates removing and adding new instances
+without downtime.
+
+Set the following ENV variables to a comma sepearted string of nsqds:
+
+```
+ENV['NSQD_CONSUMERS']="nsqd01:4150,nsd02:4150"
+ENV['NSQD_PRODUCERS']="nsqd01:4150,nsd02:4150"
+```
+
+Or configure them directly:
+
+```
+FastlyNsq.configure do |config|
+  config.consumer_nsqds = ["nsqd01:4150", "nsqd02:4150"]
+  config.producer_nsqds = ["nsqd01:4150", "nsqd02:4150"]
+end
+```
+
+### Connection Priority
+
+When `FastlyNsq.consumer_nsqds` or `FastlyNsq.producer_nsqds` are set they
+will be used instead of `FastlyNsq.lookupd_http_addresses`.
+
+### TLS
+
+Set the following ENV variables to enable TLS support:
+
+```
+NSQ_SSL_KEY
+NSQ_SSL_CERTIFICATE
+NSQ_SSL_CA_CERTIFICATE
+NSQ_SSL_VERIFY_MODE (optional)
+```
+
 ### `FastlyNsq::Producer`
 
 This is a class
@@ -50,7 +109,6 @@ message_data = {
 }
 
 producer = FastlyNsq::Producer.new(
-  nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
   topic: topic,
 )
 
@@ -281,6 +339,22 @@ expect(some_result)
 
 ## Configuration
 
+See the [documentation](https://www.rubydoc.info/gems/fastly_nsq/FastlyNsq) for additional settings
+
+Example:
+
+```
+FastlyNsq.configure do |config|
+ config.channel = "z"
+ config.producer_nsqds = ["nsqd01:4150", "nsqd02:4150"]
+ config.lookupd_http_addresses = ["lookupd01:4161", "lookupd02:4161"]
+ config.logger = Logger.new(STDOUT)
+ config.max_attempts = 10
+ config.max_req_timeout = 10_000
+ config.max_processing_pool_threads = 42
+end
+```
+
 ### Environment Variables
 
 The URLs for the various
@@ -293,10 +367,10 @@ stock NSQ on OS X,
 installed via Homebrew:
 
 ```shell
-NSQD_TCP_ADDRESS='127.0.0.1:4150'
 NSQD_HTTP_ADDRESS='127.0.0.1:4151'
-NSQLOOKUPD_TCP_ADDRESS='127.0.0.1:4160'
 NSQLOOKUPD_HTTP_ADDRESS='127.0.0.1:4161, 10.1.1.101:4161'
+NSQD_CONSUMERS='127.0.0.1:4150'
+NSQD_PRODUCERS='127.0.0.1:4150'
 ```
 
 See the [`.sample.env`](examples/.sample.env) file

data/fastly_nsq.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.files = `git ls-files`.split("\n")
 
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files = gem.files.grep(%r{^(test|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "awesome_print", "~> 1.6"
@@ -31,6 +30,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard"
 
   gem.add_dependency "concurrent-ruby", "~> 1.0"
-  gem.add_dependency "nsq-ruby-fastly", "~> 2.4"
+  gem.add_dependency "nsq-ruby", "~> 2.4.1"
   gem.add_dependency "priority_queue_cxx", "~> 0.3"
 end

data/lib/fastly_nsq/consumer.rb

@@ -61,6 +61,9 @@ class FastlyNsq::Consumer
   ##
   # Create a FastlyNsq::Consumer
   #
+  # Will connect to NSQDs in this priority: 1. direct from FastlyNsq.consumer_nsqds 2. discovered via FastlyNsq.lookupd_http_addresses.
+  # If both `consumer_nsqds` and `lookupd_http_addresses` are set only the FastlyNsq.consumer_nsqds will be used.
+  #
   # @param topic [String] NSQ topic from which to consume
   # @param channel [String] NSQ channel from which to consume
   # @param queue [#pop, #size] Queue object, most likely an instance of {FastlyNsq::Feeder}
@@ -99,15 +102,25 @@ class FastlyNsq::Consumer
   attr_reader :tls_options
 
   def connect(queue, **options)
-    Nsq::Consumer.new(
-      {
-        nsqlookupd: FastlyNsq.lookupd_http_addresses,
-        topic: topic,
-        channel: channel,
-        queue: queue,
-        max_attempts: max_attempts,
-        **options
-      }.merge(tls_options)
-    )
+    consumers = FastlyNsq.consumer_nsqds
+    lookupd = FastlyNsq.lookupd_http_addresses
+
+    opts = {
+      topic: topic,
+      channel: channel,
+      queue: queue,
+      max_attempts: max_attempts,
+      **options
+    }.merge(tls_options)
+
+    if !consumers.empty?
+      opts[:nsqd] = consumers
+    elsif !lookupd.empty?
+      opts[:nsqlookupd] = lookupd
+    else
+      raise FastlyNsq::ConnectionFailed, "One of FastlyNsq.consumer_nsqds or FastlyNsq.lookupd_http_addresses must be present"
+    end
+
+    Nsq::Consumer.new(opts)
   end
 end

data/lib/fastly_nsq/producer.rb

@@ -24,6 +24,9 @@ class FastlyNsq::Producer
   ##
   # Create a FastlyNsq::Producer
   #
+  # Will connect to NSQDs in this priority: 1. direct from FastlyNsq.producer_nsqds 2. discovered via FastlyNsq.lookupd_http_addresses.
+  # If both `producer_nsqds` and `lookupd_http_addresses` are set only the FastlyNsq.producer_nsqds will be used.
+  #
   # @param topic [String] NSQ topic on which to deliver the message
   # @param tls_options [Hash] Hash of TSL options passed the connection.
   #   In most cases this should be nil unless you need to override the
@@ -71,27 +74,33 @@ class FastlyNsq::Producer
   # Create an Nsq::Producer and set as +@connection+ instance variable
   # @return [Boolean]
   def connect
+    producers = FastlyNsq.producer_nsqds
     lookupd = FastlyNsq.lookupd_http_addresses
 
-    @connection ||= Nsq::Producer.new(
-      tls_options.merge(
-        nsqlookupd: lookupd,
-        topic: topic
-      )
-    )
-
-    timeout_args = [connect_timeout, FastlyNsq::ConnectionFailed]
+    opts = tls_options.merge(topic: topic)
 
-    if RUBY_VERSION > "2.4.0"
-      timeout_args << "Failed connection to #{lookupd} within #{connect_timeout} seconds"
+    if !producers.empty?
+      opts[:nsqd] = producers
+    elsif !lookupd.empty?
+      opts[:nsqlookupd] = lookupd
+    else
+      raise FastlyNsq::ConnectionFailed, "One of FastlyNsq.producer_nsqds or FastlyNsq.lookupd_http_addresses must be present"
     end
 
+    @connection ||= Nsq::Producer.new(opts)
+
+    timeout_args = [
+      connect_timeout,
+      FastlyNsq::ConnectionFailed,
+      "Failed connection to #{opts[:nsqd] || opts[:nsqlookupd]} within #{connect_timeout} seconds"
+    ]
+
     Timeout.timeout(*timeout_args) { Thread.pass until connection.connected? }
 
     true
   rescue FastlyNsq::ConnectionFailed
     logger.error { "Producer for #{topic} failed to connect!" }
-    terminate
+    terminate if @connection
     raise
   end
 

data/lib/fastly_nsq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastlyNsq
-  VERSION = "1.17.1"
+  VERSION = "1.18.1"
 end

data/lib/fastly_nsq.rb

@@ -126,7 +126,44 @@ module FastlyNsq
     # Return an array of NSQ lookupd http addresses sourced from ENV['NSQLOOKUPD_HTTP_ADDRESS']
     # @return [Array<String>] list of nsqlookupd http addresses
     def lookupd_http_addresses
-      ENV.fetch("NSQLOOKUPD_HTTP_ADDRESS").split(",").map(&:strip)
+      @lookups ||= ENV.fetch("NSQLOOKUPD_HTTP_ADDRESS", "").split(/, ?|\s+/).map(&:strip)
+    end
+
+    ##
+    # Set the lookupd_http_addresses
+    # @param lookups [Array] List of http lookupd addresses to use.
+    def lookupd_http_addresses=(lookups)
+      @lookups = lookups.nil? ? nil : Array(lookups)
+    end
+
+    ##
+    # Return an array of NSQD TCP addresses for NSQ consumers. Defaults to the value of ENV['NSQD_CONSUMERS'].
+    # ENV['NSQD_CONSUMERS'] must be a comma or space seperated string of NSQD addresses
+    # @return [Array<String>] list of nsqd addresses
+    def consumer_nsqds
+      @consumer_nsqds ||= ENV.fetch("NSQD_CONSUMERS", "").split(/, ?|\s+/).map(&:strip)
+    end
+
+    ##
+    # Set the consumer_nsqd addresses
+    # @param nsqd_addresses [Array] List of consumer nsqd addresses to use
+    def consumer_nsqds=(nsqd_addresses)
+      @consumer_nsqds = nsqd_addresses.nil? ? nil : Array(nsqd_addresses)
+    end
+
+    ##
+    # Return an array of NSQD TCP addresses for NSQ producers. Defaults to the value of ENV['NSQD_PRODUCERS'].
+    # ENV['NSQD_PRODUCERS'] must be a comma or space seperated string of NSQD addresses
+    # @return [Array<String>] list of nsqd addresses
+    def producer_nsqds
+      @producer_nsqds ||= ENV.fetch("NSQD_PRODUCERS", "").split(/, ?|\s+/).map(&:strip)
+    end
+
+    ##
+    # Set the producer_nsqd addresses
+    # @param nsqd_addresses [Array] List of producer nsqd addresses to use
+    def producer_nsqds=(nsqd_addresses)
+      @producer_nsqds = nsqd_addresses.nil? ? nil : Array(nsqd_addresses)
     end
 
     # Register a block to run at a point in the lifecycle.

data/spec/consumer_spec.rb

@@ -56,4 +56,45 @@ RSpec.describe FastlyNsq::Consumer do
       it { should be_empty }
     end
   end
+
+  describe "connection priority" do
+    after do
+      FastlyNsq.lookupd_http_addresses = nil
+      FastlyNsq.consumer_nsqds = nil
+    end
+
+    it "connects to consumer_nsqds if provided" do
+      allow(Nsq::Consumer).to receive(:new)
+
+      expect(FastlyNsq.lookupd_http_addresses).not_to be_empty
+      expect(FastlyNsq.consumer_nsqds).not_to be_empty
+
+      FastlyNsq::Consumer.new(topic: topic, channel: channel)
+      expect(Nsq::Consumer).to have_received(:new).with a_hash_including(nsqd: FastlyNsq.consumer_nsqds).and(excluding(:nsqlookupd))
+    end
+
+    it "connects to lookupd_http_addresses if consumer_nsqds is empty" do
+      FastlyNsq.consumer_nsqds = []
+      allow(Nsq::Consumer).to receive(:new)
+
+      expect(FastlyNsq.lookupd_http_addresses).not_to be_empty
+      expect(FastlyNsq.consumer_nsqds).to be_empty
+
+      FastlyNsq::Consumer.new(topic: topic, channel: channel)
+      expect(Nsq::Consumer).to have_received(:new).with a_hash_including(nsqlookupd: FastlyNsq.lookupd_http_addresses).and(excluding(:nsqd))
+    end
+
+    it "raises when neither consumer_nsqds or lookupd_http_addresses are available" do
+      FastlyNsq.consumer_nsqds = []
+      FastlyNsq.lookupd_http_addresses = []
+      allow(Nsq::Consumer).to receive(:new)
+
+      expect(FastlyNsq.lookupd_http_addresses).to be_empty
+      expect(FastlyNsq.consumer_nsqds).to be_empty
+
+      expect { FastlyNsq::Consumer.new(topic: topic, channel: channel) }
+        .to raise_error(FastlyNsq::ConnectionFailed, "One of FastlyNsq.consumer_nsqds or FastlyNsq.lookupd_http_addresses must be present")
+      expect(Nsq::Consumer).not_to have_received(:new)
+    end
+  end
 end

data/spec/fastly_nsq_spec.rb

@@ -37,7 +37,10 @@ RSpec.describe FastlyNsq do
 
   describe "#logger" do
     let!(:default_logger) { subject.logger }
-    after { subject.logger = default_logger }
+    after do
+      subject.logger = default_logger
+      $stderr = STDERR
+    end
 
     it "returns the set logger" do
       logger = Logger.new(nil)
@@ -47,6 +50,7 @@ RSpec.describe FastlyNsq do
     end
 
     it "sets the default logger if none is set" do
+      $stderr = File.new("/dev/null", "w")
       subject.instance_variable_set(:@logger, nil)
       expect(subject.instance_variable_get(:@logger)).to be nil
       logger = subject.logger
@@ -62,14 +66,14 @@ RSpec.describe FastlyNsq do
     after { subject.logger = default_logger }
 
     it "allows the logger to be set and retrieved" do
-      logger = Logger.new($stdout)
+      logger = Logger.new("/dev/null")
       subject.logger = logger
 
       expect(subject.logger).to eq logger
     end
 
     it "sets Nsq.logger" do
-      logger = Logger.new($stdout)
+      logger = Logger.new("/dev/null")
       subject.logger = logger
 
       expect(Nsq.logger).to eq logger
@@ -94,9 +98,81 @@ RSpec.describe FastlyNsq do
   end
 
   describe "#lookupd_http_addresses" do
-    it "retreives NSQLOOKUPD_HTTP_ADDRESS" do
+    after { subject.instance_variable_set(:@lookups, nil) }
+
+    it "retreives NSQLOOKUPD_HTTP_ADDRESS by default" do
       expect(subject.lookupd_http_addresses).to eq(ENV["NSQLOOKUPD_HTTP_ADDRESS"].split(","))
     end
+
+    it "returns the value of the instance variable" do
+      subject.instance_variable_set(:@lookups, ["lolcathost"])
+
+      expect(subject.lookupd_http_addresses).to eq(["lolcathost"])
+    end
+  end
+
+  describe "#lookupd_http_addresses=" do
+    let!(:default_loookups) { subject.lookupd_http_addresses }
+    after { subject.lookupd_http_addresses = default_loookups }
+
+    it "allows the lookups to be set and retrieved" do
+      lookups = ["lolcathost:1234"]
+      subject.lookupd_http_addresses = lookups
+
+      expect(subject.lookupd_http_addresses).to eq lookups
+    end
+  end
+
+  describe "#producer_nsqds" do
+    after { subject.instance_variable_set(:@producer_nsqds, nil) }
+
+    it "retreives NSQD_PRODUCERS by default" do
+      expect(subject.producer_nsqds).to eq(ENV["NSQD_PRODUCERS"].split(","))
+    end
+
+    it "returns the value of the instance variable" do
+      subject.instance_variable_set(:@producer_nsqds, ["producer:1234"])
+
+      expect(subject.producer_nsqds).to eq(["producer:1234"])
+    end
+  end
+
+  describe "#producer_nsqds=" do
+    let!(:default_producers) { subject.producer_nsqds }
+    after { subject.producer_nsqds = default_producers }
+
+    it "allows the producer_nsqds to be set and retrieved" do
+      producers = ["producer:1234"]
+      subject.producer_nsqds = producers
+
+      expect(subject.producer_nsqds).to eq producers
+    end
+  end
+
+  describe "#consumer_nsqds" do
+    after { subject.instance_variable_set(:@consumer_nsqds, nil) }
+
+    it "retreives NSQD_CONSUMERS by default" do
+      expect(subject.consumer_nsqds).to eq(ENV["NSQD_CONSUMERS"].split(","))
+    end
+
+    it "returns the value of the instance variable" do
+      subject.instance_variable_set(:@consumer_nsqds, ["consumer:1234"])
+
+      expect(subject.consumer_nsqds).to eq(["consumer:1234"])
+    end
+  end
+
+  describe "#consumer_nsqds=" do
+    let!(:default_consumers) { subject.consumer_nsqds }
+    after { subject.consumer_nsqds = default_consumers }
+
+    it "allows the consumer_nsqds to be set and retrieved" do
+      consumers = ["consumer:1234"]
+      subject.consumer_nsqds = consumers
+
+      expect(subject.consumer_nsqds).to eq consumers
+    end
   end
 
   describe "#on" do

data/spec/http/nsqd_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe FastlyNsq::Http::Nsqd, :webmock do
       stub_request(:post, url)
       data = {topic: "lol"}
 
-      FastlyNsq::Http::Nsqd.send("topic_#{verb}".to_sym, topic: "lol", base_uri: base_uri)
+      FastlyNsq::Http::Nsqd.send(:"topic_#{verb}", topic: "lol", base_uri: base_uri)
 
       expect(a_request(:post, url).with(query: data)).to have_been_requested
 
@@ -71,7 +71,7 @@ RSpec.describe FastlyNsq::Http::Nsqd, :webmock do
       stub_request(:post, url)
       data = {topic: "lol", channel: "foo"}
 
-      FastlyNsq::Http::Nsqd.send("channel_#{verb}".to_sym, topic: "lol", channel: "foo", base_uri: base_uri)
+      FastlyNsq::Http::Nsqd.send(:"channel_#{verb}", topic: "lol", channel: "foo", base_uri: base_uri)
 
       expect(a_request(:post, url).with(query: data)).to have_been_requested
     end

data/spec/listener_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe FastlyNsq::Listener do
   describe "#call" do
     it "processes a message" do
       body = {"foo" => "bar"}
-      message = spy("message", body: JSON.dump(body))
+      message = spy("message", body: JSON.dump(body), attempts: 1, id: 1)
       expect { subject.call(message) }.to change { messages }.to([body])
     end
 
@@ -104,7 +104,7 @@ RSpec.describe FastlyNsq::Listener do
       let(:processor) { ->(_) { true } }
 
       it "finishes the message" do
-        message = spy("message", body: "{}")
+        message = spy("message", body: "{}", attempts: 1, id: 1)
         subject.call(message)
 
         expect(message).to have_received(:finish)
@@ -115,7 +115,7 @@ RSpec.describe FastlyNsq::Listener do
       let(:processor) { ->(_) { false } }
 
       it "finishes the message" do
-        message = spy("message", body: "{}")
+        message = spy("message", body: "{}", attempts: 1, id: 1)
         subject.call(message)
 
         expect(message).not_to have_received(:finish)

data/spec/producer_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+RSpec::Matchers.define_negated_matcher :excluding, :include
 
 RSpec.describe FastlyNsq::Producer do
   let!(:topic) { "fnsq" }
@@ -42,12 +43,50 @@ RSpec.describe FastlyNsq::Producer do
     logger = spy("logger")
     expect(logger).to receive(:error).and_return("Producer for #{topic} failed to connect!")
 
-    if RUBY_VERSION > "2.4.0"
-      expect { FastlyNsq::Producer.new(topic: topic, logger: logger, connect_timeout: 0.2) }
-        .to raise_error(FastlyNsq::ConnectionFailed, match(FastlyNsq.lookupd_http_addresses.inspect))
-    else
-      expect { FastlyNsq::Producer.new(topic: topic, logger: logger, connect_timeout: 0.2) }
-        .to raise_error(FastlyNsq::ConnectionFailed)
+    expect { FastlyNsq::Producer.new(topic: topic, logger: logger, connect_timeout: 0.2) }
+      .to raise_error(FastlyNsq::ConnectionFailed, match(FastlyNsq.lookupd_http_addresses.inspect))
+  end
+
+  describe "connection priority" do
+    after do
+      FastlyNsq.lookupd_http_addresses = nil
+      FastlyNsq.producer_nsqds = nil
+    end
+
+    it "connects to producer_nsqds if provided" do
+      connection = double "FastlyNsq::Producer", connected?: true
+      allow(Nsq::Producer).to receive(:new).and_return(connection)
+
+      expect(FastlyNsq.lookupd_http_addresses).not_to be_empty
+      expect(FastlyNsq.producer_nsqds).not_to be_empty
+
+      FastlyNsq::Producer.new(topic: topic)
+      expect(Nsq::Producer).to have_received(:new).with a_hash_including(nsqd: FastlyNsq.producer_nsqds).and(excluding(:nsqlookupd))
+    end
+
+    it "connects to lookupd_http_addresses if producer_nsqds is empty" do
+      FastlyNsq.producer_nsqds = []
+      connection = double "FastlyNsq::Producer", connected?: true
+      allow(Nsq::Producer).to receive(:new).and_return(connection)
+
+      expect(FastlyNsq.lookupd_http_addresses).not_to be_empty
+      expect(FastlyNsq.producer_nsqds).to be_empty
+
+      FastlyNsq::Producer.new(topic: topic)
+      expect(Nsq::Producer).to have_received(:new).with a_hash_including(nsqlookupd: FastlyNsq.lookupd_http_addresses).and(excluding(:nsqd))
+    end
+
+    it "raises when neither producer_nsqds or lookupd_http_addresses are available" do
+      FastlyNsq.producer_nsqds = []
+      FastlyNsq.lookupd_http_addresses = []
+      allow(Nsq::Producer).to receive(:new)
+
+      expect(FastlyNsq.lookupd_http_addresses).to be_empty
+      expect(FastlyNsq.producer_nsqds).to be_empty
+
+      expect { FastlyNsq::Producer.new(topic: topic) }
+        .to raise_error(FastlyNsq::ConnectionFailed, "One of FastlyNsq.producer_nsqds or FastlyNsq.lookupd_http_addresses must be present")
+      expect(Nsq::Producer).not_to have_received(:new)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.18.1
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -156,19 +156,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: nsq-ruby-fastly
+  name: nsq-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: priority_queue_cxx
   requirement: !ruby/object:Gem::Requirement
@@ -194,11 +194,12 @@ files:
 - ".env"
 - ".git-blame-ignore-revs"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rdoc_options"
 - ".ruby-version"
-- ".travis.yml"
+- ".standard.yml"
 - ChangeLog.md
 - Gemfile
 - LICENSE.txt
@@ -269,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Fastly NSQ Adapter

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-  - 2.6.9
-  - 2.7.5
-  - 3.0.3
-script:
-  - bundle exec rake
-services:
-  - docker
-before_install:
-  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-  - docker-compose up -d
-before_script:
-  - gem update --system
-notifications:
-  slack:
-    rooms:
-      secure: Uo78FoH8dwSbt7BjTcfb62RXW8aU5h2se+bs0fHSXNrzh6D3Zl+JmwzMkgN8u7M6F0WsOy6RhilYggRYAGds4K1CUi0wGJOG86NaXB4igqBIdHa6f6vzMQZoXxJk8ekc/0NFCj2UV+2Obt6FpeUZvF0Y+u029k5gN0SROfrN+ANtSq+jbI8sdsCCsedXHgDWnGsZS1hHleiRF1Q6VfKnBFcewPP/W49gzbABlKk2MjkVhse6kg+7+LRXfnDxh+aaRXBGYfzmGn4+gS6Jey63U0woAa8TdP/THlwhgvvBS0kwMMaCss+Uq1690lnVV5MX84Fsm4C+A9gbdJmlansLrYRRWm4aaAf8IGlqRTwx3F2yNHTaPA2zmkooFtn1kTuz1J8L9NjsVPPkATMAg3rTIhel+YkVK8q0Q9N9A70+P2u+Rp3htgjxVPMN7Ve9GqejUEaw690Wsp4hCK5tINj8Aq42ET/RpQt4Rzx78Vk4jEK+9UsFuuRH+awAJu/UsnA0JMTq9Smgk2kE69McVNfYPXRIRQXWAkV2dc6FwI8AAmqRusTeyWMK9SOQNXhlmry5ltWfAnHtuKdq9delbc1iOkcj8u9sCBkTz0ZogsI2oHpLlrw2oHFe49kSOkB5HMSQo8IOR7yXHAZ41lmd87/T367bak9HGqsCrweJL7Vz2Mw=
-    on_success: change
-    on_failure: change
-  email:
-    on_success: never
-    on_failure: never