amqp-spec 0.2.0 → 0.2.1

data/HISTORY

@@ -46,22 +46,14 @@
 
 * SpecHelper class methods refactored
 
-== 0.1.10 / 2010-10-15
-
-* Cleanup
-
 == 0.1.11 / 2010-10-18
 
 * Optional delay added to done
 
-== 0.1.12 / 2010-10-18
-
-* README extended
-
-== 0.1.13 / 2010-10-23
-
-* Release
-
 == 0.2.0 / 2010-10-28
 
 * Rspec 2 support added
+
+== 0.2.1 / 2010-10-28
+
+* RSpec2-specific examples added

data/README.rdoc

@@ -4,7 +4,7 @@ url: http://github.com/arvicco/amqp-spec
 
 == Summary
 
-Simple API for testing asynchronous EventMachine/AMQP code.
+Simple API for writing asynchronous EventMachine/AMQP specs. Supports RSpec and RSpec2.
 
 == Description
 
@@ -28,12 +28,17 @@ between examples. You can try to combine AMQP-Spec and Moqueue[http://github.com
 if you want to abstract away actual broker interactions, but still specify some event-based expectations.
 
 ==Rspec
+
 There are several ways to use amqp-spec. To use it as a helper, include AMQP::SpecHelper in your describe block.
 You then use either 'amqp' or 'em' methods to wrap your evented test code. Inside the amqp/em block, you must call
 #done after your expectations. Everything works normally otherwise. You can use default_timeout and default_options
 macros to avoid manually setting AMQP options in each example. However, if you DO manually set options inside
-the example, they override the defaults. Only default options and default timeout are global across groups,
-it is currently impossible to have separate defaults for separate groups.
+the example, they override the defaults.
+
+RSpec 1:: Default options and default timeout are global across all groups, it is impossible to have separate
+          defaults for separate groups.
+RSpec 2:: Default options and default timeout are local for each example group and inherited by its nested groups,
+          different example groups can have separate defaults.
 
   require "amqp-spec/rspec"
   describe AMQP do
@@ -205,7 +210,7 @@ actually fired at all AFTER your amqp/em block. Something like this will do the
 
 ==Limitations
 
-AMQP-Spec can be currently used with rspec only. I suppose, there is nothing special in extending EM-Spec's
+AMQP-Spec can be currently used with Rspec only. I suppose, there is nothing special in extending EM-Spec's
 test unit and bacon support, I just do not have experience dealing with these platforms. Another limitation,
 it uses native Fibers and therefore not compatible with Ruby 1.8. Again, it seems possible to rewrite it in
 1.8-compatible style, with string evals and Fiber backport, but I'd rather leave this work to someone else.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/amqp-spec/rspec.rb

@@ -55,42 +55,39 @@ module AMQP
     SpecTimeoutExceededError = Class.new(RuntimeError)
 
     def self.included(example_group)
-#     unless defined? self.default_timeout
-      if defined?(RSpec)
-        example_group.instance_exec do
 
-          metadata[:em_default_options] = {}
-          metadata[:em_default_timeout] = nil
+      extended_class = defined?(RSpec) ? example_group : ::Spec::Example::ExampleGroup
+      unless extended_class.respond_to? :default_timeout
+        extended_class.instance_exec do
+          if defined?(RSpec)
+            metadata[:em_default_options] = {}
+            metadata[:em_default_timeout] = nil
 
-          def self.default_timeout(spec_timeout=nil)
-            metadata[:em_default_timeout] = spec_timeout if spec_timeout
-            metadata[:em_default_timeout]
-          end
+            def self.default_timeout(spec_timeout=nil)
+              metadata[:em_default_timeout] = spec_timeout if spec_timeout
+              metadata[:em_default_timeout]
+            end
 
-          def self.default_options(opts=nil)
-            metadata[:em_default_options] = opts if opts
-            metadata[:em_default_options]
-          end
-        end
-      else
-        ::Spec::Example::ExampleGroup.instance_exec do
-          @@_em_default_options = {}
-          @@_em_default_timeout = nil
+            def self.default_options(opts=nil)
+              metadata[:em_default_options] = opts if opts
+              metadata[:em_default_options]
+            end
+          else
+            @@_em_default_options = {}
+            @@_em_default_timeout = nil
 
-          def self.default_timeout(spec_timeout=nil)
-            @@_em_default_timeout = spec_timeout if spec_timeout
-            @@_em_default_timeout
-          end
+            def self.default_timeout(spec_timeout=nil)
+              @@_em_default_timeout = spec_timeout if spec_timeout
+              @@_em_default_timeout
+            end
 
-          def self.default_options(opts=nil)
-            @@_em_default_options = opts if opts
-            @@_em_default_options
+            def self.default_options(opts=nil)
+              @@_em_default_options = opts if opts
+              @@_em_default_options
+            end
           end
         end
-
-#        end
       end
-
     end
 
     # Yields to given block inside EM.run and AMQP.start loops. This method takes any option that is

data/spec/rspec_amqp_spec.rb

@@ -27,7 +27,7 @@ describe 'Evented AMQP specs' do
     default_options AMQP_OPTS if defined? AMQP_OPTS
     default_timeout 1 # Can be used to set default :spec_timeout for all your amqp-based specs
 
-    puts "Default timeout: #{default_timeout.inspect}, Default options:"
+    puts "Default timeout: #{default_timeout}, Default options:"
     p default_options
 
     it_should_behave_like 'SpecHelper examples'

data/spec/shared_examples.rb

@@ -130,6 +130,27 @@ shared_examples_for 'timeout examples' do
   specify "AMQP connection should not leak between examples" do
     AMQP.conn.should be_nil
   end
+
+  if rspec2?
+    context 'embedded context can set up separate defaults' do
+      default_timeout 0.25 # Can be used to set default :spec_timeout for all your amqp-based specs
+
+      specify 'default timeout should be 0.25' do
+        expect { amqp { EM.add_timer(2) { done } } }.to raise_error SpecTimeoutExceededError
+        (Time.now-@start).should be_close(0.25, 0.1)
+      end
+
+      context 'deeply embedded context can set up separate defaults' do
+        default_timeout 0.5 # Can be used to set default :spec_timeout for all your amqp-based specs
+
+        specify 'default timeout should be 0.5' do
+          expect { amqp { EM.add_timer(2) { done } } }.to raise_error SpecTimeoutExceededError
+          (Time.now-@start).should be_close(0.5, 0.1)
+        end
+      end
+    end
+
+  end
 end
 
 shared_examples_for 'Spec examples' do

data/spec/spec_helper.rb

@@ -8,7 +8,11 @@ require 'yaml'
 require 'amqp-spec/rspec'
 require 'shared_examples'
 
-RSPEC = defined?(RSpec) ? RSpec : Spec
+def rspec2?
+  defined?(RSpec)
+end
+
+RSPEC = rspec2? ? RSpec : Spec
 
 amqp_config = File.dirname(__FILE__) + '/amqp.yml'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp-spec
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Arvicco
@@ -50,7 +50,7 @@ dependencies:
         version: 0.6.7
   type: :runtime
   version_requirements: *id002
-description: Simple API for writing (asynchronous) AMQP specs
+description: Simple API for writing asynchronous EventMachine/AMQP specs. Supports RSpec and RSpec2.
 email: arvitallian@gmail.com
 executables: []
 
@@ -122,7 +122,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Simple API for writing (asynchronous) AMQP specs
+summary: Simple API for writing asynchronous EventMachine/AMQP specs. Supports RSpec and RSpec2.
 test_files: 
 - spec/amqp.yml
 - spec/failing_rspec_spec.rb