spy_rb 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d02da3ec411aeb9266e4a61a295444c3cfcb39
-  data.tar.gz: f03057fc9d0291fd1b50c2253a3b346e734a055a
+  metadata.gz: fb54969a1052380817f46a078bf3ebafe57acb2c
+  data.tar.gz: e29c5522dfd48423fe78b387fc06ce29e005d16d
 SHA512:
-  metadata.gz: 1d8a048abf6d0856beb2887accce5d074eb81880e3ee5c3cf769631476eb956be7a85b7acd98c05e61f186b8c508008b57db9771cf69cea40a9f44fd6f1c39fc
-  data.tar.gz: 2149e676609384f4adb744f0b5434a86c73c25ec6b2f742cb80b8a4c7b038a72e9e4ca86c0c77736d38faf6b37d3db338bed98eb220d830eb8c6f46922104884
+  metadata.gz: e415ad43572895dc1e3d94f25e61690b2b143fc32ac6fcdc581258b218db44eef37425afd44e0c05ea0ee5ab6e87e03e938ee4ced101eacb592ed625ffe2089f
+  data.tar.gz: ff2432d2149adacf34bd528f6b5ea62464eff36dc6d5eeb429431d254977893079062cb74b9f322f0230098df1e96fc3846053a42398f834bd495298b23a2b1b

data/lib/spy/instance/api/internal.rb

@@ -28,48 +28,63 @@ module Spy
           #   This will let us be a bit more elegant about how we do before/after
           #   callbacks. We can also merge MethodCall with this responsibility so
           #   it isn't just a data struct
-          is_active = @conditional_filters.all? {|f| f.call(receiver, *args)}
+          is_active = if @conditional_filters.any?
+                        mc = build_method_call(receiver, *args, &block)
+                        @conditional_filters.all? {|f| f.call(mc)}
+                      else
+                        true
+                      end
 
-          if !is_active
-            call_original(receiver, *args, &block)
-          else
-            @before_callbacks.each {|f| f.call(receiver, *args)}
+          return call_original(receiver, *args, &block) if !is_active
+
+          if @before_callbacks.any?
+            mc = build_method_call(receiver, *args, &block)
+            @before_callbacks.each {|f| f.call(mc)}
+          end
 
-            if @around_procs.any?
-              # Procify the original call
-              # Still return the result from it
-              result = nil
-              original_proc = Proc.new do
-                result = call_and_record(receiver, *args, &block)
-              end
+          if @around_procs.any?
+            mc = build_method_call(receiver, *args, &block)
 
-              # Keep wrapping the original proc with each around_proc
-              @around_procs.reduce(original_proc) do |p, wrapper|
-                Proc.new { wrapper.call receiver, *args, &p }
-              end.call
-            else
-              result = call_and_record(receiver, *args, &block)
+            # Procify the original call
+            # Still return the result from it
+            result = nil
+            original_proc = Proc.new do
+              result = call_and_record(receiver, args, { :record => mc }, &block)
             end
 
-            @after_callbacks.each {|f| f.call(receiver, *args)}
+            # Keep wrapping the original proc with each around_proc
+            @around_procs.reduce(original_proc) do |p, wrapper|
+              Proc.new { wrapper.call(mc, &p) }
+            end.call
+          else
+            result = call_and_record(receiver, args, &block)
+          end
 
-            result
+          if @after_callbacks.any?
+            mc = @call_history.last
+            @after_callbacks.each {|f| f.call(mc)}
           end
+
+          result
         end
 
         private
 
-        def call_and_record(receiver, *args, &block)
-          record = track_call(receiver, *args, &block)
-          result = call_original(receiver, *args, &block)
-          record.result = result
+        def build_method_call(receiver, *args, &block)
+          Spy::MethodCall.new(
+            proc { call_original(receiver, *args, &block) },
+            original.name,
+            receiver,
+            *args,
+            &block)
         end
 
-        def track_call(receiver, *args, &block)
-          replayer = proc { call_original(receiver, *args, &block) }
-          record = Spy::MethodCall.new(replayer, original.name, receiver, *args, &block)
+        def call_and_record(receiver, args, opts = {}, &block)
+          record = opts[:record] || build_method_call(receiver, *args, &block)
           @call_history << record
-          record
+
+          result = call_original(receiver, *args, &block)
+          record.result = result
         end
 
         def call_original(receiver, *args, &block)

data/lib/spy/instance.rb

@@ -23,6 +23,10 @@ module Spy
       @strategy = Strategy.factory_build(self)
     end
 
+    def name
+      @original.name
+    end
+
     def call_count
       @call_history.size
     end

data/lib/spy/version.rb

@@ -1,3 +1,3 @@
 module Spy
-  VERSION = '0.5.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spy_rb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Josh Bodah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2016-02-10 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
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: SinonJS-style Test Spies for Ruby