amqp-spec 0.1.12 → 0.1.13

data/HISTORY

@@ -57,3 +57,7 @@
 == 0.1.12 / 2010-10-18
 
 * README extended
+
+== 0.1.13 / 2010-10-23
+
+* Release

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/spec/failing_rspec_spec.rb

@@ -20,16 +20,12 @@ context 'Following examples should all be failing:' do
 
     include AMQP::EMSpec
     it 'should timeout before reaching done' do
-      EM.add_timer(2) {
-        done
-      }
+      EM.add_timer(2) { done }
     end
 
     it 'should timeout before reaching done' do
       timeout(0.3)
-      EM.add_timer(0.6) {
-        done
-      }
+      EM.add_timer(0.6) { done }
     end
   end
 
@@ -37,19 +33,15 @@ context 'Following examples should all be failing:' do
 
     include AMQP::Spec
 
-    default_timeout 1
+    default_timeout 1 # Because we may need to run this spec file separately
 
     it 'should timeout before reaching done' do
-      EM.add_timer(2) {
-        done
-      }
+      EM.add_timer(2) { done }
     end
 
     it 'should timeout before reaching done' do
       timeout(0.2)
-      EM.add_timer(0.5) {
-        done
-      }
+      EM.add_timer(0.5) { done }
     end
 
     it 'should fail due to timeout, not hang up' do

data/spec/rspec_amqp_spec.rb

@@ -51,21 +51,21 @@ context 'Evented AMQP specs' do
     include AMQP::SpecHelper
 
     it "bubbles failing expectations up to Rspec" do
-      proc {
+      expect {
         amqp do
           :this.should == :fail
         end
-      }.should raise_error Spec::Expectations::ExpectationNotMetError
+      }.to raise_error Spec::Expectations::ExpectationNotMetError
       AMQP.conn.should == nil
     end
 
     it "should NOT ignore failing expectations after 'done'" do
-      proc {
+      expect {
         amqp do
           done
           :this.should == :fail
         end
-      }.should raise_error Spec::Expectations::ExpectationNotMetError
+      }.to raise_error Spec::Expectations::ExpectationNotMetError
       AMQP.conn.should == nil
     end
 
@@ -77,11 +77,11 @@ context 'Evented AMQP specs' do
   describe 'MQ', " when MQ.queue/fanout/topic tries to access Thread.current[:mq] across examples" do
     include AMQP::SpecHelper
 
-    it 'sends data to queue' do
+    it 'sends data to the queue' do
       publish_and_consume_once
     end
 
-    it 'sends data to queue, again' do
+    it 'does not hang sending data to the same queue, again' do
       publish_and_consume_once
     end
 

data/spec/rspec_em_spec.rb

@@ -9,9 +9,8 @@ context 'Plain EM, no AMQP' do
     end
 
     it "should have timers" do
+      start = Time.now
       em do
-        start = Time.now
-
         EM.add_timer(0.5) {
           (Time.now-start).should be_close(0.5, 0.1)
           done
@@ -21,27 +20,21 @@ context 'Plain EM, no AMQP' do
 
     it "should be possible to set spec timeouts as a number of secounds" do
       start = Time.now
-      proc {
+      expect {
         em(0.5) do
-
-          EM.add_timer(1) {
-            done
-          }
+          EM.add_timer(1) { done }
         end
-      }.should raise_error SpecTimeoutExceededError
+      }.to raise_error SpecTimeoutExceededError
       (Time.now-start).should be_close(0.5, 0.1)
     end
 
     it "should be possible to set spec timeout as an option (amqp interface compatibility)" do
       start = Time.now
-      proc {
+      expect {
         em(0.5) do
-
-          EM.add_timer(1) {
-            done
-          }
+          EM.add_timer(1) { done }
         end
-      }.should raise_error SpecTimeoutExceededError
+      }.to raise_error SpecTimeoutExceededError
       (Time.now-start).should be_close(0.5, 0.1)
     end
   end
@@ -50,7 +43,6 @@ context 'Plain EM, no AMQP' do
     include AMQP::EMSpec
 
     it_should_behave_like 'Spec examples'
-
   end
 end
 

data/spec/shared_examples.rb

@@ -1,5 +1,5 @@
 shared_examples_for 'SpecHelper examples' do
-  after(:each) do
+  after do
     EM.reactor_running?.should == false
     AMQP.conn.should be_nil
   end
@@ -9,15 +9,12 @@ shared_examples_for 'SpecHelper examples' do
   end
 
   it "should properly work" do
-    amqp do
-      done
-    end
+    amqp { done}
   end
 
   it "should have timers" do
+    start = Time.now
     amqp do
-      start = Time.now
-
       EM.add_timer(0.5) {
         (Time.now-start).should be_close(0.5, 0.1)
         done
@@ -51,12 +48,12 @@ shared_examples_for 'SpecHelper examples' do
   end
 
   it "should gracefully exit if no AMQP connection was made" do
-    proc {
+    expect {
       amqp(:host => 'Impossible') do
         AMQP.conn.should be_nil
         done
       end
-    }.should raise_error EventMachine::ConnectionError
+    }.to raise_error EventMachine::ConnectionError
     AMQP.conn.should be_nil
   end
 
@@ -65,7 +62,7 @@ shared_examples_for 'SpecHelper examples' do
 end
 
 shared_examples_for 'Spec examples' do
-  after(:each) do
+  after do
     EM.reactor_running?.should == true
 #      AMQP.conn.should be_nil # You're inside running amqp block, stupid!
     done
@@ -143,38 +140,33 @@ end
 
 
 shared_examples_for 'timeout examples' do
-  before(:each) { @start = Time.now }
+  before { @start = Time.now }
 
   it 'should timeout before reaching done because of default spec timeout' do
-    proc {
-      amqp do
-        EM.add_timer(2) { done }
-      end
-    }.should raise_error SpecTimeoutExceededError
+    expect { amqp { EM.add_timer(2) { done } } }.
+            to raise_error SpecTimeoutExceededError
     (Time.now-@start).should be_close(1.0, 0.1)
   end
 
   it 'should timeout before reaching done because of explicit in-loop timeout' do
-    proc {
+    expect {
       amqp do
         timeout(0.2)
         EM.add_timer(0.5) { done }
       end
-    }.should raise_error SpecTimeoutExceededError
+    }.to raise_error SpecTimeoutExceededError
     (Time.now-@start).should be_close(0.2, 0.1)
   end
 
   specify "spec timeout given in amqp options has higher priority than default" do
-    proc {
-      amqp(:spec_timeout => 0.2) {}
-    }.should raise_error SpecTimeoutExceededError
+    expect { amqp(:spec_timeout => 0.2) {} }.
+            to raise_error SpecTimeoutExceededError
     (Time.now-@start).should be_close(0.2, 0.1)
   end
 
   specify "but timeout call inside amqp loop has even higher priority" do
-    proc {
-      amqp(:spec_timeout => 0.5) { timeout(0.2) }
-    }.should raise_error SpecTimeoutExceededError
+    expect { amqp(:spec_timeout => 0.5) { timeout(0.2) } }.
+            to raise_error SpecTimeoutExceededError
     (Time.now-@start).should be_close(0.2, 0.1)
   end
 

metadata

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