instrumentable 0.0.3 → 0.0.4

data/lib/instrumentable.rb

@@ -26,9 +26,13 @@ module Instrumentable
 
       # Redefine method_to_instrument to call inside the Notification
       define_method(method_to_instrument) do |*args, &block|
-        callable_payload = payload.inject({}) do |result, element|
-          value = (__send__(element.last) if respond_to?(element.last)) || element.last
-          result.tap { |r| r[element.first] = value }
+        callable_payload = payload.inject({}) do |result, (payload_key, payload_value)|
+          value = if respond_to?(payload_value)
+                    __send__ payload_value
+                  else
+                    payload_value
+                  end
+          result.tap { |r| r[payload_key] = value }
         end
         ActiveSupport::Notifications.instrument event_name, callable_payload do
           __send__(instrument_method, *args, &block)

data/lib/instrumentable/version.rb

@@ -1,3 +1,3 @@
 module Instrumentable
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/instrumentable_test.rb

@@ -4,8 +4,10 @@ require_relative "../lib/instrumentable"
 class FakeModel
   include Instrumentable
   def simple_event; end
+  def false_event; end
   def payload_event; end
   instrument_for :simple_event,   'event.name',   :my_payload => :id
+  instrument_for :false_event,    'event.name',   :my_payload => :valid
   instrument_for :payload_event,  'payload.name', :my_payload => 'megaman'
 end
 
@@ -14,7 +16,7 @@ describe Instrumentable do
   it "must instrument simple_event" do
     fm = FakeModel.new
     def fm.id; 1; end
-    expected = ['event.name-1']
+    expected = ["event.name-#{fm.id}"]
     events = []
 
     callback = lambda { |*_| events << "#{_.first}-#{_.last[:my_payload]}" }
@@ -25,6 +27,20 @@ describe Instrumentable do
     events.must_equal expected
   end
 
+  it "must work with callable payload that returns false" do
+    fm = FakeModel.new
+    def fm.valid; false; end
+    expected = ["event.name-#{fm.valid}"]
+    events = []
+
+    callback = lambda { |*_| events << "#{_.first}-#{_.last[:my_payload]}" }
+    ActiveSupport::Notifications.subscribed(callback, 'event.name') do
+      fm.false_event
+      ActiveSupport::Notifications.instrument('other.event')
+    end
+    events.must_equal expected
+  end
+
   it "must handle non-callable payloads" do
     fm = FakeModel.new
     expected = ['payload.name-megaman']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumentable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport