fastly_nsq 1.16.0 → 1.18.0

data/spec/producer_spec.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
+RSpec::Matchers.define_negated_matcher :excluding, :include
 
 RSpec.describe FastlyNsq::Producer do
-  let!(:topic) { 'fnsq' }
+  let!(:topic) { "fnsq" }
   subject { FastlyNsq::Producer.new(topic: topic) }
 
   before { reset_topic(topic) }
@@ -12,86 +13,124 @@ RSpec.describe FastlyNsq::Producer do
 
   it { should be_connected }
 
-  it 'writes a message' do
-    subject.write 'foo'
+  it "writes a message" do
+    subject.write "foo"
     expect { message_count(topic) }.to eventually(eq(1)).within(5)
   end
 
-  it 'writes multiple messages' do
+  it "writes multiple messages" do
     subject.write %w[foo bar]
     expect { message_count(topic) }.to eventually(eq(2)).within(5)
   end
 
-  it 'should terminate' do
+  it "should terminate" do
     expect { subject.terminate }.to change(subject, :connected?).to(false)
     expect(subject.connection).to eq(nil)
   end
 
-  it 'does not write after termination' do
+  it "does not write after termination" do
     subject.terminate
-    expect { subject.write 'foo' }.to raise_error(FastlyNsq::NotConnectedError)
+    expect { subject.write "foo" }.to raise_error(FastlyNsq::NotConnectedError)
   end
 
-  it 'can connect after termination' do
+  it "can connect after termination" do
     subject.terminate
     expect { subject.connect }.to change(subject, :connected?).to(true)
   end
 
-  it 'raises when connection fails within the specified timeframe' do
+  it "raises when connection fails within the specified timeframe" do
     allow_any_instance_of(Nsq::Producer).to receive(:connected?).and_return(false)
-    logger = spy('logger')
+    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
 
-  describe 'faking', :fake do
+  describe "faking", :fake do
     it { should be_connected }
 
-    it 'should terminate' do
+    it "should terminate" do
       expect { subject.terminate }.to change(subject, :connected?).to(false)
       expect(subject.connection).to eq(nil)
     end
 
-    it 'writes a message' do
-      expect { subject.write 'foo' }.to change { subject.messages.size }.by(1)
+    it "writes a message" do
+      expect { subject.write "foo" }.to change { subject.messages.size }.by(1)
     end
 
-    it 'does not write after termination' do
+    it "does not write after termination" do
       subject.terminate
-      expect { subject.write 'foo' }.to raise_error(FastlyNsq::NotConnectedError)
+      expect { subject.write "foo" }.to raise_error(FastlyNsq::NotConnectedError)
     end
 
-    it 'can connect after termination' do
+    it "can connect after termination" do
       subject.terminate
       expect { subject.connect }.to change(subject, :connected?).to(true)
     end
   end
 
-  describe 'inline', :inline do
+  describe "inline", :inline do
     it { should be_connected }
 
-    it 'should terminate' do
+    it "should terminate" do
       expect { subject.terminate }.to change(subject, :connected?).to(false)
       expect(subject.connection).to eq(nil)
     end
 
-    it 'writes a message' do
-      expect { subject.write 'foo' }.to change { subject.messages.size }.by(1)
+    it "writes a message" do
+      expect { subject.write "foo" }.to change { subject.messages.size }.by(1)
     end
 
-    it 'does not write after termination' do
+    it "does not write after termination" do
       subject.terminate
-      expect { subject.write 'foo' }.to raise_error(FastlyNsq::NotConnectedError)
+      expect { subject.write "foo" }.to raise_error(FastlyNsq::NotConnectedError)
     end
 
-    it 'can connect after termination' do
+    it "can connect after termination" do
       subject.terminate
       expect { subject.connect }.to change(subject, :connected?).to(true)
     end

data/spec/spec_helper.rb

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
-require 'dotenv'
+require "dotenv"
 Dotenv.load
 
-require 'bundler/setup'
+require "bundler/setup"
 
 Bundler.require(:development)
 
-require 'fastly_nsq'
-require 'fastly_nsq/http'
-require 'fastly_nsq/testing'
+require "fastly_nsq"
+require "fastly_nsq/http"
+require "fastly_nsq/testing"
 
-Dir[File.expand_path('../{support,shared,matchers}/**/*.rb', __FILE__)].each { |f| require(f) }
+Dir[File.expand_path("../{support,shared,matchers}/**/*.rb", __FILE__)].sort.each { |f| require(f) }
 
 FastlyNsq::Testing.disable!
 
-if ENV['DEBUG']
+if ENV["DEBUG"]
   Concurrent.use_stdlib_logger(Logger::DEBUG)
-  FastlyNsq.logger = Logger.new(STDOUT)
+  FastlyNsq.logger = Logger.new($stdout)
 else
   Concurrent.use_stdlib_logger(Logger::ERROR)
-  FastlyNsq.logger = Logger.new('/dev/null').tap { |l| l.level = Logger::DEBUG }
+  FastlyNsq.logger = Logger.new("/dev/null").tap { |l| l.level = Logger::DEBUG }
 end
 
 RSpec.configure do |config|
@@ -32,15 +32,15 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  config.default_formatter = 'progress'
+  config.default_formatter = "progress"
   config.disable_monkey_patching!
-  config.example_status_persistence_file_path = 'spec/examples.txt'
+  config.example_status_persistence_file_path = "spec/examples.txt"
   config.filter_run :focus
   config.order = :random
   config.profile_examples = 1
   config.run_all_when_everything_filtered = true
   Kernel.srand config.seed
-  config.default_formatter = 'doc' if config.files_to_run.one?
+  config.default_formatter = "doc" if config.files_to_run.one?
 
   config.around(:each, fake: true) do |example|
     RSpec::Mocks.with_temporary_scope do

data/spec/support/http.rb

@@ -2,8 +2,8 @@
 
 module SupportHttp
   def message_count(topic)
-    topic_stats = JSON.parse(FastlyNsq::Http::Nsqd.stats(topic: topic).body)['topics'].first || {}
-    topic_stats['message_count']
+    topic_stats = JSON.parse(FastlyNsq::Http::Nsqd.stats(topic: topic).body)["topics"].first || {}
+    topic_stats["message_count"]
   end
 
   def create_topic(topic)

data/spec/support/webmock.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'webmock/rspec/matchers'
+require "webmock/rspec/matchers"
 
 RSpec.configure do |config|
   config.include WebMock::API, :webmock

data/spec/testing_spec.rb

@@ -1,29 +1,29 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe FastlyNsq::Testing do
-  describe '.message' do
-    it 'returns a FastlyNsq::Message' do
-      data = { 'foo' => 'bar' }
+  describe ".message" do
+    it "returns a FastlyNsq::Message" do
+      data = {"foo" => "bar"}
       message = FastlyNsq::Testing.message(data: data)
 
-      expect(message.body).to eq('data' => data, 'meta' => nil)
+      expect(message.body).to eq("data" => data, "meta" => nil)
     end
 
-    it 'returns a FastlyNsq::Message with meta' do
-      data = { 'foo' => 'bar' }
-      meta = 'foo'
+    it "returns a FastlyNsq::Message with meta" do
+      data = {"foo" => "bar"}
+      meta = "foo"
       message = FastlyNsq::Testing.message(data: data, meta: meta)
 
-      expect(message.body).to eq('data' => data, 'meta' => meta)
+      expect(message.body).to eq("data" => data, "meta" => meta)
     end
 
-    it 'wraps a FastlyNsq::TestMessage' do
-      data = 'bar'
+    it "wraps a FastlyNsq::TestMessage" do
+      data = "bar"
       message = FastlyNsq::Testing.message(data: data)
       expect(message.nsq_message).to be_a(FastlyNsq::TestMessage)
-      expect(message.nsq_message.body).to eq(JSON.dump('data' => data, 'meta' => nil))
+      expect(message.nsq_message.body).to eq(JSON.dump("data" => data, "meta" => nil))
     end
   end
 end

data/spec/tls_options_spec.rb

@@ -1,39 +1,39 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe FastlyNsq::TlsOptions do
-  describe 'when SSL ENV variables are not set' do
-    describe '.to_h' do
-      it 'returns nil when initialized without parameters' do
+  describe "when SSL ENV variables are not set" do
+    describe ".to_h" do
+      it "returns nil when initialized without parameters" do
         context = FastlyNsq::TlsOptions.new
 
         expect(context.to_h).to eq({})
       end
 
-      it 'returns an equivalent hash when all variables are defined' do
+      it "returns an equivalent hash when all variables are defined" do
         tls_options_hash = {
-          key: 'key',
-          certificate: 'certificate',
-          ca_certificate: 'ca_certificate',
+          key: "key",
+          certificate: "certificate",
+          ca_certificate: "ca_certificate"
         }
         context = FastlyNsq::TlsOptions.new(tls_options_hash)
 
         expected_output = {
           tls_v1: true,
           tls_options: {
-            key: 'key',
-            certificate: 'certificate',
-            ca_certificate: 'ca_certificate',
-          },
+            key: "key",
+            certificate: "certificate",
+            ca_certificate: "ca_certificate"
+          }
         }
         expect(context.to_h).to eq(expected_output)
       end
 
-      it 'does not add keys with nil values' do
+      it "does not add keys with nil values" do
         tls_options_hash = {
-          key: 'key',
-          certificate: 'certificate',
+          key: "key",
+          certificate: "certificate"
         }
         context = FastlyNsq::TlsOptions.new(tls_options_hash)
         ca_certificate = context.to_h[:ca_certificate]
@@ -43,60 +43,60 @@ RSpec.describe FastlyNsq::TlsOptions do
     end
   end
 
-  describe 'when SSL ENV variables are set' do
+  describe "when SSL ENV variables are set" do
     before do
-      ENV['NSQ_SSL_KEY'] = '/some/key'
-      ENV['NSQ_SSL_CERTIFICATE'] = '/some/certificate'
-      ENV['NSQ_SSL_CA_CERTIFICATE'] = '/some/ca_certificate'
-      ENV['NSQ_SSL_VERIFY_MODE'] = 'value'
+      ENV["NSQ_SSL_KEY"] = "/some/key"
+      ENV["NSQ_SSL_CERTIFICATE"] = "/some/certificate"
+      ENV["NSQ_SSL_CA_CERTIFICATE"] = "/some/ca_certificate"
+      ENV["NSQ_SSL_VERIFY_MODE"] = "value"
     end
 
     after do
-      ENV['NSQ_SSL_KEY'] = nil
-      ENV['NSQ_SSL_CERTIFICATE'] = nil
-      ENV['NSQ_SSL_CA_CERTIFICATE'] = nil
-      ENV['NSQ_SSL_VERIFY_MODE'] = nil
+      ENV["NSQ_SSL_KEY"] = nil
+      ENV["NSQ_SSL_CERTIFICATE"] = nil
+      ENV["NSQ_SSL_CA_CERTIFICATE"] = nil
+      ENV["NSQ_SSL_VERIFY_MODE"] = nil
     end
 
-    describe '.to_h' do
-      it 'returns a hash of the env variables when no parameters are passed' do
+    describe ".to_h" do
+      it "returns a hash of the env variables when no parameters are passed" do
         expected_hash = {
           tls_v1: true,
           tls_options: {
-            key: ENV['NSQ_SSL_KEY'],
-            certificate: ENV['NSQ_SSL_CERTIFICATE'],
-            ca_certificate: ENV['NSQ_SSL_CA_CERTIFICATE'],
-            verify_mode: ENV['NSQ_SSL_VERIFY_MODE'],
-          },
+            key: ENV["NSQ_SSL_KEY"],
+            certificate: ENV["NSQ_SSL_CERTIFICATE"],
+            ca_certificate: ENV["NSQ_SSL_CA_CERTIFICATE"],
+            verify_mode: ENV["NSQ_SSL_VERIFY_MODE"]
+          }
         }
         context = FastlyNsq::TlsOptions.new
 
         expect(context.to_h).to eq(expected_hash)
       end
 
-      it 'merges passed parameters and env variables' do
-        passed_certificate = '/passed/certificate'
+      it "merges passed parameters and env variables" do
+        passed_certificate = "/passed/certificate"
         expected_hash = {
           tls_v1: true,
           tls_options: {
-            key: ENV['NSQ_SSL_KEY'],
+            key: ENV["NSQ_SSL_KEY"],
             certificate: passed_certificate,
-            ca_certificate: ENV['NSQ_SSL_CA_CERTIFICATE'],
-            verify_mode: ENV['NSQ_SSL_VERIFY_MODE'],
-          },
+            ca_certificate: ENV["NSQ_SSL_CA_CERTIFICATE"],
+            verify_mode: ENV["NSQ_SSL_VERIFY_MODE"]
+          }
         }
         context = FastlyNsq::TlsOptions.new(certificate: passed_certificate)
 
         expect(context.to_h).to eq(expected_hash)
       end
 
-      it 'removes keys that are nil' do
+      it "removes keys that are nil" do
         expected_hash = {
           tls_v1: true,
           tls_options: {
-            ca_certificate: ENV['NSQ_SSL_CA_CERTIFICATE'],
-            verify_mode: ENV['NSQ_SSL_VERIFY_MODE'],
-          },
+            ca_certificate: ENV["NSQ_SSL_CA_CERTIFICATE"],
+            verify_mode: ENV["NSQ_SSL_VERIFY_MODE"]
+          }
         }
         context = FastlyNsq::TlsOptions.new(key: nil, certificate: nil)
 
@@ -105,16 +105,16 @@ RSpec.describe FastlyNsq::TlsOptions do
     end
   end
 
-  describe 'as_hash' do
-    it 'returns an tls_options hash' do
+  describe "as_hash" do
+    it "returns an tls_options hash" do
       expected_hash = {
         tls_v1: true,
         tls_options: {
-          key: 'joe',
-          certificate: 'biden',
-        },
+          key: "joe",
+          certificate: "biden"
+        }
       }
-      output_hash = FastlyNsq::TlsOptions.as_hash(key: 'joe', certificate: 'biden')
+      output_hash = FastlyNsq::TlsOptions.as_hash(key: "joe", certificate: "biden")
       expect(output_hash).to eq(expected_hash)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -10,10 +10,10 @@ authors:
 - Lukas Eklund
 - Josh Lane
 - Hassan Shahid
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2022-03-04 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
+  name: nsq-ruby-fastly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: priority_queue_cxx
   requirement: !ruby/object:Gem::Requirement
@@ -192,11 +192,11 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".env"
+- ".git-blame-ignore-revs"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rdoc_options"
-- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - ChangeLog.md
@@ -254,7 +254,7 @@ homepage: https://github.com/fastly/fastly_nsq
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -269,9 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Fastly NSQ Adapter
 test_files: []

data/.rubocop.yml

@@ -1,68 +0,0 @@
-AllCops:
-  Include:
-    - '**/Rakefile'
-  Exclude:
-    - 'db/schema.rb'
-    - 'vendor/**/*'
-    - 'Gemfile'
-  TargetRubyVersion: 2.4
-
-Layout/DotPosition:
-  Enabled: true
-  EnforcedStyle: trailing
-  SupportedStyles:
-    - leading
-    - trailing
-
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'spec/**/*'
-
-Lint/RescueWithoutErrorClass:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/BlockLength:
-  ExcludedMethods: [describe, context, configure]
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/ClassVars:
-  Description: 'Avoid the use of class variables.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-class-vars'
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/SignalException:
-  EnforcedStyle: only_raise
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-  Enabled: true
-
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
-  Enabled: true