activerecord-custom_timestamps 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWY1Njc3YWI5ZGRiN2ZkMjRjZjBkMTNhMTNkZWM1NzgzMjRkOWEyOA==
-  data.tar.gz: !binary |-
-    NGRjOGI2OTAwNDdhMjdlOTlmZmU5OTc2MTA0NDEzZjBmYWNkNzE4OQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTkzMzYyZTE1ODYyMmE0Y2QwODZiZjc1NWNlNWE1ZjNhZmJhYWIwYmY4MGNi
-    NzRhZGNmNDg0NTJhM2VmODk3ODU3MGE1NjU0ZWIyNWQ5YTYzYjNjZTU1MmNh
-    ZjBiNWZhZjEyNmQ4N2ZhODU0ZGVlNTlkZTE4MmUwNDFiODJlZWE=
-  data.tar.gz: !binary |-
-    YjRiYzJmZGU5NWE4YjE1ZWQxZTA0YjU1NWRiYTEzOTliZWQyMDhiYmY1Y2Ex
-    OGZiYzI2NGU5NjA3MGNiOGFlOTU3MzVjZjk0ZGNiODlhNWQyNDhkYjAzMmVk
-    YzljMzViOGFjOWE5ODVkNDQ5MTlhZjYwNWEyNjllMjE1MzkwZTI=
+SHA1:
+  metadata.gz: d7e696d572ca7d365e18040ec0720c11c8d19173
+  data.tar.gz: 0565454f72ab635e96965bd06e8d8dd9415c132b
+SHA512:
+  metadata.gz: 63bd9a2c6e68c8d826cb9f0013d5dc160fb387432ef47f73ec2400f566ae22ccf50f5c836c05f3ba6a8e1e8c8dd364366ed94d8b1a10b528428db3acaceab756
+  data.tar.gz: be9b2fe5f08421bc2e3ec97a495f466bf05247fd80971a4a1d004a4e8a4586d861b1df1b281f938b40b8e8ee156ddd5b5a51d842cfe92b70f6399b9f196a0a3f

data/README.md

@@ -52,22 +52,33 @@ Just try to save and update an existing model that has the custom timestamp colu
 
 ### Using Without Rails
 
-If using Rails, the appropriate module will be included into ActiveRecord::Base for Rails 3 or 4 (the method names changed in 4).
+If using Rails, the appropriate module will be included into ActiveRecord::Base for Rails 3 or 4 (the method names changed in 4, then again in 4.2).
 
 If you aren't using Rails, you'll want to include the appropriate module in your model or base model, e.g.
 
+Rails 4.2+:
 ```ruby
-include ActiveRecord::VERSION::MAJOR > 3 ? ::CustomTimestamps::Model : ::CustomTimestamps::Rails3Model
+include ::CustomTimestamps::Model
+```
+
+Rails 4.0-4.1.x:
+```ruby
+include ::CustomTimestamps::EarlyRails4Model
+```
+
+Rails 3.1.x+ but < 4:
+```ruby
+include ::CustomTimestamps::Rails3Model
 ```
 
 ### Authors
 
