[dm-timestamps] Further simplifications

addywaddy · Nov 23, 2008 · 1072cff · 1072cff
1 parent 6a2365d
commit 1072cff
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/dm-timestamps/lib/dm-timestamps.rb b/dm-timestamps/lib/dm-timestamps.rb
@@ -8,10 +8,10 @@ module Timestamp
     Resource.append_inclusions self
 
     TIMESTAMP_PROPERTIES = {
-      :updated_at => [ DateTime, lambda { |r| r.updated_at   = DateTime.now                  } ],
-      :updated_on => [ Date,     lambda { |r| r.updated_on   = Date.today                    } ],
-      :created_at => [ DateTime, lambda { |r| r.created_at ||= DateTime.now if r.new_record? } ],
-      :created_on => [ Date,     lambda { |r| r.created_on ||= Date.today   if r.new_record? } ],
+      :updated_at => [ DateTime, lambda { |r| DateTime.now                                    } ],
+      :updated_on => [ Date,     lambda { |r| Date.today                                      } ],
+      :created_at => [ DateTime, lambda { |r| r.created_at || (DateTime.now if r.new_record?) } ],
+      :created_on => [ Date,     lambda { |r| r.created_on || (Date.today   if r.new_record?) } ],
     }.freeze
 
     def self.included(model)
@@ -26,7 +26,7 @@ def set_timestamps
       return unless dirty?
       TIMESTAMP_PROPERTIES.each do |name,(_type,proc)|
         if property = model.properties[name]
-          proc.call(self) unless attribute_dirty?(name)
+          property.set(self, proc.call(self)) unless attribute_dirty?(name)
         end
       end
     end