crispy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906a71958302bc1652930a6e9f1c5aa237eaa233
-  data.tar.gz: 27951041fba2e5b62fb3d78d3b26311455ac5863
+  metadata.gz: f0ba38b20d7b6e7700337f66b764927162119554
+  data.tar.gz: 010fb0e6c5a5ca038d34233e183765d48e0ba4fd
 SHA512:
-  metadata.gz: 569d2a0881f1f684974e70ed3e50c11d73038d1b07a29964521d6d50e6beaad11e3943e2b53455d9140707cc635f5b0e617fd4907608a919c59f990b833695c7
-  data.tar.gz: 4b8dee5f09c25f3494b22ce3cf9a2f511489fb8d1ef70d430abf8e6b9eae99ae1aadb0c2add730c6037bdc32cbf41032a09f19b42912eb247780d05a5e0ba334
+  metadata.gz: 998646e708b914e987754ac308f65fd941f832f3ca0859dff0232651f195dabca73075bf66e2d3b875bc80741665053910b262ff2e5ba111a09d7b5ba7013992
+  data.tar.gz: 7e00aba14ee6804286283d024e8a568e40d01ba0eb2df9bcc7c11c0267247a3071281b7667bc5d350e561803d24b95a0744934d358d5ca3e541504e978b2b20f

data/ChangeLog.md

@@ -1,8 +1,13 @@
+# 0.3.1 (2015.1.3)
+
+- Enhancement: Forget every spy log and reset every stubbed method by resetting. [#25](https://github.com/igrep/crispy/pull/25)
+- Fix bug: Not spied anymore after removing the stubbed methods when resetting. [`cb38ddf`](https://github.com/igrep/crispy/commit/cb38ddf6f0affe2ea884e4a16d7622dca51c1f2d)
+
 # 0.3.0 (2014.12.31)
 
 - New Feature: Add stub feature to `ClassSpy`. [#23](https://github.com/igrep/crispy/pull/23)
 - New Feature: Now double is automatically spied without `spy_into`. [#21](https://github.com/igrep/crispy/pull/21)
-- Fix Bug: now `spy_into` replaces all stubber's methods with given stub spec when reinitialize a spy.[0f91579decbe27e6b05bec4b779dd1c3ede24380](https://github.com/igrep/crispy/commit/0f91579decbe27e6b05bec4b779dd1c3ede24380)
+- Fix Bug: now `spy_into` replaces all stubber's methods with given stub spec when reinitialize a spy. [`0f9157`](https://github.com/igrep/crispy/commit/0f91579decbe27e6b05bec4b779dd1c3ede24380)
 - Fix Bug: reset spy log when `spy_into`-ing an already spied object. e.g. Class.[#20](https://github.com/igrep/crispy/pull/20)
 - New Feature: `spied?`. [#18](https://github.com/igrep/crispy/pull/18)
 - Refactor many internal classes and tests. [#21](https://github.com/igrep/crispy/pull/21) [#22](https://github.com/igrep/crispy/pull/22) [#23](https://github.com/igrep/crispy/pull/23) [#24](https://github.com/igrep/crispy/pull/24)

data/README.md

@@ -268,11 +268,24 @@ Specify the **fully qualified name of the constant** instead of the constant its
 => "more cool value!"
 ```
 
-Then you can recover the stubbed constant value by `CrispyWorld.reset`.
+### Embedding Crispy into your Testing Framework
+
+Remember to reset all the changes made by Crispy, call `CrispyWorld.reset`.
 
 ```ruby
 >> CrispyWorld.reset
 
+>> spy(object).count_received :your_cool_method
+=> 0
+>> spy(object).count_received :your_lovely_method
+=> 0
+>> spy(object).received? :your_finalizer
+=> false
+
+>> object.your_cool_method
+=> "cool!"
+>> object.your_lovely_method
+=> "lovely!"
 >> YourCoolClass::YOUR_COOL_CONST
 => "value before stubbed"
 ```

data/lib/crispy/crispy_internal/class_spy.rb

@@ -70,6 +70,10 @@ module Crispy
         @registry[of_class] = spy
       end
 
+      def self.reset_all
+        @registry.each_value {|spy| spy.reinitialize }
+      end
+
     end
   end
 end

data/lib/crispy/crispy_internal/spy.rb

@@ -1,10 +1,14 @@
 require 'crispy/crispy_received_message'
 require 'crispy/crispy_internal/spy_base'
 
+require 'weakref'
+
 module Crispy
   module CrispyInternal
     class Spy < SpyBase
 
+      @spies_to_reset = []
+
       attr_reader :received_messages
 
       def initialize target, stubs_map = {}
@@ -15,6 +19,8 @@ module Crispy
 
         @received_messages = []
         super
+
+        self.class.remember_to_reset_later self
       end
 
       def target_to_class target
@@ -37,6 +43,17 @@ module Crispy
       end
       private :append_received_message
 
+      def self.remember_to_reset_later spy
+        @spies_to_reset << ::WeakRef.new(spy)
+      end
+
+      def self.reset_all
+        # get rid of spies of GCed objects
+        @spies_to_reset.select! {|spy| spy.weakref_alive? }
+
+        @spies_to_reset.each {|spy| spy.reinitialize }
+      end
+
     end
   end
 end

data/lib/crispy/crispy_internal/spy_base.rb

@@ -21,14 +21,7 @@ module Crispy
 
       def self.new target, stubs_map = {}
         spy = self.of_target(target)
-        if spy
-          spy.restart
-          spy.erase_log
-          spy.reinitialize_stubber stubs_map
-          spy
-        else
-          super
-        end
+        spy ? spy.reinitialize(stubs_map) : super
       end
 
       def self.of_target target
@@ -51,6 +44,13 @@ module Crispy
         raise NotImplementedError
       end
 
+      def reinitialize stubs_map = {}
+        restart
+        erase_log
+        reinitialize_stubber stubs_map
+        self
+      end
+
       def stop
         @spying = false
       end
@@ -126,6 +126,7 @@ module Crispy
 
       def reinitialize_stubber stubs_map = {}
         remove_method(*@stubbed_methods)
+        @stubbed_methods.each {|stubbed_method| define_wrapper stubbed_method }
         @stubbed_methods.clear
         stub stubs_map
       end

data/lib/crispy/crispy_world.rb

@@ -6,6 +6,8 @@ module Crispy
 
       def reset
         ::Crispy::CrispyInternal::ConstChanger.recover_all
+        ::Crispy::CrispyInternal::Spy.reset_all
+        ::Crispy::CrispyInternal::ClassSpy.reset_all
       end
 
     end

data/lib/crispy/version.rb

@@ -1,3 +1,3 @@
 module Crispy
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/doctest-fixtures/your_cool_class.rb

@@ -1,10 +1,12 @@
 class YourCoolClass
   YOUR_COOL_CONST = 'value before stubbed'.freeze
   def your_cool_method *args
+    'cool!'
   end
   def your_method_without_argument
   end
   def your_lovely_method *args
+    'lovely!'
   end
   def your_finalizer *args
   end

data/test/test_crispy.rb

@@ -226,6 +226,24 @@ class TestCrispy < MiniTest::Test
       assert_equal 'xxx'             , ObjectClass.stubbed_method3
     end
 
+    def test_spy_resets_stubbed_methods_after_resetting
+      CrispyWorld.reset
+      assert_equal 'before stubbed 1', ObjectClass.stubbed_method1
+      assert_equal 'before stubbed 2', ObjectClass.stubbed_method2
+    end
+
+    def test_spy_forgets_received_messages_after_resetting
+      CrispyWorld.reset
+      assert_empty @subject.received_messages
+    end
+
+    def test_spy_still_logs_methods_stubbed_once_after_resetting
+      CrispyWorld.reset
+
+      ObjectClass.stubbed_method1
+      assert_equal 1, spy(ObjectClass).count_received(:stubbed_method1)
+    end
+
   end
 
   class TestCrispySpyIntoInstances < TestCrispy
@@ -274,6 +292,22 @@ class TestCrispy < MiniTest::Test
         end
       end
 
+      def test_spy_resets_stubbed_methods_after_resetting
+        ::Crispy::CrispyWorld.reset
+
+        @object_instances.each do|object|
+          assert_equal 'method to stub 1 (before stubbed)', object.method_to_stub1
+          assert_equal 'method to stub 2 (before stubbed)', object.method_to_stub2
+          assert_equal 'method to stub 3 (before stubbed)', object.method_to_stub3
+        end
+      end
+
+      def test_spy_forgets_received_messages_after_resetting
+        ::Crispy::CrispyWorld.reset
+        assert_empty @subject.received_messages
+        assert_empty @subject.received_messages_with_receiver
+      end
+
     end
 
     class TestReceivedMessage < self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crispy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yamamoto Yuji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler