rspec 0.1.1 → 0.1.2

data/CHANGES

@@ -1,5 +1,16 @@
 = RSpec Changelog
 
+== Version 0.1.2
+
+This release adds some improvements to the mock API and minor syntax improvements
+
+* Added Mock.should_expect for a more consistent DSL
+* Added MockExpectation.and_returns for a better DSL
+* Made Mock behave as a null object after a call to Mock.ignore_missing
+* Internal syntax improvements
+* Improved exception trace by adding exception class name to error message
+* Renamed some tests for better consistency
+
 == Version 0.1.1
 
 This release adds some shoulds and improves error reporting

data/Rakefile.rb

@@ -7,7 +7,17 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 PKG_NAME = "rspec"
-PKG_VERSION = "0.1.1"
+# Versioning scheme: MAJOR.MINOR.PATCH
+# MAJOR bumps when API is broken backwards
+# MINOR bumps when the API is broken backwards in a very slight/subtle (but not fatal) way
+# -OR when a new release is made and propaganda is sent out.
+# PATCH is bumped for every API addition and/or bugfix (ideally for every commit)
+# Later DamageControl can bump PATCH automatically.
+#
+# (This is subject to change - AH)
+#
+# REMEMBER TO KEEP PKG_VERSION IN SYNC WITH CHANGELOG
+PKG_VERSION = "0.1.2"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/spec/mock.rb

@@ -3,14 +3,17 @@ require 'spec'
 
 class Mock
 
-  def initialize
+  def initialize(identifier="")
     @expectations = Hash.new
   end
   
-  def __expects(sym)
-    @expectations[sym] = MockExpectation.new
+  # How about renaming this to should_expect. This would be well aligned with the rest of
+  # the API, as well as the recommendation to use should as prefix for methods (Aslak)
+  def __expects(sym, &block)
+    @expectations[sym] = MockExpectation.new(block_given? ? block : nil)
     @expectations[sym]
-  end 
+  end
+  alias :should_expect :__expects
 
   def __verify
     @expectations.keys.each do |method|
@@ -18,6 +21,8 @@ class Mock
     end
   end
   
+  # Tell the mock to act as a forgiving null object on missing methods, in which
+  # case it will return itself.
   def ignore_missing
     @ignore_missing = true
   end
@@ -27,9 +32,10 @@ class Mock
       expectation.verify_call(sym.to_s,args,block)
     else
       begin
-        super(sym, *args, &block) unless @ignore_missing 
+        # act as null object if method is missing and we ignore them. return value too!
+        @ignore_missing ? self : super(sym, *args, &block)
       rescue NoMethodError
-        raise Spec::Exceptions::MockExpectationError, "Unexpected method "+sym.to_s+" called."
+        raise Spec::Exceptions::MockExpectationError, "Unexpected method '#{sym.to_s}' called."
       end
     end
   end
@@ -47,7 +53,13 @@ class MockExpectation
   end
   
   def verify_call(message,args,block)
-    unless @expected_params == nil or @expected_params == args
+    unless @method_block.nil?
+      result = @method_block.call(*args)
+      @call_count = @call_count + 1
+      return result
+    end
+    
+    unless @expected_params.nil? or @expected_params == args
       raise Spec::Exceptions::MockExpectationError,
         message+": Parameter mismatch: Expected <#{@expected_params}>, got <#{@args}>" 
     end
@@ -56,7 +68,8 @@ class MockExpectation
     @block.call(*args)
   end
 
-  def initialize
+  def initialize(block)
+    @method_block = block
     @block = proc {}
     @expected_call_count = 1
     @call_count = 0
@@ -100,5 +113,8 @@ class MockExpectation
   def returns(value=nil,&block)
     @block = block_given? ? block : proc { value }
   end
+  alias :and_return :returns
+  # this reads better: (AH)
+  # uri_specs.should_expect(:[]).with(:overview).and_return("http://some.host/look_here/\#{path}")
   
 end

data/lib/spec/text_runner.rb

@@ -53,12 +53,12 @@ module Spec
       dump_duration(@end_time - @start_time)
       
       dump_counts
-    end
-    
+    end    
+
     def dump_failures
       @failures.inject(1) do |index, exception|
-        @output << index.to_s << ") " 
-        @output << exception.to_s << "\n"
+        @output << index.to_s << ")\n" 
+        @output << "#{exception.message} (#{exception.class.name})\n"
         dump_backtrace(exception.backtrace)
         index + 1
       end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 date: 2005-08-13
 summary: Behaviour Specification Framework for Ruby
 require_paths: