rspec-expectations 2.0.0.beta.4 → 2.0.0.beta.5

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.4
+2.0.0.beta.5

data/features/expectations/customized_message.feature

@@ -45,7 +45,7 @@ Feature: customized message
       end
 
       """
-    When I run "rspec node_spec.rb --format n"
+    When I run "rspec node_spec.rb --format documentation"
     Then I should see "3 examples, 3 failures"
     And  I should not see "to return true, got false"
     And  I should not see "to return false, got true"

data/features/matchers/access_running_example.feature

@@ -1,12 +1,20 @@
-@wip
 Feature: access running example
 
-  Scenario: matcher defined via DSL
+  In order to take advantage of services that are available
+    in my examples when I'm writing matchers
+  As a spec author
+  I want to call methods on the running example
+
+  If the method exists in the context of the example, it gets
+  called. If not, a NoMethodError is raised on the Matcher itself
+  (not the example).
+
+  Scenario: call method defined on example from matcher
     Given a file named "example_spec.rb" with:
       """
       Rspec::Matchers.define :bar do
         match do |_|
-          running_example.foo == "foo"
+          foo == "foo"
         end
       end
 
@@ -22,27 +30,24 @@ Feature: access running example
       """
     When I run "rspec example_spec.rb"
     Then I should see "1 example, 0 failures"
-    
-  Scenario: matcher defined via #new 
+
+  Scenario: call method _not_ defined on example from matcher
     Given a file named "example_spec.rb" with:
       """
-      describe "something" do
-        def bar
-          Rspec::Matchers::Matcher.new :bar do
-            match do |_|
-              running_example.foo == "foo"
-            end
-          end
-        end
-
-        def foo
-          "foo"
+      Rspec::Matchers.define :bar do
+        match do |_|
+          foo == "foo"
         end
+      end
 
+      describe "something" do
         it "does something" do
           "foo".should bar
         end
       end
       """
     When I run "rspec example_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then I should see "1 example, 1 failure"
+    And I should see "undefined local variable"
+    And I should see "Rspec::Matchers::Matcher"
+    And I should not see "ExampleGroup"

data/features/matchers/define_matcher.feature

@@ -34,7 +34,7 @@ Feature: define matcher
       end
 
       """
-    When I run "rspec matcher_with_default_message_spec.rb --format specdoc"
+    When I run "rspec matcher_with_default_message_spec.rb --format documentation"
     Then the exit status should not be 0
 
     And I should see "should be a multiple of 3"
@@ -116,7 +116,7 @@ Feature: define matcher
         it {should_not be_a_multiple_of(4)}
       end
       """
-    When I run "rspec matcher_overriding_description_spec.rb --format specdoc"
+    When I run "rspec matcher_overriding_description_spec.rb --format documentation"
     Then the exit status should be 0
     And the stdout should contain "2 examples, 0 failures"
     And the stdout should contain "should be multiple of 3"
@@ -141,7 +141,7 @@ Feature: define matcher
         it {should have_7_fingers}
       end
       """
-    When I run "rspec matcher_with_no_args_spec.rb --format specdoc"
+    When I run "rspec matcher_with_no_args_spec.rb --format documentation"
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
     And the stdout should contain "should have 7 fingers"
@@ -161,7 +161,7 @@ Feature: define matcher
         it {should be_the_sum_of(1,2,3,4)}
       end
       """
-    When I run "rspec matcher_with_multiple_args_spec.rb --format specdoc"
+    When I run "rspec matcher_with_multiple_args_spec.rb --format documentation"
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
     And the stdout should contain "should be the sum of 1, 2, 3, and 4"

data/features/matchers/define_matcher_with_fluent_interface.feature

@@ -22,6 +22,6 @@ Feature: define matcher
         it { should be_bigger_than(4).but_smaller_than(6) }
       end
       """
-    When I run "rspec between_spec.rb --format specdoc"
+    When I run "rspec between_spec.rb --format documentation"
     Then I should see "1 example, 0 failures"
     And  I should see "should be bigger than 4"

data/lib/rspec/matchers/dsl.rb

@@ -4,6 +4,7 @@ module Rspec
       # See Rspec::Matchers
       def define(name, &declarations)
         define_method name do |*expected|
+          $matcher_execution_context = self
           Rspec::Matchers::Matcher.new name, *expected, &declarations
         end
       end

data/lib/rspec/matchers/matcher.rb

@@ -22,11 +22,6 @@ module Rspec
         end
       end
       
-      def instance_exec(*args, &block)
-        self.running_example ||= eval("running_example", block.binding) rescue nil
-        super(*args, &block)
-      end
-            
       #Used internally by objects returns by +should+ and +should_not+.
       def matches?(actual)
         @actual = actual
@@ -92,10 +87,15 @@ module Rspec
         end
       end
       
-    protected
-      attr_accessor :running_example
-      
     private
+
+      def method_missing(name, *args, &block)
+        if $matcher_execution_context.respond_to?(name)
+          $matcher_execution_context.send name, *args, &block
+        else
+          super(name, *args, &block)
+        end
+      end
     
       def making_declared_methods_public # :nodoc:
         # Our home-grown instance_exec in ruby 1.8.6 results in any methods

data/rspec-expectations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.beta.4"
+  s.version = "2.0.0.beta.5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-04-04}
   s.description = %q{rspec expectations (should[_not] and matchers)}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/expectations}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-expectations-2.0.0.beta.4
+  Thank you for installing rspec-expectations-2.0.0.beta.5
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -121,7 +121,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-expectations-2.0.0.beta.4}
+  s.summary = %q{rspec-expectations-2.0.0.beta.5}
   s.test_files = [
     "spec/rspec/expectations/differs/default_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
@@ -163,19 +163,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_development_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.4"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.5"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
     else
       s.add_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.4"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.5"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
     end
   else
     s.add_dependency(%q<cucumber>, [">= 0.6.2"])
     s.add_dependency(%q<aruba>, [">= 0.1.1"])
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.4"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.5"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
   end
 end
 

data/spec/rspec/matchers/matcher_spec.rb

@@ -286,37 +286,32 @@ module Rspec
       end
 
       context "defined using the dsl" do
-        it "can access the running_example" do
+        def a_method_in_the_example
+          "method defined in the example"
+        end
+
+        it "can access methods in the running_example" do
           Rspec::Matchers.define(:__access_running_example) do
             match do |actual|
-              actual == running_example
+              a_method_in_the_example == "method defined in the example"
             end
           end
           running_example.should __access_running_example
         end
-      end
-    
-      context "defined using #new" do
-        it "can access the running_example" do
-          @matcher = Rspec::Matchers::Matcher.new(:something) {}
-          @matcher.send(:running_example).should eq(running_example)
-        end
-      end
 
-      context "wrapped in a method" do
-        
-        def access_running_example
-          Matcher.new(:access_running_example) do
+        it "raises NoMethodError for methods not in the running_example" do
+          Rspec::Matchers.define(:__raise_no_method_error) do
             match do |actual|
-              actual == running_example
+              a_method_not_in_the_example == "method defined in the example"
             end
           end
-        end
-        
-        it "can access the running_example" do
-          running_example.should access_running_example
+
+          expect do
+            running_example.should __raise_no_method_error
+          end.to raise_error(/Rspec::Matchers::Matcher/)
         end
       end
+    
     end
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 4
-  version: 2.0.0.beta.4
+  - 5
+  version: 2.0.0.beta.5
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -05:00
+date: 2010-04-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,8 +60,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 4
-        version: 2.0.0.beta.4
+        - 5
+        version: 2.0.0.beta.5
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,8 +76,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 4
-        version: 2.0.0.beta.4
+        - 5
+        version: 2.0.0.beta.5
   type: :development
   version_requirements: *id004
 description: rspec expectations (should[_not] and matchers)
@@ -185,7 +185,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-expectations-2.0.0.beta.4
+    Thank you for installing rspec-expectations-2.0.0.beta.5
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -219,7 +219,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.0.0.beta.4
+summary: rspec-expectations-2.0.0.beta.5
 test_files: 
 - spec/rspec/expectations/differs/default_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb