qusion 0.1.8 → 0.1.9

data/lib/qusion.rb

@@ -10,12 +10,12 @@ module Qusion
     attr_reader :thread
   end
 
-  def self.start(*opts)
+  def self.start(*opts, &block)
     amqp_opts = AmqpConfig.new(*opts).config_opts
-    start_amqp_dispatcher(amqp_opts)
+    start_amqp_dispatcher(amqp_opts, &block)
   end
 
-  def self.start_amqp_dispatcher(amqp_settings={})
+  def self.start_amqp_dispatcher(amqp_settings={}, &block)
     AMQP.settings.merge!(amqp_settings)
 
     if defined?(::PhusionPassenger) && ::PhusionPassenger.respond_to?(:on_event)
@@ -26,13 +26,13 @@ module Qusion
           Thread.current[:mq] = nil
           AMQP.instance_variable_set(:@conn, nil)
         end
-        start_in_background
+        start_in_background(&block)
         die_gracefully_on_signal
       end
       return
     end
 
-    start_in_background
+    start_in_background(&block)
     die_gracefully_on_signal
   end
 
@@ -49,14 +49,14 @@ module Qusion
     ChannelPool.pool_size = new_pool_size
   end
 
-  def self.start_in_background
+  def self.start_in_background(&block)
     if EM.reactor_running?
       raise ArgumentError, 'AMQP already connected' if ready_to_dispatch?
-      AMQP.start
+      AMQP.start(&block)
     else
       raise ArgumentError, 'Qusion already started' if thread && thread.alive?
       @thread = Thread.new do
-        EM.run { AMQP.start }
+        EM.run { AMQP.start(&block) }
         raise "Premature AMQP shutdown" unless @graceful_stop
       end
       thread.abort_on_exception = true

data/lib/qusion/version.rb

@@ -1,3 +1,3 @@
 module Qusion
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/unit/amqp_config_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + "/../../spec_helper"
-require File.dirname(__FILE__) + "/../../stub_rails"
+require "spec_helper"
+require "stub_rails"
 
 describe AmqpConfig do
 

data/spec/unit/channel_pool_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + "/../../spec_helper"
+require "spec_helper"
 
 describe ChannelPool do
   MQ = Object.new

data/spec/unit/qusion_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + "/../../spec_helper"
+require "spec_helper"
 
 describe "Qusion Convenience Methods" do
 
@@ -47,27 +47,43 @@ describe Qusion, 'amqp startup' do
     amqp_conn.should_receive(:connected?).and_return(false)
     AMQP.should_receive(:conn).any_number_of_times.and_return(amqp_conn)
     EM.should_receive(:stop)
-    AMQP.should_receive(:start).once
-    Qusion.start_amqp_dispatcher
+
+    block = proc { nil }
+    AMQP.should_receive(:start).with(&block).once
+
+    Qusion.start_amqp_dispatcher(&block)
   end
 
-  it "should set AMQP's connection settings when running under Thin" do
-    Qusion.should_receive(:die_gracefully_on_signal)
-    Qusion.should_receive(:start_in_background)
-    ::Thin = Module.new
+  it "should set AMQP's connection settings" do
+    Qusion.stub(:die_gracefully_on_signal)
+    Qusion.stub(:start_in_background)
     Qusion.start_amqp_dispatcher(:cookie => "yummy")
     AMQP.settings[:cookie].should == "yummy"
   end
 
-  it "should start a worker thread when running under Mongrel" do
-    Qusion.should_receive(:die_gracefully_on_signal)
-    mock_thread = mock('thread')
-    mock_thread.should_receive(:abort_on_exception=).with(true)
-    Qusion.should_receive(:ready_to_dispatch?).twice.and_return(false, true)
-    mock_thread.should_receive(:join)
-    Thread.should_receive(:new).and_return(mock_thread)
-    ::Mongrel = Module.new
-    Qusion.start_amqp_dispatcher
+  it "should start a worker thread when the EM reactor isn't running" do
+    EM.stub(:reactor_running? => false)
+    Qusion.stub(:die_gracefully_on_signal)
+    Qusion.stub(:ready_to_dispatch?).twice.and_return(false, true)
+
+    block = proc { nil }
+
+    AMQP.should_receive(:start).with(&block)
+
+    Qusion.start_amqp_dispatcher(&block)
+
+    Qusion.thread.should be_a(Thread)
+    Qusion.thread.abort_on_exception.should be_true
+    Qusion.thread.kill
+  end
+
+  it 'should start up AMQP when the EM reactor is running' do
+    block = proc { nil }
+    EM.stub(:reactor_running? => true)
+    Thread.should_not_receive(:new)
+    AMQP.should_receive(:start).with(&block)
+
+    Qusion.start_amqp_dispatcher(&block)
   end
 
   it "should be ready to dispatch when the reactor is running and amqp is connected" do
@@ -78,4 +94,4 @@ describe Qusion, 'amqp startup' do
     Qusion.ready_to_dispatch?.should == true
   end
 
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: qusion
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Dan DeLeo
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
+date: 2011-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,7 +72,6 @@ files:
 - .gemtest
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile