dm-timestamps 0.9.3 → 0.9.4

data/lib/dm-timestamps.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'dm-core', '=0.9.3'
+gem 'dm-core', '=0.9.4'
 require 'dm-core'
 
 module DataMapper
@@ -8,8 +8,8 @@ module DataMapper
     TIMESTAMP_PROPERTIES = {
       :updated_at => lambda { |r| r.updated_at = DateTime.now },
       :updated_on => lambda { |r| r.updated_on = Date.today   },
-      :created_at => lambda { |r| r.created_at = DateTime.now if r.new_record? },
-      :created_on => lambda { |r| r.created_on = Date.today   if r.new_record? },
+      :created_at => lambda { |r| r.created_at = DateTime.now if r.new_record? && r.created_at.nil? },
+      :created_on => lambda { |r| r.created_on = Date.today   if r.new_record? && r.created_on.nil?},
     }
 
     def self.included(model)
@@ -19,8 +19,10 @@ module DataMapper
     private
 
     def set_timestamp_properties
-      self.class.properties.slice(*TIMESTAMP_PROPERTIES.keys).compact.each do |property|
-        TIMESTAMP_PROPERTIES[property.name][self]
+      if dirty?
+        self.class.properties.slice(*TIMESTAMP_PROPERTIES.keys).compact.each do |property|
+          TIMESTAMP_PROPERTIES[property.name][self]
+        end
       end
     end
   end # module Timestamp

data/lib/dm-timestamps/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Timestamps
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
-end
+end

data/spec/integration/timestamps_spec.rb

@@ -22,6 +22,20 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
      repository(:default).adapter.execute('DELETE from green_smoothies');
     end
 
+    it "should not set the created_at/on fields if they're already set" do
+      repository(:default) do
+        green_smoothie = GreenSmoothie.new(:name => 'Banana')
+        time = (DateTime.now - 100)
+        green_smoothie.created_at = time
+        green_smoothie.created_on = time
+        green_smoothie.save
+        green_smoothie.created_at.should == time
+        green_smoothie.created_on.should == time
+        green_smoothie.created_at.should be_a_kind_of(DateTime)
+        green_smoothie.created_on.should be_a_kind_of(Date)
+      end
+    end
+
     it "should set the created_at/on fields on creation" do
       repository(:default) do
         green_smoothie = GreenSmoothie.new(:name => 'Banana')
@@ -58,14 +72,40 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         green_smoothie.updated_on.should be_a_kind_of(Date)
         original_updated_at = green_smoothie.updated_at
         original_updated_on = green_smoothie.updated_on
-        sleep 1
-        tomorrow = Date.today + 1
-        Date.should_receive(:today).and_return(tomorrow)
+        time_tomorrow = DateTime.now + 1
+        date_tomorrow = Date.today + 1
+        DateTime.stub!(:now).and_return { time_tomorrow }
+        Date.stub!(:today).and_return { date_tomorrow }
         green_smoothie.name = 'Cranberry Mango'
         green_smoothie.save
         green_smoothie.updated_at.should_not eql(original_updated_at)
         green_smoothie.updated_on.should_not eql(original_updated_on)
+        green_smoothie.updated_at.should eql(time_tomorrow)
+        green_smoothie.updated_on.should eql(date_tomorrow)
+      end
+    end
+
+    it "should only set the updated_at/on fields on dirty objects" do
+      repository(:default) do
+        green_smoothie = GreenSmoothie.new(:name => 'Mango')
+        green_smoothie.updated_at.should be_nil
+        green_smoothie.updated_on.should be_nil
+        green_smoothie.save
+        green_smoothie.updated_at.should be_a_kind_of(DateTime)
+        green_smoothie.updated_on.should be_a_kind_of(Date)
+        original_updated_at = green_smoothie.updated_at
+        original_updated_on = green_smoothie.updated_on
+        time_tomorrow = DateTime.now + 1
+        date_tomorrow = Date.today + 1
+        DateTime.stub!(:now).and_return { time_tomorrow }
+        Date.stub!(:today).and_return { date_tomorrow }
+        green_smoothie.save
+        green_smoothie.updated_at.should_not eql(time_tomorrow)
+        green_smoothie.updated_on.should_not eql(date_tomorrow)
+        green_smoothie.updated_at.should eql(original_updated_at)
+        green_smoothie.updated_on.should eql(original_updated_on)
       end
     end
+
   end
 end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.3'
+    gem lib, '=0.9.4'
     require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-timestamps
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Foy Savas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 -05:00
+date: 2008-08-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe