fastly_nsq 0.13.2 → 1.0.2

data/spec/matchers/delegate.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :delegate do |method|
+  match do |delegator|
+    @method = @prefix ? :"#{@to}_#{method}" : method
+    @delegator = delegator
+    begin
+      @delegator.send(@to)
+    rescue NoMethodError
+      raise "#{@delegator} does not respond to #{@to}!"
+    end
+    allow(@delegator).to receive(@to).and_return(double('receiver', method => :called))
+    actual = (@delegator.send(@method) == :called)
+    allow(@delegator).to receive(@to).and_call_original # unstub
+    actual
+  end
+
+  description do
+    "delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
+  end
+
+  failure_message do |_text|
+    "expected #{@delegator} to delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
+  end
+
+  failure_message_when_negated do |_text|
+    "expected #{@delegator} not to delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
+  end
+
+  chain(:to) { |receiver| @to = receiver }
+  chain(:with_prefix) { @prefix = true }
+end

data/spec/{lib/fastly_nsq/message_spec.rb → message_spec.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 

data/spec/{lib/fastly_nsq/messenger_spec.rb → messenger_spec.rb}

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 
@@ -26,7 +28,7 @@ RSpec.describe FastlyNsq::Messenger do
     it 'writes a single message on a producer' do
       subject.producers['topic'] = producer
 
-      subject.deliver message: message, on_topic: 'topic', originating_service: origin
+      subject.deliver message: message, topic: 'topic', originating_service: origin
 
       expect(producer).to have_received(:write).with(expected_attributes.to_json)
     end
@@ -35,7 +37,7 @@ RSpec.describe FastlyNsq::Messenger do
       subject.producers['topic'] = producer
       expected_attributes[:meta][:originating_service] = 'Unknown'
 
-      subject.deliver message: message, on_topic: 'topic'
+      subject.deliver message: message, topic: 'topic'
 
       expect(producer).to have_received(:write).with(expected_attributes.to_json)
     end
@@ -47,7 +49,7 @@ RSpec.describe FastlyNsq::Messenger do
 
       subject.producers['topic'] = producer
 
-      subject.deliver message: message, on_topic: 'topic', meta: meta, originating_service: origin
+      subject.deliver message: message, topic: 'topic', meta: meta, originating_service: origin
 
       expect(producer).to have_received(:write).with(expected_attributes.to_json)
     end
@@ -61,7 +63,7 @@ RSpec.describe FastlyNsq::Messenger do
 
       subject.producers['topic'] = producer
 
-      subject.deliver message: message, on_topic: 'topic', meta: meta, originating_service: origin
+      subject.deliver message: message, topic: 'topic', meta: meta, originating_service: origin
 
       expect(producer).to have_received(:write).with(expected_attributes.to_json)
     end
@@ -74,7 +76,7 @@ RSpec.describe FastlyNsq::Messenger do
       subject.originating_service = service
       expected_attributes[:meta][:originating_service] = service
 
-      subject.deliver message: message, on_topic: 'nanotopic'
+      subject.deliver message: message, topic: 'nanotopic'
 
       expect(producer).to have_received(:write).with(expected_attributes.to_json)
 

data/spec/priority_thread_pool_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe FastlyNsq::PriorityThreadPool do
+  let!(:pool) { described_class.new(max_threads: 1) }
+
+  after { pool.shutdown || pool.wait_for_termination }
+
+  it 'executes work based on supplied priority' do
+    actual = []
+    count = 10
+    count.times { |i| pool.post(i) { actual << i } }
+    expect { pool.completed_task_count }.to eventually(eq(count)).within(30)
+
+    # weak but stable assertion that the last element was not the last processed
+    expect(actual.last).not_to eq(count - 1)
+  end
+end

data/spec/producer_spec.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe FastlyNsq::Producer do
+  let!(:topic) { 'fnsq' }
+  subject { FastlyNsq::Producer.new(topic: topic) }
+
+  before { reset_topic(topic) }
+  before { expect { subject }.to eventually(be_connected).within(5) }
+  after { subject.terminate if subject.connected? }
+
+  it { should be_connected }
+
+  it 'writes a message' do
+    subject.write 'foo'
+    expect { message_count(topic) }.to eventually(eq(1)).within(5)
+  end
+
+  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
+    subject.terminate
+    expect { subject.write 'foo' }.to raise_error(FastlyNsq::NotConnectedError)
+  end
+
+  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
+    allow_any_instance_of(Nsq::Producer).to receive(:connected?).and_return(false)
+    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)
+    end
+  end
+
+  describe 'faking', :fake do
+    it { should be_connected }
+
+    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)
+    end
+
+    it 'does not write after termination' do
+      subject.terminate
+      expect { subject.write 'foo' }.to raise_error(FastlyNsq::NotConnectedError)
+    end
+
+    it 'can connect after termination' do
+      subject.terminate
+      expect { subject.connect }.to change(subject, :connected?).to(true)
+    end
+  end
+
+  describe 'inline', :inline do
+    it { should be_connected }
+
+    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)
+    end
+
+    it 'does not write after termination' do
+      subject.terminate
+      expect { subject.write 'foo' }.to raise_error(FastlyNsq::NotConnectedError)
+    end
+
+    it 'can connect after termination' do
+      subject.terminate
+      expect { subject.connect }.to change(subject, :connected?).to(true)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,27 @@
+# frozen_string_literal: true
+
+require 'dotenv'
+Dotenv.load
+
+require 'bundler/setup'
+
+Bundler.require(:development)
+
 require 'fastly_nsq'
-require 'awesome_print'
-require 'pry-byebug'
-require 'webmock/rspec'
+require 'fastly_nsq/http'
+require 'fastly_nsq/testing'
 
-require_relative 'support/env_helpers'
+Dir[File.expand_path('../{support,shared,matchers}/**/*.rb', __FILE__)].each { |f| require(f) }
+
+FastlyNsq::Testing.disable!
+
+if ENV['DEBUG']
+  Concurrent.use_stdlib_logger(Logger::DEBUG)
+  FastlyNsq.logger = Logger.new(STDOUT)
+else
+  Concurrent.use_stdlib_logger(Logger::ERROR)
+  FastlyNsq.logger = Logger.new(STDOUT).tap { |l| l.level = Logger::ERROR }
+end
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
@@ -22,38 +40,24 @@ RSpec.configure do |config|
   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?
 
-  if config.files_to_run.one?
-    config.default_formatter = 'doc'
-  end
-
-  config.before(:each) do
-    load_sample_environment_variables
-    FastlyNsq::FakeBackend.reset!
-    WebMock.reset!
-  end
-
-  config.around(:each, fake_queue: true) do |example|
+  config.around(:each, fake: true) do |example|
     RSpec::Mocks.with_temporary_scope do
-      use_fake_connection do
-        example.run
-      end
+      FastlyNsq::Messages.messages.clear
+      FastlyNsq::Testing.fake! { example.run }
     end
   end
 
-  config.around(:each, fake_queue: false) do |example|
+  config.around(:each, inline: true) do |example|
     RSpec::Mocks.with_temporary_scope do
-      use_real_connection do
-        example.run
-      end
+      FastlyNsq::Testing.inline! { example.run }
     end
   end
 
-  def load_sample_environment_variables
-    env_file = File.open('env_configuration_for_local_gem_tests.yml')
-
-    YAML.safe_load(env_file).each do |key, value|
-      ENV[key.to_s] = value
-    end
+  config.before(:each) do
+    FastlyNsq.manager.terminate(1)
+    FastlyNsq.manager = FastlyNsq::Manager.new
+    FastlyNsq::Testing.reset!
   end
 end

data/spec/support/http.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module SupportHttp
+  def message_count(topic)
+    topic_stats = JSON.parse(FastlyNsq::Http::Nsqd.stats(topic: topic).body)['topics'].first || {}
+    topic_stats['message_count']
+  end
+
+  def create_topic(topic)
+    FastlyNsq::Http::Nsqd.topic_create(topic: topic).code == 200
+  end
+
+  def empty_topic(topic)
+    FastlyNsq::Http::Nsqd.topic_empty(topic: topic).code == 200
+  end
+
+  def delete_topic(topic)
+    FastlyNsq::Http::Nsqd.topic_delete(topic: topic).code == 200
+  end
+
+  def delete_channel(topic, channel)
+    FastlyNsq::Http::Nsqd.channel_delete(topic: topic, channel: channel).code == 200
+  end
+
+  def create_channel(topic, channel)
+    FastlyNsq::Http::Nsqd.channel_create(topic: topic, channel: channel).code == 200
+  end
+
+  def reset_topic(topic, channel: nil)
+    delete_channel(topic, channel) if channel
+    delete_topic(topic)
+    create_topic(topic)
+    create_channel(topic, channel) if channel
+  end
+end
+
+RSpec.configure { |config| config.include(SupportHttp) }

data/spec/support/webmock.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'webmock/rspec/matchers'
+
+RSpec.configure do |config|
+  config.include WebMock::API, :webmock
+  config.include WebMock::Matchers, :webmock
+
+  config.before(:each, :webmock) do
+    WebMock.enable!
+  end
+
+  config.after(:each, :webmock) do
+    WebMock.disable!
+  end
+
+  config.after(:each) do
+    WebMock.reset!
+  end
+end
+
+WebMock::AssertionFailure.error_class = RSpec::Expectations::ExpectationNotMetError

data/spec/{lib/fastly_nsq/tls_options_spec.rb → tls_options_spec.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe FastlyNsq::TlsOptions do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 1.0.2
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -43,20 +43,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -71,20 +57,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: overcommit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.32.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,109 +72,95 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec-eventually
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
+  name: nsq-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
-  name: nsq-ruby
+  name: priority_queue_cxx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0.3'
 description: Helper classes for Fastly's NSQ Services
 email: tommy@fastly.com
 executables:
@@ -211,6 +169,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".env"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".overcommit.yml"
@@ -224,49 +183,48 @@ files:
 - README.md
 - Rakefile
 - bin/fastly_nsq
-- env_configuration_for_local_gem_tests.yml
-- example_config_class.rb
+- docker-compose.yml
 - examples/.sample.env
-- examples/Rakefile
 - fastly_nsq.gemspec
 - lib/fastly_nsq.rb
 - lib/fastly_nsq/cli.rb
 - lib/fastly_nsq/consumer.rb
-- lib/fastly_nsq/fake_backend.rb
+- lib/fastly_nsq/feeder.rb
 - lib/fastly_nsq/http.rb
 - lib/fastly_nsq/http/nsqd.rb
 - lib/fastly_nsq/http/nsqlookupd.rb
 - lib/fastly_nsq/launcher.rb
 - lib/fastly_nsq/listener.rb
-- lib/fastly_nsq/listener/config.rb
 - lib/fastly_nsq/manager.rb
 - lib/fastly_nsq/message.rb
 - lib/fastly_nsq/messenger.rb
+- lib/fastly_nsq/priority_queue.rb
+- lib/fastly_nsq/priority_thread_pool.rb
 - lib/fastly_nsq/producer.rb
-- lib/fastly_nsq/rake_task.rb
 - lib/fastly_nsq/safe_thread.rb
-- lib/fastly_nsq/strategy.rb
+- lib/fastly_nsq/testing.rb
 - lib/fastly_nsq/tls_options.rb
 - lib/fastly_nsq/version.rb
-- spec/lib/fastly_nsq/cli_spec.rb
-- spec/lib/fastly_nsq/consumer_spec.rb
-- spec/lib/fastly_nsq/fake_backend_spec.rb
-- spec/lib/fastly_nsq/fastly_nsq_spec.rb
-- spec/lib/fastly_nsq/http/nsqd_spec.rb
-- spec/lib/fastly_nsq/http/nsqlookupd_spec.rb
-- spec/lib/fastly_nsq/http_spec.rb
-- spec/lib/fastly_nsq/launcher_spec.rb
-- spec/lib/fastly_nsq/listener_spec.rb
-- spec/lib/fastly_nsq/manager_spec.rb
-- spec/lib/fastly_nsq/message_spec.rb
-- spec/lib/fastly_nsq/messenger_spec.rb
-- spec/lib/fastly_nsq/producer_spec.rb
-- spec/lib/fastly_nsq/rake_task_spec.rb
-- spec/lib/fastly_nsq/strategy_spec.rb
-- spec/lib/fastly_nsq/tls_options_spec.rb
-- spec/lib/fastly_nsq_spec.rb
+- spec/cli_spec.rb
+- spec/consumer_spec.rb
+- spec/fastly_nsq_spec.rb
+- spec/feeder_spec.rb
+- spec/http/nsqd_spec.rb
+- spec/http/nsqlookupd_spec.rb
+- spec/http_spec.rb
+- spec/integration_spec.rb
+- spec/launcher_spec.rb
+- spec/listener_spec.rb
+- spec/manager_spec.rb
+- spec/matchers/delegate.rb
+- spec/message_spec.rb
+- spec/messenger_spec.rb
+- spec/priority_thread_pool_spec.rb
+- spec/producer_spec.rb
 - spec/spec_helper.rb
-- spec/support/env_helpers.rb
+- spec/support/http.rb
+- spec/support/webmock.rb
+- spec/tls_options_spec.rb
 homepage: https://github.com/fastly/fastly_nsq
 licenses:
 - MIT
@@ -287,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Fastly NSQ Adapter