flexmock 0.8.3 → 0.8.4

data/CHANGES

@@ -1,5 +1,14 @@
 = Changes for FlexMock
 
+== Version 0.8.4
+
+* Added support for rails 2.2.x in should_render_view.
+
+== Version 0.8.3
+
+* Fixed a bug where the by_default option was not completely honored
+  in some edge cases.
+
 == Version 0.8.2
 
 * Added workaround for compatibility issues with RSpec on Rails.

data/README

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.8.3
+Version :: 0.8.4
 
 = Links
 
@@ -470,12 +470,29 @@ The following rules are used for argument matching:
       with(eq(Integer))             will match       f(Integer)
       with(eq(Integer))             will NOT match   f(3)
 
-  Note: If you do not use the FlexMock::TestCase Test Unit integration
-  module, or the FlexMock::ArgumentTypes module, you will have to
-  fully qualify the +eq+ method:
+  <b>Note:</b> If you do not use the FlexMock::TestCase Test Unit
+  integration module, or the FlexMock::ArgumentTypes module, you will
+  have to fully qualify the +eq+ method.  This is true of all the
+  special argument matches (+eq+, +on+, +any+, +hsh+ and +ducktype+).
 
-      with(FlexMock.eq(Integer))    will match       f(Integer)
-      with(FlexMock.eq(Integer))    will NOT match   f(3)
+      with(FlexMock.eq(Integer))
+      with(FlexMock.on { code })
+      with(FlexMock.any)
+      with(FlexMock.hsh(:tag => 3))
+      with(FlexMock.ducktype(:wag => "dog"))
+
+* If you wish to match a hash on _some_ of its values, the
+  FlexMock.hsh(...) method will work.  Only specify the hash values
+  you are interested in, the others will be ignored.
+
+      with(hsh(:run => true))  will match    f(:run => true, :stop => false)
+
+* If you wish to match any object that responds to a certain set of
+  methods, use the FlexMock.ducktype method.
+
+      with(ducktype(:to_str))     will match   f("string")
+      with(ducktype(:wag, :bark)) will match   f(dog)
+                                  (assuming dog implements wag and bark)
 
 * If you wish to match _anything_, then use the <tt>FlexMock.any</tt>
   method in the with argument list.

data/Rakefile

@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.8.3'
+PKG_VERSION = '0.8.4'
 
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -145,7 +145,7 @@ else
 
     s.author = "Jim Weirich"
     s.email = "jim@weirichhouse.org"
-    s.homepage = "http://onestepback.org/software/flexmock"
+    s.homepage = "http://flexmock.rubyforge.org"
   end
 
   Rake::GemPackageTask.new(spec) do |pkg|

data/TAGS

@@ -60,14 +60,13 @@ class FlexMockFlexMock
15,371
     def initializeinitialize
75,2276
     def passed?passed?
79,2337
 
-lib/flexmock/default_framework_adapter.rb,387
+lib/flexmock/default_framework_adapter.rb,345
 class FlexMockFlexMock
14,337
   class DefaultFrameworkAdapterDefaultFrameworkAdapter
15,352
     def assert_block(msg, &block)assert_block
16,384
     def assert_equal(a, b, msg=nil)assert_equal
22,497
-    def passed?(test_case)passed?
26,597
-    class AssertionFailedError < StandardError; endAssertionFailedError
30,657
-    def assertion_failed_errorassertion_failed_error
31,709
+    class AssertionFailedError < StandardError; endAssertionFailedError
26,597
+    def assertion_failed_errorassertion_failed_error
27,649
 
 lib/flexmock/deprecated_methods.rb,340
 class ModuleModule
13,314
@@ -137,38 +136,26 @@ class FlexMockFlexMock
15,363
     def call(*args)call
38,1207
     def <<(expectation)<<
46,1460
     def find_expectation(*args) # :nodoc:find_expectation
51,1584
-    def flexmock_verify         # :nodoc:flexmock_verify
59,1909
-    def defaultify_expectation(exp) # :nodoc:defaultify_expectation
66,2120
-    def find_expectation_in(expectations, *args)find_expectation_in
78,2401
-
-lib/flexmock/mini_unit.rb,393
-class FlexMockFlexMock
15,357
-  module TestCaseTestCase
29,918
-    def teardownteardown
35,1093
-  class MiniUnitFrameworkAdapterMiniUnitFrameworkAdapter
45,1302
-    def assertion_failed_errorassertion_failed_error
47,1364
-    def passed?(test_case)passed?
51,1426
-module MiniMini
59,1536
-  class TestTest
60,1548
-    class TestCaseTestCase
61,1561
-      def teardownteardown
70,1876
+    def flexmock_verify         # :nodoc:flexmock_verify
62,1959
+    def defaultify_expectation(exp) # :nodoc:defaultify_expectation
69,2170
+    def find_expectation_in(expectations, *args)find_expectation_in
81,2451
 
 lib/flexmock/mock_container.rb,882
-class FlexMockFlexMock
15,371
-  module MockContainerMockContainer
25,777
-    def flexmock_teardownflexmock_teardown
30,961
-    def flexmock_verifyflexmock_verify
37,1152
-    def flexmock_closeflexmock_close
46,1447
-    def flexmock(*args)flexmock
115,4717
-    def flexmock_remember(mocking_object)flexmock_remember
157,5993
-  class MockContainerHelperMockContainerHelper
173,6643
-    def next_idnext_id
177,6752
-    def parse_should_args(mock, args, &block)  # :nodoc:parse_should_args
190,7225
-    def add_model_methods(mock, model_class, id)add_model_methods
208,7738
-    def make_partial_proxy(container, obj, name, safe_mode)make_partial_proxy
232,8597
-    def build_demeter_chain(mock, arg, &block)build_demeter_chain
277,10450
-    def check_proper_mock(mock, method_name)check_proper_mock
302,11301
-    def check_method_names(names)check_method_names
312,11708
+class FlexMockFlexMock
16,399
+  module MockContainerMockContainer
26,805
+    def flexmock_teardownflexmock_teardown
31,989
+    def flexmock_verifyflexmock_verify
38,1147
+    def flexmock_closeflexmock_close
47,1442
+    def flexmock(*args)flexmock
116,4712
+    def flexmock_remember(mocking_object)flexmock_remember
158,5988
+  class MockContainerHelperMockContainerHelper
174,6638
+    def next_idnext_id
178,6747
+    def parse_should_args(mock, args, &block)  # :nodoc:parse_should_args
191,7220
+    def add_model_methods(mock, model_class, id)add_model_methods
209,7733
+    def make_partial_proxy(container, obj, name, safe_mode)make_partial_proxy
233,8592
+    def build_demeter_chain(mock, arg, &block)build_demeter_chain
278,10445
+    def check_proper_mock(mock, method_name)check_proper_mock
303,11296
+    def check_method_names(names)check_method_names
313,11703
 
 lib/flexmock/noop.rb,0
 
@@ -225,6 +212,30 @@ class FlexMockFlexMock
14,347
     def strict?strict?
53,1675
     def method_missing(sym, *args, &block)method_missing
59,1805
 
+lib/flexmock/rmock.rb,991
+class ObjectObject
4,59
+  def stub!(method)stub!
5,72
+  def should_receive(method)should_receive
8,157
+class FlexMockFlexMock
13,261
+  class GlobalContainerGlobalContainer
14,276
+  module RMockEmulationRMockEmulation
20,375
+    class SpecialArgSpecialArg
23,436
+      def initialize(&block)initialize
24,457
+      def apply(exp)apply
27,519
+    class RMockExpecationProxyRMockExpecationProxy
35,682
+      def initialize(expectation)initialize
36,713
+      def with(*args)with
39,792
+      def method_missing(sym, *args, &block)method_missing
48,1053
+    class RMockProxyRMockProxy
53,1163
+      def initialize(mock)initialize
54,1184
+      def should_receive(method)should_receive
57,1242
+      def should_not_receive(method)should_not_receive
60,1353
+      def method_missing(sym, *args, &block)method_missing
63,1469
+    def mock(name, options={})mock
68,1598
+    def stub(name, options={})stub
74,1742
+    def no_argsno_args
78,1812
+    def any_argsany_args
82,1851
+
 lib/flexmock/rspec.rb,341
 class FlexMockFlexMock
