fastly_nsq 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfbb2df1f2bb5e0a03516595b655c65c72238697
-  data.tar.gz: db467a7f87cf17d1dd6d69b577d8c8c051c87028
+  metadata.gz: 8ccbc7fd7e6fa179bd882b2484044920665c0a3a
+  data.tar.gz: eb2b73af286d71f8e8a4c07de67801ebf50768fb
 SHA512:
-  metadata.gz: e07fc37bed4ef892de6ed12048c4ae9d8217b9f55f0ed08a1a3b16b118264be3e2a757b0fd9b35c433399b82ada9731ddaf026f204f507055fa283769fd9a780
-  data.tar.gz: 28044043d848e2143b517db10a5d2d6bbec39e244d18af1d313e38d5268ae0853e802d2c6c77aaeb8c77ee4bf560cfe02cae5447a8984bbb92459310a8264acd
+  metadata.gz: 023c35498c520e22c39fae392a1d912297b66371bf177aca8ee3a8c6a74941b5024c078a91f576b3659bef3efcddd7372bff70b363f040a7ced73f8076ca0b1f
+  data.tar.gz: d9bd4a185e4540466e8c4dbe64aef1e6cda7627019c98860d1a482052ca3fdf1beee7d75f2821b966b19437a81599e7b61dff631fe3b6dcf3c204f9cd0ec41ff

data/lib/fastly_nsq/fake_message_queue.rb

@@ -1,16 +1,12 @@
 module FakeMessageQueue
-  @@queue = []
+  @@queue = Queue.new
 
   def self.queue
     @@queue
   end
 
-  def self.queue=(message)
-    @@queue = message
-  end
-
   def self.reset!
-    self.queue = []
+    self.queue.clear
   end
 
   class Producer

data/lib/fastly_nsq/version.rb

@@ -1,3 +1,3 @@
 module FastlyNsq
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/lib/fastly_nsq/fake_message_queue_spec.rb

@@ -2,14 +2,17 @@ require 'spec_helper'
 
 RSpec.describe FakeMessageQueue do
   describe '@@queue' do
-    it 'is initalized as an empty array' do
-      expect(FakeMessageQueue.queue).to eq []
+    it 'is initalized as an empty Ruby Queue' do
+      queue = FakeMessageQueue.queue
+
+      expect(queue).to be_a Thread::Queue
+      expect(queue).to be_empty
     end
   end
 
   describe '.reset!' do
     it 'resets the fake message queue' do
-      FakeMessageQueue.queue = ['hello']
+      FakeMessageQueue.queue.push('hello')
       expect(FakeMessageQueue.queue.size).to eq 1
 
       FakeMessageQueue.reset!
@@ -76,7 +79,7 @@ RSpec.describe FakeMessageQueue::Consumer do
 
   describe '#size' do
     it 'tells you how many messages are in the queue' do
-      FakeMessageQueue.queue = ['hello']
+      FakeMessageQueue.queue.push('hello')
       topic = 'death_star'
       channel = 'star_killer_base'
 
@@ -92,20 +95,42 @@ RSpec.describe FakeMessageQueue::Consumer do
   end
 
   describe '#pop' do
-    it 'returns the last message off of the queue' do
-      message = FakeMessageQueue::Message.new('hello')
-      FakeMessageQueue.queue = [message]
-      topic = 'death_star'
-      channel = 'star_killer_base'
-
-      consumer = FakeMessageQueue::Consumer.new(
-        nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
-        topic: topic,
-        channel: channel,
-      )
-      popped_message = consumer.pop
+    context 'when there is a message on the queue' do
+      it 'returns the last message off of the queue' do
+        message = FakeMessageQueue::Message.new('hello')
+        FakeMessageQueue.queue.push(message)
+        topic = 'death_star'
+        channel = 'star_killer_base'
+
+        consumer = FakeMessageQueue::Consumer.new(
+          nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
+          topic: topic,
+          channel: channel,
+        )
+        popped_message = consumer.pop
+
+        expect(popped_message).to eq message
+      end
+    end
 
