rspec 0.6.4 → 0.7.0

data/lib/spec/mocks/mock.rb

@@ -1,80 +1,15 @@
 module Spec
   module Mocks
-    module MockInstanceMethods
+    class Mock
+      include MockMethods
+
       # Creates a new mock with a +name+ (that will be used in error messages only)
       # Options:
       # * <tt>:null_object</tt> - if true, the mock object acts as a forgiving null object allowing any message to be sent to it.
       def initialize(name, options={})
         @name = name
-        @options = DEFAULT_OPTIONS.dup.merge(options)
-        @expectations = []
-        @expectation_ordering = OrderGroup.new
-      end
-
-      def should_receive(sym, &block)
-        add MessageExpectation, caller(1)[0], sym, &block
-      end
-      
-      def should_not_receive(sym, &block)
-        add NegativeMessageExpectation, caller(1)[0], sym, &block
-      end
-      
-      def __verify #:nodoc:
-        @expectations.each do |expectation|
-          expectation.verify_messages_received
-        end
-      end
-
-      def method_missing(sym, *args, &block)
-        begin
-          return self if @options[:null_object]
-          super(sym, *args, &block)
-        rescue NoMethodError
-          arg_message = args.collect{|arg| "<#{arg}:#{arg.class.name}>"}.join(", ")
-          Kernel::raise Spec::Mocks::MockExpectationError, "Mock '#{@name}' received unexpected message '#{sym}' with [#{arg_message}]"
-        end
-      end
-      
-    private
-
-      DEFAULT_OPTIONS = {
-        :null_object => false
-      }
-
-      def add(expectation_class, expected_from, sym, &block)
-        define_expected_method(sym)
-        expectation = expectation_class.send(:new, @name, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
-        @expectations << expectation
-        expectation
-      end
-
-      def metaclass
-        class << self; self; end
-      end
-    
-      def define_expected_method(sym)
-        metaclass.__send__ :class_eval, %{
-          def #{sym}(*args, &block)
-            message_received :#{sym}, *args, &block # ?
-          end
-        }
+        @options = options
       end
-    
-      def message_received(sym, *args, &block)
-        if expectation = find_matching_expectation(sym, *args)
-          expectation.invoke(args, block)
-        else
-          method_missing(sym, *args, &block)
-        end
-      end
-      
-      def find_matching_expectation(sym, *args)
-        expectation = @expectations.find {|expectation| expectation.matches(sym, args)}
-      end
-    end
-    
-    class Mock
-      include MockInstanceMethods
     end
   end
 end

data/lib/spec/mocks/mock_handler.rb

@@ -0,0 +1,158 @@
+module Spec
+  module Mocks
+    class MockHandler
+      def initialize(target, name, options={})
+        @target = target
+        @name = name
+        @error_generator = ErrorGenerator.new target, name
+        @expectation_ordering = OrderGroup.new @error_generator
+        @expectations = []
+        @messages_received = []
+        @stubs = []
+        @proxied_methods = []
+        @options = options ? DEFAULT_OPTIONS.dup.merge(options) : DEFAULT_OPTIONS
+      end
+
+      DEFAULT_OPTIONS = {
+        :null_object => false,
+        :auto_verify => true
+      }
+      
+      def null_object?
+        @options[:null_object]
+      end
+      
+      def add_message_expectation(expected_from, sym, opts={}, &block)
+        __add expected_from, sym, block
+        @expectations << MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
+        @expectations.last
+      end
+      
+      def add_negative_message_expectation(expected_from, sym, &block)
+        __add expected_from, sym, block
+        @expectations << NegativeMessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
+        @expectations.last
+      end
+      
+      def add_stub(expected_from, sym)
+        __add expected_from, sym, nil
+        @stubs << MethodStub.new(@error_generator, @expectation_ordering, expected_from, sym, nil)
+        @stubs.last
+      end
+      
+      def __add expected_from, sym, block
+        Runner::Specification.add_listener(self) if @options[:auto_verify]
+        define_expected_method(sym)
+      end
+      
+      def spec_finished spec
+        verify
+      end
+
+      def define_expected_method(sym)
+        if @target.respond_to? sym
+          metaclass_eval %-
+            alias_method :#{__pre_proxied_method_name(sym)}, :#{sym}
+          -
+          @proxied_methods << sym
+        end
+
+        metaclass_eval %-
+          def #{sym}(*args, &block)
+            __mock_handler.message_received :#{sym}, *args, &block
+          end
+        -
+      end
+
+      def __pre_proxied_method_name method_name
+        "original_#{method_name.to_s.delete('!').delete('[').delete('\]')}_before_proxy"
+      end
+
+      def verify #:nodoc:
+        begin
+          verify_expectations
+        ensure
+          reset
+        end
+      end
+      
+      def reset
+        clear_expectations
+        clear_stubs
+        reset_proxied_methods
+        clear_proxied_methods
+      end
+      
+      def verify_expectations
+        @expectations.each do |expectation|
+          expectation.verify_messages_received
+        end
+      end
+
+      def reset_proxied_methods
+        @proxied_methods.each do |method_name|
+          if @target.respond_to? __pre_proxied_method_name(method_name)
+            metaclass_eval %-
+              alias_method :#{method_name}, :#{__pre_proxied_method_name(method_name)}
+              remove_method :#{__pre_proxied_method_name(method_name)}
+            -
+          end  
+        end  
+      end  
+
+      def clear_expectations #:nodoc:
+        @expectations.clear
+      end
+      
+      def clear_stubs #:nodoc:
+        @stubs.clear
+      end
+      
+      def clear_proxied_methods #:nodoc:
+        @proxied_methods.clear
+      end
+
+      def metaclass_eval str
+        (class << @target; self; end).class_eval str
+      end
+      
+      def received_message?(sym, *args, &block)
+        return true if @messages_received.find {|array| array == [sym, args, block]}
+        return false
+      end
+
+      def find_matching_expectation(sym, *args)
+        @expectations.find {|expectation| expectation.matches(sym, args)}
+      end
+      
+      def find_almost_matching_expectation(sym, *args)
+        @expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
+      end
+      
+      def find_matching_method_stub(sym)
+        @stubs.find {|stub| stub.matches(sym, [])}
+      end
+      
+      def has_negative_expectation?(sym)
+        @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
+      end
+      
+      def message_received(sym, *args, &block)
+        if expectation = find_matching_expectation(sym, *args)
+          expectation.invoke(args, block)
+        elsif stub = find_matching_method_stub(sym)
+          stub.invoke([], nil)
+        elsif expectation = find_almost_matching_expectation(sym, *args)
+          raise_unexpected_message_error(sym, *args) unless has_negative_expectation?(sym) unless null_object?
+        else
+          @target.send :method_missing, sym, *args, &block
+        end
+      end
+      
+      def raise_unexpected_message_error sym, *args
+        @error_generator.raise_unexpected_message_error sym, *args
+      end
+      
+    end
+  end
+end

data/lib/spec/mocks/mock_methods.rb

@@ -0,0 +1,44 @@
+module Spec
+  module Mocks
+    module MockMethods
+      def should_receive(sym, opts={}, &block)
+        __mock_handler.add_message_expectation(opts[:expected_from] || caller(1)[0], sym, opts, &block)
+      end
+
+      def should_not_receive(sym, &block)
+        __mock_handler.add_negative_message_expectation(caller(1)[0], sym, &block)
+      end
+      
+      def stub!(sym)
+        __mock_handler.add_stub caller(1)[0], sym
+      end
+      
+      def received_message?(sym, *args, &block)
+        __mock_handler.received_message?(sym, *args, &block)
+      end
+      
+      def __verify
+        __mock_handler.verify
+      end
+
+      def __reset_mock
+        __mock_handler.reset
+      end
+
+      def method_missing(sym, *args, &block)
+        __mock_handler.instance_eval {@messages_received << [sym, args, block]}
+        begin
+          return self if __mock_handler.null_object?
+          super(sym, *args, &block)
+        rescue NoMethodError
+          __mock_handler.raise_unexpected_message_error sym, *args
+        end
+      end
+      
+      private
+      def __mock_handler
+        @mock_handler ||= MockHandler.new(self, @name, @options)
+      end
+    end
+  end
+end

data/lib/spec/mocks/order_group.rb

@@ -1,7 +1,8 @@
 module Spec
   module Mocks
     class OrderGroup
-      def initialize
+      def initialize error_generator
+        @error_generator = error_generator
         @ordering = Array.new
       end
       
@@ -13,9 +14,16 @@ module Spec
         return @ordering.first == expectation
       end
       
-      def consume(expectation)
+      def consume
         @ordering.shift
       end
+      
+      def handle_order_constraint expectation
+        return unless @ordering.include? expectation
+        return consume if ready_for?(expectation)
+        @error_generator.raise_out_of_order_error expectation.sym
+      end
+      
     end
   end
 end

data/lib/spec/rake/spectask.rb

@@ -93,7 +93,6 @@ module Spec
       end
 
       def define
-        #raise "No spec files found." if file_list.empty?
         spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
 
         lib_path = @libs.join(File::PATH_SEPARATOR)
@@ -109,23 +108,26 @@ module Spec
             ruby_opts.push( "-w" ) if @warning
 
             redirect = @out.nil? ? "" : " > #{@out}"
-            # ruby [ruby_opts] -Ilib -S rcov [rcov_opts] bin/spec -- [spec_opts] examples
-            # or
-            # ruby [ruby_opts] -Ilib bin/spec [spec_opts] examples
-            begin
-              ruby(
-                ruby_opts.join(" ") + " " + 
-                rcov_option_list +
-                (@rcov ? %[ -o "#{@rcov_dir}" ] : "") + 
-                '"' + spec_script + '"' + " " +
-                (@rcov ? "-- " : "") + 
-                spec_option_list + " " +
-                file_list.collect { |fn| %["#{fn}"] }.join(' ') + " " + 
-                redirect
-              )
-            rescue => e
-               puts @failure_message if @failure_message
-               raise e if @fail_on_error
+
+            unless file_list.empty?
+              # ruby [ruby_opts] -Ilib -S rcov [rcov_opts] bin/spec -- [spec_opts] examples
+              # or
+              # ruby [ruby_opts] -Ilib bin/spec [spec_opts] examples
+              begin
+                ruby(
+                  ruby_opts.join(" ") + " " + 
+                  rcov_option_list +
+                  (@rcov ? %[ -o "#{@rcov_dir}" ] : "") + 
+                  '"' + spec_script + '"' + " " +
+                  (@rcov ? "-- " : "") + 
+                  file_list.collect { |fn| %["#{fn}"] }.join(' ') + " " + 
+                  spec_option_list + " " +
+                  redirect
+                )
+              rescue => e
+                 puts @failure_message if @failure_message
+                 raise e if @fail_on_error
+              end
             end
           end
         end

data/lib/spec/rake/{rcov_verify.rb → verify_rcov.rb}

@@ -3,7 +3,7 @@ module RCov
   # drop below a certain threshold. It should be run after
   # running Spec::Rake::SpecTask.
   class VerifyTask < Rake::TaskLib
-    # Name of the task. Defaults to :rcov_verify
+    # Name of the task. Defaults to :verify_rcov
     attr_accessor :name
     
     # Path to the index.html file generated by RCov, which
@@ -19,7 +19,7 @@ module RCov
     # exception. 
     attr_accessor :threshold
     
-    def initialize(name=:rcov_verify)
+    def initialize(name=:verify_rcov)
       @name = name
       @index_html = 'coverage/index.html'
       @verbose = true

data/lib/spec/runner.rb

@@ -1,5 +1,4 @@
 require 'spec/runner/formatter'
-require 'spec/runner/instance_exec'
 require 'spec/runner/context'
 require 'spec/runner/context_eval'
 require 'spec/runner/specification'
@@ -9,3 +8,6 @@ require 'spec/runner/option_parser'
 require 'spec/runner/backtrace_tweaker'
 require 'spec/runner/reporter'
 require 'spec/runner/spec_matcher'
+require 'spec/runner/extensions/kernel'
+require 'spec/runner/extensions/object'
+require 'spec/runner/spec_should_raise_handler'

data/lib/spec/runner/backtrace_tweaker.rb

@@ -7,7 +7,6 @@ module Spec
       end
     end
 
-    # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
     class NoisyBacktraceTweaker < BacktraceTweaker
       def tweak_backtrace(error, spec_name)
         return if error.backtrace.nil?
@@ -26,11 +25,13 @@ module Spec
           line = tweak_instance_exec_line line, spec_name
           line = nil if line =~ /\/lib\/ruby\//
           line = nil if line =~ /\/lib\/spec\/expectations\//
+          line = nil if line =~ /\/lib\/spec\/method_proxy\//
           line = nil if line =~ /\/lib\/spec\/mocks\//
           line = nil if line =~ /\/lib\/spec\/rake\//
           line = nil if line =~ /\/lib\/spec\/runner\//
           line = nil if line =~ /\/lib\/spec\/stubs\//
           line = nil if line =~ /bin\/spec:/
+          line = nil if line =~ /bin\/rcov:/
           line = nil if line =~ /lib\/rspec_on_rails/
           line = nil if line =~ /script\/rails_spec/
           # TextMate's Ruby plugin

data/lib/spec/runner/context.rb

@@ -1,11 +1,13 @@
 module Spec
   module Runner
+    class ContextEvalModule < Module
+    end
     class Context
       module InstanceMethods
         def initialize(name, &context_block)
           @name = name
 
-          @context_eval_module = Module.new
+          @context_eval_module = ContextEvalModule.new
           @context_eval_module.extend ContextEval::ModuleMethods
           @context_eval_module.include ContextEval::InstanceMethods
           before_context_eval
@@ -31,8 +33,8 @@ module Spec
           @context_eval_module.teardown(&block)
         end
 
-        def specify(spec_name, &block)
-          @context_eval_module.specify(spec_name, &block)
+        def specify(spec_name, opts={}, &block)
+          @context_eval_module.specify(spec_name, opts, &block)
         end
 
         def run(reporter, dry_run=false)
@@ -40,10 +42,13 @@ module Spec
 
           prepare_execution_context_class
           specifications.each do |specification|
-            execution_context = execution_context_class.new(specification)
-            specification.run(reporter, setup_block, teardown_block, dry_run, execution_context)
+            specification.run(reporter, setup_block, teardown_block, dry_run, execution_context(specification))
           end
         end
+        
+        def execution_context specification
+          execution_context_class.new(specification)
+        end
 
         def number_of_specs
           specifications.length
@@ -89,14 +94,6 @@ module Spec
           @context_eval_module.send :teardown_block
         end
 
-        def setup_parts
-          @context_eval_module.send :setup_parts
-        end
-
-        def teardown_parts
-          @context_eval_module.send :teardown_parts
-        end
-
         def prepare_execution_context_class
           weave_in_context_modules
           execution_context_class
@@ -121,9 +118,6 @@ module Spec
           @context_eval_module.send :execution_context_class
         end
 
-        def context_superclass
-          @context_eval_module.send :context_superclass
-        end
       end
       include InstanceMethods
     end