always_execute 0.0.2 → 0.1.0

data/Gemfile

@@ -1,16 +1,5 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "shared_should", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem "mocha", ">= 0"
-end
+# always_execute.gemspec
+gemspec
 

data/Gemfile.lock

@@ -1,26 +1,46 @@
+PATH
+  remote: .
+  specs:
+    always_execute (0.0.2)
+      always_execute
+      shoulda
+
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    minitest (2.12.1)
     mocha (0.9.8)
       rake
-    rake (0.8.7)
+    rake (0.9.2.2)
     rcov (0.9.9)
-    shared_should (0.8.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    shared_should (0.8.3)
       shoulda
-    shoulda (2.10.3)
+    shoulda (2.11.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  always_execute!
+  bundler (>= 1.0.0)
+  jeweler (>= 1.5.2)
+  minitest (>= 2.12.1)
   mocha
   rcov
-  shared_should
-  shoulda
+  rspec (>= 2.9.0)
+  shared_should (>= 0.8.3)
+  shoulda (>= 2.11.3)

data/README.md

@@ -1,16 +1,27 @@
 # Always Execute - Change the way you test!
 
-## Examples
+Always Execute extends [RSpec](http://rspec.info) or [Shoulda](https://github.com/thoughtbot/shoulda) by adding an execute block, which is the natural home for the actual code you are testing.  Why would you ever need that? The answer is simple, the execute block provides a clear separation of concerns in your test structure making it easier to read and write.  
+
+All good tests have 3 separate and equally important steps:
+
+1. **_Setup_** the environment in a known state
+2. **_Execute_** the code you want to test
+3. **_Assert_** that your code changed the environment in the way you expected
+
+Both RSpec and Shoulda by default provide blocks to encapsulate the **_setup_** and **_assert_** steps with the `before` / `setup` and `it` / `should` blocks, but there is no built-in block for the **_execute_** step. This leads to muddled blocks for your assertions that often contain bits of **_setup_**, **_execute_**, and **_assert_** code, making the test difficult to understand.  
+
+Checkout the examples:
+
+[RSpec Examples](doc/rspec_examples.md)
+[Shoulda Examples](doc/shoulda_examples.md)
 
 # Credits
 
-Always Execute is maintained by [Michael Pearce](http://github.com/michaelgpearce) and is funded by [BookRenter.com](http://www.bookrenter.com "BookRenter.com"). Many of the ideas that have inspired Always Execute come
-from practical usage by the Bookrenter software development team and conversations with [Philippe Huibonhoa](http://github.com/phuibonhoa).
+Always Execute was developed by [Michael Pearce](http://github.com/michaelgpearce) in conjunction with [Philippe Huibonhoa](http://github.com/phuibonhoa) and is funded by [BookRenter.com](http://www.bookrenter.com "BookRenter.com"). 
 
 ![BookRenter.com Logo](http://assets0.bookrenter.com/images/header/bookrenter_logo.gif "BookRenter.com")
 
 
 # Copyright
 
-Copyright (c) 2011 Michael Pearce, Bookrenter.com. See LICENSE.txt for further details.
-
+Copyright (c) 2011 Michael Pearce, Bookrenter.com. See LICENSE.txt for further details.``

data/Rakefile

@@ -22,7 +22,12 @@ Jeweler::Tasks.new do |gem|
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   gem.add_runtime_dependency 'shoulda', '>= 0'
-  gem.add_development_dependency 'shoulda', '>= 0'
+  gem.add_development_dependency 'shoulda', '>= 2.11.3'
+  gem.add_development_dependency 'rspec', '>= 2.9.0'
+  gem.add_development_dependency 'shared_should', '>= 0.8.3'
+  gem.add_development_dependency 'rcov', '>= 0'
+  gem.add_development_dependency 'mocha', '>= 0'
+  gem.add_development_dependency 'minitest', '>= 2.12.1'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -33,16 +38,11 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
+require 'rspec/core/rake_task'
+desc "Run Rspecs"
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
-
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -51,3 +51,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :default => [:test, :spec]
+

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/always_execute.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{always_execute}
-  s.version = "0.0.2"
+  s.name = "always_execute"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Pearce"]
-  s.date = %q{2011-08-22}
-  s.description = %q{Adds execute and expect test blocks for added BDD test clarity.}
-  s.email = %q{michael.pearce@bookrenter.com}
+  s.date = "2012-08-09"
+  s.description = "Adds execute and expect test blocks for added BDD test clarity."
+  s.email = "michael.pearce@bookrenter.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -25,55 +25,96 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "always_execute.gemspec",
+    "docs/rspec_examples.md",
+    "docs/shoulda_examples.md",
     "lib/always_execute.rb",
+    "lib/rspec_execute.rb",
+    "lib/rspec_expects.rb",
     "lib/shoulda_execute.rb",
     "lib/shoulda_expects.rb",
+    "spec/execute_spec.rb",
+    "spec/expects_spec.rb",
+    "spec/spec_helper.rb",
     "test/helper.rb",
     "test/shoulda_execute_test.rb",
     "test/shoulda_expects_test.rb"
   ]
-  s.homepage = %q{http://github.com/michaelgpearce/always_execute}
+  s.homepage = "http://github.com/michaelgpearce/always_execute"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Adds execute and expect test blocks for added BDD test clarity.}
-  s.test_files = [
-    "test/helper.rb",
-    "test/shoulda_execute_test.rb",
-    "test/shoulda_expects_test.rb"
-  ]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Adds execute and expect test blocks for added BDD test clarity."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<shared_should>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_runtime_dependency(%q<always_execute>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.11.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_development_dependency(%q<shared_should>, [">= 0.8.3"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 2.12.1"])
       s.add_runtime_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.11.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_development_dependency(%q<shared_should>, [">= 0.8.3"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 2.12.1"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<shared_should>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<always_execute>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 2.11.3"])
+      s.add_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_dependency(%q<shared_should>, [">= 0.8.3"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 2.12.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 2.11.3"])
+      s.add_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_dependency(%q<shared_should>, [">= 0.8.3"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 2.12.1"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<shared_should>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<always_execute>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.9.0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 2.11.3"])
+    s.add_dependency(%q<rspec>, [">= 2.9.0"])
+    s.add_dependency(%q<shared_should>, [">= 0.8.3"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 2.12.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 2.11.3"])
+    s.add_dependency(%q<rspec>, [">= 2.9.0"])
+    s.add_dependency(%q<shared_should>, [">= 0.8.3"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 2.12.1"])
   end
 end
 

data/docs/rspec_examples.md

@@ -0,0 +1,125 @@
+
+# RSpec Examples
+
+## Without Always Execute
+
+Notice in the test below there is **_setup_**, **_execute_**, and **_assert_** code all in the `it` blocks.  Different test cases are not separated by contexts, instead they're all just strewn together; it may not be immediately obvious, but we're really testing 3 different cases below (not 4 - the first 2 `it`s describe the default behavior of the dvd\_player).  It's easy to see how these problems could be much worse given a less trivial example and how these tests would not serve as the best documentation of how dvd_player#play works.
+
+```ruby
+  describe "dvd player" do
+    before do
+      @dvd_player = DvdPlayer.new
+      @dvd = Dvd.new
+    end
+
+    it "should play movie" do
+      @dvd_player.play(@dvd)
+      @dvd_player.movie_playing?.should be_true
+    end
+  
+    it "should not allow another disc to be inserted" do
+      @dvd_player.play(@dvd)
+      @dvd_player.allows_disc_insert?.should be_false
+    end
+
+    it "should not play movie with invalid region code" do
+      @dvd.region_code = 'invalid'
+      @dvd_player.play(@dvd)
+      @dvd_player.movie_playing?.should be_false
+    end
+
+    it "should resume from last played postiion with previously played dvd" do
+      @dvd.last_played_position = 123
+      @dvd_player.play(@dvd)
+      @dvd_player.movie_playing?.should be_true
+      @dvd_player.current_position.should == 123
+    end
+  end
+```
+
+## With Always Execute
+
+When using always execute, you'll notice it's a lot DRYer, but more importantly all the **_setup_**, **_execute_**, and **_assert_** code is cleanly separated.  Furthermore, test cases are cleanly separated by contexts.  This makes it much easier to see that the first two should blocks apply to the default case, whereas the following contexts apply to exception cases.  It's also much easier to see what makes the exception cases different, since their **_setup_** code is cleanly spelled out, rather than lumped in with other code.
+
+```ruby
+  describe "dvd player" do
+    context "#play" do
+      before do
+        @dvd_player = DvdPlayer.new
+        @dvd = Dvd.new
+      end
+
+      execute do
+        @dvd_player.play(@dvd)
+      end
+
+
+      it "should play movie" do
+        @dvd_player.movie_playing?.should be_true
+      end
+    
+      it "should not allow another disc to be inserted" do
+        @dvd_player.allows_disc_insert?.should be_false
+      end
+
+      context "with invalid region code" do
+        before do
+          @dvd.region_code = 'invalid'
+        end
+  
+        it "should not play movie" do
+          @dvd_player.movie_playing?.should be_false
+        end
+      end
+
+      context "with previously played dvd" do
+        before do
+          @dvd.last_played_position = 123
+        end
+  
+        it "should resume from last played position" do
+          @dvd_player.movie_playing?.should be_true
+          @dvd_player.current_position.should == 123
+        end
+      end    
+    end
+  end
+```
+    
+# Other Features
+
+## execute_result
+
+Often in specs, you are testing the returned value of a single function.  For connivence, the returned value of an execute block is stored in a variable called `@execute_result`.
+
+```ruby
+  describe "dvd player" do
+    context "#current_dvd" do
+      before do
+        @dvd_player = DvdPlayer.new
+      end
+
+      execute do
+        @dvd_player.current_dvd
+      end
+
+      context "without any dvd in the player" do
+        it "should return no dvd" do
+          @execute_result.should be_nil
+        end
+      end
+
+      context "with a dvd in the player" do
+        before do
+          @dvd = Dvd.new
+          @dvd_player.insert(@dvd)
+        end
+
+        it "should return the dvd in the player" do
+          @execute_result.should == @dvd
+        end
+      end
+    end
+  end
+```
+

data/docs/shoulda_examples.md

@@ -0,0 +1,149 @@
+
+# Shoulda Examples
+
+## Without Always Execute
+
+Notice in the test below there is **_setup_**, **_execute_**, and **_assert_** code all in the `should` blocks.  Different test cases are not separated by contexts, instead they're all just strewn together; it may not be immediately obvious, but we're really testing 3 different cases below (not 4 - the first 2 shoulds describe the default behavior of the dvd\_player).  It's easy to see how these problems could be much worse given a less trivial example and how these tests would not serve as the best documentation of how dvd_player#play works.
+
+```ruby
+  class DvdPlayerTest
+    context "dvd player" do
+      setup do
+        @dvd_player = DvdPlayer.new
+        @dvd = Dvd.new
+      end
+
+      should "play movie" do
+        @dvd_player.play(@dvd)
+        assert @dvd_player.movie_playing?
+      end
+    
+      should "not allow another disc to be inserted" do
+        @dvd_player.play(@dvd)
+        assert_equal false, @dvd_player.allows_disc_insert?
+      end
+
+      should "not play movie with invalid region code" do
+        @dvd.region_code = 'invalid'
+        @dvd_player.play(@dvd)
+        assert_equal false, @dvd_player.movie_playing?
+      end
+
+      should "resume from last played postiion with previously played dvd" do
+        @dvd.last_played_position = 123
+        @dvd_player.play(@dvd)
+        assert @dvd_player.movie_playing?
+        assert_equal 123, @dvd_player.current_position
+      end
+    end
+  end
+```
+
+## With Always Execute
+
+When using always execute, you'll notice it's a lot DRYer, but more importantly all the **_setup_**, **_execute_**, and **_assert_** code is cleanly separated.  Furthermore, test cases are cleanly separated by contexts.  This makes it much easier to see that the first two should blocks apply to the default case, whereas the following contexts apply to exception cases.  It's also much easier to see what makes the exception cases different, since their **_setup_** code is cleanly spelled out, rather than lumped in with other code.
+
+```ruby
+  class DvdPlayerTest
+    context "#play" do
+      setup do
+        @dvd_player = DvdPlayer.new
+        @dvd = Dvd.new
+      end
+
+      execute do
+        @dvd_player.play(@dvd)
+      end
+
+
+      should "play movie" do
+        assert @dvd_player.movie_playing?
+      end
+    
+      should "not allow another disc to be inserted" do
+        assert_equal false, @dvd_player.allows_disc_insert?
+      end
+
+      context "with invalid region code" do
+        setup do
+          @dvd.region_code = 'invalid'
+        end
+  
+        should "not play movie" do
+          assert_equal false, @dvd_player.movie_playing?
+        end
+      end
+
+      context "with previously played dvd" do
+        setup do
+          @dvd.last_played_position = 123
+        end
+  
+        should "resume from last played position" do
+          assert @dvd_player.movie_playing?
+          assert_equal 123, @dvd_player.current_position
+        end
+      end    
+    end
+  end
+```
+    
+# Other Features
+
+## execute_result
+
+Often in unit tests, you are testing the returned value of a single function.  For connivence, the returned value of an execute block is stored in a variable called `@execute_result`.
+
+```ruby
+  class DvdPlayerTest
+    context "#current_dvd" do
+      setup do
+        @dvd_player = DvdPlayer.new
+      end
+
+      execute do
+        @dvd_player.current_dvd
+      end
+
+      context "without any dvd in the player" do
+        should "return no dvd" do
+          assert_nil @execute_result
+        end
+      end
+
+      context "with a dvd in the player" do
+        setup do
+          @dvd = Dvd.new
+          @dvd_player.insert(@dvd)
+        end
+
+        should "return the dvd in the player" do
+          assert_equal @dvd, @execute_result
+        end
+      end
+    end
+  end
+```
+
+## expects
+
+Expectations belong in the **_assert_** step of testing, but because of the nature of mocha expectations they need to be called in your `setup` block.  The `expects` block allows you to set your expectations without needing to create a new context.
+
+```ruby
+  class DvdPlayerTest
+    context "#menu" do
+      setup do
+        @dvd_player = DvdPlayer.new
+      end
+
+      execute do
+        @dvd_player.menu
+      end
+
+      expects do
+        @dvd_player.expects(:display_menu_options)
+      end    
+    end
+  end
+```
+

data/lib/always_execute.rb

@@ -1,5 +1,9 @@
-require 'shoulda'
-
-require 'shoulda_execute'
-require 'shoulda_expects'
+if defined?(Shoulda)
+  require 'shoulda_execute'
+  require 'shoulda_expects'
+end
 
+if defined?(RSpec)
+  require 'rspec_execute'
+  require 'rspec_expects'
+end

data/lib/rspec_execute.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Core
+    class Example
+      alias :initialize_without_execute :initialize
+      
+      def initialize(example_group_class, description, metadata, example_block=nil)
+        if example_block
+          example_block_with_execute = Proc.new do |*args|
+            if @execute_block
+              self.instance_variable_set('@execute_result', instance_exec(&@execute_block))
+            end
+            instance_exec(*args, &example_block)
+          end
+        end
+        
+        initialize_without_execute(example_group_class, description, metadata, example_block_with_execute)
+      end
+    end
+    
+    class ExampleGroup
+      def self.execute(&execute_block)
+        before do
+          @execute_block = execute_block
+        end
+      end
+    end
+  end
+end
+

data/lib/rspec_expects.rb

@@ -0,0 +1,18 @@
+module RSpec
+  module Core
+    class ExampleGroup
+      def self.expects(name = nil, &expects_block)
+        describe nil do
+          before do
+            instance_exec(&expects_block)
+          end
+
+          it "should meet expectation #{name}" do
+            # empty body
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/execute_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe ".execute" do
+  context "with execute_result on execute" do
+    execute do
+      :success
+    end
+    
+    it "should set execute_result to execute block return value" do
+      :success.should == @execute_result
+    end
+  end
+  
+  context "execute in nested contexts" do
+    before do
+      @last_step = :before_level1
+    end
+    
+    execute do
+      :before_level1.should == @last_step
+      @last_step = :execute_level1
+    end
+    
+    it "should execute execute_level1" do
+      @last_step.should == :execute_level1
+    end
+    
+    context "with nested context with no execute" do
+      it "should execute execute_level1" do
+        @last_step.should == :execute_level1
+      end
+    end
+    
+    context "with nested context with execute override" do
+      before do
+        :before_level1.should == @last_step
+        @last_step = :before_level2
+      end
+      
+      execute do
+        :before_level2.should == @last_step
+        @last_step = :execute_level2
+      end
+
+      it "should execute execute_level2" do
+        @last_step.should == :execute_level2
+      end
+    end
+  end
+end  

data/spec/expects_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+
+describe ".expects" do
+  before do
+    @object = mock
+  end
+  
+  context "with met expectation" do
+    execute do
+      @object.call_me
+    end
+    
+    expects "call_me to be called" do
+      @object.should_receive(:call_me)
+    end
+    
+    expects "call_me to be called second time" do
+      @object.should_receive(:call_me)
+    end
+  end
+  
+  context "execution order" do
+    before do
+      @last_step = :before
+    end
+    
+    context "with 'expects'" do
+      execute do
+        :expects.should == @last_step
+        @last_step = :execute
+      end
+
+      expects "to be called before execute" do
+        :before.should == @last_step
+        @last_step = :expects
+      end
+    end
+    
+    context "with 'expects' and 'it'" do
+      before do
+        @expects_called = false
+      end
+      
+      execute do
+        :before.should == @last_step
+        @last_step = :execute
+      end
+      
+      expects do
+        @expects_called = true
+      end
+      
+      it "should not call 'expects' for 'it'" do
+        :execute.should == @last_step
+        @expects_called.should be_false
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'rspec'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'always_execute'

metadata

@@ -1,149 +1,360 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: always_execute
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Michael Pearce
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-22 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-08-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: always_execute
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: shared_should
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: shared_should
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.1
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: shared_should
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.1
   type: :development
-  requirement: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 description: Adds execute and expect test blocks for added BDD test clarity.
 email: michael.pearce@bookrenter.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -152,47 +363,45 @@ files:
 - Rakefile
 - VERSION
 - always_execute.gemspec
+- docs/rspec_examples.md
+- docs/shoulda_examples.md
 - lib/always_execute.rb
+- lib/rspec_execute.rb
+- lib/rspec_expects.rb
 - lib/shoulda_execute.rb
 - lib/shoulda_expects.rb
+- spec/execute_spec.rb
+- spec/expects_spec.rb
+- spec/spec_helper.rb
 - test/helper.rb
 - test/shoulda_execute_test.rb
 - test/shoulda_expects_test.rb
-has_rdoc: true
 homepage: http://github.com/michaelgpearce/always_execute
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -860824188872113324
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds execute and expect test blocks for added BDD test clarity.
-test_files: 
-- test/helper.rb
-- test/shoulda_execute_test.rb
-- test/shoulda_expects_test.rb
+test_files: []