ivory_tower 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd1f4d0e215ca1b4f98b68e0f3420b5bd02c3472
-  data.tar.gz: dc9b3dce1535033b7dfb2d605337693d0086e3b5
+  metadata.gz: 93bbc845eefce4a6323c6069a6ee35538fce5446
+  data.tar.gz: c814fa6092da33bf715d9bfdfd3cadb896a07046
 SHA512:
-  metadata.gz: 91ee17b56c2f4036a8598a426787bd794d43a4d037d9f1637bb6416ec31fa9075b06efee2e2a216b666acb34f67e05a9932e99e21cd0586573832cb50ef685b2
-  data.tar.gz: e529257a9acae03ef40b01c0c98328052a2161469e44006d07592fb40bae7f3fcef1465bca8e9b47c425155443251ff4af7f928213e399c21959c416e2f58a14
+  metadata.gz: 64b8330157d5364488f37f607418cfef2f48475e2eeff226d736ae7aa31752c6245294fdcba0f0655c545ec6c6f1c0e5bcde5b8861d513ba23200adb2cf3f011
+  data.tar.gz: 63040860e6646eacbfb5685da92cb284d405c702fb09b9b6dc1d9d0da04afea37f8a340d7a367731e4a1f6f634cf278dbea0c3bb0d096dc6fa5fb810284b902f

data/ivory_tower.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ["lib", "spec/support"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
   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"
+  spec.add_dependency "hashie"
 end

data/lib/ivory_tower.rb

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

data/lib/ivory_tower/consumer.rb

@@ -1,13 +1,11 @@
 module IvoryTower::Consumer
   include IvoryTower::Queueable
   
-  def run
+  def run(options = nil)
+    queue.subscribe_options = options if options
+
     queue.consume do |message|
       consume(message)
     end
   end
-
-  def stop
-    queue.close
-  end
 end

data/lib/ivory_tower/queue.rb

@@ -8,12 +8,12 @@ class IvoryTower::Queue
 
   def consume(&block)
     bunny_queue.subscribe subscribe_options do |delivery_info, properties, body|
-      message = JSON.parse body
+      message = Hashie::Mash.new(JSON.parse(body))
       block.call(message)
       channel.ack delivery_info.delivery_tag
     end
   ensure
-    close
+    close_connection if subscribe_options[:block]
   end
 
   def produce(message)
@@ -24,20 +24,24 @@ class IvoryTower::Queue
     bunny_queue.message_count
   end
 
-  def empty!
-    bunny_queue.purge
+  def subscribe_options=(changes)
+    subscribe_options.merge!(changes)
   end
 
-  def close
-    unless [:closed, :closing].include? channel.connection.status
-      channel.connection.close
-    end
+  def empty!
+    bunny_queue.purge
   end
 
   private
 
   def subscribe_options
-    {manual_ack: true, block: true}
+    @subscribe_options ||= {manual_ack: true, block: true}
+  end
+
+  def close_connection
+    unless channel.connection.status == :closed
+      channel.connection.close
+    end
   end
 
   def bunny_queue

data/lib/ivory_tower/version.rb

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

data/spec/integration/sending_a_message_spec.rb

@@ -16,8 +16,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)
+    allow_any_instance_of(IvoryTower::Queue).to receive(:close_connection)
   end
 
   after :each do
@@ -35,7 +34,7 @@ describe 'Sending a message' do
   end
 
   it 'changes global through the queue' do
-    AdditionConsumer.new.run
+    AdditionConsumer.new.run({block: false})
 
     p = AdditionProducer.new
     p.produce(addends: [1,3])
@@ -44,16 +43,3 @@ 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, :close)
+FakeQueue = Struct.new(:channel)
 FakeChannel = Struct.new(:connection)
 FakeConnection = Struct.new(:status, :close)
 
 def mock_queue
-  FakeQueue.new(FakeChannel.new(FakeConnection.new(:open, nil)), nil)
+  FakeQueue.new(FakeChannel.new(FakeConnection.new(:open, nil)))
 end
 
 RSpec.configure do |config|

data/spec/support/ivory_tower_test_helper.rb

@@ -0,0 +1,8 @@
+class IvoryTowerTestHelper
+  def self.setup_queue(name, &block)
+    queue = IvoryTower::Queue.new name
+    queue.empty!
+    block.call
+    queue.send(:channel).connection.close
+  end
+end

data/spec/unit/consumer_spec.rb

@@ -24,16 +24,4 @@ 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,12 +28,4 @@ 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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - ecuageo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,13 +68,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -121,6 +121,7 @@ files:
 - lib/ivory_tower/version.rb
 - spec/integration/sending_a_message_spec.rb
 - spec/spec_helper.rb
+- spec/support/ivory_tower_test_helper.rb
 - spec/unit/bunny_factory_spec.rb
 - spec/unit/consumer_spec.rb
 - spec/unit/producer_spec.rb
@@ -133,6 +134,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- spec/support
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -152,6 +154,7 @@ summary: rabbitmq abstractions
 test_files:
 - spec/integration/sending_a_message_spec.rb
 - spec/spec_helper.rb
+- spec/support/ivory_tower_test_helper.rb
 - spec/unit/bunny_factory_spec.rb
 - spec/unit/consumer_spec.rb
 - spec/unit/producer_spec.rb