amqp-spec 0.1.10 → 0.1.11

data/HISTORY

@@ -49,3 +49,7 @@
 == 0.1.10 / 2010-10-15
 
 * Cleanup
+
+== 0.1.11 / 2010-10-18
+
+* Optional delay added to done

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/amqp-spec/rspec.rb

@@ -24,7 +24,7 @@ require 'mq'
 module AMQP
 
   # Initializes new AMQP client/connection without starting another EM loop
-  def self.start_connection opts={}, &block
+  def self.start_connection(opts={}, &block)
 #    puts "!!!!!!!!! Existing connection: #{@conn}" if @conn
     @conn = connect opts
     @conn.callback(&block) if block
@@ -91,7 +91,6 @@ module AMQP
       opts = @@_em_default_options.merge opts
       begin
         EM.run do
-#        begin ?
           @_em_spec_with_amqp = true
           @_em_spec_exception = nil
           spec_timeout = opts.delete(:spec_timeout) || @@_em_default_timeout
@@ -110,7 +109,7 @@ module AMQP
         end
       rescue Exception => outer_spec_exception
 #        p "outer", outer_spec_exception unless outer_spec_exception.is_a? SpecTimeoutExceededError
-        # Makes sure AMQP state is cleaned even after Rspec failures
+        # Make sure AMQP state is cleaned even after Rspec failures
         AMQP.cleanup_state
         raise outer_spec_exception
       end
@@ -146,21 +145,36 @@ module AMQP
       end
     end
 
-    # Stops EM event loop, for amqp specs stops AMQP and cleans up its state
-    def done
-      EM.next_tick do
-        if @_em_spec_with_amqp
-          if AMQP.conn and not AMQP.closing
-            AMQP.stop_connection do
+    # Breaks the event loop and finishes the spec. This should be called after
+    # you are reasonably sure that your expectations either succeeded or failed.
+    # Done yields to any given block first, then stops EM event loop.
+    # For amqp specs, stops AMQP and cleans up AMQP state.
+    #
+    # You may pass delay (in seconds) to done. If you do so, please keep in mind
+    # that your (default or explicit) spec timeout may fire before your delayed done
+    # callback is due, leading to SpecTimeoutExceededError
+    def done(delay=nil)
+      done_proc = proc do
+        yield if block_given?
+        EM.next_tick do
+          if @_em_spec_with_amqp
+            if AMQP.conn and not AMQP.closing
+              AMQP.stop_connection do
+                finish_em_spec_fiber { AMQP.cleanup_state }
+              end
+            else
               finish_em_spec_fiber { AMQP.cleanup_state }
             end
           else
-            finish_em_spec_fiber { AMQP.cleanup_state }
+            finish_em_spec_fiber
           end
-        else
-          finish_em_spec_fiber
         end
       end
+      if delay
+        EM.add_timer delay, &done_proc
+      else
+        done_proc.call
+      end
     end
 
     private

data/spec/shared_examples.rb

@@ -59,6 +59,8 @@ shared_examples_for 'SpecHelper examples' do
     }.should raise_error EventMachine::ConnectionError
     AMQP.conn.should be_nil
   end
+
+  it_should_behave_like 'done examples'
 end
 
 shared_examples_for 'Spec examples' do
@@ -103,6 +105,42 @@ shared_examples_for 'Spec examples' do
   end
 end
 
+shared_examples_for 'done examples' do
+
+  it 'should yield to block given to done (when amqp is used)' do
+    amqp do
+      done { @block_called = true; EM.reactor_running?.should == true }
+    end
+    @block_called.should == true
+  end
+
+  it 'should yield to block given to done (when em is used)' do
+    em do
+      done { @block_called = true; EM.reactor_running?.should == true }
+    end
+    @block_called.should == true
+  end
+
+  it 'should have delayed done (when amqp is used)' do
+    start = Time.now
+    amqp do
+      done(0.2) { @block_called = true; EM.reactor_running?.should == true }
+    end
+    @block_called.should == true
+    (Time.now-start).should be_close(0.2, 0.05)
+  end
+
+  it 'should have delayed done (when em is used)' do
+    start = Time.now
+    em do
+      done(0.2) { @block_called = true; EM.reactor_running?.should == true }
+    end
+    @block_called.should == true
+    (Time.now-start).should be_close(0.2, 0.05)
+  end
+end
+
+
 shared_examples_for 'timeout examples' do
   before(:each) { @start = Time.now }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp-spec
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Arvicco
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +04:00
+date: 2010-10-18 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency