amqp-spec 0.3.1 → 0.3.2

data/HISTORY

@@ -61,3 +61,7 @@
 == 0.3.1 / 2010-11-17
 
 * Documentation cleanup
+
+== 0.3.2 / 2010-11-23
+
+* EM hooks now working as they should - bugs fixed

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/amqp-spec/evented_example.rb

@@ -46,9 +46,10 @@ module AMQP
 
       # Runs hooks of specified type (hopefully, inside the event loop)
       #
-      def run_hooks type
-        hooks = @example_group_instance.class.em_hooks[type]
+      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|
           if @example_group_instance.respond_to? :instance_eval_without_event_loop
             @example_group_instance.instance_eval_without_event_loop(&hook)
           else
@@ -64,7 +65,7 @@ module AMQP
       def run_em_loop
         begin
           EM.run do
-            run_hooks :before
+            run_em_hooks :before
 
             @spec_exception = nil
             timeout(@opts[:spec_timeout]) if @opts[:spec_timeout]
@@ -77,7 +78,7 @@ module AMQP
           end
         rescue Exception => @spec_exception
 #          p "Outside loop, caught #{@spec_exception}"
-          run_hooks :after # Event loop was broken, but we still need to run em_after hooks
+          run_em_hooks :after # Event loop was broken, but we still need to run em_after hooks
         ensure
           finish_example
         end
@@ -86,7 +87,7 @@ module AMQP
       # Stops EM event loop. It is called from #done
       #
       def finish_em_loop
-        run_hooks :after
+        run_em_hooks :after
         EM.stop_event_loop if EM.reactor_running?
       end
 
@@ -94,6 +95,7 @@ module AMQP
       # Descendant classes may redefine to clean up type-specific state.
       #
       def finish_example
+#        p @spec_exception if @spec_exception
         raise @spec_exception if @spec_exception
       end
 

data/lib/amqp-spec/rspec.rb

@@ -1,5 +1,5 @@
-require 'amqp-spec/amqp'
-require 'amqp-spec/evented_example'
+require_relative 'amqp'
+require_relative 'evented_example'
 
 # You can include one of the following modules into your example groups:
 # AMQP::SpecHelper,
@@ -80,8 +80,30 @@ module AMQP
 
       # Collection of evented hooks
       def em_hooks
-        metadata[:em_hooks] ||= {:before => [], :after => []}
+        metadata[:em_hooks] ||= {}
+        metadata[:em_hooks][self] ||= {:before => [], :after => []}
+#        p "#{self} < #{superclass}", em_metadata[:em_hooks].keys
+        metadata[:em_hooks][self]
       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
@@ -92,6 +114,12 @@ module AMQP
       end
     end
 
+    # Retrieves metadata passed in from enclosing example groups
+    #
+    def metadata
+      @em_metadata ||= self.class.metadata.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.

data/spec/em_defaults_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+describe AMQP::SpecHelper, " .default_options" do
+  include AMQP::SpecHelper
+  root_default_options = {:one => 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
+  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
+    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
+    end
+
+    it 'changing example default_options has no effect on subsequent examples' do
+      self.class.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
+      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
+      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
+      end
+    end
+  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
+      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
+      default_options[:example_key] = :example_value
+      default_options.should have_key :example_key
+      default_options.should_not == nested_default_options
+      default_options.should_not == root_default_options
+    end
+
+    it 'changing example default_options has no effect on subsequent examples' do
+      default_options.should == nested_default_options
+    end
+
+    context 'inside deeply nested example group 2' do
+      default_options[:deeply_nested_key] = :deeply_nested_value
+      deeply_nested_default_options = default_options
+
+      it 'changing default_options in nested group affects example group default_options' do
+        default_options.should == deeply_nested_default_options
+        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
+        default_options[:example_key] = :example_value
+        default_options.should have_key :example_key
+        default_options.should_not == nested_default_options
+        default_options.should_not == root_default_options
+      end
+
+      it 'changing example default_options has no effect on subsequent examples' do
+        default_options.should == deeply_nested_default_options
+      end
+    end
+  end # inside nested example group 2
+
+end # describe AMQP, "default_options"

data/spec/em_hooks_spec.rb

@@ -10,6 +10,7 @@ shared_examples_for 'hooked em specs' do
   end
 
   it 'should execute em_after if business exception is raised' do
+    # Expectation is set in after{} hook
     em do
       expect {
         raise StandardError
@@ -19,6 +20,7 @@ shared_examples_for 'hooked em specs' do
   end
 
   it 'should execute em_after if RSpec expectation fails' do
+    # Expectation is set in after{} hook
     em do
       expect { :this.should == :fail
       }.to raise_error RSPEC::Expectations::ExpectationNotMetError
@@ -37,6 +39,7 @@ shared_examples_for 'hooked amqp specs' do
   end
 
   it 'should execute em_after if business exception is raised' do
+    # Expectation is set in after{} hook
     amqp do
       expect {
         raise StandardError
@@ -46,6 +49,7 @@ shared_examples_for 'hooked amqp specs' do
   end
 
   it 'should execute em_after if RSpec expectation fails' do
+    # Expectation is set in after{} hook
     amqp do
       expect { :this.should == :fail
       }.to raise_error RSPEC::Expectations::ExpectationNotMetError
@@ -92,6 +96,21 @@ describe AMQP, " with em_before/em_after" do
 
         it_should_behave_like 'hooked em specs'
 
+        it 'should not run nested em hooks' do
+          em do
+            @hooks_called.should_not include :context_em_before, :context_before
+            done
+          end
+        end
+
+        it 'should not run hooks from unrelated group' do
+          em do
+            @hooks_called.should_not include :amqp_context_em_before,
+                                             :amqp_context_before
+            done
+          end
+        end
+
         context 'inside nested example group' do
           before { @hooks_called << :context_before }
           em_before { @hooks_called << :context_em_before }
@@ -104,6 +123,8 @@ describe AMQP, " with em_before/em_after" do
                                                :context_em_after,
                                                :em_after }
 
+          it_should_behave_like 'hooked em specs'
+
           it 'should fire both nested :before hooks' do
             em do
               @hooks_called.should include :before,
@@ -115,8 +136,6 @@ describe AMQP, " with em_before/em_after" do
             end
           end
 
-          it_should_behave_like 'hooked em specs'
-
         end # context 'inside nested example group'
       end # context 'with em block'
 
@@ -124,31 +143,45 @@ describe AMQP, " with em_before/em_after" do
 
         it_should_behave_like 'hooked amqp specs'
 
+        it 'should not run nested em hooks' do
+          amqp do
+            @hooks_called.should_not include :amqp_context_em_before,
+                                             :amqp_context_before
+            done
+          end
+        end
+
+        it 'should not run hooks from unrelated group' do
+          amqp do
+            @hooks_called.should_not include :context_em_before, :context_before
+            done
+          end
+        end
+
         context 'inside nested example group' do
-          before { @hooks_called << :context_before }
-          em_before { @hooks_called << :context_em_before }
-          em_after { @hooks_called << :context_em_after }
+          before { @hooks_called << :amqp_context_before }
+          em_before { @hooks_called << :amqp_context_em_before }
+          em_after { @hooks_called << :amqp_context_em_after }
 
-          after { @hooks_called.should include :before,
-                                               :context_before,
-                                               :em_before,
-                                               :context_em_before,
-                                               :context_em_after,
-                                               :em_after }
+          after { @hooks_called.should == [:before,
+                                           :amqp_context_before,
+                                           :em_before,
+                                           :amqp_context_em_before,
+                                           :amqp_context_em_after,
+                                           :em_after] }
 
-          it 'should fire both nested :before hooks' do
+          it_should_behave_like 'hooked amqp specs'
+
+          it 'should fire all :before hooks in correct order' do
             amqp do
-              @hooks_called.should include :before,
-                                           :context_before,
-                                           :em_before,
-                                           :context_em_before
-              @hooks_called.should_not include :em_after, :context_em_after
+              @hooks_called.should == [:before,
+                                       :amqp_context_before,
+                                       :em_before,
+                                       :amqp_context_em_before]
               done
             end
           end
 
-          it_should_behave_like 'hooked amqp specs'
-
         end # context 'inside nested example group'
       end # context 'with amqp block'
     end # context 'for evented specs'

data/spec/em_metadata_spec.rb

@@ -0,0 +1,167 @@
+require 'spec_helper'
+
+describe AMQP::SpecHelper, " .metadata" do
+  include AMQP::SpecHelper
+  root_metadata = metadata
+
+  it 'example metadata starts as a copy of example group metadata' do
+    metadata.should == root_metadata
+  end
+
+  it 'can be changed, thus diverging from example group metadata' do
+    metadata[:example_key] = :example_value
+    metadata.should have_key :example_key
+    metadata.should_not == root_metadata
+  end
+
+  it 'changing example metadata has no effect on subsequent examples' do
+    metadata.should_not have_key :example_key
+    metadata.should == root_metadata
+  end
+
+  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]
+    end
+
+    it 'except for :example_group key, nested and root group metadata is the same' do
+      @root = root_metadata.dup
+      @root.delete(:example_group)
+      @nested = nested_metadata.dup
+      @nested.delete(:example_group)
+      @nested.should == @root
+    end
+
+    it 'example metadata starts as a copy of nested group metadata' do
+      metadata.should == nested_metadata
+    end
+
+    it 'can be changed, thus diverging from example group metadata' do
+      metadata[:example_key] = :example_value
+      metadata.should have_key :example_key
+      metadata.should_not == nested_metadata
+    end
+
+    it 'changing example metadata has no effect on subsequent examples' do
+      metadata.should_not have_key :example_key
+      metadata.should == nested_metadata
+    end
+
+    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]
+      end
+
+      it 'except for :example_group key, deeply_nested and root group metadata is the same' do
+        @root = root_metadata.dup
+        @root.delete(:example_group)
+        @nested = nested_metadata.dup
+        @nested.delete(:example_group)
+        @deeply_nested = deeply_nested_metadata.dup
+        @deeply_nested.delete(:example_group)
+        @deeply_nested.should == @nested
+        @deeply_nested.should == @root
+      end
+
+      it 'example metadata starts as a copy of deeply_nested group metadata' do
+        metadata.should == deeply_nested_metadata
+      end
+
+      it 'can be changed, thus diverging from example group metadata' do
+        metadata[:example_key] = :example_value
+        metadata.should have_key :example_key
+        metadata.should_not == deeply_nested_metadata
+      end
+
+      it 'changing example metadata has no effect on subsequent examples' do
+        metadata.should_not have_key :example_key
+        metadata.should == deeply_nested_metadata
+      end
+
+    end
+  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]
+    end
+
+    it "except for :example_group and modified keys," +
+           "nested and root group metadata is the same" do
+      @root = root_metadata.dup
+      @root.delete(:example_group)
+      @nested = nested_metadata.dup
+      @nested.delete(:example_group)
+      @nested.delete(:nested_key)
+      @nested.should == @root
+    end
+
+    it 'example metadata starts as a copy of nested group metadata' do
+      metadata.should == nested_metadata
+    end
+
+    it 'can be changed, thus diverging from example group metadata' do
+      metadata[:example_key] = :example_value
+      metadata.should have_key :example_key
+      metadata.should_not == nested_metadata
+    end
+
+    it 'changing example metadata has no effect on subsequent examples' do
+      metadata.should_not have_key :example_key
+      metadata.should == nested_metadata
+    end
+
+    context 'inside deeply nested example group 1' 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]
+      end
+
+      it "except for :example_group and modified keys," +
+             "deeply nested and root group metadata is the same" do
+        @root = root_metadata.dup
+        @root.delete(:example_group)
+        @nested = nested_metadata.dup
+        @nested.delete(:example_group)
+        @deeply_nested = deeply_nested_metadata.dup
+        @deeply_nested.delete(:example_group)
+        @deeply_nested.delete(:deeply_nested_key)
+        @deeply_nested.should == @nested
+        @deeply_nested.delete(:nested_key)
+        @deeply_nested.should == @root
+      end
+
+      it 'example metadata starts as a copy of deeply_nested group metadata' do
+        metadata.should == deeply_nested_metadata
+      end
+
+      it 'can be changed, thus diverging from example group metadata' do
+        metadata[:example_key] = :example_value
+        metadata.should have_key :example_key
+        metadata.should_not == deeply_nested_metadata
+      end
+
+      it 'changing example metadata has no effect on subsequent examples' do
+        metadata.should_not have_key :example_key
+        metadata.should == deeply_nested_metadata
+      end
+    end
+  end # inside nested example group 2
+
+end # describe AMQP, "metadata"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Arvicco
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +03:00
+date: 2010-11-23 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,9 @@ files:
 - lib/amqp-spec.rb
 - lib/version.rb
 - spec/amqp.yml
+- spec/em_defaults_spec.rb
 - spec/em_hooks_spec.rb
+- spec/em_metadata_spec.rb
 - spec/failing_rspec_spec.rb
 - spec/problematic_rspec_spec.rb
 - spec/rspec_amqp_spec.rb
@@ -138,7 +140,9 @@ specification_version: 3
 summary: Simple API for writing asynchronous EventMachine/AMQP specs. Supports RSpec and RSpec2.
 test_files: 
 - spec/amqp.yml
+- spec/em_defaults_spec.rb
 - spec/em_hooks_spec.rb
+- spec/em_metadata_spec.rb
 - spec/failing_rspec_spec.rb
 - spec/problematic_rspec_spec.rb
 - spec/rspec_amqp_spec.rb