-      expect(popped_message). to eq message
+    context 'when there no message on the queue' do
+      it 'blocks on the process, waiting for a message ' do
+        FakeMessageQueue.reset!
+        topic = 'death_star'
+        channel = 'star_killer_base'
+
+        consumer = FakeMessageQueue::Consumer.new(
+          nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
+          topic: topic,
+          channel: channel,
+        )
+
+        expect {
+          Timeout::timeout(0.1) do
+            consumer.pop
+          end
+        }.to raise_error(Timeout::Error)
+      end
     end
   end
 

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

@@ -2,41 +2,37 @@ require 'spec_helper'
 
 RSpec.describe MessageQueue::Consumer do
   describe '#connection' do
-    describe 'when using the real queue' do
+    describe 'when using the real queue', fake_queue: false do
       it 'returns an instance of the queue consumer' do
-        use_real_connection do
-          allow(Nsq::Consumer).to receive(:new)
-          topic = 'death_star'
-          channel = 'star_killer_base'
+        allow(Nsq::Consumer).to receive(:new)
+        topic = 'death_star'
+        channel = 'star_killer_base'
 
-          MessageQueue::Consumer.new(topic: topic, channel: channel).connection
+        MessageQueue::Consumer.new(topic: topic, channel: channel).connection
 
-          expect(Nsq::Consumer).to have_received(:new).
-            with(
-              nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
-              topic: topic,
-              channel: channel,
-          ).at_least(:once)
-        end
+        expect(Nsq::Consumer).to have_received(:new).
+          with(
+            nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
+            topic: topic,
+            channel: channel,
+        ).at_least(:once)
       end
     end
 
-    describe 'when using the fake queue' do
+    describe 'when using the fake queue', fake_queue: true do
       it 'returns an instance of the queue consumer' do
-        use_fake_connection do
-          allow(FakeMessageQueue::Consumer).to receive(:new)
-          topic = 'death_star'
-          channel = 'star_killer_base'
+        allow(FakeMessageQueue::Consumer).to receive(:new)
+        topic = 'death_star'
+        channel = 'star_killer_base'
 
-          MessageQueue::Consumer.new(topic: topic, channel: channel).connection
+        MessageQueue::Consumer.new(topic: topic, channel: channel).connection
 
-          expect(FakeMessageQueue::Consumer).to have_received(:new).
-            with(
-              nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
-              topic: topic,
-              channel: channel,
-          ).at_least(:once)
-        end
+        expect(FakeMessageQueue::Consumer).to have_received(:new).
+          with(
+            nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
+            topic: topic,
+            channel: channel,
+        ).at_least(:once)
       end
     end
   end
@@ -54,39 +50,35 @@ RSpec.describe MessageQueue::Consumer do
   end
 
   describe '#terminate' do
-    describe 'when using the real queue' do
+    describe 'when using the real queue', fake_queue: false do
       it 'closes the connection' do
-        use_real_connection do
-          consumer = double('Consumer', connection: nil, terminate: nil)
-          allow(Nsq::Consumer).to receive(:new).and_return(consumer)
-          topic = 'death_star'
-          channel = 'star_killer_base'
-          params = { topic: topic, channel: channel }
+        consumer = double('Consumer', connection: nil, terminate: nil)
+        allow(Nsq::Consumer).to receive(:new).and_return(consumer)
+        topic = 'death_star'
+        channel = 'star_killer_base'
+        params = { topic: topic, channel: channel }
 
-          live_consumer = MessageQueue::Consumer.new(params)
-          live_consumer.connection
-          live_consumer.terminate
+        live_consumer = MessageQueue::Consumer.new(params)
+        live_consumer.connection
+        live_consumer.terminate
 
-          expect(consumer).to have_received(:terminate)
-        end
+        expect(consumer).to have_received(:terminate)
       end
     end
 
-    describe 'when using the fake queue' do
+    describe 'when using the fake queue', fake_queue: true do
       it 'closes the connection' do
-        use_fake_connection do
-          consumer = double('Consumer', connection: nil, terminate: nil)
-          allow(FakeMessageQueue::Consumer).to receive(:new).and_return(consumer)
-          topic = 'death_star'
-          channel = 'star_killer_base'
-          params = { topic: topic, channel: channel }
+        consumer = double('Consumer', connection: nil, terminate: nil)
+        allow(FakeMessageQueue::Consumer).to receive(:new).and_return(consumer)
+        topic = 'death_star'
+        channel = 'star_killer_base'
+        params = { topic: topic, channel: channel }
 
