spy_rb 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4256e6a05208bf9e7467ac42d7f1c5393a44ce87
-  data.tar.gz: d4a27a39240558415d0b3fc10ca3a9124d765e8d
+  metadata.gz: 8961d7ee67921ac362c6fc641cc406cfc794262b
+  data.tar.gz: 950d59327fceab861d83df830251e847e4474c0b
 SHA512:
-  metadata.gz: e658ea9847acbdcb43d54526b9da0c7f2d132448f6c6c4e05874d1ee49ae4bdbf518b9d878376141684d95679cedd589caa79a95d691e72af25573bc59930bd2
-  data.tar.gz: 62e3beeb79895b0ecb3de90af60864a0b687529fb4b99b2e33c7964d801824ab350f71a9e7fc4d7d581f14929afaae5d1d0aa10072870e6295d0338da699e519
+  metadata.gz: bd5e5a986047c5ad17c8f05807f2846f6bc142825af545b9eb954d9db7a429628b97f2da61e6abd45635c446b035c4e7f8c74c2cba9eff72ef48477d8332a1b6
+  data.tar.gz: 0a893d712ea97c103e9b62795fe6312ba763b85877037f74f38891dccbe8af9aacf74facc030ee023428563e9599fc23bb68184a48a21e36fd3d57795cb1137a

data/lib/spy/callbacks/when.rb

@@ -0,0 +1,13 @@
+module Spy
+  module Callbacks
+    class When
+      def initialize(filter)
+        @filter = filter
+      end
+
+      def before_call(*args)
+        @filter.call(*args)
+      end
+    end
+  end
+end

data/lib/spy/callbacks/with_args.rb

@@ -0,0 +1,14 @@
+module Spy
+  module Callbacks
+    class WithArgs
+      def initialize(*args)
+        puts 'Spy::Callbacks::WithArgs is deprecated; use Spy::Callbacks::When instead'
+        @match_args = args
+      end
+
+      def before_call(*args)
+        @match_args == args
+      end
+    end
+  end
+end

data/lib/spy/instance.rb

@@ -1,34 +1,39 @@
+require 'spy/callbacks/with_args'
+require 'spy/callbacks/when'
+
 # An instance of a spied method
 # - Holds a reference to the original method
 # - Wraps the original method
 # - Provides hooks for callbacks
 module Spy
   class Instance
-    attr_reader :receiver, :method_type, :msg, :original, :call_count
+    attr_reader :receiver, :method_type, :msg, :original, :call_count, :visibility
 
     def initialize(receiver, msg, method_type)
       @msg = msg
       @receiver = receiver
       @method_type = method_type
+      @before_filters = []
+      @call_count = 0
 
       # Cache the original method for unwrapping later
       @original = @receiver.send(method_type, msg)
-      @call_count = 0
-      @match_args = []
+      @visibility = extract_visibility
     end
 
     def start
       context = self
       original.owner.instance_eval do
         define_method context.msg do |*args|
+          context.before_call(*args)
           if context.original.respond_to? :bind
             result = context.original.bind(self).call(*args)
           else
             result = context.original.call(*args)
           end
-          context.after_call(result, *args)
           result
         end
+        send(context.visibility, context.msg)
       end
       self
     end
@@ -41,14 +46,34 @@ module Spy
       self
     end
 
-    def after_call(result, *args)
-      return unless @match_args.empty? || @match_args == args
-      @call_count += 1
+    def before_call(*args)
+      @call_count += 1 if @before_filters.all? {|f| f.before_call(*args)}
     end
 
     def with_args(*args)
-      @match_args = args || []
+      add_before_filter Callbacks::WithArgs.new(*args)
+    end
+
+    def when(&block)
+      add_before_filter Callbacks::When.new(block)
+    end
+
+    private
+
+    def add_before_filter(filter)
+      @before_filters << filter
       self
     end
+
+    def extract_visibility
+      owner = @original.owner
+      [:public, :protected, :private].each do |vis|
+        query = "#{vis}_method_defined?"
+        if owner.respond_to?(query) && owner.send(query, @msg)
+          return vis
+        end
+      end
+      raise NoMethodError, "couldn't find method #{@msg} belonging to #{owner}"
+    end
   end
 end

data/lib/spy/version.rb

@@ -0,0 +1,3 @@
+module Spy
+  VERSION = '0.1.5'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spy_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Josh Bodah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies: []
 description: Spy brings everything that's great about Sinon.JS to Ruby. Mocking frameworks
   work by stubbing out functionality. Spy works by listening in on functionality and
@@ -21,12 +21,14 @@ extra_rdoc_files: []
 files:
 - lib/spy.rb
 - lib/spy/api.rb
+- lib/spy/callbacks/when.rb
+- lib/spy/callbacks/with_args.rb
 - lib/spy/collection.rb
 - lib/spy/collection/entry.rb
-- lib/spy/collection_entry.rb
 - lib/spy/core.rb
 - lib/spy/errors.rb
 - lib/spy/instance.rb
+- lib/spy/version.rb
 homepage: https://github.com/jbodah/spy_rb
 licenses:
 - MIT

data/lib/spy/collection_entry.rb

@@ -1,34 +0,0 @@
-module Spy
-  class CollectionEntry < Struct.new(:receiver, :msg, :method_type)
-    attr_accessor :value
-
-    def key
-      "#{receiver.object_id}|#{msg}|#{method_type}"
-    end
-
-    def ==(other)
-      key == other.key
-    end
-
-    module ClassMethods
-      def parse(key)
-        new *parse_key(key)
-      end
-
-      def parse_key(key)
-        parts = key.split('|')
-        parts[0] = find_object(parts[0].to_i)
-        parts[1] = parts[1].to_sym
-        parts[2] = parts[2].to_sym
-        parts
-      end
-
-      # Looks up an object in the global ObjectSpace
-      def find_object(object_id)
-        ObjectSpace._id2ref(object_id)
-      end
-    end
-
-    extend ClassMethods
-  end
-end