rspec-given 2.0.0 → 2.1.0.beta.1

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 gem 'rspec', '>= 2.0'
-gem 'rake', '>= 0.9.2.2'
+gem 'rake', '>= 0.9.2.2'
+
+group :test do
+  gem 'flexmock'
+end

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    flexmock (1.0.2)
     rake (0.9.2.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
@@ -16,5 +17,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  flexmock
   rake (>= 0.9.2.2)
   rspec (>= 2.0)

data/README.md

@@ -1,6 +1,6 @@
 # rspec-given
 
-Covering rspec-given, version 2.0.0.
+Covering rspec-given, version 2.1.0.beta.1.
 
 rspec-given is an RSpec extension to allow Given/When/Then notation in
 RSpec specifications.  It is a natural extension of the experimental
@@ -46,7 +46,7 @@ describe Stack do
       When { stack.push(:an_item) }
 
       Then { stack.depth.should == 1 }
-      Then { stack.top.should == :an_item }
+      Also { stack.top.should == :an_item }
     end
 
     context "when popping" do
@@ -62,7 +62,7 @@ describe Stack do
       When(:pop_result) { stack.pop }
 
       Then { pop_result.should == :an_item }
-      Then { stack.depth.should == 0 }
+      Also { stack.depth.should == 0 }
     end
   end
 
@@ -241,9 +241,9 @@ in term of <tt>size</tt>.  Whenever <tt>size</tt> is 0,
 <tt>empty?</tt> should be false.
 
 You can conceptually think of an _Invariant_ block as a _Then_ block
-that automatically gets added to every _When_ within its scope.
+that automatically gets added to every _Then_ within its scope.
 
-Invariants nested within a context only apply to the _When_ blocks in
+Invariants nested within a context only apply to the _Then_ blocks in
 that context.
 
 Invariants that reference a _Given_ precondition accessor must only be
@@ -255,11 +255,7 @@ I really like the way the Given framework is working out.  I feel my
 tests are much more like specifications when I use it.  However, I'm
 not entirely happy with it.
 
-First, I would like to introduce invariants.  An _Invariant_ block
-would essentially be a post-conditions that should be true after
-_Then_ block in the same (or nested) context as the invariant.
-
-Second, I would like to remove the need for the ".should" in all the
+I would like to remove the need for the ".should" in all the
 _Then_ blocks.  In other words, instead of saying:
 
     Then { x.should == y }

data/examples/integration/also_spec.rb

@@ -0,0 +1,48 @@
+require 'rspec/given'
+require 'spec_helper'
+
+describe "Also" do
+  Given(:info) { [] }
+  Given(:mock) { flexmock("mock") }
+
+  describe "Also is called after Then" do
+    Given { mock.should_receive(:also_ran).once }
+    Then { info << "T" }
+    Also {
+      info.should == ["T"]
+      mock.also_ran
+    }
+  end
+
+  describe "Also is called only once with multiple Thens" do
+    Then { info << "T" }
+    Then { info << "T2" }
+    Also { info.should == ["T"] }
+  end
+
+  describe "Inherited Alsos are not run" do
+    Then { info << "T-OUTER" }
+    Also { info << "A-OUTER" }
+    Also { info.should == ["T-OUTER", "A-OUTER"] }
+
+    context "inner" do
+      Then { info << "T-INNER" }
+      Also { info << "A-INNER" }
+      Also { info.should == ["T-INNER", "A-INNER"] }
+    end
+  end
+
+  describe "Alsos require a Then" do
+    begin
+      Also { }
+    rescue StandardError => ex
+      @message = ex.message
+    end
+
+    it "should define a message" do
+      message = self.class.instance_eval { @message }
+      message.should =~ /also.*without.*then/i
+    end
+  end
+
+end

data/examples/spec_helper.rb

@@ -1,2 +1,6 @@
 require 'rspec/given'
 $LOAD_PATH << './examples/stack'
+
+RSpec.configure do |c|
+  c.mock_with :flexmock
+end

data/examples/stack/stack_spec.rb

@@ -20,7 +20,7 @@ describe Stack do
       When { stack.push(:an_item) }
 
       Then { stack.depth.should == 1 }
-      Then { stack.top.should == :an_item }
+      Also { stack.top.should == :an_item }
     end
 
     context "when popping" do
@@ -36,7 +36,7 @@ describe Stack do
       When(:pop_result) { stack.pop }
 
       Then { pop_result.should == :an_item }
-      Then { stack.depth.should == 0 }
+      Also { stack.depth.should == 0 }
     end
   end
 

data/lib/rspec/given/extensions.rb

@@ -31,11 +31,20 @@ module RSpec
         end
       end
 
+      def _rg_check_alsos  # :nodoc:
+        return if self.class._rg_context_info[:also_ran]
+        self.class._rg_alsos.each do |block|
+          instance_eval(&block)
+        end
+        self.class._rg_context_info[:also_ran] = true
+      end
+
       # Implement the run-time semantics of the Then clause.
       def _rg_then(&block)      # :nodoc:
         _rg_establish_givens
         _rg_check_invariants
         instance_eval(&block)
+        _rg_check_alsos
       end
     end
 
@@ -53,6 +62,14 @@ module RSpec
         @_rg_invariants ||= []
       end
 
+      def _rg_alsos
+        @_rg_alsos ||= []
+      end
+
+      def _rg_context_info
+        @_rg_contet_info ||= {}
+      end
+
       # Trigger the evaluation of a Given! block by referencing its
       # name.
       def _rg_trigger_given(name) # :nodoc:
@@ -145,6 +162,7 @@ module RSpec
         file = eval "__FILE__", b
         line = eval "__LINE__", b
         eval %{specify do _rg_then(&block) end}, binding, file, line
+        _rg_context_info[:then_defined] = true
       end
 
       # Establish an invariant that must be true for all Then blocks
@@ -152,6 +170,11 @@ module RSpec
       def Invariant(&block)
         _rg_invariants << block
       end
+
+      def Also(&block)
+        fail "Also defined without a Then" unless _rg_context_info[:then_defined]
+        _rg_alsos << block
+      end
     end
   end
 end

data/lib/rspec/given/version.rb

@@ -2,8 +2,10 @@ module RSpec
   module Given
     VERSION_NUMBERS = [
       VERSION_MAJOR = 2,
-      VERSION_MINOR = 0,
+      VERSION_MINOR = 1,
       VERSION_BUILD = 0,
+      VERSION_BETA  = 'beta',
+      VERSION_BETANUM = '1'
     ]
     VERSION = VERSION_NUMBERS.join(".")
   end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rspec-given
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70178365108520 !ruby/object:Gem::Requirement
+  requirement: &70227316783380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70178365108520
+  version_requirements: *70227316783380
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70178365107200 !ruby/object:Gem::Requirement
+  requirement: &70227316782580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70178365107200
+  version_requirements: *70227316782580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70178365103560 !ruby/object:Gem::Requirement
+  requirement: &70227316781360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -43,7 +43,7 @@ dependencies:
         version: 2.4.2
   type: :development
   prerelease: false
-  version_requirements: *70178365103560
+  version_requirements: *70227316781360
 description: ! 'Given is an RSpec extension that allows explicit definition of the
 
   pre and post-conditions for code under test.
@@ -67,6 +67,7 @@ files:
 - lib/rspec/given/rspec1_given.rb
 - lib/rspec/given/version.rb
 - lib/rspec/given.rb
+- examples/integration/also_spec.rb
 - examples/integration/focused_line_spec.rb
 - examples/integration/given_spec.rb
 - examples/integration/invariant_spec.rb
@@ -96,9 +97,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: given
 rubygems_version: 1.8.15