-          live_consumer = MessageQueue::Consumer.new(params)
-          live_consumer.connection
-          live_consumer.terminate
+        live_consumer = MessageQueue::Consumer.new(params)
+        live_consumer.connection
+        live_consumer.terminate
 
-          expect(consumer).to have_received(:terminate)
-        end
+        expect(consumer).to have_received(:terminate)
       end
     end
   end

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

@@ -8,8 +8,8 @@ RSpec.describe MessageQueue::Listener do
       connection = double('Connection', pop: message, terminate: nil)
       consumer = double('Consumer', connection: connection)
       allow(MessageQueue::Consumer).to receive(:new).and_return(consumer)
-      topic = 'minitest'
-      channel = 'northstar'
+      topic = 'testing_topic'
+      channel = 'testing_channel'
 
       MessageQueue::Listener.new(topic: topic, channel: channel).
         process_next_message
@@ -26,8 +26,8 @@ RSpec.describe MessageQueue::Listener do
       connection = double('Connection', pop: message, terminate: nil)
       consumer = double('Consumer', connection: connection)
       allow(MessageQueue::Consumer).to receive(:new).and_return(consumer)
-      topic = 'minitest'
-      channel = 'northstar'
+      topic = 'testing_topic'
+      channel = 'testing_channel'
 
       MessageQueue::Listener.new(topic: topic, channel: channel).
         process_next_message
@@ -42,14 +42,31 @@ RSpec.describe MessageQueue::Listener do
       connection = double('Connection', pop: message, terminate: nil)
       consumer = double('Consumer', connection: connection)
       allow(MessageQueue::Consumer).to receive(:new).and_return(consumer)
-      topic = 'minitest'
-      channel = 'northstar'
+      topic = 'testing_topic'
+      channel = 'testing_channel'
 
       MessageQueue::Listener.new(topic: topic, channel: channel).
         process_next_message
 
       expect(message).to have_received(:finish)
     end
+
+    context 'when using the fake queue and it is empty' do
+      it 'blocks on the process, waiting for a message ' do
+        MessageQueue::TRUTHY_VALUES.each do |yes|
+          allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(yes)
+          topic = 'testing_topic'
+          channel = 'testing_channel'
+
+          expect {
+            Timeout::timeout(0.1) do
+              MessageQueue::Listener.new(topic: topic, channel: channel).
+                process_next_message
+            end
+          }.to raise_error(Timeout::Error)
+        end
+      end
+    end
   end
 
   describe '#go' do
@@ -60,8 +77,8 @@ RSpec.describe MessageQueue::Listener do
         connection = double('Connection', pop: message, terminate: nil)
         consumer = double('Consumer', connection: connection)
         allow(MessageQueue::Consumer).to receive(:new).and_return(consumer)
-        topic = 'minitest'
-        channel = 'northstar'
+        topic = 'testing_topic'
+        channel = 'testing_channel'
 
         pid = fork do
           MessageQueue::Listener.new(topic: topic, channel: channel).go
@@ -69,9 +86,10 @@ RSpec.describe MessageQueue::Listener do
 
         Process.kill('TERM', pid)
 
-        # Success for this test is to expect it to complete
-        # Note: We are not testing the SIGINT case because it orphans the test
-        # Ruby process and is sort of meaningless as a test.
+        # 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

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

@@ -2,37 +2,33 @@ require 'spec_helper'
 
 RSpec.describe MessageQueue::Producer do
   describe '#connection' do
-    describe 'when using the real queue' do
+    describe 'when using the real queue', fake_queue: false do
       it 'returns an instance of the queue producer' do
-        use_real_connection do
-          allow(Nsq::Producer).to receive(:new)
-          topic = 'death_star'
+        allow(Nsq::Producer).to receive(:new)
+        topic = 'death_star'
 
-          MessageQueue::Producer.new(topic: topic).connection
+        MessageQueue::Producer.new(topic: topic).connection
 
-          expect(Nsq::Producer).to have_received(:new).
-            with(
-              nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
-              topic: topic,
-          ).at_least(:once)
-        end
+        expect(Nsq::Producer).to have_received(:new).
+          with(
+            nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
+            topic: topic,
+        ).at_least(:once)
       end
     end
 
-    describe 'when using the fake queue' do
+    describe 'when using the fake queue', fake_queue: true do
       it 'returns an instance of the queue producer' do
-        use_fake_connection do
-          allow(FakeMessageQueue::Producer).to receive(:new)
-          topic = 'death_star'
+        allow(FakeMessageQueue::Producer).to receive(:new)
+        topic = 'death_star'
 
-          MessageQueue::Producer.new(topic: topic).connection
+        MessageQueue::Producer.new(topic: topic).connection
 
-          expect(FakeMessageQueue::Producer).to have_received(:new).
-            with(
-              nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
-              topic: topic,
-          ).at_least(:once)
-        end
+        expect(FakeMessageQueue::Producer).to have_received(:new).
+          with(
+            nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
+            topic: topic,
+        ).at_least(:once)
       end
     end
 
@@ -49,35 +45,31 @@ RSpec.describe MessageQueue::Producer do
   end
 
   describe '#terminate' do
-    describe 'when using the real queue' do
+    describe 'when using the real queue', fake_queue: false do
       it 'closes the connection' do
-        use_real_connection do
-          producer = double('Producer', connection: nil, terminate: nil)
-          allow(Nsq::Producer).to receive(:new).and_return(producer)
-          topic = 'death_star'
+        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
+        live_producer = MessageQueue::Producer.new(topic: topic)
+        live_producer.connection
+        live_producer.terminate
 
-          expect(producer).to have_received(:terminate)
-        end
+        expect(producer).to have_received(:terminate)
       end
     end
 
-    describe 'when using the fake queue' do
+    describe 'when using the fake queue', fake_queue: true do
       it 'closes the connection' do
-        use_fake_connection do
-          producer = double('Producer', connection: nil, terminate: nil)
-          allow(FakeMessageQueue::Producer).to receive(:new).and_return(producer)
-          topic = 'death_star'
+        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
+        live_producer = MessageQueue::Producer.new(topic: topic)
+        live_producer.connection
+        live_producer.terminate
 
-          expect(producer).to have_received(:terminate)
-        end
+        expect(producer).to have_received(:terminate)
       end
     end
   end

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

@@ -2,27 +2,19 @@ require 'spec_helper'
 
 RSpec.describe Strategy do
   describe '.for_queue' do
-    describe 'when using the fake queue' do
+    describe 'when using the fake queue', fake_queue: true do
       it 'returns the strategy based on the ENV variable' do
-        MessageQueue::TRUTHY_VALUES.each do |yes|
-          allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(yes)
+        strategy = Strategy.for_queue
 
-          strategy = Strategy.for_queue
-
-          expect(strategy).to eq FakeMessageQueue
-        end
+        expect(strategy).to eq FakeMessageQueue
       end
     end
 
-    describe 'when using the real queue' do
+    describe 'when using the real queue', fake_queue: false do
       it 'returns the strategy based on the ENV variable' do
-        MessageQueue::FALSY_VALUES.each do |no|
-          allow(ENV).to receive(:[]).with('FAKE_QUEUE').and_return(no)
-
-          strategy = Strategy.for_queue
+        strategy = Strategy.for_queue
 
-          expect(strategy).to eq Nsq
-        end
+        expect(strategy).to eq Nsq
       end
     end
 

data/spec/spec_helper.rb

@@ -34,6 +34,22 @@ RSpec.configure do |config|
     FakeMessageQueue.reset!
   end
 
+  config.around(:each, fake_queue: true) do |example|
+    RSpec::Mocks.with_temporary_scope do
+      use_fake_connection do
+        example.run
+      end
+    end
+  end
+
+  config.around(:each, fake_queue: false) do |example|
+    RSpec::Mocks.with_temporary_scope do
+      use_real_connection do
+        example.run
+      end
+    end
+  end
+
   def load_sample_environment_variables
     env_file = File.open('env_configuration_for_local_gem_tests.yml')
 

metadata

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