fastly_nsq 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b814efb023751a7379ea0190cbff20bd92eb082
-  data.tar.gz: b750d879dc3b688c4b3286294b373e02ae576db8
+  metadata.gz: 912a3507f9a1f2aa279cae728bbfef969339efa4
+  data.tar.gz: 58b52a9f841f21cd58385b87e81e9a73a7397648
 SHA512:
-  metadata.gz: 34d1cd71cd955642569c2228f70bf78f8e15b14c599f6527e30078cd8fbc4dc4e9db8d29928085fb24f5610dc903a791fb665889e6e833e5bd073359045f9ade
-  data.tar.gz: f226f49a4282418dcd558ad9207a11647e03b9d2ea791844e682d5303a9b40e8106ac8b4f9428e4195aac1911c1284a2e922cea8785d3cc26e8f11d0565ac1ac
+  metadata.gz: c4b5b7230487629c39cfc004f5f0cdac24c2912bbefc8f4938a38ca1d975fccf320f7347c210b769fb8b00bfe4d28461dabc9824fce2dc8fd2ea11063a3a6a7b
+  data.tar.gz: dedc25afac6237e9efc24ce889e57d5fa3b27fc658bd36d92cccb3207064fd6582d21def6580707cb0dfd0682f9b5c1b2d05b79b43130965f28605e1cee1bb85

data/README.md

@@ -60,7 +60,7 @@ message_data = {
 producer = MessageQueue::Producer.new(
   nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
   topic: topic,
-).connection
+)
 
 producer.write(message_data.to_json)
 ```

data/Rakefile

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

data/lib/fastly_nsq/fake_message_queue.rb

@@ -32,7 +32,7 @@ module FakeMessageQueue
   end
 
   class Producer
-    def initialize(nsqd:, topic:, ssl_context: nil)
+    def initialize(topic:, nsqd: nil, ssl_context: nil)
     end
 
     def write(string)

data/lib/fastly_nsq/message_queue/producer.rb

@@ -1,32 +1,33 @@
+require 'forwardable'
+
 class InvalidParameterError < StandardError; end
 
 module MessageQueue
   class Producer
-    def initialize(topic:, ssl_context: nil)
-      @topic = topic
-      @ssl_context = SSLContext.new(ssl_context)
-    end
+    extend Forwardable
+    def_delegator :connection, :terminate
+    def_delegator :connection, :write
 
-    def connection
-      @producer ||= producer.new(params)
-    end
-
-    def terminate
-      @producer.terminate
+    def initialize(topic:, ssl_context: nil, connector: nil)
+      @topic       = topic
+      @ssl_context = SSLContext.new(ssl_context)
+      @connector   = connector || DEFAULT_CONNECTOR
     end
 
     private
 
-    attr_reader :topic, :ssl_context
+    DEFAULT_CONNECTOR = ->(params) { MessageQueue.strategy::Producer.new params }
 
-    def producer
-      MessageQueue.strategy::Producer
+    attr_reader :connector, :topic, :ssl_context
+
+    def connection
+      @connection ||= connector.call(params)
     end
 
     def params
       {
-        nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
-        topic: topic,
+        nsqd:        ENV.fetch('NSQD_TCP_ADDRESS'),
+        topic:       topic,
         ssl_context: ssl_context.to_h,
       }
     end

data/lib/fastly_nsq/version.rb

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

data/spec/lib/fastly_nsq/fake_message_queue_spec.rb

@@ -37,38 +37,21 @@ RSpec.describe FakeMessageQueue do
 end
 
 RSpec.describe FakeMessageQueue::Producer do
-  after do
-    FakeMessageQueue.reset!
-  end
+  let(:topic)    { 'death_star' }
+  let(:producer) { FakeMessageQueue::Producer.new topic: topic }
 
-  describe '#write' do
-    it 'adds a new message to the queue' do
-      topic = 'death_star'
+  it 'adds a new message to the queue' do
+    producer.write('hello')
 
-      producer = FakeMessageQueue::Producer.new(
-        nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
-        topic: topic,
-      )
-      producer.write('hello')
-
-      expect(FakeMessageQueue.queue.size).to eq 1
-    end
+    expect(FakeMessageQueue.queue.size).to eq 1
   end
 
-  describe '#terminate' do
-    it 'has a `terminate` method which is a noop' do
-      producer = instance_double('FakeMessageQueue::Producer')
-
-      allow(producer).to receive(:terminate)
-    end
+  it 'has a `terminate` method which is a noop' do
+    expect(producer).to respond_to(:terminate)
   end
 end
 
 RSpec.describe FakeMessageQueue::Message do
-  after do
-    FakeMessageQueue.reset!
-  end
-
   describe '#body' do
     it 'returns the body of the message' do
       topic = 'death_star'
@@ -92,10 +75,6 @@ RSpec.describe FakeMessageQueue::Consumer do
   let(:channel)  { 'star_killer_base' }
   let(:consumer) { FakeMessageQueue::Consumer.new topic: topic, channel: channel }
 
-  after do
-    FakeMessageQueue.reset!
-  end
-
   describe 'when there are no messages on the queue' do
     it 'tells you there are 0 messages in the queue' do
       expect(consumer.size).to eq 0

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

@@ -1,78 +1,49 @@
 require 'spec_helper'
 
 RSpec.describe MessageQueue::Producer do
-  describe '#connection' do
-    describe 'when using the real queue', fake_queue: false do
-      it 'returns an instance of the queue producer' do
-        allow(Nsq::Producer).to receive(:new)
-        topic = 'death_star'
+  let(:topic)    { 'death_star' }
+  let(:producer) { MessageQueue::Producer.new(topic: topic) }
+  let(:backend)  { double 'Producer' }
 
-        MessageQueue::Producer.new(topic: topic).connection
+  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(Nsq::Producer).to have_received(:new).
-          with(
-            nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
-            topic: topic,
-            ssl_context: nil,
-          ).at_least(:once)
-      end
+      expect { producer.terminate }.to raise_error(InvalidParameterError)
     end
+  end
 
-    describe 'when using the fake queue', fake_queue: true do
-      it 'returns an instance of the queue producer' do
-        allow(FakeMessageQueue::Producer).to receive(:new)
-        topic = 'death_star'
-
-        MessageQueue::Producer.new(topic: topic).connection
-
-        expect(FakeMessageQueue::Producer).to have_received(:new).
-          with(
-            nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
-            topic: topic,
-            ssl_context: nil,
-          ).at_least(:once)
-      end
+  describe 'when connector connects to a backend Producer' do
+    let(:producer) do
+      MessageQueue::Producer.new topic: topic, connector: ->(_) { backend }
     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')
-        topic = 'death_star'
-
-        producer = MessageQueue::Producer.new(topic: topic)
+    it 'forwards #write' do
+      expect(backend).to receive(:write).with("it's a message")
+      producer.write "it's a message"
+    end
 
-        expect { producer.connection }.to raise_error(InvalidParameterError)
-      end
+    it 'forwards #terminate' do
+      expect(backend).to receive(:terminate)
+      producer.terminate
     end
   end
 
-  describe '#terminate' do
-    describe 'when using the real queue', fake_queue: false do
-      it 'closes the connection' do
-        producer = double('Producer', connection: nil, terminate: nil)
-        allow(Nsq::Producer).to receive(:new).and_return(producer)
-        topic = 'death_star'
-
-        live_producer = MessageQueue::Producer.new(topic: topic)
-        live_producer.connection
-        live_producer.terminate
-
-        expect(producer).to have_received(:terminate)
+  describe 'using the default connector' do
+    module TestStrategy
+      module Producer
+        def self.new(*_); end
       end
     end
 
-    describe 'when using the fake queue', fake_queue: true do
-      it 'closes the connection' do
-        producer = double('Producer', connection: nil, terminate: nil)
-        allow(FakeMessageQueue::Producer).to receive(:new).and_return(producer)
-        topic = 'death_star'
-
-        live_producer = MessageQueue::Producer.new(topic: topic)
-        live_producer.connection
-        live_producer.terminate
+    before do
+      allow(MessageQueue).to receive(:strategy).and_return(TestStrategy)
+    end
 
-        expect(producer).to have_received(:terminate)
-      end
+    it 'instantiates a producer via Strategy' do
+      allow(backend).to receive(:terminate)
+      expect(TestStrategy::Producer).to receive(:new).and_return(backend)
+      producer.terminate
     end
   end
 end

metadata

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