ivory_tower 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30d9f405000f6d819ffb604dab705ffa7e4e7796
-  data.tar.gz: 3434716e4fa4ab6f270856b0d8aa8af7d179ee24
+  metadata.gz: bd1f4d0e215ca1b4f98b68e0f3420b5bd02c3472
+  data.tar.gz: dc9b3dce1535033b7dfb2d605337693d0086e3b5
 SHA512:
-  metadata.gz: 7ebcb62f2dffab4b8d3cd022bda7caccda125039974ae264fb96a2d11c9398eca8d0d4cc665f9e614fa26ee624c8793303e5a22a7a3442d17b15038af203581d
-  data.tar.gz: 430ec2dde1b1fc193875b418b1343af5c2edf42bf7ef11d53d24e70c260d6bc6f5f039b177d3019f0c864ce7264a9dd80fd53e841c4e0f61cb2ff3423b2203b1
+  metadata.gz: 91ee17b56c2f4036a8598a426787bd794d43a4d037d9f1637bb6416ec31fa9075b06efee2e2a216b666acb34f67e05a9932e99e21cd0586573832cb50ef685b2
+  data.tar.gz: e529257a9acae03ef40b01c0c98328052a2161469e44006d07592fb40bae7f3fcef1465bca8e9b47c425155443251ff4af7f928213e399c21959c416e2f58a14

data/ivory_tower.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "pry-byebug"
   
   spec.add_dependency "bunny"
 end

data/lib/ivory_tower/consumer.rb

@@ -6,4 +6,8 @@ module IvoryTower::Consumer
       consume(message)
     end
   end
+
+  def stop
+    queue.close
+  end
 end

data/lib/ivory_tower/queue.rb

@@ -13,7 +13,7 @@ class IvoryTower::Queue
       channel.ack delivery_info.delivery_tag
     end
   ensure
-    close_connection
+    close
   end
 
   def produce(message)
@@ -28,18 +28,18 @@ class IvoryTower::Queue
     bunny_queue.purge
   end
 
+  def close
+    unless [:closed, :closing].include? channel.connection.status
+      channel.connection.close
+    end
+  end
+
   private
 
   def subscribe_options
     {manual_ack: true, block: true}
   end
 
-  def close_connection
-    unless channel.connection.status == :closed
-      channel.connection.close
-    end
-  end
-
   def bunny_queue
     @bunny_queue
   end

data/lib/ivory_tower/version.rb

@@ -1,3 +1,3 @@
 module IvoryTower
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/ivory_tower.rb

@@ -1,5 +1,6 @@
 require "ivory_tower/version"
 require "bunny"
+require 'pry-byebug'
 
 module IvoryTower
   require "ivory_tower/bunny_factory"

data/spec/integration/sending_a_message_spec.rb

@@ -17,7 +17,7 @@ end
 describe 'Sending a message' do
   before :each do
     allow_any_instance_of(IvoryTower::Queue).to receive(:subscribe_options).and_return(manual_ack: true, block: false)
-    allow_any_instance_of(IvoryTower::Queue).to receive(:close_connection)
+    allow_any_instance_of(IvoryTower::Queue).to receive(:close)
   end
 
   after :each do
@@ -44,3 +44,16 @@ describe 'Sending a message' do
     expect($addition_value).to eq 4
   end
 end
+
+describe 'running the consumer' do
+  # is this necessary? won't the ensure block catch this?
+  it 'answers to stop' do
+    consumer = AdditionConsumer.new
+    t = Thread.new do
+      consumer.run
+    end
+    connection = consumer.send(:queue).send(:channel).connection
+    expect(connection).to receive(:close).and_call_original
+    consumer.stop
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 require 'ivory_tower'
 
-FakeQueue = Struct.new(:channel)
+FakeQueue = Struct.new(:channel, :close)
 FakeChannel = Struct.new(:connection)
 FakeConnection = Struct.new(:status, :close)
 
 def mock_queue
-  FakeQueue.new(FakeChannel.new(FakeConnection.new(:open, nil)))
+  FakeQueue.new(FakeChannel.new(FakeConnection.new(:open, nil)), nil)
 end
 
 RSpec.configure do |config|

data/spec/unit/consumer_spec.rb

@@ -24,4 +24,16 @@ describe IvoryTower::Consumer do
       expect($multiply_result).to eq 8
     end
   end
+
+  describe "#stop" do
+    it "closes the connection" do
+      mocked = mock_queue
+      expect(IvoryTower::Queue).to receive(:new).with("Multiply").and_return(mocked)
+
+      mult = MultiplyConsumer.new
+
+      expect(mocked).to receive(:close)
+      mult.stop
+    end
+  end
 end

data/spec/unit/queue_spec.rb

@@ -28,4 +28,12 @@ describe IvoryTower::Queue do
       queue.produce(message)
     end
   end
+
+  describe "#close" do
+    it "closes the connection" do
+      queue = IvoryTower::Queue.new "Modulus"
+      expect(stub_queue.channel.connection).to receive(:close)
+      queue.close
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ivory_tower
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ecuageo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement