amqp-spec 0.3.2 → 0.3.3

data/HISTORY

@@ -65,3 +65,7 @@
 == 0.3.2 / 2010-11-23
 
 * EM hooks now working as they should - bugs fixed
+
+== 0.3.3 / 2010-11-24
+
+* Spec timeout refactored

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/amqp-spec/evented_example.rb

@@ -38,18 +38,10 @@ module AMQP
         end
       end
 
-      # Retrieves metadata passed in from enclosing example groups
-      #
-      def metadata
-        @metadata ||= @example_group_instance.metadata.dup rescue {}
-      end
-
       # Runs hooks of specified type (hopefully, inside the event loop)
       #
       def run_em_hooks type
-        hooks = @example_group_instance.class.all_hooks type
-        (:before == type ? hooks : hooks.reverse).each do |hook|
-#          @example_group_instance.class.all_hooks(type).each do |hook|
+        @example_group_instance.class.em_hooks[type].each do |hook|
           if @example_group_instance.respond_to? :instance_eval_without_event_loop
             @example_group_instance.instance_eval_without_event_loop(&hook)
           else
@@ -78,7 +70,7 @@ module AMQP
           end
         rescue Exception => @spec_exception
 #          p "Outside loop, caught #{@spec_exception}"
-          run_em_hooks :after # Event loop was broken, but we still need to run em_after hooks
+          run_em_hooks :after # Event loop broken, but we still need to run em_after hooks
         ensure
           finish_example
         end
@@ -91,7 +83,8 @@ module AMQP
         EM.stop_event_loop if EM.reactor_running?
       end
 
-      # Called from #run_event_loop when event loop is stopped, but before example returns.
+      # Called from #run_event_loop when event loop is stopped,
+      # but before the example returns.
       # Descendant classes may redefine to clean up type-specific state.
       #
       def finish_example

data/lib/amqp-spec/rspec.rb

@@ -54,16 +54,16 @@ module AMQP
       # example group and its nested groups.
       #
       def default_timeout spec_timeout=nil
-        metadata[:em_timeout] = spec_timeout if spec_timeout
-        metadata[:em_timeout]
+        default_options[:spec_timeout] = spec_timeout || default_options[:spec_timeout]
       end
 
       # Sets/retrieves default AMQP.start options for this example group
       # and its nested groups.
       #
       def default_options opts=nil
-        metadata[:em_defaults] = opts if opts
-        metadata[:em_defaults]
+        metadata[:em_defaults] ||= {}
+        metadata[:em_defaults][self] ||= (superclass.default_options.dup rescue {})
+        metadata[:em_defaults][self] = opts || metadata[:em_defaults][self]
       end
 
       # Add before hook that will run inside EM event loop
@@ -75,42 +75,21 @@ module AMQP
       # Add after hook that will run inside EM event loop
       def em_after scope = :each, &block
         raise ArgumentError, "em_after only supports :each scope" unless :each == scope
-        em_hooks[:after] << block
+        em_hooks[:after].unshift block
       end
 
-      # Collection of evented hooks
+      # Collection of evented hooks for THIS example group
       def em_hooks
         metadata[:em_hooks] ||= {}
-        metadata[:em_hooks][self] ||= {:before => [], :after => []}
-#        p "#{self} < #{superclass}", em_metadata[:em_hooks].keys
-        metadata[:em_hooks][self]
+        metadata[:em_hooks][self] ||=
+            {before: (superclass.em_hooks[:before].clone rescue []),
+             after: (superclass.em_hooks[:after].clone rescue [])}
       end
-
-#      # Returns a collection of all em hooks of given type
-#      # (including ancestor hooks)
-#      #
-#      def all_hooks type
-#        hooks = superclass.all_hooks(type) rescue []
-#        hooks += em_hooks[type]
-#      end
-
-      # Returns a collection of all em hooks of given type
-      # (including ancestor hooks)
-      #
-      def all_hooks type
-        hooks = superclass.all_hooks(type) rescue []
-        hooks += em_hooks[type]
-#        :before == type ? hooks : hooks.reverse
-        hooks
-      end
-
     end
 
     def self.included example_group
       unless example_group.respond_to? :default_timeout
         example_group.extend GroupMethods
-        example_group.metadata[:em_defaults] = {}
-        example_group.metadata[:em_timeout] = nil
       end
     end
 
@@ -120,6 +99,12 @@ module AMQP
       @em_metadata ||= self.class.metadata.dup rescue {}
     end
 
+    # Retrieves default options passed in from enclosing example groups
+    #
+    def default_options
+      @em_default_options ||= self.class.default_options.dup rescue {}
+    end
+
     # Yields to a given block inside EM.run and AMQP.start loops. This method takes
     # any option that is accepted by EventMachine::connect. Options for AMQP.start include:
     # * :user => String (default ‘guest’) - Username as defined by the AMQP server.
@@ -133,8 +118,7 @@ module AMQP
     # reason. SpecTimeoutExceededError is raised if it happens.
     #
     def amqp opts={}, &block
-      opts = self.class.default_options.merge opts
-      opts[:spec_timeout] ||= self.class.default_timeout
+      opts = default_options.merge opts
       @evented_example = AMQPExample.new(opts, self, &block)
       @evented_example.run
     end
@@ -147,11 +131,7 @@ module AMQP
     # or numeric timeout in seconds.
     #
     def em opts = {}, &block
-      if opts.is_a? Hash
-        opts[:spec_timeout] ||= self.class.default_timeout
-      else
-        opts = {spec_timeout: opts}
-      end
+      opts = default_options.merge(opts.is_a?(Hash) ? opts : {spec_timeout: opts})
       @evented_example = EMExample.new(opts, self, &block)
       @evented_example.run
     end

data/spec/em_defaults_spec.rb

@@ -2,58 +2,91 @@ require 'spec_helper'
 
 describe AMQP::SpecHelper, " .default_options" do
   include AMQP::SpecHelper
-  root_default_options = {:one => 1}
+  root_default_options = {:root_key => 1}
   default_options root_default_options
 
-  it 'example has access to default options through self.class.default_options' do
-    self.class.default_options.should == root_default_options
+  it 'subsequent and nested groups should not change root default options' do
+    root_default_options.should == {:root_key => 1}
+  end
+
+  it 'example has access to default options' do
+    default_options.should == root_default_options
+  end
+
+  it 'defaults can be changed inside example, diverging from example group defaults' do
+    default_options[:example_key] = :example_value
+    default_options.should have_key :example_key
+    default_options.should_not == root_default_options
+  end
+
+  it 'changing example defaults has no effect on subsequent examples' do
+    default_options.should_not have_key :example_key
+    default_options.should == root_default_options
   end
 
   context 'inside nested example group 1' do
-    it 'defaults start as a copy of enclosing example group default_options' do
-      self.class.default_options.should == root_default_options
+    nested_default_options = default_options
+
+    it 'nested group defaults start as a copy of enclosing group default_options' do
+      nested_default_options.should == root_default_options
+    end
+
+    it 'example has access to default options' do
+      default_options.should == nested_default_options
     end
 
     it 'can be changed, thus diverging from example group default_options' do
-      self.class.default_options[:example_key] = :example_value
-      self.class.default_options.should have_key :example_key
-      self.class.default_options.should_not == root_default_options
+      default_options[:example_key] = :example_value
+      default_options.should have_key :example_key
+      default_options.should_not == root_default_options
     end
 
     it 'changing example default_options has no effect on subsequent examples' do
-      self.class.default_options.should == root_default_options
+      default_options.should_not have_key :example_key
+      default_options.should == root_default_options
     end
 
     context 'inside deeply nested example group 1' do
-      it 'example default_options starts as a copy of enclosing example group default_options' do
-        default_options.should == root_default_options
+      nested_default_options = default_options
+
+      it 'nested group defaults start as a copy of enclosing group default_options' do
+        nested_default_options.should == root_default_options
       end
 
-      it 'can be changed, thus diverging from example group default_options' do
-        self.class.default_options[:example_key] = :example_value
-        self.class.default_options.should have_key :example_key
-        self.class.default_options.should_not == root_default_options
+      it 'example has access to default options' do
+        default_options.should == nested_default_options
+      end
+
+      it 'can be changed in example, thus diverging from example group default_options' do
+        default_options[:example_key] = :example_value
+        default_options.should have_key :example_key
+        default_options.should_not == nested_default_options
       end
 
       it 'changing example default_options has no effect on subsequent examples' do
