Change save to create/update. Added model to payload.

jnunemaker · Jan 31, 2013 · 6482c88 · 6482c88
1 parent 5568ec0
commit 6482c88
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/lib/toy/persistence.rb b/lib/toy/persistence.rb
@@ -78,16 +78,14 @@ def persisted?
     def save(options={})
       default_payload = {
         :id => persisted_id,
+        :model => self.class,
       }
 
-      Toy.instrumenter.instrument('save.toystore', default_payload) { |payload|
-        if new_record?
-          payload[:new_record] = true
-          create
-        else
-          payload[:new_record] = false
-          update
-        end
+      new_record = new_record?
+      action = new_record ? 'create' : 'update'
+
+      Toy.instrumenter.instrument("#{action}.toystore", default_payload) { |payload|
+        new_record ? create : update
       }
     end
 
@@ -99,6 +97,7 @@ def update_attributes(attrs)
     def destroy
       default_payload = {
         :id => persisted_id,
+        :model => self.class,
       }
 
       Toy.instrumenter.instrument('destroy.toystore', default_payload) { |payload|

diff --git a/lib/toy/querying.rb b/lib/toy/querying.rb
@@ -4,11 +4,14 @@ module Querying
 
     module ClassMethods
       def read(id, options = nil)
-        Toy.instrumenter.instrument('read.toystore') { |payload|
-          payload[:id] = id
-          payload[:options] = options
-          payload[:hit] = false # hit if found, miss if not found
+        default_payload = {
+          :id      => id,
+          :options => options,
+          :model   => self,
+          :hit     => false, # default to not found
+        }
 
+        Toy.instrumenter.instrument('read.toystore', default_payload) { |payload|
           if (attrs = adapter.read(id, options))
             payload[:hit] = true
             load(id, attrs)
@@ -30,6 +33,7 @@ def read_multiple(ids, options = nil)
         default_payload = {
           :ids     => ids,
           :options => options,
+          :model   => self,
           :hits    => 0,
           :misses  => 0,
         }
@@ -56,6 +60,7 @@ def key?(id, options = nil)
         default_payload = {
           :id      => id,
           :options => options,
+          :model => self,
         }
 
         Toy.instrumenter.instrument('key.toystore', default_payload) { |payload|

diff --git a/spec/toy/persistence_spec.rb b/spec/toy/persistence_spec.rb
@@ -257,10 +257,10 @@
         @doc.save
 
         event = instrumenter.events.last
-        event.name.should eq('save.toystore')
+        event.name.should eq('create.toystore')
         event.payload.should eq({
           :id => @doc.persisted_id,
-          :new_record => true,
+          :model => User,
         })
       end
 
@@ -328,10 +328,10 @@ def persist
         @doc.save
 
         event = instrumenter.events.last
-        event.name.should eq('save.toystore')
+        event.name.should eq('update.toystore')
         event.payload.should eq({
           :id => @doc.persisted_id,
-          :new_record => false,
+          :model => User,
         })
       end
 
@@ -403,6 +403,7 @@ def persist
       event.name.should eq('destroy.toystore')
       event.payload.should eq({
         :id => @doc.id,
+        :model => User,
       })
     end
   end

diff --git a/spec/toy/querying_spec.rb b/spec/toy/querying_spec.rb
@@ -27,6 +27,7 @@
         event.payload.should eq({
           :id      => @user.id,
           :options => {some: 'thing'},
+          :model   => User,
           :hit     => true,
         })
       end
@@ -50,6 +51,7 @@
         event.payload.should eq({
           :id      => @id,
           :options => {some: 'thing'},
+          :model   => User,
           :hit     => false,
         })
       end
@@ -116,6 +118,7 @@
       event.payload.should eq({
         :ids     => ids,
         :options => {some: 'thing'},
+        :model   => User,
         :hits    => 2,
         :misses  => 1,
       })
@@ -148,6 +151,7 @@
         event.payload.should eq({
           :id      => @user.id,
           :options => {some: 'thing'},
+          :model   => User,
           :hit     => true,
         })
       end
@@ -172,6 +176,7 @@
         event.payload.should eq({
           :id      => @id,
           :options => {some: 'thing'},
+          :model   => User,
           :hit     => false,
         })
       end