fastly_nsq 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b927006ea75538d36b77a9988c99f159327e72c
-  data.tar.gz: 0ba8e537719bcb36721c65292741d779f9d4da4c
+  metadata.gz: 6b814efb023751a7379ea0190cbff20bd92eb082
+  data.tar.gz: b750d879dc3b688c4b3286294b373e02ae576db8
 SHA512:
-  metadata.gz: acaa3eb91200476a12e5f4099ef6515803293007f8643d49cd9651d5f786a6c9e2f36f39ff8086cff38a339a2767346ffada9131bb584db7d6155343d08788ed
-  data.tar.gz: 667ebee86054600dbd16e1f0450f51ce0186d759210c4c4c5e3fbac1f1d84e994124c4496cbcfce2ce6281da1398a5e3e0b8c22e45fdf3b1700511081be008bf
+  metadata.gz: 34d1cd71cd955642569c2228f70bf78f8e15b14c599f6527e30078cd8fbc4dc4e9db8d29928085fb24f5610dc903a791fb665889e6e833e5bd073359045f9ade
+  data.tar.gz: f226f49a4282418dcd558ad9207a11647e03b9d2ea791844e682d5303a9b40e8106ac8b4f9428e4195aac1911c1284a2e922cea8785d3cc26e8f11d0565ac1ac

data/Rakefile

@@ -11,7 +11,7 @@ end
 require 'rake'
 
 require 'rubygems/tasks'
-Gem::Tasks.new
+Gem::Tasks.new scm: {status: false, tag: false}
 
 require 'rdoc/task'
 RDoc::Task.new

data/lib/fastly_nsq/message_queue.rb

@@ -7,9 +7,6 @@ require_relative 'message_queue/strategy'
 require_relative 'ssl_context'
 
 module MessageQueue
-  FALSY_VALUES = [false, 0, '0', 'false', 'FALSE', 'off', 'OFF', nil].freeze
-  TRUTHY_VALUES = [true, 1, '1', 'true', 'TRUE', 'on', 'ON'].freeze
-
   def self.logger=(logger)
     strategy.logger = logger
   end

data/lib/fastly_nsq/message_queue/consumer.rb

@@ -10,18 +10,21 @@ module MessageQueue
     def_delegator :connection, :size
     def_delegator :connection, :terminate
 
-    def initialize(topic:, channel:, ssl_context: nil)
-      @topic = topic
-      @channel = channel
+    def initialize(topic:, channel:, ssl_context: nil, connector: nil)
+      @topic       = topic
+      @channel     = channel
       @ssl_context = SSLContext.new(ssl_context)
+      @connector   = connector || DEFAULT_CONNECTOR
     end
 
     private
 
-    attr_reader :channel, :topic, :ssl_context
+    attr_reader :channel, :connector, :topic, :ssl_context
+
+    DEFAULT_CONNECTOR = ->(params) { MessageQueue.strategy::Consumer.new(params) }
 
     def connection
-      Strategy.for_queue::Consumer.new(params)
+      @connection ||= connector.call(params)
     end
 
     def params

data/lib/fastly_nsq/message_queue/producer.rb

@@ -20,7 +20,7 @@ module MessageQueue
     attr_reader :topic, :ssl_context
 
     def producer
-      Strategy.for_queue::Producer
+      MessageQueue.strategy::Producer
     end
 
     def params

data/lib/fastly_nsq/message_queue/strategy.rb

@@ -1,12 +1,34 @@
-class Strategy
-  def self.for_queue
-    if MessageQueue::FALSY_VALUES.include?(ENV['FAKE_QUEUE'])
-      Nsq
-    elsif MessageQueue::TRUTHY_VALUES.include?(ENV['FAKE_QUEUE'])
-      FakeMessageQueue
-    else
-      message = "You must set ENV['FAKE_QUEUE'] to either true or false"
-      raise InvalidParameterError, message
-    end
+module MessageQueue::Strategy
+  module_function
+
+  def for_queue
+    real_queue || fake_queue || error
+  end
+
+  private_class_method
+
+  ERR_MESSAGE = "You must set ENV['FAKE_QUEUE'] to either true or false".freeze
+
+  def error
+    raise InvalidParameterError, ERR_MESSAGE
+  end
+
+  FALSY_VALUES  = [false, 0, '0', 'false', 'FALSE', 'off', 'OFF', nil].freeze
+  TRUTHY_VALUES = [true, 1, '1', 'true', 'TRUE', 'on', 'ON'].freeze
+
+  def fake_queue
+    FakeMessageQueue if should_use_fake_queue?
+  end
+
+  def should_use_real_queue?
+    FALSY_VALUES.include? ENV['FAKE_QUEUE']
+  end
+
+  def real_queue
+    Nsq if should_use_real_queue?
+  end
+
+  def should_use_fake_queue?
+    TRUTHY_VALUES.include? ENV['FAKE_QUEUE']
   end
 end

data/lib/fastly_nsq/version.rb

@@ -1,3 +1,3 @@
 module FastlyNsq
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/spec/lib/fastly_nsq/message_queue/consumer_spec.rb

@@ -3,11 +3,8 @@ require 'spec_helper'
 RSpec.describe MessageQueue::Consumer do
   let(:channel)  { 'star_killer_base' }
   let(:topic)    { 'death_star' }
-  let(:consumer) { MessageQueue::Consumer.new(topic: topic, channel: channel) }
-
-  def fake_consumer
-    double 'Consumer', connection: nil, terminate: nil, pop: :popped, size: 0
-  end
+  let(:consumer) { MessageQueue::Consumer.new topic: topic, channel: channel }
+  let(:backend)  { double 'Consumer' }
 
   describe 'when the ENV is set incorrectly' do
     it 'raises with a helpful error' do
@@ -17,49 +14,47 @@ RSpec.describe MessageQueue::Consumer do
     end
   end
 
-  describe 'when using the real queue', fake_queue: false do
-    before(:example) do
-      @fake_consumer = fake_consumer
-      allow(Nsq::Consumer).to receive(:new).and_return(@fake_consumer)
+  describe 'when connector connects to a backend Consumer' do
+    let(:consumer) do
+      MessageQueue::Consumer.new topic: topic, channel: channel, connector: ->(_) { backend }
     end
 
-    it 'forwards #pop to Nsq::Consumer' do
+    it 'forwards #pop' do
+      expect(backend).to receive(:pop)
       consumer.pop
-      expect(@fake_consumer).to have_received(:pop)
     end
 
-    it 'forwards #size to Nsq::Consumer' do
+    it 'forwards #pop_without_blocking' do
+      expect(backend).to receive(:pop_without_blocking)
+      consumer.pop_without_blocking
+    end
+
+    it 'forwards #size' do
+      expect(backend).to receive(:size)
       consumer.size
-      expect(@fake_consumer).to have_received(:size)
     end
 
-    it 'forwards #terminate to Nsq::Consumer' do
+    it 'forwards #terminate' do
+      expect(backend).to receive(:terminate)
       consumer.terminate
-
-      expect(@fake_consumer).to have_received(:terminate)
     end
   end
 
-  describe 'when using the fake queue', fake_queue: true do
-    before(:example) do
-      @fake_consumer = fake_consumer
-      allow(FakeMessageQueue::Consumer).to receive(:new).and_return(@fake_consumer)
+  describe 'using the default connector' do
+    module TestStrategy
+      module Consumer
+        def self.new(*_); end
+      end
     end
 
-    it 'forwards #pop to FakeMessageQueue::Consumer' do
-      consumer.pop
-      expect(@fake_consumer).to have_received(:pop)
+    before do
+      allow(MessageQueue).to receive(:strategy).and_return(TestStrategy)
     end
 
-    it 'forwards #size to FakeMessageQueue::Consumer' do
-      consumer.size
-      expect(@fake_consumer).to have_received(:size)
-    end
-
-    it 'forwards #terminate to FakeMessageQueue::Consumer' do
+    it 'instantiates a consumer via Strategy' do
+      allow(backend).to receive(:terminate)
+      expect(TestStrategy::Consumer).to receive(:new).and_return(backend)
       consumer.terminate
-
-      expect(@fake_consumer).to have_received(:terminate)
     end
   end
 end

data/spec/lib/fastly_nsq/message_queue/listener_spec.rb

@@ -87,21 +87,4 @@ RSpec.describe MessageQueue::Listener do
       end
     end
   end
-
-  describe '#go' do
-    describe 'when a SIGTERM is received' do
-      it 'closes the consumer connection' do
-        pid = fork do
-          MessageQueue::Listener.new(topic: topic, channel: channel).go
-        end
-
-        Process.kill('TERM', pid)
-
-        # Success for this test is to expect it to complete.
-        #
-        # Additional Note: We are NOT testing the SIGINT case because it
-        # orphans the test's Ruby process and is thus meaningless as a test.
-      end
-    end
-  end
 end

data/spec/lib/fastly_nsq/message_queue/strategy_spec.rb

@@ -1,29 +1,35 @@
 require 'spec_helper'
 
-RSpec.describe Strategy do
-  describe '.for_queue' do
-    describe 'when using the fake queue', fake_queue: true do
-      it 'returns the strategy based on the ENV variable' do
-        strategy = Strategy.for_queue
+RSpec.describe MessageQueue::Strategy do
+  describe 'when FAKE_QUEUE is falsy' do
+    it 'returns the strategy based on the ENV variable' do
+      [false, 0, '0', 'false', 'FALSE', 'off', 'OFF', nil].each do |no|
+        allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(no)
 
-        expect(strategy).to eq FakeMessageQueue
+        strategy = MessageQueue::Strategy.for_queue
+
+        expect(strategy).to eq Nsq
       end
     end
+  end
 
-    describe 'when using the real queue', fake_queue: false do
-      it 'returns the strategy based on the ENV variable' do
-        strategy = Strategy.for_queue
+  describe 'when FAKE_QUEUE is truthy' do
+    it 'returns the strategy based on the ENV variable' do
+      [true, 1, '1', 'true', 'TRUE', 'on', 'ON'].each do |yes|
+        allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(yes)
 
-        expect(strategy).to eq Nsq
+        strategy = MessageQueue::Strategy.for_queue
+
+        expect(strategy).to eq FakeMessageQueue
       end
     end
+  end
 
-    describe 'when the ENV is set incorrectly' do
-      it 'raises with a helpful error' do
-        allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return('taco')
+  describe 'when the ENV is set incorrectly' do
+    it 'raises with a helpful error' do
+      allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return('taco')
 
-        expect { Strategy.for_queue }.to raise_error(InvalidParameterError)
-      end
+      expect { MessageQueue::Strategy.for_queue }.to raise_error(InvalidParameterError)
     end
   end
 end

data/spec/lib/fastly_nsq/message_queue_spec.rb

@@ -1,14 +1,23 @@
 require 'spec_helper'
 
 RSpec.describe MessageQueue do
+  module TestStrategy; end
+
+  it 'allows the logger to be set and retrieved' do
+    logger = Logger.new(STDOUT)
+    MessageQueue.logger = logger
+
+    expect(MessageQueue.logger).to eq logger
+  end
+
+  it 'returns the current Strategy' do
+    allow(MessageQueue::Strategy).to receive(:for_queue).and_return(TestStrategy)
+
+    expect(MessageQueue.strategy).to eql(TestStrategy)
+  end
+
   describe '.logger' do
     describe 'when using the fake queue', fake_queue: true do
-      it 'allows the logger to be set and retrieved' do
-        logger = Logger.new(STDOUT)
-        MessageQueue.logger = logger
-
-        expect(MessageQueue.logger).to eq logger
-      end
     end
 
     describe 'when using the real queue, fake_queue: false' do

data/spec/support/env_helpers.rb

@@ -1,16 +1,12 @@
 module EnvHelpers
   def use_fake_connection
-    MessageQueue::TRUTHY_VALUES.each do |yes|
-      allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(yes)
-      yield
-    end
+    allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(true)
+    yield
   end
 
   def use_real_connection
-    MessageQueue::FALSY_VALUES.each do |no|
-      allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(no)
-      yield
-    end
+    allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(false)
+    yield
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print