dchelimsky-rspec 1.1.11.7 → 1.1.12

data/History.txt

@@ -1,4 +1,4 @@
-=== Maintenance
+=== Version 1.1.12 / 2009-01-11
 
 WARNING: there was a stub/mock bug in 1.1.11 that allowed a structure that was
 not intended:

data/features/support/helpers/story_helper.rb

@@ -1,4 +1,3 @@
-require 'spec/story'
 require File.dirname(__FILE__) + '/../../../spec/ruby_forker'
 
 module StoryHelper
@@ -11,6 +10,4 @@ module StoryHelper
   def cmdline(args, stderr)
     ruby("#{File.dirname(__FILE__) + '/../../resources/helpers/cmdline.rb'} #{args}", stderr)
   end
-  
-  Spec::Story::World.__send__ :include, self
 end

data/lib/spec/example/example_group_methods.rb

@@ -118,7 +118,7 @@ WARNING
       #   exist (for state expectations)
       #     File.should exist("path/to/file")
       #
-      #   an_instance_of (for mock argument constraints)
+      #   an_instance_of (for mock argument matchers)
       #     mock.should_receive(:message).with(an_instance_of(String))
       #
       # == Examples

data/lib/spec/matchers.rb

@@ -31,7 +31,7 @@ module Spec
   #   description #optional
   #
   # See Spec::Expectations to learn how to use these as Expectation Matchers.
-  # See Spec::Mocks to learn how to use them as Mock Argument Constraints.
+  # See Spec::Mocks to learn how to use them as Mock Argument Matchers.
   #
   # == Predicates
   #

data/lib/spec/mocks.rb

@@ -105,11 +105,11 @@ module Spec
   #   my_mock.should_receive(:sym).with(*args)
   #   my_mock.should_not_receive(:sym).with(*args)
   #
-  # == Argument Constraints using Expression Matchers
+  # == Argument Matchers
   #
   # Arguments that are passed to #with are compared with actual arguments received
   # using == by default. In cases in which you want to specify things about the arguments
-  # rather than the arguments themselves, you can use any of the Expression Matchers.
+  # rather than the arguments themselves, you can use any of RSpec's Expression Matchers.
   # They don't all make syntactic sense (they were primarily designed for use with
   # Spec::Expectations), but you are free to create your own custom Spec::Matchers.
   #
@@ -120,7 +120,7 @@ module Spec
   #
   #   my_mock.should_receive(:sym).with(no_args())
   #   my_mock.should_receive(:sym).with(any_args())
-  #   my_mock.should_receive(:sym).with(1, an_instance_of(Numeric), "b") #2nd argument can any type of Numeric
+  #   my_mock.should_receive(:sym).with(1, kind_of(Numeric), "b") #2nd argument can any kind of Numeric
   #   my_mock.should_receive(:sym).with(1, boolean(), "b") #2nd argument can true or false
   #   my_mock.should_receive(:sym).with(1, /abc/, "b") #2nd argument can be any String matching the submitted Regexp
   #   my_mock.should_receive(:sym).with(1, anything(), "b") #2nd argument can be anything at all

data/lib/spec/mocks/argument_expectation.rb

@@ -6,21 +6,21 @@ module Spec
       
       def initialize(args, &block)
         @args = args
-        @constraints_block = block
+        @matchers_block = block
         
-        if ArgumentConstraints::AnyArgsConstraint === args.first
+        if ArgumentMatchers::AnyArgsMatcher === args.first
           @match_any_args = true
-        elsif ArgumentConstraints::NoArgsConstraint === args.first
-          @constraints = []
+        elsif ArgumentMatchers::NoArgsMatcher === args.first
+          @matchers = []
         else
-          @constraints = args.collect {|arg| constraint_for(arg)}
+          @matchers = args.collect {|arg| matcher_for(arg)}
         end
       end
       
-      def constraint_for(arg)
-        return ArgumentConstraints::MatcherConstraint.new(arg)   if is_matcher?(arg)
-        return ArgumentConstraints::RegexpConstraint.new(arg) if arg.is_a?(Regexp)
-        return ArgumentConstraints::EqualityProxy.new(arg)
+      def matcher_for(arg)
+        return ArgumentMatchers::MatcherMatcher.new(arg)   if is_matcher?(arg)
+        return ArgumentMatchers::RegexpMatcher.new(arg) if arg.is_a?(Regexp)
+        return ArgumentMatchers::EqualityProxy.new(arg)
       end
       
       def is_matcher?(obj)