-This app was written by [FineLine Prototyping, Inc.](http://www.finelineprototyping.com) by the following contributors:
+This was written by [FineLine Prototyping, Inc.](http://www.finelineprototyping.com) by the following contributors:
 * Gary Weaver (https://github.com/garysweaver)
 
 ### License
 
-Copyright (c) 2013 FineLine Prototyping, Inc., released under the [MIT license][lic].
+Copyright (c) 2013-2015 FineLine Prototyping, Inc., released under the [MIT license][lic].
 
 [lic]: http://github.com/FineLinePrototyping/activerecord-custom_timestamps/blob/master/LICENSE
 [travis]: http://travis-ci.org/FineLinePrototyping/activerecord-custom_timestamps

data/Rakefile

@@ -2,14 +2,15 @@ require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'appraisal'
 
-task :default do |t|
+# Override the default task
+task :default => [] # Just in case it hasn't already been set
+Rake::Task[:default].clear
+task :default => :appraise
+
+task :appraise do |t|
   if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
     load 'test/custom_timestamps_test.rb'
   else
-    exec 'bundle install && bundle exec rake appraise'
+    exec 'appraisal install && rake appraisal'
   end
 end
-
-task :appraise => ['appraisal:install'] do |t|
-  exec 'bundle install && bundle exec rake appraisal'
-end

data/lib/activerecord-custom_timestamps/early_rails4_model.rb

@@ -0,0 +1,52 @@
+require 'activerecord-custom_timestamps/config'
+
+module CustomTimestamps
+  module EarlyRails4Model
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :created_timestamp, instance_writer: false
+      class_attribute :updated_timestamp, instance_writer: false
+      class_attribute :update_custom_updated_timestamp_on_create, instance_writer: false
+      self.update_custom_updated_timestamp_on_create = CustomTimestamps.update_custom_updated_timestamp_on_create?
+    end
+
+  private
+
+    def create_record
+      if self.record_timestamps
+        current_time = current_time_from_proper_timezone
+
+        Array.wrap(self.created_timestamp).each do |column|
+          if respond_to?(column) && respond_to?("#{column}=") && self.send(column).nil?
+            write_attribute(column.to_s, current_time)
+          end
+        end
+
+        if self.update_custom_updated_timestamp_on_create
+          Array.wrap(self.updated_timestamp).each do |column|
+            column = column.to_s
+            next if attribute_changed?(column)
+            write_attribute(column, current_time)
+          end
+        end
+      end
+      
+      super
+    end
+
+    def update_record(*args)
+      if should_record_timestamps?
+        current_time = current_time_from_proper_timezone
+
+        Array.wrap(self.updated_timestamp).each do |column|
+          column = column.to_s
+          next if attribute_changed?(column)
+          write_attribute(column, current_time)
+        end
+      end
+      super
+    end
+
+  end
+end

data/lib/activerecord-custom_timestamps/model.rb

@@ -13,7 +13,7 @@ module CustomTimestamps
 
   private
 
-    def create_record
+    def _create_record
       if self.record_timestamps
         current_time = current_time_from_proper_timezone
 
@@ -35,8 +35,8 @@ module CustomTimestamps
       super
     end
 
-    def update_record(*args)
-      if should_record_timestamps?
+    def _update_record(*args, touch: true, **options)
+      if touch && should_record_timestamps?
         current_time = current_time_from_proper_timezone
 
         Array.wrap(self.updated_timestamp).each do |column|
@@ -45,7 +45,8 @@ module CustomTimestamps
           write_attribute(column, current_time)
         end
       end
-      super
+      super(*args, touch, **options)
     end
+
   end
 end

data/lib/activerecord-custom_timestamps/railtie.rb

@@ -4,7 +4,15 @@ module CustomTimestamps
   class Railtie < Rails::Railtie
     initializer "custom_timestamps.active_record" do
       ActiveSupport.on_load(:active_record) do
-        include Rails::VERSION::MAJOR > 3 ? ::CustomTimestamps::Model : ::CustomTimestamps::Rails3Model
+        if Rails::VERSION::MAJOR == 4
+          if Rails::VERSION::MINOR < 2
+            include ::CustomTimestamps::EarlyRails4Model
+          else
+            include ::CustomTimestamps::Model
+          end
+        elsif Rails::VERSION::MAJOR == 3 
+          include ::CustomTimestamps::Rails3Model
+        end
       end
     end
   end

data/lib/activerecord-custom_timestamps/version.rb

@@ -1,3 +1,3 @@
 module CustomTimestamps
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-custom_timestamps
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gary S. Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 description: Allows sets of custom timestamps for all or some models.
@@ -37,14 +37,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- Rakefile
+- lib/activerecord-custom_timestamps.rb
 - lib/activerecord-custom_timestamps/config.rb
+- lib/activerecord-custom_timestamps/early_rails4_model.rb
 - lib/activerecord-custom_timestamps/model.rb
 - lib/activerecord-custom_timestamps/rails3_model.rb
 - lib/activerecord-custom_timestamps/railtie.rb
 - lib/activerecord-custom_timestamps/version.rb
-- lib/activerecord-custom_timestamps.rb
-- Rakefile
-- README.md
 homepage: https://github.com/FineLinePrototyping/activerecord-custom_timestamps
 licenses:
 - MIT
@@ -55,17 +56,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Custom Timestamps for ActiveRecord 3.x/4.x.