spy 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -0,0 +1,65 @@
+## Spy 0.3.1 (March 13, 2013) ##
+
+*   Fix Agency recruiting of mock
+
+## Spy 0.3.0 (March 12, 2013) ##
+
+*   Added Mock
+
+    Example:
+
+        book = Spy.mock(Book, author: "John Steinbeck")
+
+*   Deprecate Double and use Mock instead
+*   Fix Exceptions so they can have custom messages
+
+## Spy 0.2.5 (March 9, 2013) ##
+
+*   Add custom exception classes
+
+## Spy 0.2.4 (February 28, 2013) ##
+
+*   Fix airty checking of Spy::Subroutine#and_return
+
+## Spy 0.2.3 (February 28, 2013) ##
+
+*   Fix marshal dumping
+*   Add Docs
+*   Make error messages clearer
+
+## Spy 0.2.2 (February 26, 2013) ##
+
+*   Make compatible with ruby 2.0.0
+
+## Spy 0.2.1 (February 25, 2013) ##
+
+* fix missing CallLog
+
+## Spy 0.2.0 (February 22, 2013) ##
+
+*   Add CallLog
+*   Fix constant stubbing
+*   Ensure spy is logging all calls even if an error is raised
+*   add Spy::Subroutine#called_with
+
+## Spy 0.1.0 (February 20, 2013) ##
+
+*   add Spy#and_raise
+*   add Spy#and_throw
+*   add Spy#and_yield
+*   add Constant stubbing
+*   fix private method lookups
+
+## Spy 0.0.1 (February 5, 2013) ##
+
+*   Stub objects
+
+    Example:
+
+        Spy.on(book, :title).and_return("East of Eden")
+
+*   Create Doubles
+
+    Example:
+
+        Spy.double("Double Name", stub: :method)

data/README.md

@@ -97,8 +97,8 @@ Book.new(title: "The Big Cheese").title   #=> "Cannery Row"
 ### Test Mocks
 
 A test mock is an object that quacks like a given class but will raise an error
-when the method is not stubbed. You can spy on the classes and call through to
-the original method.
+when the method is not stubbed. Spy will not let you stub a method that wasn't
+on the mocked class. You can spy on the classes and call through to the original method.
 
 ```ruby
 book = Spy.mock(Book)

data/lib/spy/agency.rb

@@ -22,11 +22,8 @@ module Spy
     # @return [spy]
     def recruit(spy)
       raise AlreadyStubbedError if @spies[spy.object_id]
-      if spy.is_a? Base
-        @spies[spy.object_id] = spy
-      else
-        raise ArgumentError, "#{spy}, was not a spy"
-      end
+      check_spy!(spy)
+      @spies[spy.object_id] = spy
     end
 
     # remove spy from the records
@@ -34,22 +31,15 @@ module Spy
     # @return [spy]
     def retire(spy)
       raise NoSpyError unless @spies[spy.object_id]
-      if spy.is_a? Base
-        @spies.delete(spy.object_id)
-      else
-        raise ArgumentError, "#{spy}, was not a spy"
-      end
+      @spies.delete(spy.object_id)
     end
 
     # checks to see if a spy is hooked
     # @param spy [Subroutine, Constant, Double]
     # @return [Boolean]
     def active?(spy)
-      if spy.is_a? Base
-        @spies.has_key?(spy.object_id)
-      else
-        raise ArgumentError, "#{spy}, was not a spy"
-      end
+      check_spy!(spy)
+      @spies.has_key?(spy.object_id)
     end
 
     # unhooks all spies and clears records
@@ -74,5 +64,11 @@ module Spy
     def spies
       @spies.values
     end
+
+    private
+
+    def check_spy!(spy)
+      raise ArgumentError, "#{spy}, was not a spy" unless spy.is_a?(Base) || spy.respond_to?(:_mock_class, true)
+    end
   end
 end

data/lib/spy/mock.rb

@@ -8,7 +8,8 @@ module Spy
     CLASSES_NOT_TO_OVERRIDE = [Enumerable, Numeric, Comparable, Class, Module, Object]
     METHODS_NOT_TO_OVERRIDE = [:initialize, :method]
 
-    def initialize
+    def initialize(&mock_method)
+      Agency.instance.recruit(self)
     end
 
     def is_a?(other)
@@ -24,7 +25,7 @@ module Spy
     def method(method_name)
       new_method = super
       if new_method.parameters.size >= 1 &&
-        new_method.parameters.last.last == :never_hooked
+        new_method.parameters.last.last == :mock_method
 
         begin
           _mock_class.send(:remove_method, method_name)
@@ -52,7 +53,6 @@ module Spy
 
           include Mock
         end
-        Agency.instance.recruit(mock_klass)
         mock_klass
       end
 
@@ -114,7 +114,7 @@ module Spy
             "*#{name}"
           end
         end.compact
-        args << "&never_hooked"
+        args << "&mock_method"
         args.join(",")
       end
     end

data/lib/spy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -118,6 +118,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md