@@ -28,15 +28,15 @@ module Spec
       end
       
       def args_match?(given_args)
-        match_any_args? || constraints_block_matches?(given_args) || constraints_match?(given_args)
+        match_any_args? || matchers_block_matches?(given_args) || matchers_match?(given_args)
       end
       
-      def constraints_block_matches?(given_args)
-        @constraints_block ? @constraints_block.call(*given_args) : nil
+      def matchers_block_matches?(given_args)
+        @matchers_block ? @matchers_block.call(*given_args) : nil
       end
       
-      def constraints_match?(given_args)
-        @constraints == given_args
+      def matchers_match?(given_args)
+        @matchers == given_args
       end
       
       def match_any_args?

data/lib/spec/mocks/framework.rb

@@ -3,7 +3,7 @@
 # object in the system.
 
 require 'spec/mocks/methods'
-require 'spec/mocks/argument_constraints'
+require 'spec/mocks/argument_matchers'
 require 'spec/mocks/spec_methods'
 require 'spec/mocks/proxy'
 require 'spec/mocks/mock'

data/lib/spec/mocks/message_expectation.rb

@@ -17,7 +17,7 @@ module Spec
         @return_block = nil
         @actual_received_count = 0
         @expected_received_count = expected_received_count
-        @args_expectation = ArgumentExpectation.new([ArgumentConstraints::AnyArgsConstraint.new])
+        @args_expectation = ArgumentExpectation.new([ArgumentMatchers::AnyArgsMatcher.new])
         @consecutive = false
         @exception_to_raise = nil
         @symbol_to_throw = nil

data/lib/spec/mocks/mock.rb

@@ -14,10 +14,9 @@ module Spec
       end
       
       # This allows for comparing the mock to other objects that proxy such as
-      # ActiveRecords belongs_to proxy objects By making the other object run
-      # the comparison, we're sure the call gets delegated to the proxy target
-      # This is an unfortunate side effect from ActiveRecord, but this should
-      # be safe unless the RHS redefines == in a nonsensical manner
+      # ActiveRecords belongs_to proxy objects. By making the other object run
+      # the comparison, we're sure the call gets delegated to the proxy
+      # target.
       def ==(other)
         other == __mock_proxy
       end

data/lib/spec/mocks/spec_methods.rb

@@ -1,7 +1,7 @@
 module Spec
   module Mocks
     module ExampleMethods
-      include Spec::Mocks::ArgumentConstraints
+      include Spec::Mocks::ArgumentMatchers
 
       # Shortcut for creating an instance of Spec::Mocks::Mock.
       #
@@ -26,10 +26,19 @@ module Spec
       
       alias :stub :mock
 
+      # DEPRECATED - use mock('name').as_null_object instead
+      #
       # Shortcut for creating a mock object that will return itself in response
       # to any message it receives that it hasn't been explicitly instructed
       # to respond to.
       def stub_everything(name = 'stub')
+        Kernel.warn(<<-WARNING)
+
+DEPRECATION: stub_everything('#{name}') is deprecated and will be removed
+from a future version of rspec. Please use mock('#{name}').as_null_object
+or stub('#{name}').as_null_object instead.
+
+WARNING
         mock(name, :null_object => true)
       end
       

data/lib/spec/version.rb

@@ -3,8 +3,8 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 1
-      TINY   = 11
-      MINESCULE = 7
+      TINY   = 12
+      MINESCULE = nil
       
 
       STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')

data/rspec.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec}
-  s.version = "1.1.11.7"
+  s.version = "1.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2009-01-09}
+  s.date = %q{2009-01-11}
   s.description = %q{Behaviour Driven Development for Ruby.}
   s.email = ["rspec-devel@rubyforge.org"]
   s.executables = ["autospec", "spec"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec 1.1.11.7}
+  s.summary = %q{rspec 1.1.12}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/spec/spec/mocks/hash_including_matcher_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    module ArgumentConstraints
-      describe HashIncludingConstraint do
+    module ArgumentMatchers
+      describe HashIncludingMatcher do
         
         it "should describe itself properly" do
-          HashIncludingConstraint.new(:a => 1).description.should == "hash_including(:a=>1)"
+          HashIncludingMatcher.new(:a => 1).description.should == "hash_including(:a=>1)"
         end      
 
         describe "passing" do
@@ -18,7 +18,7 @@ module Spec
             hash_including(:a => 1).should == {:a => 1, :b => 2}
           end
           
-          describe "when matching against other constraints" do
+          describe "when matching against other matchers" do
             it "should match an int against anything()" do
               hash_including(:a => anything, :b => 2).should == {:a => 1, :b => 2}
             end

data/spec/spec/mocks/hash_not_including_matcher_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    module ArgumentConstraints
-      describe HashNotIncludingConstraint do
+    module ArgumentMatchers
+      describe HashNotIncludingMatcher do
         
         it "should describe itself properly" do
-          HashNotIncludingConstraint.new(:a => 5).description.should == "hash_not_including(:a=>5)"
+          HashNotIncludingMatcher.new(:a => 5).description.should == "hash_not_including(:a=>5)"
         end      
 
         describe "passing" do

data/spec/spec/mocks/mock_spec.rb

@@ -11,6 +11,21 @@ module Spec
         @mock.rspec_reset
       end
       
+      describe "deprecated #stub_everything method" do
+        before(:each) do
+          Kernel.stub!(:warn)
+        end
+        
+        it "creates a mock that behaves as a null object" do
+          stub_everything.should be_null_object
+        end
+        
+        it "provides deprecation warning" do
+          Kernel.should_receive(:warn).with(/DEPRECATION: stub_everything.* is deprecated./)
+          stub_everything
+        end
+      end
+      
       it "should report line number of expectation of unreceived message" do
         expected_error_line = __LINE__; @mock.should_receive(:wont_happen).with("x", 3)
         begin
@@ -550,5 +565,15 @@ module Spec
         valid_html_str.should_not include('<')
       end
     end
+    
+    describe "==" do
+      it "sends '== self' to the comparison object" do
+        first = mock('first')
+        second = mock('second')
+        
+        first.should_receive(:==).with(second)
+        second == first
+      end
+    end
   end
 end

data/spec/spec/runner/reporter_spec.rb

@@ -17,7 +17,7 @@ module Spec
       end
 
       def failure
-        Mocks::ArgumentConstraints::DuckTypeConstraint.new(:header, :exception)
+        Mocks::ArgumentMatchers::DuckTypeMatcher.new(:header, :exception)
       end
 
       def create_example_group(description_text)

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ $_spec_spec = true # Prevents Kernel.exit in various places
 
 require 'spec'
 require 'spec/mocks'
-require 'spec/story'
 spec_classes_path = File.expand_path("#{dir}/../spec/spec/spec_classes")
 require spec_classes_path unless $LOAD_PATH.include?(spec_classes_path)
 require File.dirname(__FILE__) + '/../lib/spec/expectations/differs/default'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.11.7
+  version: 1.1.12
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -08:00
+date: 2009-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -442,6 +442,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec 1.1.11.7
+summary: rspec 1.1.12
 test_files: []
 

data/lib/spec/mocks/argument_constraints.rb

@@ -1,237 +0,0 @@
-module Spec
-  module Mocks
-
-    # ArgumentConstraints are messages that you can include in message
-    # expectations to match arguments against a broader check than simple
-    # equality.
-    #
-    # With the exception of any_args() and no_args(), the constraints
-    # are all positional - they match against the arg in the given position.
-    module ArgumentConstraints
-
-      class AnyArgsConstraint
-        def description
-          "any args"
-        end
-      end
-
-      class AnyArgConstraint
-        def initialize(ignore)
-        end
-
-        def ==(other)
-          true
-        end
-      end
-
-      class NoArgsConstraint
-        def description
-          "no args"
-        end
-
-        def ==(args)
-          args == []
-        end
-      end
-
-      class RegexpConstraint
-        def initialize(regexp)
-          @regexp = regexp
-        end
-
-        def ==(value)
-          return value =~ @regexp unless value.is_a?(Regexp)
-          value == @regexp
-        end
-      end
-
-      class BooleanConstraint
-        def initialize(ignore)
-        end
-
-        def ==(value)
-          TrueClass === value || FalseClass === value
-        end
-      end
-
-      class HashIncludingConstraint
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def ==(actual)
-          @expected.each do | key, value |
-            return false unless actual.has_key?(key) && value == actual[key]
-          end
-          true
-        rescue NoMethodError => ex
-          return false
-        end
-
-        def description
-          "hash_including(#{@expected.inspect.sub(/^\{/,"").sub(/\}$/,"")})"
-        end
-      end
-      
-      class HashNotIncludingConstraint
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def ==(actual)
-          @expected.each do | key, value |
-            return false if actual.has_key?(key) && value == actual[key]
-          end
-          true
-        rescue NoMethodError => ex
-          return false
-        end
-
-        def description
-          "hash_not_including(#{@expected.inspect.sub(/^\{/,"").sub(/\}$/,"")})"
-        end
-      end
-      
-      class DuckTypeConstraint
-        def initialize(*methods_to_respond_to)
-          @methods_to_respond_to = methods_to_respond_to
-        end
-
-        def ==(value)
-          @methods_to_respond_to.all? { |sym| value.respond_to?(sym) }
-        end
-      end
-
-      class MatcherConstraint
-        def initialize(matcher)
-          @matcher = matcher
-        end
-
-        def ==(value)
-          @matcher.matches?(value)
-        end
-      end
-
-      class EqualityProxy
-        def initialize(given)
-          @given = given
-        end
-
-        def ==(expected)
-          @given == expected
-        end
-      end
-      
-      class InstanceOf
-        def initialize(klass)
-          @klass = klass
-        end
-        
-        def ==(actual)
-          actual.instance_of?(@klass)
-        end
-      end
-      
-      class KindOf
-        def initialize(klass)
-          @klass = klass
-        end
-        
-        def ==(actual)
-          actual.kind_of?(@klass)
-        end
-      end
-
-      # :call-seq:
-      #   object.should_receive(:message).with(any_args())
-      #
-      # Passes if object receives :message with any args at all. This is
-      # really a more explicit variation of object.should_receive(:message)
-      def any_args
-        AnyArgsConstraint.new
-      end
-      
-      # :call-seq:
-      #   object.should_receive(:message).with(anything())
-      #
-      # Passes as long as there is an argument.
-      def anything
-        AnyArgConstraint.new(nil)
-      end
-      
-      # :call-seq:
-      #   object.should_receive(:message).with(no_args)
-      #
-      # Passes if no arguments are passed along with the message
-      def no_args
-        NoArgsConstraint.new
-      end
-      
-      # :call-seq:
-      #   object.should_receive(:message).with(duck_type(:hello))
-      #   object.should_receive(:message).with(duck_type(:hello, :goodbye))
-      #
-      # Passes if the argument responds to the specified messages.
-      #
-      # == Examples
-      #
-      #   array = []
-      #   display = mock('display')
-      #   display.should_receive(:present_names).with(duck_type(:length, :each))
-      #   => passes
-      def duck_type(*args)
-        DuckTypeConstraint.new(*args)
-      end
-
-      # :call-seq:
-      #   object.should_receive(:message).with(boolean())
-      #
-      # Passes if the argument is boolean.
-      def boolean
-        BooleanConstraint.new(nil)
-      end
-      
-      # :call-seq:
-      #   object.should_receive(:message).with(hash_including(:key => val))
-      #   object.should_receive(:message).with(hash_including(:key))
-      #   object.should_receive(:message).with(hash_including(:key, :key2 => val2))
-      # Passes if the argument is a hash that includes the specified key(s) or key/value
-      # pairs. If the hash includes other keys, it will still pass.
-      def hash_including(*args)
-        HashIncludingConstraint.new(anythingize_lonely_keys(*args))
-      end
-      
-      # :call-seq:
-      #   object.should_receive(:message).with(hash_not_including(:key => val))
-      #   object.should_receive(:message).with(hash_not_including(:key))
-      #   object.should_receive(:message).with(hash_not_including(:key, :key2 => :val2))
-      #
-      # Passes if the argument is a hash that doesn't include the specified key(s) or key/value
-      def hash_not_including(*args)
-        HashNotIncludingConstraint.new(anythingize_lonely_keys(*args))
-      end
-      
-      # Passes if arg.instance_of?(klass)
-      def instance_of(klass)
-        InstanceOf.new(klass)
-      end
-      
-      alias_method :an_instance_of, :instance_of
-      
-      # Passes if arg.kind_of?(klass)
-      def kind_of(klass)
-        KindOf.new(klass)
-      end
-      
-      alias_method :a_kind_of, :kind_of
-      
-      private
-      
-      def anythingize_lonely_keys(*args)
-        hash = args.last.class == Hash ? args.delete_at(-1) : {}
-        args.each { | arg | hash[arg] = anything }
-        hash
-      end
-    end
-  end
-end