14,337
   class RSpecFrameworkAdapterRSpecFrameworkAdapter
16,355
@@ -239,13 +250,12 @@ module TestTest
14,354
     class TestCaseTestCase
16,380
       def teardownteardown
25,695
 
-lib/flexmock/test_unit_integration.rb,270
+lib/flexmock/test_unit_integration.rb,227
 class FlexMockFlexMock
15,357
   module TestCaseTestCase
29,917
     def teardownteardown
35,1092
   class TestUnitFrameworkAdapterTestUnitFrameworkAdapter
45,1301
     def assertion_failed_errorassertion_failed_error
47,1369
-    def passed?(test_case)passed?
51,1448
 
 lib/flexmock/undefined.rb,288
 class FlexMockFlexMock
12,312
@@ -277,29 +287,13 @@ class FlexMockFlexMock
12,312
   module FailureAssertionFailureAssertion
15,368
     def assert_failure(message=nil)assert_failure
21,567
 
-test/frameworks/mini_unit_test.rb,407
-class FlexmockMiniUnitTest < Mini::Test::TestCaseFlexmockMiniUnitTest
20,432
-  def test_can_create_mockstest_can_create_mocks
22,509
-  def test_can_use_argument_matcherstest_can_use_argument_matchers
28,609
-class FlexmockMinitUnitCleanupTest < Mini::Test::TestCaseFlexmockMinitUnitCleanupTest
35,730
-  def teardownteardown
37,789
-  def test_mocks_are_auto_verifiedtest_mocks_are_auto_verified
50,1066
-
-test/frameworks/rspec_spec.rb,0
-
-test/frameworks/test_unit_test.rb,431
-class TestFlexmockTestUnit < Test::Unit::TestCaseTestFlexmockTestUnit
18,412
-  def test_can_create_mockstest_can_create_mocks
20,489
-  def test_can_use_argument_matcherstest_can_use_argument_matchers
26,589
-class TestFlexmockTestUnitCleanup < Test::Unit::TestCaseTestFlexmockTestUnitCleanup
33,710
-  def teardownteardown
35,768
-  def test_should_fail__mocks_are_auto_verifiedtest_should_fail__mocks_are_auto_verified
45,1004
-
 test/redirect_error.rb,114
 class FlexMockFlexMock
3,20
   module RedirectErrorRedirectError
4,35
     def redirect_errorredirect_error
5,58
 
+test/rspec_integration/integration_spec.rb,0
+
 test/test_aliasing.rb,522
 class FlexMockFlexMock
6,61
   module StubsAndExpectsStubsAndExpects
7,76
@@ -577,6 +571,26 @@ class TestRecordMode < Test::Unit::TestCaseTestRecordMode
16,390
   def test_strict_record_mode_requires_oncetest_strict_record_mode_requires_once
136,3242
   def test_strict_record_mode_can_not_failtest_strict_record_mode_can_not_fail
149,3517
 
