hardmock 1.3.2 → 1.3.3

data/CHANGES

@@ -1,3 +1,31 @@
+Hardmock 1.3.3
+ 
+* stubs! and expects! no longer require that their target methods exist in reality (this used to prevent you from stubbing methods that "exist" by virtue of "method_missing"
+* Tweaked inner metaclass code to avoid collisions with rspec's "metaid" stuff
+* Moved this project's Rake tasks into rake_tasks... otherwise Rails will load them, if Hardmock is installed as a Rails plugin
+* Alias added: 'verify_hardmocks' is now an alias for 'verify_mocks'  (some internal projects were using this modified method name as a means of cooexisting with mocha)
+
+Hardmock 1.3.2
+
+November 2007
+
+* adds 'with' as an alternate syntax for specifying argument expectations.
+
+Hardmock 1.3.1 
+
+October 2007
+
+* Can use stubs! on a mock object 
+* expects! now generates mocked methods that can safely transfer runtime blocks to the mock instance itself 
+* No longer need to call "prepare_hardmock_control" when using stubs in the absence of mocks 
+* Stubs of concrete class or instance methods are restored to original state in teardown
+
+Hardmock 1.3.0 
+
+October 2007
+
+* Adds stubs! and expects! method to all objects and classes to support concrete stubbing/mocking.
+
 Hardmock 1.2.3
 
 Sat Apr 28 01:16:15 EDT 2007

data/README

@@ -46,6 +46,25 @@ Expects <tt>@garage.open_door</tt>, <tt>@car.start(:choke)</tt> and <tt>@car.dri
 * SVN access: svn co svn://rubyforge.org/var/svn/hardmock/trunk
 * Developer SVN access: svn co svn://developername@rubyforge.org/var/svn/hardmock/trunk
 
+== Setup for Test::Unit
+
+  require 'hardmock'
+  require 'assert_error' # OPTIONAL: this adds the TestUnit extension 'assert_error' 
+
+NOTE: If installed as a Rails plugin, init.rb does this for you... nothing else is needed.
+
+== Setup for RSpec
+
+Get this into your spec helper or environment or Rakefile or wherever you prefer:
+
+  Spec::Runner.configure do |configuration|
+    configuration.include Hardmock
+    configuration.after(:each) {verify_mocks}
+  end
+
+This puts the implicit conveniences into your spec context, like "create_mocks" etc, and also provides for automatic
+"verify_mocks" after each Example is run.
+
 == Author
 * David Crosby crosby at http://atomicobject.com
 * (c) 2006,2007 Atomic Object LLC 

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rake'
 require 'rubygems'
 
-HARDMOCK_VERSION = "1.3.2"
+HARDMOCK_VERSION = "1.3.3"
 
-Dir["lib/tasks/*.rake"].each { |f| load f }
+Dir["rake_tasks/*.rake"].each { |f| load f }
 
 task :default => [ 'test:all' ]

data/lib/hardmock/method_cleanout.rb

@@ -1,13 +1,32 @@
 
 module Hardmock #:nodoc:
   module MethodCleanout #:nodoc:
-    SACRED_METHODS = %w|__id__ __send__ equal? object_id send nil? class kind_of? respond_to? inspect method to_s instance_variables instance_eval ==|
+    SACRED_METHODS = %w{
+      __id__
+      __send__
+      equal?
+      object_id
+      send
+      nil?
+      class
+      kind_of?
+      respond_to?
+      inspect
+      method
+      to_s
+      instance_variables
+      instance_eval
+      ==
+      hm_metaclass
+      hm_meta_eval
+      hm_meta_def
+    }
 
     def self.included(base) #:nodoc:
       base.class_eval do
-        instance_methods.each { |m| 
+        instance_methods.each do |m| 
           undef_method m unless SACRED_METHODS.include?(m.to_s)
-        }
+        end
       end
     end
   end

data/lib/hardmock/stubbing.rb

@@ -1,36 +1,25 @@
-#
+
+
 # Stubbing support
 #
 # Stubs methods on classes and instances
 #
 
-# Why's "metaid.rb":
+# Why's "metaid.rb" stuff crunched down:
 class Object #:nodoc:#
-	# The hidden singleton lurks behind everyone
-	def metaclass #:nodoc:#
+	def hm_metaclass #:nodoc:#
     class << self
       self
     end
   end
 	
-  # Evaluate a block of code within the metaclass
-	def meta_eval(&blk) #:nodoc:#
-    metaclass.instance_eval(&blk)
+	def hm_meta_eval(&blk) #:nodoc:#
+    hm_metaclass.instance_eval(&blk)
   end
 
-	# Adds methods to a metaclass
-	def meta_def(name, &blk) #:nodoc:#
-		meta_eval { define_method name, &blk }
+	def hm_meta_def(name, &blk) #:nodoc:#
+		hm_meta_eval { define_method name, &blk }
 	end
-
-#  def meta_eval_string(str)
-#    metaclass.instance_eval(str)
-#  end
-
-	# Defines an instance method within a class
-#	def class_def(name, &blk) #:nodoc:#
-#		class_eval { define_method name, &blk }
-#	end
 end
 
 
@@ -87,13 +76,11 @@ module Hardmock
     def raises(err)
       err = RuntimeError.new(err) unless err.kind_of?(Exception)
       @raises = err
-#      puts "Setup to raise #{@raises}"
     end
   end
 
   class ::Object
     def stubs!(method_name)
-      _ensure_stubbable method_name
       method_name = method_name.to_s
       already_stubbed = Hardmock.has_replaced_method?(self, method_name)
 
@@ -101,12 +88,14 @@ module Hardmock
 
 
       unless _is_mock? or already_stubbed
-        meta_eval do 
-          alias_method "_hardmock_original_#{method_name}".to_sym, method_name.to_sym
+        if methods.include?(method_name.to_s)
+          hm_meta_eval do 
+            alias_method "_hardmock_original_#{method_name}".to_sym, method_name.to_sym
+          end
         end
       end
 
-      meta_def method_name do |*args|
+      hm_meta_def method_name do |*args|
         stubbed_method.invoke(args)
       end
 
@@ -117,7 +106,6 @@ module Hardmock
       if self._is_mock?
         raise Hardmock::StubbingError, "Cannot use 'expects!(:#{method_name})' on a Mock object; try 'expects' instead"
       end
-      _ensure_stubbable method_name
 
       method_name = method_name.to_s
 
@@ -125,8 +113,10 @@ module Hardmock
         @_my_mock = Mock.new(_my_name, $main_mock_control)
         Hardmock::ReplacedMethod.new(self, method_name)
 
-        meta_eval do 
-          alias_method "_hardmock_original_#{method_name}".to_sym, method_name.to_sym
+        if methods.include?(method_name.to_s)
+          hm_meta_eval do 
+            alias_method "_hardmock_original_#{method_name}".to_sym, method_name.to_sym
+          end
         end
 
         begin
@@ -147,19 +137,6 @@ module Hardmock
       return @_my_mock.expects(method_name, *args, &block)
     end
       
-    def _ensure_stubbable(method_name)
-      unless self.respond_to?(method_name.to_sym) or self._is_mock?
-        msg = "Cannot stub non-existant "
-        if self.kind_of?(Class) 
-          msg += "class method #{_my_name}."
-        else
-          msg += "method #{_my_name}#"
-        end
-        msg += method_name.to_s
-        raise Hardmock::StubbingError.new(msg)
-      end
-    end
-
     def _is_mock?
       self.kind_of?(Mock)
     end
@@ -193,8 +170,11 @@ module Hardmock
     def restore_all_replaced_methods
       all_replaced_methods.each do |replaced|
         unless replaced.target._is_mock?
-          replaced.target.meta_eval do
-            alias_method replaced.method_name.to_sym, "_hardmock_original_#{replaced.method_name}".to_sym 
+          backed_up = "_hardmock_original_#{replaced.method_name}"
+          if replaced.target.methods.include?(backed_up)
+            replaced.target.hm_meta_eval do
+              alias_method replaced.method_name.to_sym, backed_up.to_sym 
+            end
           end
           replaced.target._clear_mock
         end

data/lib/hardmock.rb

@@ -150,6 +150,8 @@ module Hardmock
     $main_mock_control = nil
     reset_stubs
   end
+  
+  alias :verify_hardmocks :verify_mocks
 
   # Purge the main MockControl of all expectations, restore all concrete stubbed/mocked methods
   def clear_expectations

data/test/functional/hardmock_test.rb

@@ -393,6 +393,14 @@ class HardmockTest < Test::Unit::TestCase
     end
   end
 
+  should "support alias verify_hardmocks" do
+    create_mock :tree
+    @tree.expects(:grow)
+    assert_error VerifyError, /unmet/i do
+      verify_hardmocks
+    end
+  end
+
   #
   # HELPERS
   #

data/test/functional/stubbing_test.rb

@@ -77,16 +77,15 @@ class StubbingTest < Test::Unit::TestCase
     assert_equal "For roads", Concrete.describe, "'describe' class method broken after restore"
   end
 
-  should "not allow stubbing of nonexistant class methods" do
-    assert_error(Hardmock::StubbingError, /cannot stub/i, /class method/i, /Concrete.funky/) do   
-      Concrete.stubs!(:funky)
-    end
+  should "allow stubbing of nonexistant class methods" do
+    Concrete.stubs!(:funky).returns('juice')
+    assert_equal 'juice', Concrete.funky
   end
 
-  should "not allow stubbing of nonexistant instance methods" do
-    assert_error(Hardmock::StubbingError, /cannot stub/i, /method/i, /Concrete#my_inst_mth/) do   
-      Concrete.new.stubs!(:my_inst_mth)
-    end
+  should "allow stubbing of nonexistant instance methods" do
+    chunk = Concrete.new
+    chunk.stubs!(:shark).returns('bite')
+    assert_equal 'bite', chunk.shark
   end
 
   should "allow re-stubbing" do
@@ -107,7 +106,6 @@ class StubbingTest < Test::Unit::TestCase
   end
 
   it "does nothing with a runtime block when simply stubbing" do
-    
     slab = Concrete.new
     slab.stubs!(:hit) do |nothing|
       raise "BOOOMM!"
@@ -117,7 +115,6 @@ class StubbingTest < Test::Unit::TestCase
   end
 
   it "can raise errors from a stubbed method" do
-    
     Concrete.stubs!(:pour).raises(StandardError.new("no!"))
     assert_error StandardError, /no!/ do
       Concrete.pour
@@ -125,7 +122,6 @@ class StubbingTest < Test::Unit::TestCase
   end
 
   it "provides string syntax for convenient raising of RuntimeErrors" do
-    
     Concrete.stubs!(:pour).raises("never!")
     assert_error RuntimeError, /never!/ do
       Concrete.pour
@@ -192,11 +188,9 @@ class StubbingTest < Test::Unit::TestCase
     clear_expectations
   end
 
-  should "not allow mocking non-existant class methods" do
-    
-    assert_error Hardmock::StubbingError, /non-existant/, /something/ do
-      Concrete.expects!(:something)
-    end
+  should "allow mocking non-existant class methods" do
+    Concrete.expects!(:something).returns("else")
+    assert_equal "else", Concrete.something
   end
 
   it "mocks specific methods on existing instances, then restore them after verify" do
@@ -265,12 +259,10 @@ class StubbingTest < Test::Unit::TestCase
     clear_expectations
   end
 
-  should "not allow mocking non-existant instance methods" do
-    
+  should "allow mocking non-existant instance methods" do
     slab = Concrete.new
-    assert_error Hardmock::StubbingError, /non-existant/, /something/ do
-      slab.expects!(:something)
-    end
+    slab.expects!(:wholly).returns('happy')
+    assert_equal 'happy', slab.wholly
   end
 
   should "support concrete expectations that deal with runtime blocks" do
@@ -303,6 +295,23 @@ class StubbingTest < Test::Unit::TestCase
     verify_mocks
     reset_stubs
   end
+  
+  it "can stub the new method and return values" do
+    Concrete.stubs!(:new).returns("this value")
+    assert_equal "this value", Concrete.new, "did not properly stub new class method"
+    reset_stubs
+  end
+  
+  it "can mock the new method and return values" do
+    Concrete.expects!(:new).with("foo").returns("hello")
+    Concrete.expects!(:new).with("bar").returns("world")
+    
+    assert_equal "hello", Concrete.new("foo"), "did not properly mock out new class method"
+    assert_equal "world", Concrete.new("bar"), "did not properly mock out new class method"
+    
+    verify_mocks
+    reset_stubs
+  end
 
   it "will not allow expects! to be used on a mock object" do
     create_mock :cow
@@ -316,6 +325,7 @@ class StubbingTest < Test::Unit::TestCase
   #
 
   class Concrete
+    def initialize; end
     def self.pour
       "stones and gravel"
     end

data/test/unit/method_cleanout_test.rb

@@ -22,7 +22,8 @@ class MethodCleanoutTest < Test::Unit::TestCase
 
   def test_should_leave_the_sacred_methods_defined
     Hardmock::MethodCleanout::SACRED_METHODS.each do |m|
-      assert @victim.respond_to?(m)
+      next if m =~ /^hm_/
+      assert @victim.respond_to?(m), "Sacred method '#{m}' was removed unexpectedly"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hardmock
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - David Crosby
@@ -9,7 +9,7 @@ autorequire: hardmock
 bindir: bin
 cert_chain: []
 
-date: 2007-11-28 00:00:00 -05:00
+date: 2007-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -36,7 +36,6 @@ files:
 - lib/hardmock/trapper.rb
 - lib/hardmock/utils.rb
 - lib/hardmock.rb
-- lib/tasks/rdoc_options.rb
 - test/functional/assert_error_test.rb
 - test/functional/auto_verify_test.rb
 - test/functional/direct_mock_usage_test.rb
@@ -53,8 +52,9 @@ files:
 - test/unit/verify_error_test.rb
 - Rakefile
 - config/environment.rb
-- lib/tasks/rdoc.rake
-- lib/tasks/test.rake
+- rake_tasks/rdoc_options.rb
+- rake_tasks/rdoc.rake
+- rake_tasks/test.rake
 - README
 - CHANGES
 - LICENSE