dm-timestamps 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
 === 0.9.11 / 2009-03-29
 
 * No changes this version

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-timestamps.rb

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ GEM_NAME = 'dm-timestamps'
 GEM_VERSION = DataMapper::Timestamps::VERSION
 GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for magical timestamps'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/lib/dm-timestamps.rb

@@ -1,32 +1,34 @@
-require 'rubygems'
-
-gem 'dm-core', '0.9.11'
-require 'dm-core'
-
 module DataMapper
-  module Timestamp
-    Resource.append_inclusions self
-
+  module Timestamps
     TIMESTAMP_PROPERTIES = {
-      :updated_at => [ DateTime, lambda { |r, p| DateTime.now                                    } ],
-      :updated_on => [ Date,     lambda { |r, p| Date.today                                      } ],
-      :created_at => [ DateTime, lambda { |r, p| r.created_at || (DateTime.now if r.new_record?) } ],
-      :created_on => [ Date,     lambda { |r, p| r.created_on || (Date.today   if r.new_record?) } ],
+      :updated_at => [ DateTime, lambda { |r, p| DateTime.now                             } ],
+      :updated_on => [ Date,     lambda { |r, p| Date.today                               } ],
+      :created_at => [ DateTime, lambda { |r, p| r.created_at || (DateTime.now if r.new?) } ],
+      :created_on => [ Date,     lambda { |r, p| r.created_on || (Date.today   if r.new?) } ],
     }.freeze
 
     def self.included(model)
-      model.before :create, :set_timestamps
-      model.before :update, :set_timestamps
+      model.before :save, :set_timestamps_on_save
       model.extend ClassMethods
     end
 
+    # Saves the record with the updated_at/on attributes set to the current time.
+    def touch
+      set_timestamps
+      save
+    end
+
     private
 
+    def set_timestamps_on_save
+      return unless dirty?
+      set_timestamps
+    end
+
     def set_timestamps
-      return unless dirty? || new_record?
       TIMESTAMP_PROPERTIES.each do |name,(_type,proc)|
-        if model.properties.has_property?(name)
-          model.properties[name].set(self, proc.call(self, model.properties[name])) unless attribute_dirty?(name)
+        if property = properties[name]
+          property.set(self, proc.call(self, property))
         end
       end
     end
@@ -52,7 +54,10 @@ module DataMapper
     end # module ClassMethods
 
     class InvalidTimestampName < RuntimeError; end
+
+    Model.append_inclusions self
   end # module Timestamp
+
   # include Timestamp or Timestamps, it still works
-  Timestamps = Timestamp
+  Timestamp = Timestamps
 end # module DataMapper

data/lib/dm-timestamps/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Timestamps
-    VERSION = '0.9.11'
+    VERSION = '0.10.0'.freeze
   end
 end

data/spec/integration/timestamps_spec.rb

@@ -1,13 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-
-# run the specs with dm-validations, if available
-begin
-  gem 'dm-validations', '0.9.11'
-  require 'dm-validations'
-rescue LoadError
-  # do nothing
-end
+require 'spec_helper'
 
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
   describe 'DataMapper::Timestamp' do
@@ -86,6 +77,34 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         green_smoothie.updated_at.should eql(original_updated_at)
         green_smoothie.updated_on.should eql(original_updated_on)
       end
+
+      describe '#touch' do
+        it 'should update the updated_at/on fields' do
+          green_smoothie = GreenSmoothie.create(:name => 'Mango')
+
+          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.touch
+
+          green_smoothie.updated_at.should eql(time_tomorrow)
+          green_smoothie.updated_on.should eql(date_tomorrow)
+        end
+
+        it 'should not update the created_at/on fields' do
+          green_smoothie = GreenSmoothie.create(:name => 'Mango')
+
+          original_created_at = green_smoothie.created_at
+          original_created_on = green_smoothie.created_on
+
+          green_smoothie.touch
+
+          green_smoothie.created_at.should equal(original_created_at)
+          green_smoothie.created_on.should equal(original_created_on)
+        end
+      end
     end
 
     describe "explicit property declaration" do
@@ -96,10 +115,10 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
           property :id,         Serial
           property :name,       String
-          property :created_at, DateTime
-          property :created_on, Date
-          property :updated_at, DateTime
-          property :updated_on, Date
+          property :created_at, DateTime, :nullable => false, :auto_validation => false
+          property :created_on, Date,     :nullable => false, :auto_validation => false
+          property :updated_at, DateTime, :nullable => false, :auto_validation => false
+          property :updated_on, Date,     :nullable => false, :auto_validation => false
 
           auto_migrate!
         end
@@ -123,26 +142,26 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         it "should set the *at properties" do
           @klass.timestamps :at
 
-          @klass.properties.should have_property(:created_at)
+          @klass.properties.should be_named(:created_at)
           @klass.properties[:created_at].type.should == DateTime
-          @klass.properties.should have_property(:updated_at)
+          @klass.properties.should be_named(:updated_at)
           @klass.properties[:updated_at].type.should == DateTime
         end
 
         it "should set the *on properties" do
           @klass.timestamps :on
 
-          @klass.properties.should have_property(:created_on)
+          @klass.properties.should be_named(:created_on)
           @klass.properties[:created_on].type.should == Date
-          @klass.properties.should have_property(:updated_on)
+          @klass.properties.should be_named(:updated_on)
           @klass.properties[:updated_on].type.should == Date
         end
 
         it "should set multiple properties" do
           @klass.timestamps :created_at, :updated_on
 
-          @klass.properties.should have_property(:created_at)
-          @klass.properties.should have_property(:updated_on)
+          @klass.properties.should be_named(:created_at)
+          @klass.properties.should be_named(:updated_on)
         end
 
         it "should fail on unknown property name" do

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,10 +1,19 @@
-require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
-require 'spec'
+# Use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
 
-require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-timestamps'
+# Use local dm-validations if running from a typical dev checkout.
+lib = File.join('..', 'dm-validations', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-validations'
+
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+
+require 'dm-timestamps'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-timestamps
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Foy Savas
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin for magical timestamps
 email: 
 - foysavas [a] gmail [d] com
@@ -30,15 +21,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-timestamps.rb
@@ -49,11 +40,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-timestamps
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-timestamps
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,9 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin for magical timestamps
 test_files: []