flexmock 0.8.9 → 0.8.10

data/README.rdoc

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.8.9
+Version :: 0.8.10
 
 = Links
 

data/Rakefile

@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.8.9'
+PKG_VERSION = '0.8.10'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/TAGS

@@ -143,12 +143,12 @@ lib/flexmock/expectation_director.rb,483
 class FlexMockFlexMock
15,363
   class ExpectationDirectorExpectationDirector
20,574
     def initialize(sym)initialize
23,658
-    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
62,1958
-    def defaultify_expectation(exp) # :nodoc:defaultify_expectation
69,2169
-    def find_expectation_in(expectations, *args)find_expectation_in
81,2450
+    def call(*args)call
38,1206
+    def <<(expectation)<<
46,1459
+    def find_expectation(*args) # :nodoc:find_expectation
51,1583
+    def flexmock_verify         # :nodoc:flexmock_verify
62,1957
+    def defaultify_expectation(exp) # :nodoc:defaultify_expectation
69,2168
+    def find_expectation_in(expectations, *args)find_expectation_in
81,2449
 
 lib/flexmock/mock_container.rb,944
 class FlexMockFlexMock
16,399
@@ -166,7 +166,7 @@ class FlexMockFlexMock
16,399
     def make_partial_proxy(container, obj, name, safe_mode)make_partial_proxy
241,9002
     def build_demeter_chain(mock, arg, &block)build_demeter_chain
286,10855
     def check_proper_mock(mock, method_name)check_proper_mock
311,11706
-    def check_method_names(names)check_method_names
321,12113
+    def check_method_names(names)check_method_names
321,12114
 
 lib/flexmock/noop.rb,0
 
@@ -179,30 +179,30 @@ class FlexMockFlexMock
12,312
     def flexmock_current_order=(value)flexmock_current_order=
39,1145
     def flexmock_validate_order(method_name, order_number)flexmock_validate_order
43,1231
 
-lib/flexmock/partial_mock.rb,1380
+lib/flexmock/partial_mock.rb,1375
 class FlexMockFlexMock
14,337
-  class PartialMockProxyPartialMockProxy
26,968
-    def initialize(obj, mock, safe_mode)initialize
40,1310
-    def flexmock_getflexmock_get
56,1722
-    def should_receive(*args)should_receive
80,2662
-    def add_mock_method(obj, method_name)add_mock_method
91,2940
-    def new_instances(*allocators, &block)new_instances
119,3994
-    def invoke_original(method, args)invoke_original
140,4796
-    def flexmock_verifyflexmock_verify
148,5090
-    def flexmock_teardownflexmock_teardown
153,5226
-    def flexmock_containerflexmock_container
165,5564
-    def flexmock_container=(container)flexmock_container=
171,5759
-    def flexmock_expectations_for(method_name)flexmock_expectations_for
175,5875
-    def sclasssclass
182,6036
-    def singleton?(method_name)singleton?
188,6177
-    def hide_existing_method(method_name)hide_existing_method
198,6639
-    def stow_existing_definition(method_name)stow_existing_definition
205,6856
-    def create_alias_for_existing_method(method_name)create_alias_for_existing_method
225,7573
-    def define_proxy_method(method_name)define_proxy_method
243,8092
-    def restore_original_definition(method_name)restore_original_definition
264,8792
-    def remove_current_method(method_name)remove_current_method
276,9156
-    def detached?detached?
281,9317
-    def new_name(old_name)new_name
286,9425
+  class PartialMockProxyPartialMockProxy
26,966
+    def initialize(obj, mock, safe_mode)initialize
40,1303
+    def flexmock_getflexmock_get
56,1703
+    def should_receive(*args)should_receive
80,2643
+    def add_mock_method(method_name)add_mock_method
91,2921
+    def new_instances(*allocators, &block)new_instances
123,4137
+    def invoke_original(method, args)invoke_original
144,4938
+    def flexmock_verifyflexmock_verify
152,5232
+    def flexmock_teardownflexmock_teardown
157,5368
+    def flexmock_containerflexmock_container
169,5706
+    def flexmock_container=(container)flexmock_container=
175,5901
+    def flexmock_expectations_for(method_name)flexmock_expectations_for
179,6017
+    def sclasssclass
186,6178
+    def singleton?(method_name)singleton?
192,6319
+    def hide_existing_method(method_name)hide_existing_method
202,6781
+    def stow_existing_definition(method_name)stow_existing_definition
209,6998
+    def create_alias_for_existing_method(method_name)create_alias_for_existing_method
229,7715
+    def define_proxy_method(method_name)define_proxy_method
247,8234
+    def restore_original_definition(method_name)restore_original_definition
268,8932
+    def remove_current_method(method_name)remove_current_method
280,9296
+    def detached?detached?
285,9457
+    def new_name(old_name)new_name
290,9565
 
 lib/flexmock/rails/view_mocking.rb,665
 class FlexMockFlexMock
3,20
@@ -226,12 +226,12 @@ class FlexMockFlexMock
14,347
     def method_missing(sym, *args, &block)method_missing
59,1805
 
 lib/flexmock/rspec.rb,341
-class FlexMockFlexMock
14,337
-  class RSpecFrameworkAdapterRSpecFrameworkAdapter
16,355
-    def assert_block(msg, &block)assert_block
17,385
-    def assert_equal(a, b, msg=nil)assert_equal
21,481
-    class AssertionFailedError < StandardError; endAssertionFailedError
26,644
-    def assertion_failed_errorassertion_failed_error
27,696
+class FlexMockFlexMock
14,344
+  class RSpecFrameworkAdapterRSpecFrameworkAdapter
21,441
+    def assert_block(msg, &block)assert_block
22,471
+    def assert_equal(a, b, msg=nil)assert_equal
26,573
+    class AssertionFailedError < StandardError; endAssertionFailedError
31,736
+    def assertion_failed_errorassertion_failed_error
32,788
 
 lib/flexmock/test_unit.rb,120
 module TestTest
14,354
@@ -271,6 +271,9 @@ class FlexMockFlexMock
14,337
 
 lib/flexmock.rb,0
 
+print_tree.rb,47
+def print_tree(tree, indent=0)print_tree
5,44
+
 test/asserts.rb,139
 class FlexMockFlexMock
12,312
   module FailureAssertionFailureAssertion
15,368
@@ -546,19 +549,19 @@ module ActionViewActionView
142,3294
   class BaseBase
143,3312
 
 test/test_record_mode.rb,1339
-class TestRecordMode < Test::Unit::TestCaseTestRecordMode
16,390
-  def test_recording_mode_workstest_recording_mode_works
20,505
-  def test_arguments_are_passed_to_recording_mode_blocktest_arguments_are_passed_to_recording_mode_block
28,687
-  def test_recording_mode_handles_multiple_returnstest_recording_mode_handles_multiple_returns
39,962
-  def test_recording_mode_does_not_specify_ordertest_recording_mode_does_not_specify_order
53,1386
-  def test_recording_mode_gets_block_args_tootest_recording_mode_gets_block_args_too
64,1632
-  def test_recording_mode_should_validate_args_with_equalstest_recording_mode_should_validate_args_with_equals
76,1914
-  def test_recording_mode_should_allow_arg_contraint_validationtest_recording_mode_should_allow_arg_contraint_validation
87,2149
-  def test_recording_mode_should_handle_multiplicity_contraintstest_recording_mode_should_handle_multiplicity_contraints
98,2390
-  def test_strict_record_mode_requires_exact_argument_matchestest_strict_record_mode_requires_exact_argument_matches
110,2657
-  def test_strict_record_mode_requires_exact_orderingtest_strict_record_mode_requires_exact_ordering
122,2937
-  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
+class TestRecordMode < Test::Unit::TestCaseTestRecordMode
16,375
+  def test_recording_mode_workstest_recording_mode_works
20,486
+  def test_arguments_are_passed_to_recording_mode_blocktest_arguments_are_passed_to_recording_mode_block
28,660
+  def test_recording_mode_handles_multiple_returnstest_recording_mode_handles_multiple_returns
39,924
+  def test_recording_mode_does_not_specify_ordertest_recording_mode_does_not_specify_order
53,1334
+  def test_recording_mode_gets_block_args_tootest_recording_mode_gets_block_args_too
64,1569
+  def test_recording_mode_should_validate_args_with_equalstest_recording_mode_should_validate_args_with_equals
76,1839
+  def test_recording_mode_should_allow_arg_contraint_validationtest_recording_mode_should_allow_arg_contraint_validation
87,2063
+  def test_recording_mode_should_handle_multiplicity_contraintstest_recording_mode_should_handle_multiplicity_contraints
98,2292
+  def test_strict_record_mode_requires_exact_argument_matchestest_strict_record_mode_requires_exact_argument_matches
110,2547
+  def test_strict_record_mode_requires_exact_orderingtest_strict_record_mode_requires_exact_ordering
122,2815
+  def test_strict_record_mode_requires_oncetest_strict_record_mode_requires_once
136,3106
+  def test_strict_record_mode_can_not_failtest_strict_record_mode_can_not_fail
149,3368
 
 test/test_samples.rb,2164
 class TestSamples < Test::Unit::TestCaseTestSamples
17,378
@@ -734,11 +737,11 @@ class TestFlexMockShoulds < Test::Unit::TestCaseTestFlexMockShoulds
34,545
   def test_wicked_and_evil_tricks_with_by_default_are_thwartedtest_wicked_and_evil_tricks_with_by_default_are_thwarted
1019,26165
   def test_mocks_can_handle_multi_parameter_respond_tostest_mocks_can_handle_multi_parameter_respond_tos
1031,26570
   def test_can_mock_operatorstest_can_mock_operators
1042,26917
-  def assert_operator(op, &block)assert_operator
1071,27932
-class TestFlexMockShouldsWithInclude < Test::Unit::TestCaseTestFlexMockShouldsWithInclude
1079,28086
-  def test_include_enables_unqualified_arg_type_referencestest_include_enables_unqualified_arg_type_references
1081,28180
-class TestFlexMockArgTypesDontLeak < Test::Unit::TestCaseTestFlexMockArgTypesDontLeak
1089,28344
-  def test_unqualified_arg_type_references_are_undefined_by_defaulttest_unqualified_arg_type_references_are_undefined_by_default
1090,28402
+  def assert_operator(op, &block)assert_operator
1072,27985
+class TestFlexMockShouldsWithInclude < Test::Unit::TestCaseTestFlexMockShouldsWithInclude
1080,28139
+  def test_include_enables_unqualified_arg_type_referencestest_include_enables_unqualified_arg_type_references
1082,28233
+class TestFlexMockArgTypesDontLeak < Test::Unit::TestCaseTestFlexMockArgTypesDontLeak
1090,28397
+  def test_unqualified_arg_type_references_are_undefined_by_defaulttest_unqualified_arg_type_references_are_undefined_by_default
1091,28455
 
 test/test_tu_integration.rb,1570
 class TestTuIntegrationFlexMockMethod < Test::Unit::TestCaseTestTuIntegrationFlexMockMethod
15,352

data/lib/flexmock/mock_container.rb

@@ -14,7 +14,7 @@ require 'flexmock/argument_types'
 require 'flexmock/ordering'
 
 class FlexMock
-  
+
   # ######################################################################
   # Mock container methods
   #
@@ -22,7 +22,7 @@ class FlexMock
   # is included, mocks may be created with a simple call to the +flexmock+
   # method.  Mocks created with via the method call will automatically be
   # verified in the teardown of the test case.
-  #   
+  #
   module MockContainer
     include Ordering
 
@@ -40,12 +40,12 @@ class FlexMock
         m.flexmock_verify
       end
     end
-    
+
     # List of mocks created in this container
     def flexmock_created_mocks
       @flexmock_created_mocks ||= []
     end
-    
+
     # Close all the mock objects in the container.  Closing a mock object
     # restores any original behavior that was displaced by the mock.
     def flexmock_close
@@ -54,7 +54,7 @@ class FlexMock
       end
       @flexmock_created_mocks = []
     end
-    
+
     # Create a mocking object in the FlexMock framework.  The +flexmock+
     # method has a number of options available, depending on just what kind of
     # mocking object your require.  Mocks created via +flexmock+ will be
@@ -86,9 +86,9 @@ class FlexMock
     #   mocks.
     #
     # expect_hash ::
-    #   Hash table of method names and values.  Each method/value pair is 
+    #   Hash table of method names and values.  Each method/value pair is
     #   used to setup a simple expectation so that if the mock object
-    #   receives a message matching an entry in the table, it returns 
+    #   receives a message matching an entry in the table, it returns
     #   the associated value.  No argument our call count constraints are
     #   added.  Using an expect_hash is identical to calling:
     #
@@ -97,24 +97,24 @@ class FlexMock
     #   for each of the method/value pairs in the hash.
     #
     # real_object ::
-    #   If a real object is given, then a partial mock is constructed 
-    #   using the real_object as a base. Partial mocks (formally referred 
-    #   to as stubs) behave as a mock object when an expectation is matched, 
-    #   and otherwise will behave like the original object.  This is useful 
-    #   when you want to use a real object for testing, but need to mock out 
-    #   just one or two methods.  
+    #   If a real object is given, then a partial mock is constructed
+    #   using the real_object as a base. Partial mocks (formally referred
+    #   to as stubs) behave as a mock object when an expectation is matched,
+    #   and otherwise will behave like the original object.  This is useful
+    #   when you want to use a real object for testing, but need to mock out
+    #   just one or two methods.
     #
     # :base ::
     #   Forces the following argument to be used as the base of a
-    #   partial mock object.  This explicit tag is only needed if you 
+    #   partial mock object.  This explicit tag is only needed if you
     #   want to use a string or a symbol as the mock base (string and
     #   symbols would normally be interpretted as the mock name).
-    #       
+    #
     # &block ::
     #   If a block is given, then the mock object is passed to the block and
     #   expectations may be configured within the block.  When a block is given
-    #   for a partial mock, flexmock will return the domain object rather than 
-    #   the mock object.  
+    #   for a partial mock, flexmock will return the domain object rather than
+    #   the mock object.
     #
     def flexmock(*args)
       name = nil
@@ -156,7 +156,7 @@ class FlexMock
       result
     end
     alias flexstub flexmock
-    
+
     # Remember the mock object / stub in the mock container.
     def flexmock_remember(mocking_object)
       @flexmock_created_mocks ||= []
@@ -240,15 +240,16 @@ class FlexMock
     # the name of the mock object.
     def make_partial_proxy(container, obj, name, safe_mode)
       name ||= "flexmock(#{obj.class.to_s})"
-      obj.instance_eval {
+      if !obj.instance_variable_defined?("@flexmock_proxy") || obj.instance_variable_get("@flexmock_proxy").nil?
         mock = FlexMock.new(name, container)
-        @flexmock_proxy ||= PartialMockProxy.new(obj, mock, safe_mode)
-      }
+        proxy = PartialMockProxy.new(obj, mock, safe_mode)
+        obj.instance_variable_set("@flexmock_proxy", proxy)
+      end
       obj.instance_variable_get("@flexmock_proxy")
     end
 
     private
-    
+
     # Build the chain of mocks for demeter style mocking.
     #
     # Warning: Nasty code ahead.
@@ -306,7 +307,7 @@ class FlexMock
       end
       exp
     end
-    
+
     # Check that the given mock is a real FlexMock mock.
     def check_proper_mock(mock, method_name)
       unless mock.kind_of?(FlexMock)
@@ -314,7 +315,7 @@ class FlexMock
           "Conflicting mock declaration for '#{method_name}' in demeter style mock"
       end
     end
-    
+
     METHOD_NAME_RE = /^([A-Za-z_][A-Za-z0-9_]*[=!?]?|\[\]=?||\*\*|<<|>>|<=>|[<>=]=|=~|===|[-+]@|[-+\*\/%&^|<>~`])$/
 
     # Check that all the names in the list are valid method names.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flexmock
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Jim Weirich