-        self.class.default_options.should_not have_key :example_key
-        self.class.default_options.should == root_default_options
+        default_options.should_not have_key :example_key
+        default_options.should == nested_default_options
       end
-    end
+    end # inside deeply nested example group 1
   end # inside nested example group 1
 
   context 'inside nested example group 2' do
     default_options[:nested_key] = :nested_value
     nested_default_options = default_options
 
-    it 'changing default_options in nested group affects example group default_options' do
+    it 'changing default options inside nested group works' do
+      nested_default_options.should have_key :nested_key
+    end
+
+    it 'changing default_options in nested group affects example default_options' do
       default_options.should == nested_default_options
       default_options.should_not == root_default_options
     end
 
-    it 'can be changed, thus diverging from example group default_options' do
+    it 'can be changed in example, thus diverging from example group default_options' do
       default_options[:example_key] = :example_value
       default_options.should have_key :example_key
+      default_options.should have_key :nested_key
       default_options.should_not == nested_default_options
       default_options.should_not == root_default_options
     end
@@ -66,16 +99,27 @@ describe AMQP::SpecHelper, " .default_options" do
       default_options[:deeply_nested_key] = :deeply_nested_value
       deeply_nested_default_options = default_options
 
+      it 'inherits default options from enclosing group' do
+        deeply_nested_default_options.should have_key :nested_key
+      end
+
+      it 'changing default options inside deeply nested group works' do
+        deeply_nested_default_options.should have_key :deeply_nested_key
+      end
+
       it 'changing default_options in nested group affects example group default_options' do
         default_options.should == deeply_nested_default_options
+        default_options.should have_key :nested_key
+        default_options.should have_key :deeply_nested_key
         default_options.should_not == nested_default_options
         default_options.should_not == root_default_options
-        default_options.should have_key :deeply_nested_key
       end
 
-      it 'can be changed, thus diverging from example group default_options' do
+      it 'can be changed in example, thus diverging from example group default_options' do
         default_options[:example_key] = :example_value
         default_options.should have_key :example_key
+        default_options.should have_key :nested_key
+        default_options.should have_key :deeply_nested_key
         default_options.should_not == nested_default_options
         default_options.should_not == root_default_options
       end
@@ -83,7 +127,6 @@ describe AMQP::SpecHelper, " .default_options" do
       it 'changing example default_options has no effect on subsequent examples' do
         default_options.should == deeply_nested_default_options
       end
-    end
+    end # inside deeply nested example group 2
   end # inside nested example group 2
-
 end # describe AMQP, "default_options"

data/spec/em_hooks_spec.rb

@@ -58,17 +58,17 @@ shared_examples_for 'hooked amqp specs' do
   end
 end
 
-describe AMQP, " with em_before/em_after" do
-  before { @hooks_called = [] } #; puts "In before: #{self}"}  #
+describe AMQP::SpecHelper, ".em_before/.em_after" do
+  before { @hooks_called = [] }
 
   describe AMQP, " tested with AMQP::SpecHelper" do
     include AMQP::SpecHelper
     default_options AMQP_OPTS if defined? AMQP_OPTS
 
-    before { @hooks_called << :before } #; puts "In before 2: #{self}" }
+    before { @hooks_called << :before }
 
-    em_before { @hooks_called << :em_before } # puts "In em_before: #{self}";
-    em_after { @hooks_called << :em_after } # puts "In em_after: #{self}";
+    em_before { @hooks_called << :em_before }
+    em_after { @hooks_called << :em_after }
 
     context 'for non-evented specs' do
       after { @hooks_called.should == [:before] }
@@ -159,7 +159,7 @@ describe AMQP, " with em_before/em_after" do
         end
 
         context 'inside nested example group' do
-          before { @hooks_called << :amqp_context_before }
+          before { @hooks_called << :amqp_context_before; $debug = true }
           em_before { @hooks_called << :amqp_context_em_before }
           em_after { @hooks_called << :amqp_context_em_after }
 
@@ -168,7 +168,7 @@ describe AMQP, " with em_before/em_after" do
                                            :em_before,
                                            :amqp_context_em_before,
                                            :amqp_context_em_after,
-                                           :em_after] }
+                                           :em_after] ; $debug = nil}
 
           it_should_behave_like 'hooked amqp specs'
 

data/spec/em_metadata_spec.rb

@@ -22,10 +22,12 @@ describe AMQP::SpecHelper, " .metadata" do
   context 'inside nested example group 1' do
     nested_metadata = metadata
 
-    it 'nested group metadata CONTAINS root enclosing group metadata' do
-      nested_metadata.should_not == root_metadata
-      nested_metadata[:example_group][:example_group].should ==
-          root_metadata[:example_group]
+    if rspec2? #describes RSpec2-specific behavior
+      it 'nested group metadata CONTAINS root enclosing group metadata' do
+        nested_metadata.should_not == root_metadata
+        nested_metadata[:example_group][:example_group].should ==
+            root_metadata[:example_group]
+      end
     end
 
     it 'except for :example_group key, nested and root group metadata is the same' do
@@ -54,13 +56,15 @@ describe AMQP::SpecHelper, " .metadata" do
     context 'inside deeply nested example group 1' do
       deeply_nested_metadata = metadata
 
-      it 'deeply_nested group metadata CONTAINS enclosing group metadata' do
-        deeply_nested_metadata.should_not == root_metadata
-        deeply_nested_metadata[:example_group][:example_group].should ==
-            nested_metadata[:example_group]
+      if rspec2? #describes RSpec2-specific behavior
+        it 'deeply_nested group metadata CONTAINS enclosing group metadata' do
+          deeply_nested_metadata.should_not == root_metadata
+          deeply_nested_metadata[:example_group][:example_group].should ==
+              nested_metadata[:example_group]
+        end
       end
 
-      it 'except for :example_group key, deeply_nested and root group metadata is the same' do
+      it 'except for :example_group, deeply_nested and root group metadata is the same' do
         @root = root_metadata.dup
         @root.delete(:example_group)
         @nested = nested_metadata.dup
@@ -85,18 +89,19 @@ describe AMQP::SpecHelper, " .metadata" do
         metadata.should_not have_key :example_key
         metadata.should == deeply_nested_metadata
       end
-
-    end
+    end # inside deeply nested example group 1
   end # inside nested example group 1
 
   context 'inside nested example group 2' do
     metadata[:nested_key] = :nested_value
     nested_metadata = metadata
 
-    it 'nested group metadata CONTAINS root enclosing group metadata' do
-      nested_metadata.should_not == root_metadata
-      nested_metadata[:example_group][:example_group].should ==
-          root_metadata[:example_group]
+    if rspec2? #describes RSpec2-specific behavior
+      it 'nested group metadata CONTAINS root enclosing group metadata' do
+        nested_metadata.should_not == root_metadata
+        nested_metadata[:example_group][:example_group].should ==
+            root_metadata[:example_group]
+      end
     end
 
     it "except for :example_group and modified keys," +
@@ -124,13 +129,15 @@ describe AMQP::SpecHelper, " .metadata" do
       metadata.should == nested_metadata
     end
 
-    context 'inside deeply nested example group 1' do
+    context 'inside deeply nested example group 2' do
       metadata[:deeply_nested_key] = :deeply_nested_value
       deeply_nested_metadata = metadata
 
-      it 'deeply_nested group metadata CONTAINS enclosing group metadata' do
-        deeply_nested_metadata[:example_group][:example_group].should ==
-            nested_metadata[:example_group]
+      if rspec2? #describes RSpec2-specific behavior
+        it 'deeply_nested group metadata CONTAINS enclosing group metadata' do
+          deeply_nested_metadata[:example_group][:example_group].should ==
+              nested_metadata[:example_group]
+        end
       end
 
       it "except for :example_group and modified keys," +
@@ -161,7 +168,6 @@ describe AMQP::SpecHelper, " .metadata" do
         metadata.should_not have_key :example_key
         metadata.should == deeply_nested_metadata
       end
-    end
+    end # inside deeply nested example group 2
   end # inside nested example group 2
-
 end # describe AMQP, "metadata"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Arvicco
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +03:00
+date: 2010-11-24 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency