rspec-expectations 2.0.0.a1 → 2.0.0.a2

data/.document

@@ -1,5 +1,5 @@
-README.rdoc
+README.markdown
+Upgrade.markdown
 lib/**/*.rb
-bin/*
 features/**/*.feature
-LICENSE
+License.txt

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+doc

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2005-2009 The RSpec Development Team
+Copyright (c) 2005-2010 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,30 +1,37 @@
 require 'rubygems'
+gem 'jeweler', '>= 1.4.0'
 require 'rake'
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'lib'))
+require 'rspec/expectations/version'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-expectations"
+    gem.version = Rspec::Expectations::Version::STRING
     gem.summary = "rspec expectations (should[_not] and matchers)"
+    gem.rubyforge_project = "rspec"
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/expectations"
     gem.authors = ["David Chelimsky", "Chad Humphries"]    
-    gem.add_development_dependency('rspec-core', '>= 2.0.0.a1')
-    gem.add_development_dependency('rspec-mocks', '>= 2.0.0.a1')
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_development_dependency('rspec-core', ">= #{Rspec::Expectations::Version::STRING}")
+    gem.add_development_dependency('rspec-mocks', ">= #{Rspec::Expectations::Version::STRING}")
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-$:.unshift File.join(File.dirname(__FILE__), "/../core/lib")
-require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
+begin
+  require 'rspec/core/rake_task'
+  Rspec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = "spec/**/*_spec.rb"
+  end
+rescue LoadError
+  puts "Rspec core or one of its dependencies is not installed. Install it with: gem install rspec-meta"
 end
 
-task :default => :spec
+task :default => [:check_dependencies, :spec]
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/Upgrade.markdown

@@ -0,0 +1,38 @@
+# Upgrade to rspec-2.0
+
+## What's been removed
+
+### simple_matcher
+
+Use Rspec::Matchers.define instead. For example, if you had:
+
+    def eat_cheese
+      simple_matcher("eat cheese") do |actual|
+        actual.eat?(:cheese)
+      end
+    end
+
+Change it to:
+
+    Rspec::Matchers.define :eat_cheese do
+      match do |actual|
+        actual.eat?(:cheese)
+      end
+    end
+
+### wrap_expectation
+
+Use Rspec::Matchers.define instead.
+
+    Rspec::Matchers.define :eat_cheese do
+      match do |actual|
+        actual.should eat?(:cheese)
+      end
+    end
+
+    Rspec::Matchers.define :eat_cheese do
+      include MyCheesyAssertions
+      match_unless_raises Test::Unit::AssertionFailedError do |actual|
+        assert_eats_chesse actual
+      end
+    end

data/lib/rspec/expectations.rb

@@ -4,6 +4,7 @@ require 'rspec/expectations/fail_with'
 require 'rspec/expectations/errors'
 require 'rspec/expectations/extensions'
 require 'rspec/expectations/handler'
+require 'rspec/expectations/version'
 
 module Rspec
   

data/lib/rspec/expectations/extensions.rb

@@ -1 +1,2 @@
 require 'rspec/expectations/extensions/kernel'
+require 'rspec/expectations/extensions/rspec/core/example_group'

data/lib/rspec/expectations/extensions/rspec/core/example_group.rb

@@ -0,0 +1,19 @@
+module Rspec
+  module Core
+    class ExampleGroup
+      module BlockAliases
+        alias_method :to,     :should
+        alias_method :to_not, :should_not
+      end
+
+      # Extends the submitted block with aliases to and to_not
+      # for should and should_not. Allows expectations like this:
+      #
+      #   expect { this_block }.to change{this.expression}.from(old_value).to(new_value)
+      #   expect { this_block }.to raise_error
+      def expect(&block)
+        block.extend BlockAliases
+      end
+    end
+  end
+end

data/lib/rspec/expectations/version.rb

@@ -0,0 +1,16 @@
+module Rspec # :nodoc:
+  module Expectations # :nodoc:
+    module Version # :nodoc:
+      unless defined?(MAJOR)
+        MAJOR  = 2
+        MINOR  = 0
+        TINY   = 0
+        PRE    = 'a2'
+
+        STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+
+        SUMMARY = "rspec-expectations " + STRING
+      end
+    end
+  end
+end

data/lib/rspec/matchers.rb

@@ -21,9 +21,7 @@ require 'rspec/matchers/method_missing'
 require 'rspec/matchers/raise_error'
 require 'rspec/matchers/respond_to'
 require 'rspec/matchers/satisfy'
-require 'rspec/matchers/simple_matcher'
 require 'rspec/matchers/throw_symbol'
-require 'rspec/matchers/wrap_expectation'
 require 'rspec/matchers/compatibility'
 require 'rspec/matchers/dsl'
 

data/lib/rspec/matchers/exist.rb

@@ -5,10 +5,10 @@ module Rspec
     #   should_not exist
     #
     # Passes if actual.exist?
-    def exist
+    def exist(arg=nil)
       Matcher.new :exist do
         match do |actual|
-          actual.exist?
+          arg ? actual.exist?(arg) : actual.exist?
         end
       end
     end

data/lib/rspec/matchers/extensions/instance_exec.rb

@@ -1,22 +1,30 @@
-unless respond_to?(:instance_exec)
-  # based on Bounded Spec InstanceExec (Mauricio Fernandez)
-  # http://eigenclass.org/hiki/bounded+space+instance_exec
-  class Object
-    module InstanceExecHelper; end
-    include InstanceExecHelper
-    def instance_exec(*args, &block)
-      begin
-        orig_critical, Thread.critical = Thread.critical, true
-        n = 0
-        n += 1 while respond_to?(method_name="__instance_exec#{n}")
-        InstanceExecHelper.module_eval{ define_method(method_name, &block) }
-      ensure
-        Thread.critical = orig_critical
-      end
-      begin
-        return send(method_name, *args)
-      ensure
-        InstanceExecHelper.module_eval{ remove_method(method_name) } rescue nil
+module Rspec
+  module Matchers
+    module InstanceExec
+      unless respond_to?(:instance_exec)
+        # based on Bounded Spec InstanceExec (Mauricio Fernandez)
+        # http://eigenclass.org/hiki/bounded+space+instance_exec
+        # - uses singleton_class of matcher instead of global
+        #   InstanceExecHelper module
+        # - this keeps it scoped to this class only, which is the
+        #   only place we need it
+        # - only necessary for ruby 1.8.6
+        def instance_exec(*args, &block)
+          singleton_class = (class << self; self; end)
+          begin
+            orig_critical, Thread.critical = Thread.critical, true
+            n = 0
+            n += 1 while respond_to?(method_name="__instance_exec#{n}")
+            singleton_class.module_eval{ define_method(:__instance_exec, &block) }
+          ensure
+            Thread.critical = orig_critical
+          end
+          begin
+            return send(:__instance_exec, *args)
+          ensure
+            singleton_class.module_eval{ remove_method(:__instance_exec) } rescue nil
+          end
+        end
       end
     end
   end

data/lib/rspec/matchers/include.rb

@@ -17,28 +17,29 @@ module Rspec
     #   "spread".should include("read")
     #   "spread".should_not include("red")
     def include(*expected)
-      Matcher.new :include, *expected do |*_expected_|
+      Matcher.new :include, *expected do |*_expected|
         match do |actual|
-          helper(actual, *_expected_)
-        end
-        
-        def helper(actual, *_expected_)
-          _expected_.each do |expected|
-            if actual.is_a?(Hash)
-              if expected.is_a?(Hash)
-                expected.each_pair do |k,v|
-                  return false unless actual[k] == v
-                end
-              else
-                return false unless actual.has_key?(expected)
-              end
+          _expected.all? do |expected|
+            if comparing_hash_values?(actual, expected)
+              expected.all? {|k,v| actual[k] == v}
+            elsif comparing_hash_keys?(actual, expected)
+              actual.has_key?(expected)
             else
-              return false unless actual.include?(expected)
+              actual.include?(expected)
             end
           end
-          true
         end
+
+        def comparing_hash_keys?(actual, expected)
+          actual.is_a?(Hash) && !expected.is_a?(Hash)
+        end
+
+        def comparing_hash_values?(actual, expected)
+          actual.is_a?(Hash) && expected.is_a?(Hash)
+        end
+
       end
+
     end
   end
 end

data/lib/rspec/matchers/matcher.rb

@@ -1,15 +1,18 @@
 module Rspec
   module Matchers
     class Matcher
+      include Rspec::Matchers::InstanceExec
       include Rspec::Matchers::Pretty
-      
+      include Rspec::Matchers
+
       attr_reader :expected, :actual
-      
+
       def initialize(name, *expected, &declarations)
         @name     = name
         @expected = expected
         @actual   = nil
         @diffable = false
+        @expected_exception = nil
         @messages = {
           :description => lambda {"#{name_to_sentence}#{expected_to_sentence}"},
           :failure_message_for_should => lambda {|actual| "expected #{actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"},
@@ -19,36 +22,72 @@ module Rspec
           instance_exec(*@expected, &declarations)
         end
       end
-      
+
+      #Used internally by objects returns by +should+ and +should_not+.
       def matches?(actual)
         @actual = actual
-        instance_exec(@actual,    &@match_block)
+        if @expected_exception
+          begin
+            instance_exec(actual, &@match_block)
+            true
+          rescue @expected_exception
+            false
+          end
+        else
+          begin
+            instance_exec(actual, &@match_block)
+          rescue Rspec::Expectations::ExpectationNotMetError
+            false
+          end
+        end
       end
-      
-      def description(&block)
-        cache_or_call_cached(:description, &block)
+
+      # See Rspec::Matchers
+      def match(&block)
+        @match_block = block
       end
-      
+
+      # See Rspec::Matchers
+      def match_unless_raises(exception=Exception, &block)
+        @expected_exception = exception
+        match(&block)
+      end
+
+      # See Rspec::Matchers
       def failure_message_for_should(&block)
-        cache_or_call_cached(:failure_message_for_should, @actual, &block)
+        cache_or_call_cached(:failure_message_for_should, &block)
       end
-      
+
+      # See Rspec::Matchers
       def failure_message_for_should_not(&block)
-        cache_or_call_cached(:failure_message_for_should_not, @actual, &block)
+        cache_or_call_cached(:failure_message_for_should_not, &block)
       end
-      
-      def match(&block)
-        @match_block = block
+
+      # See Rspec::Matchers
+      def description(&block)
+        cache_or_call_cached(:description, &block)
       end
-      
+
+      #Used internally by objects returns by +should+ and +should_not+.
       def diffable?
         @diffable
       end
-      
+
+      # See Rspec::Matchers
       def diffable
         @diffable = true
       end
-            
+      
+      # See Rspec::Matchers
+      def chain(method, &block)
+        self.class.class_eval do
+          define_method method do |*args|
+            block.call(*args)
+            self
+          end
+        end
+      end
+
     private
 
       def making_declared_methods_public # :nodoc:
@@ -56,7 +95,7 @@ module Rspec
         # declared in the block eval'd by instance_exec in the block to which we
         # are yielding here are scoped private. This is NOT the case for Ruby
         # 1.8.7 or 1.9.
-        # 
+        #
         # Also, due some crazy scoping that I don't understand, these methods
         # are actually available in the specs (something about the matcher being
         # defined in the scope of Rspec::Matchers or within an example), so not
@@ -68,19 +107,26 @@ module Rspec
         (private_methods - orig_private_methods).each {|m| st.__send__ :public, m}
       end
 
-      def cache_or_call_cached(key, actual=nil, &block)
-        block ? @messages[key] = block : 
-                actual.nil? ? @messages[key].call : @messages[key].call(actual)
+      def cache_or_call_cached(key, &block)
+        block ? cache(key, &block) : call_cached(key)
+      end
+
+      def cache(key, &block)
+        @messages[key] = block
+      end
+
+      def call_cached(key)
+        @messages[key].arity == 1 ? @messages[key].call(@actual) : @messages[key].call
       end
-    
+
       def name_to_sentence
         split_words(@name)
       end
-      
+
       def expected_to_sentence
         to_sentence(@expected)
       end
-    
+
     end
   end
-end
+end

data/rspec-expectations.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.a1"
+  s.version = "2.0.0.a2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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{2009-09-16}
+  s.date = %q{2010-01-24}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -20,16 +20,17 @@ Gem::Specification.new do |s|
      "License.txt",
      "README.markdown",
      "Rakefile",
-     "VERSION",
-     "VERSION.yml",
+     "Upgrade.markdown",
      "lib/rspec/expectations.rb",
      "lib/rspec/expectations/differs/default.rb",
      "lib/rspec/expectations/differs/load-diff-lcs.rb",
      "lib/rspec/expectations/errors.rb",
      "lib/rspec/expectations/extensions.rb",
      "lib/rspec/expectations/extensions/kernel.rb",
+     "lib/rspec/expectations/extensions/rspec/core/example_group.rb",
      "lib/rspec/expectations/fail_with.rb",
      "lib/rspec/expectations/handler.rb",
+     "lib/rspec/expectations/version.rb",
      "lib/rspec/matchers.rb",
      "lib/rspec/matchers/be.rb",
      "lib/rspec/matchers/be_close.rb",
@@ -56,23 +57,45 @@ Gem::Specification.new do |s|
      "lib/rspec/matchers/raise_error.rb",
      "lib/rspec/matchers/respond_to.rb",
      "lib/rspec/matchers/satisfy.rb",
-     "lib/rspec/matchers/simple_matcher.rb",
      "lib/rspec/matchers/throw_symbol.rb",
-     "lib/rspec/matchers/wrap_expectation.rb",
      "rspec-expectations.gemspec",
      "spec/rspec/expectations/differs/default_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
      "spec/rspec/expectations/fail_with_spec.rb",
      "spec/rspec/expectations/handler_spec.rb",
-     "spec/rspec/expectations/wrap_expectation_spec.rb",
+     "spec/rspec/matchers/be_close_spec.rb",
+     "spec/rspec/matchers/be_instance_of_spec.rb",
+     "spec/rspec/matchers/be_kind_of_spec.rb",
+     "spec/rspec/matchers/be_spec.rb",
+     "spec/rspec/matchers/change_spec.rb",
+     "spec/rspec/matchers/compatibility_spec.rb",
+     "spec/rspec/matchers/description_generation_spec.rb",
+     "spec/rspec/matchers/dsl_spec.rb",
+     "spec/rspec/matchers/eql_spec.rb",
+     "spec/rspec/matchers/equal_spec.rb",
+     "spec/rspec/matchers/exist_spec.rb",
+     "spec/rspec/matchers/has_spec.rb",
+     "spec/rspec/matchers/have_spec.rb",
+     "spec/rspec/matchers/include_spec.rb",
+     "spec/rspec/matchers/match_array_spec.rb",
+     "spec/rspec/matchers/match_spec.rb",
+     "spec/rspec/matchers/matcher_methods_spec.rb",
+     "spec/rspec/matchers/matcher_spec.rb",
+     "spec/rspec/matchers/matchers_spec.rb",
+     "spec/rspec/matchers/operator_matcher_spec.rb",
+     "spec/rspec/matchers/raise_error_spec.rb",
+     "spec/rspec/matchers/respond_to_spec.rb",
+     "spec/rspec/matchers/satisfy_spec.rb",
+     "spec/rspec/matchers/throw_symbol_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/suite.rb",
-     "spec/support/macros.rb"
+     "spec/support/classes.rb"
   ]
   s.homepage = %q{http://github.com/rspec/expectations}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{rspec expectations (should[_not] and matchers)}
   s.test_files = [
@@ -80,10 +103,33 @@ Gem::Specification.new do |s|
      "spec/rspec/expectations/extensions/kernel_spec.rb",
      "spec/rspec/expectations/fail_with_spec.rb",
      "spec/rspec/expectations/handler_spec.rb",
-     "spec/rspec/expectations/wrap_expectation_spec.rb",
+     "spec/rspec/matchers/be_close_spec.rb",
+     "spec/rspec/matchers/be_instance_of_spec.rb",
+     "spec/rspec/matchers/be_kind_of_spec.rb",
+     "spec/rspec/matchers/be_spec.rb",
+     "spec/rspec/matchers/change_spec.rb",
+     "spec/rspec/matchers/compatibility_spec.rb",
+     "spec/rspec/matchers/description_generation_spec.rb",
+     "spec/rspec/matchers/dsl_spec.rb",
+     "spec/rspec/matchers/eql_spec.rb",
+     "spec/rspec/matchers/equal_spec.rb",
+     "spec/rspec/matchers/exist_spec.rb",
+     "spec/rspec/matchers/has_spec.rb",
+     "spec/rspec/matchers/have_spec.rb",
+     "spec/rspec/matchers/include_spec.rb",
+     "spec/rspec/matchers/match_array_spec.rb",
+     "spec/rspec/matchers/match_spec.rb",
+     "spec/rspec/matchers/matcher_methods_spec.rb",
+     "spec/rspec/matchers/matcher_spec.rb",
+     "spec/rspec/matchers/matchers_spec.rb",
+     "spec/rspec/matchers/operator_matcher_spec.rb",
+     "spec/rspec/matchers/raise_error_spec.rb",
+     "spec/rspec/matchers/respond_to_spec.rb",
+     "spec/rspec/matchers/satisfy_spec.rb",
+     "spec/rspec/matchers/throw_symbol_spec.rb",
      "spec/spec_helper.rb",
      "spec/suite.rb",
-     "spec/support/macros.rb"
+     "spec/support/classes.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -91,14 +137,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a1"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a1"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
     else
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a1"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a1"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
     end
   else
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a1"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a1"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
   end
 end
+