+test/test_rmock.rb,1390
+class RMockTest < Test::Unit::TestCaseRMockTest
6,94
+  def test_can_mock_methodstest_can_mock_methods
9,169
+  def test_mocks_require_their_methods_to_be_called_at_least_oncetest_mocks_require_their_methods_to_be_called_at_least_once
15,262
+  def test_undefined_methods_failtest_undefined_methods_fail
23,470
+  def test_null_object_optiontest_null_object_option
30,597
+  def test_can_create_stubstest_can_create_stubs
36,753
+  def test_stubs_dont_care_if_their_methods_arent_calledtest_stubs_dont_care_if_their_methods_arent_called
41,928
+  def test_stubbing_partial_mockstest_stubbing_partial_mocks
45,1024
+  def test_mocking_partial_mockstest_mocking_partial_mocks
51,1152
+  def test_mocking_partial_mockstest_mocking_partial_mocks
57,1288
+  def test_should_not_receive_where_it_is_not_receivedtest_should_not_receive_where_it_is_not_received
65,1487
+  def test_should_not_receive_where_it_is_receivedtest_should_not_receive_where_it_is_received
70,1604
+  def test_with_matching_argstest_with_matching_args
79,1814
+  def test_with_mismatching_argstest_with_mismatching_args
85,1918
+  def test_with_no_args_matchingtest_with_no_args_matching
95,2130
+  def test_with_no_args_mismatchingtest_with_no_args_mismatching
101,2240
+  def test_with_any_args_and_no_argstest_with_any_args_and_no_args
109,2420
+  def test_with_any_args_and_1_argtest_with_any_args_and_1_arg
115,2535
+
 test/test_samples.rb,2164
 class TestSamples < Test::Unit::TestCaseTestSamples
17,378
   def test_file_iotest_file_io
25,748
@@ -636,7 +650,7 @@ class TestShouldIgnoreMissing < Test::Unit::TestCaseTestShouldIgnoreMissing
16,
   def test_not_calling_method_proc_will_fail_count_constraintstest_not_calling_method_proc_will_fail_count_constraints
66,1693
   def test_method_returns_do_nothing_proc_for_missing_methodstest_method_returns_do_nothing_proc_for_missing_methods
75,1965
 
-test/test_should_receive.rb,10635
+test/test_should_receive.rb,10636
 def mock_top_level_functionmock_top_level_function
16,375
 module KernelKernel
20,416
   def mock_kernel_functionmock_kernel_function
21,430
@@ -735,20 +749,20 @@ class TestFlexMockShoulds < Test::Unit::TestCaseTestFlexMockShoulds
26,477
   def test_expectations_with_count_constraints_can_by_marked_as_defaulttest_expectations_with_count_constraints_can_by_marked_as_default
902,23069
   def test_default_expectations_are_overridden_by_later_expectationstest_default_expectations_are_overridden_by_later_expectations
910,23315
   def test_default_expectations_can_be_changed_by_later_expectationstest_default_expectations_can_be_changed_by_later_expectations
918,23543
-  def test_ordered_default_expectations_can_be_specifiedtest_ordered_default_expectations_can_be_specified
926,23792
-  def test_ordered_default_expectations_can_be_overriddentest_ordered_default_expectations_can_be_overridden
934,24043
-  def test_by_default_works_at_mock_leveltest_by_default_works_at_mock_level
946,24314
-  def test_by_default_at_mock_level_does_nothing_with_no_expectationstest_by_default_at_mock_level_does_nothing_with_no_expectations
957,24589
-  def test_partial_mocks_can_have_default_expectationstest_partial_mocks_can_have_default_expectations
963,24734
-  def test_partial_mocks_can_have_default_expectations_overriddentest_partial_mocks_can_have_default_expectations_overridden
969,24915
-  def test_wicked_and_evil_tricks_with_by_default_are_thwartedtest_wicked_and_evil_tricks_with_by_default_are_thwarted
976,25163
-  def test_mocks_can_handle_multi_parameter_respond_tostest_mocks_can_handle_multi_parameter_respond_tos
988,25568
-  def test_can_mock_operatorstest_can_mock_operators
999,25915
-  def assert_operator(op, &block)assert_operator
1028,26930
-class TestFlexMockShouldsWithInclude < Test::Unit::TestCaseTestFlexMockShouldsWithInclude
1036,27084
-  def test_include_enables_unqualified_arg_type_referencestest_include_enables_unqualified_arg_type_references
1038,27178
-class TestFlexMockArgTypesDontLeak < Test::Unit::TestCaseTestFlexMockArgTypesDontLeak
1046,27342
-  def test_unqualified_arg_type_references_are_undefined_by_defaulttest_unqualified_arg_type_references_are_undefined_by_default
1047,27400
+  def test_ordered_default_expectations_can_be_specifiedtest_ordered_default_expectations_can_be_specified
929,23915
+  def test_ordered_default_expectations_can_be_overriddentest_ordered_default_expectations_can_be_overridden
937,24166
+  def test_by_default_works_at_mock_leveltest_by_default_works_at_mock_level
949,24437
+  def test_by_default_at_mock_level_does_nothing_with_no_expectationstest_by_default_at_mock_level_does_nothing_with_no_expectations
960,24712
+  def test_partial_mocks_can_have_default_expectationstest_partial_mocks_can_have_default_expectations
966,24857
+  def test_partial_mocks_can_have_default_expectations_overriddentest_partial_mocks_can_have_default_expectations_overridden
972,25038
+  def test_wicked_and_evil_tricks_with_by_default_are_thwartedtest_wicked_and_evil_tricks_with_by_default_are_thwarted
979,25286
+  def test_mocks_can_handle_multi_parameter_respond_tostest_mocks_can_handle_multi_parameter_respond_tos
991,25691
+  def test_can_mock_operatorstest_can_mock_operators
1002,26038
+  def assert_operator(op, &block)assert_operator
1031,27053
+class TestFlexMockShouldsWithInclude < Test::Unit::TestCaseTestFlexMockShouldsWithInclude
1039,27207
+  def test_include_enables_unqualified_arg_type_referencestest_include_enables_unqualified_arg_type_references
1041,27301
+class TestFlexMockArgTypesDontLeak < Test::Unit::TestCaseTestFlexMockArgTypesDontLeak
1049,27465
+  def test_unqualified_arg_type_references_are_undefined_by_defaulttest_unqualified_arg_type_references_are_undefined_by_default
1050,27523
 
 test/test_tu_integration.rb,1570
 class TestTuIntegrationFlexMockMethod < Test::Unit::TestCaseTestTuIntegrationFlexMockMethod
15,352
@@ -784,3 +798,9 @@ class UndefinedTest < Test::Unit::TestCaseUndefinedTest
15,352
   def test_undefined_is_not_niltest_undefined_is_not_nil
75,1934
   def assert_undefined(obj)assert_undefined
81,2012
   def undefinedundefined
85,2075
+
+test/test_unit_integration/test_auto_test_unit.rb,263
+class TestFlexmockTestUnit < Test::Unit::TestCaseTestFlexmockTestUnit
17,387
+  def teardownteardown
18,437
+  def test_can_create_mockstest_can_create_mocks
23,496
+  def test_should_fail__mocks_are_auto_verifiedtest_should_fail__mocks_are_auto_verified
30,641

data/doc/releases/flexmock-0.8.3.rdoc

