hotot 0.0.0 → 0.0.1

data/lib/hotot/synchronous_connection.rb

@@ -7,7 +7,7 @@ module Hotot
     extend Configurable
     extend ClassAttributeAccessors
 
-    cattr_reader :bunny, :exchange
+    cattr_reader :producer, :exchange, :consumer
 
     @@setup = false
     @@connected = false
@@ -22,7 +22,8 @@ module Hotot
         @@env_config.keys.each {|key| @@env_config[(key.to_sym rescue key) || key] = @@env_config.delete(key) }
         raise StandardError, "'exchange' key not found in config" if !@@env_config.has_key?(:exchange)
         
-        @@bunny = Bunny.new(@@env_config)
+        @@producer = Bunny.new(@@env_config)
+        @@consumer = Bunny.new(@@env_config)
         @@setup = true
       end
     end
@@ -33,7 +34,7 @@ module Hotot
     end
     
     def self.subscribe(routing_key, &block)
-      q = @@bunny.queue.bind(@@env_config[:exchange], :routing_key => routing_key)
+      q = @@consumer.queue.bind(@@env_config[:exchange], :routing_key => routing_key)
 
       q.subscribe do |delivery_info, metadata, payload|
         block.call delivery_info, metadata, payload
@@ -44,17 +45,19 @@ module Hotot
     # Establish a connection to the underlying exchange
     def self.connect
       raise StandardError, "AMQP not setup. Call setup before calling connect" if !self.setup?
-      @@bunny.start
+      @@producer.start
+      @@consumer.start
       
       # use defualt channel for exchange
-      @@exchange = @@bunny.exchange(@@env_config[:exchange], :type => :topic, :durable => true)
+      @@exchange = @@producer.exchange(@@env_config[:exchange], :type => :topic, :durable => true)
       @@connected = true
     end
 
     # Disconnect from the underlying exchange
     def self.disconnect
       begin
-        @@bunny.stop
+        @@producer.stop
+        @@consumer.stop
       rescue
         # if this is being called because the underlying connection went bad
         # calling stop will raise an error. that's ok....
@@ -67,7 +70,8 @@ module Hotot
     def self.reconnect
       self.disconnect
       @@setup = false
-      @@bunny = Bunny.new(@@env_config)
+      @@producer = Bunny.new(@@env_config)
+      @@consumer = Bunny.new(@@env_config)
       @@setup = true
       self.connect
     end

data/lib/hotot/version.rb

@@ -1,5 +1,5 @@
 module Hotot
 
-  VERSION = '0.0.0'
+  VERSION = '0.0.1'
 
 end

data/spec/hotot/synchronous_connection_spec.rb

@@ -11,8 +11,6 @@ describe "Hotot::SynchronousConnection" do
   
   before do 
     @config_file = Pathname.new File.expand_path("../../fixtures/hotot.yml", __FILE__)
-    @bunny       = Minitest::Mock.new
-    @exchange    = Minitest::Mock.new
   end
   
   it "raise error if not setup yet" do
@@ -32,7 +30,8 @@ describe "Hotot::SynchronousConnection" do
     
     before do
       Hotot::SynchronousConnection.setup @config_file, 'test'
-      @bunny = Hotot::SynchronousConnection.bunny
+      @producer = Hotot::SynchronousConnection.producer
+      @consumer = Hotot::SynchronousConnection.consumer
     end
     
     after do
@@ -42,8 +41,8 @@ describe "Hotot::SynchronousConnection" do
     it "calls start and exchange" do
       Hotot::SynchronousConnection.connect
       Hotot::SynchronousConnection.connected?.must_equal true
-      assert_send [@bunny, :start]
-      assert_send [@bunny, :exchange, "heyook.topic", :type => :topic, :durable => true]
+      assert_send [@producer, :start]
+      assert_send [@producer, :exchange, "heyook.topic", :type => :topic, :durable => true]
     end
     
     describe "publish" do
@@ -64,10 +63,8 @@ describe "Hotot::SynchronousConnection" do
   describe "disconnect" do
     
     it "disconnects and set connected to false" do
-      Bunny.stub :new, @bunny do
-        Hotot::SynchronousConnection.disconnect
-        Hotot::SynchronousConnection.connected?.must_equal false
-      end    
+      Hotot::SynchronousConnection.disconnect
+      Hotot::SynchronousConnection.connected?.must_equal false  
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotot
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -27,7 +27,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-description: ! '    Hotot is a kind of rabbit that wraps bunny gem.
+description: ! '    Hotot is a kind of rabbit that wraps bunny''s topic exchange.
 
 '
 email: qihe229@gmail.com
@@ -72,7 +72,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A bunny wrapper.
+summary: A kind of rabbit that wraps bunny gem.
 test_files:
 - spec/hotot/configurable_spec.rb
 - spec/hotot/message/base_spec.rb