@@ -0,0 +1,94 @@
+= FlexMock 0.8.3 Released
+
+FlexMock is a flexible mocking library for use in unit testing and
+behavior specification in Ruby.  Release 0.8.3 is a minor release with
+a few bug fixes.
+
+== Bug Fixes in 0.8.3
+
+* Fixed a bug where the by_default option was not completely honored
+  in some edge cases.
+
+== What is FlexMock?
+
+FlexMock is a flexible framework for creating mock object for testing. When
+running unit tests, it is often desirable to use isolate the objects being
+tested from the "real world" by having them interact with simplified test
+objects. Sometimes these test objects simply return values when called, other
+times they verify that certain methods were called with particular arguments
+in a particular order.
+
+FlexMock makes creating these test objects easy.
+
+=== Features
+
+* Easy integration with both Test::Unit and RSpec. Mocks created with the
+  flexmock method are automatically verified at the end of the test or
+  example.
+
+* A fluent interface that allows mock behavior to be specified very
+  easily.
+
+* A "record mode" where an existing implementation can record its
+  interaction with a mock for later validation against a new
+  implementation.
+
+* Easy mocking of individual methods in existing, non-mock objects.
+
+* Easy mocking of chains of method calls.
+
+* The ability to cause classes to instantiate test instances (instead of real
+  instances) for the duration of a test.
+
+=== Example
+
+Suppose you had a Dog object that wagged a tail when it was happy.
+Something like this:
+
+  class Dog
+    def initialize(a_tail)
+      @tail = a_tail
+    end
+    def happy
+      @tail.wag
+    end
+  end
+
+To test the +Dog+ class without a real +Tail+ object (perhaps because
+real +Tail+ objects activate servos in some robotic equipment), you
+can do something like this:
+
+require 'test/unit'
+require 'flexmock/test_unit'
+
+  class TestDog < Test::Unit::TestCase
+    def test_dog_wags_tail_when_happy
+      tail = flexmock("tail")
+      tail.should_receive(:wag).once
+      dog = Dog.new(tail)
+      dog.happy
+    end
+  end
+
+FlexMock will automatically verify that the mocked tail object received the
+message +wag+ exactly one time. If it doesn't, the test will not pass.
+
+See the FlexMock documentation at http://flexmock.rubyforge.org for details on
+specifying arguments and return values on mocked methods, as well as a simple
+technique for mocking tail objects when the Dog class creates the tail objects
+directly.
+
+== Availability
+
+You can make sure you have the latest version with a quick RubyGems command:
+
+  gem install flexmock    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Download::  http://rubyforge.org/project/showfiles.php?group_id=170
+
+You will find documentation at: http://flexmock.rubyforge.org.
+
+-- Jim Weirich
+

data/doc/releases/flexmock-0.8.4.rdoc

@@ -0,0 +1,93 @@
+= FlexMock 0.8.4 Released
+
+FlexMock is a flexible mocking library for use in unit testing and
+behavior specification in Ruby.  Release 0.8.4 is a minor release with
+a few bug fixes.
+
+== Bug Fixes in 0.8.4
+
+* The should_render_view method is now compatible with Rails 2.2.2.
+
+== What is FlexMock?
+
+FlexMock is a flexible framework for creating mock object for testing. When
+running unit tests, it is often desirable to use isolate the objects being
+tested from the "real world" by having them interact with simplified test
+objects. Sometimes these test objects simply return values when called, other
+times they verify that certain methods were called with particular arguments
+in a particular order.
+
+FlexMock makes creating these test objects easy.
+
+=== Features
+
+* Easy integration with both Test::Unit and RSpec. Mocks created with the
+  flexmock method are automatically verified at the end of the test or
+  example.
+
+* A fluent interface that allows mock behavior to be specified very
+  easily.
+
+* A "record mode" where an existing implementation can record its
+  interaction with a mock for later validation against a new
+  implementation.
+
+* Easy mocking of individual methods in existing, non-mock objects.
+
+* Easy mocking of chains of method calls.
+
+* The ability to cause classes to instantiate test instances (instead of real
+  instances) for the duration of a test.
+
+=== Example
+
+Suppose you had a Dog object that wagged a tail when it was happy.
+Something like this:
+
+  class Dog
+    def initialize(a_tail)
+      @tail = a_tail
+    end
+    def happy
+      @tail.wag
+    end
+  end
+
+To test the +Dog+ class without a real +Tail+ object (perhaps because
+real +Tail+ objects activate servos in some robotic equipment), you
+can do something like this:
+
+require 'test/unit'
+require 'flexmock/test_unit'
+
+  class TestDog < Test::Unit::TestCase
+    def test_dog_wags_tail_when_happy
+      tail = flexmock("tail")
+      tail.should_receive(:wag).once
+      dog = Dog.new(tail)
+      dog.happy
+    end
+  end
+
+FlexMock will automatically verify that the mocked tail object received the
+message +wag+ exactly one time. If it doesn't, the test will not pass.
+
+See the FlexMock documentation at http://flexmock.rubyforge.org for details on
+specifying arguments and return values on mocked methods, as well as a simple
+technique for mocking tail objects when the Dog class creates the tail objects
+directly.
+
+== Availability
+
+You can make sure you have the latest version with a quick RubyGems command:
+
+  gem install flexmock    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Download::  http://rubyforge.org/project/showfiles.php?group_id=170
+
+You will find documentation at: http://flexmock.rubyforge.org.
+
+-- Jim Weirich
+

data/lib/flexmock/argument_matchers.rb

@@ -53,5 +53,34 @@ class FlexMock
     end
   end
   
+  ####################################################################
+  # Match only things where the block evaluates to true.
+  class HashMatcher
+    def initialize(hash)
+      @hash = hash
+    end
+    def ===(target)
+      @hash.all? { |k, v| target[k] == v }
+    end
+    def inspect
+      "hsh(#{@hash.inspect})"
+      "hsh(...)"
+    end
+  end
+  
+  ####################################################################
+  # Match only things where the block evaluates to true.
+  class DuckMatcher
+    def initialize(methods)
+      @methods = methods
+    end
+    def ===(target)
+      @methods.all? { |m| target.respond_to?(m) }
+    end
+    def inspect
+      "ducktype(#{@methods.map{|m| m.inspect}.join(',')})"
+    end
+  end
+  
   
 end

data/lib/flexmock/argument_types.rb

@@ -36,6 +36,18 @@ class FlexMock
     def on(&block)
       ProcMatcher.new(&block)
     end
+
+    # Return an argument matcher that matches a hash with the given
+    # entries.
+    def hsh(hash)
+      HashMatcher.new(hash)
+    end
+
+    # Return an argument matcher that matches any object that
+    # implementes (i.e. responds to) the given method list.
+    def ducktype(*methods)
+      DuckMatcher.new(methods)
+    end
   end
   extend ArgumentTypes
 

data/lib/flexmock/mock_container.rb

@@ -11,6 +11,7 @@
 
 require 'flexmock/noop'
 require 'flexmock/argument_types'
+require 'flexmock/ordering'
 
 class FlexMock
   
@@ -207,24 +208,28 @@ class FlexMock
     # models.
     def add_model_methods(mock, model_class, id)
       container = mock.flexmock_container
-      mock.should_receive(
-        :id => id,
-        :to_params => id.to_s,
-        :new_record? => false,
-        :class => model_class,
-        :errors => container.flexmock("errors", :count => 0))
+
+      mock_errors = container.flexmock("errors")
+      mock_errors.should_receive(:count).and_return(0).by_default
+
+      mock.should_receive(:id).and_return(id).by_default
+      mock.should_receive(:to_params).and_return(id.to_s).by_default
+      mock.should_receive(:new_record?).and_return(false).by_default
+      mock.should_receive(:class).and_return(model_class).by_default
+      mock.should_receive(:errors).and_return(mock_errors).by_default
+
       # HACK: Ruby 1.9 needs the following lambda so that model_class
       # is correctly bound below.
       lambda { }
       mock.should_receive(:is_a?).with(any).and_return { |other|
         other == model_class
-      }
+      }.by_default
       mock.should_receive(:instance_of?).with(any).and_return { |other|
         other == model_class
-      }
+      }.by_default
       mock.should_receive(:kind_of?).with(any).and_return { |other|
         model_class.ancestors.include?(other)
-      }
+      }.by_default
     end
 
     # Create a PartialMockProxy for the given object.  Use +name+ as

data/lib/flexmock/rails/view_mocking.rb

@@ -27,8 +27,10 @@ class FlexMock
         should_render_view_prior_version_124(template_name)
       elsif rails_version <= '2.0.0'
         should_render_view_after_version_124(template_name)
-      else
+      elsif rails_version < '2.2'
         should_render_view_after_version_202(template_name)
+      else
+        should_render_view_22x(template_name)    
       end
     end
 
@@ -97,6 +99,25 @@ class FlexMock
       end
       flexmock(ActionView::Base).should_receive(:new).and_return(viewmock)
     end
-    
+
+    # This version of should_render_view will work with versions of
+    # Rails at Version 2.2.x.
+    def should_render_view_22x(template_name)
+      viewmock = flexmock("ViewMock")
+      viewmock.should_receive(
+        :helpers => viewmock,
+        :include => nil,
+        :template_format =>nil,
+        :render => "RENDERED TEXT",
+        :assigns => {})
+      if template_name
+        viewmock.should_receive(:_exempt_from_layout?).with(/\/#{template_name}$/).
+          and_return(true).once
+        viewmock.should_receive(:_exempt_from_layout?).and_return(true)
+      else
+        viewmock.should_receive(:_exempt_from_layout?).at_least.once.and_return(true)
+      end
+      flexmock(ActionView::Base).should_receive(:new).and_return(viewmock)
+    end
   end
 end

data/test/test_should_receive.rb

@@ -23,6 +23,14 @@ module Kernel
   end
 end
 
+# Used for testing
+class Cat
+  def purr
+  end
+  def meow
+  end
+end
+
 class TestFlexMockShoulds < Test::Unit::TestCase
   include FlexMock::TestCase
   include FlexMock::FailureAssertion
@@ -357,6 +365,38 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     end
   end
 
+  def test_with_ducktype_arg_matching
+    FlexMock.use('greeter') do |m|
+      m.should_receive(:hi).with(FlexMock.ducktype(:purr, :meow)).once
+      m.hi(Cat.new)
+    end
+  end
+
+  def test_with_ducktype_arg_matching_no_match
+    FlexMock.use('greeter') do |m|
+      m.should_receive(:hi).with(FlexMock.ducktype(:purr, :meow, :growl))
+      assert_failure {
+        m.hi(Cat.new)
+      }
+    end
+  end
+
+  def test_with_hash_matching
+    FlexMock.use('greeter') do |m|
+      m.should_receive(:hi).with(FlexMock.hsh(:a => 1, :b => 2)).once
+      m.hi(:a => 1, :b => 2, :c => 3)
+    end
+  end
+
+  def test_with_hash_non_matching
+    FlexMock.use('greeter') do |m|
+      m.should_receive(:hi).with(FlexMock.hsh(:a => 1, :b => 2))
+      assert_failure {
+        m.hi(:a => 1, :b => 4, :c => 3)
+      }
+    end
+  end
+
   def test_with_equal_arg_nonmatching
     FlexMock.use('greeter') do |m|
       m.should_receive(:hi).with(FlexMock.eq(Object)).never

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-03 00:00:00 -04:00
+date: 2009-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,8 @@ extra_rdoc_files:
 - doc/releases/flexmock-0.7.1.rdoc
 - doc/releases/flexmock-0.8.0.rdoc
 - doc/releases/flexmock-0.8.2.rdoc
+- doc/releases/flexmock-0.8.3.rdoc
+- doc/releases/flexmock-0.8.4.rdoc
 files: 
 - CHANGES
 - Rakefile
@@ -107,8 +109,10 @@ files:
 - doc/releases/flexmock-0.7.1.rdoc
 - doc/releases/flexmock-0.8.0.rdoc
 - doc/releases/flexmock-0.8.2.rdoc
+- doc/releases/flexmock-0.8.3.rdoc
+- doc/releases/flexmock-0.8.4.rdoc
 has_rdoc: true
-homepage: http://onestepback.org/software/flexmock
+homepage: http://flexmock.rubyforge.org
 post_install_message: 
 rdoc_options: 
 - --title
@@ -133,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Simple and Flexible Mock Objects for Testing