Ticket #10982: time_zone_attributes_2.diff

activesupport/lib/active_support/core_ext/time/zones.rb

@@ -9 +9 @@
-        end
-        
-        module ClassMethods
+          attr_accessor :zone_default
+          
-          def zone
-
+ || zone_default
-          end
-
-          # Sets a global default time zone, separate from the system time zone in ENV['TZ']. 

activerecord/test/cases/attribute_methods_test.rb

@@ -14 +14 @@
-    ActiveRecord::Base.attribute_method_suffix *@old_suffixes
-  end
-
-
-  def test_match_attribute_method_query_returns_match_data
-    assert_not_nil md = @target.match_attribute_method?('title=')
-    assert_equal 'title', md.pre_match
@@ -97 +96 @@
-  def test_only_time_related_columns_are_meant_to_be_cached_by_default
-    expected = %w(datetime timestamp time date).sort
-    assert_equal expected, ActiveRecord::Base.attribute_types_cached_by_default.map(&:to_s).sort
-
+  
-
-  def test_declaring_attributes_as_cached_adds_them_to_the_attributes_cached_by_default
-    default_attributes = Topic.cached_attributes
@@ -138 +137 @@
-      end
-    end
-  end
+  
+  def test_time_attributes_are_retrieved_in_current_time_zone
+    in_time_zone "Pacific Time (US & Canada)" do
+      utc_time = Time.utc(2008, 1, 1)
+      record   = @target.new
+      record[:written_on] = utc_time
+      assert_equal utc_time.in_current_time_zone, record.written_on
+      assert_kind_of ActiveSupport::TimeWithZone, record.written_on
+    end
+  end
+  
+  def test_setting_time_zone_aware_attribute_to_utc
+    in_time_zone "Pacific Time (US & Canada)" do
+      utc_time = Time.utc(2008, 1, 1)
+      record   = @target.new
+      record.written_on = utc_time
+      assert_equal utc_time.in_current_time_zone, record.written_on
+    end
+  end
+  
+  def test_setting_time_zone_aware_attribute_to_utc_time
+    in_time_zone "Pacific Time (US & Canada)" do
+      utc_time = Time.utc(2008, 1, 1)
+      record   = @target.new
+      record.written_on = utc_time
+      assert_equal utc_time.in_current_time_zone, record.written_on
+    end
+  end
+  
+  def test_setting_time_zone_aware_attribute_in_other_time_zone
+    utc_time = Time.utc(2008, 1, 1)
+    cst_time = utc_time.in_time_zone("Central Time (US & Canada)")
+    in_time_zone "Pacific Time (US & Canada)" do
+      record   = @target.new
+      record.written_on = cst_time
+      assert_equal utc_time.in_current_time_zone, record.written_on
+    end
+  end
+  
+  def test_setting_time_zone_aware_attribute_in_current_time_zone
+    utc_time = Time.utc(2008, 1, 1)
+    in_time_zone "Pacific Time (US & Canada)" do
+      record   = @target.new
+      record.written_on = utc_time.in_current_time_zone
+      assert_equal utc_time.in_current_time_zone, record.written_on
+    end
+  end
-
-  private
-  def time_related_columns_on_topic
-    Topic.columns.select{|c| [:time, :date, :datetime, :timestamp].include?(c.type)}.map(&:name)
-  end
+  
+  def in_time_zone(zone)
+    old_zone  = Time.zone
+    old_tz    = ActiveRecord::Base.time_zone_aware_attributes
+
+    Time.zone = zone ? TimeZone[zone] : nil
+    ActiveRecord::Base.time_zone_aware_attributes = !zone.nil?
+    yield
+  ensure
+    Time.zone = old_zone
+    ActiveRecord::Base.time_zone_aware_attributes = old_tz
+  end
-end

activerecord/test/cases/base_test.rb

@@ -924 +924 @@
-    assert_equal Time.local(2004, 6, 24, 16, 24, 0), topic.written_on
-  end
-
+  def test_multiparameter_attributes_on_time_with_utc
+    ActiveRecord::Base.default_timezone = :utc
+    attributes = {
+      "written_on(1i)" => "2004", "written_on(2i)" => "6", "written_on(3i)" => "24",
+      "written_on(4i)" => "16", "written_on(5i)" => "24", "written_on(6i)" => "00"
+    }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    assert_equal Time.utc(2004, 6, 24, 16, 24, 0), topic.written_on
+  ensure
+    ActiveRecord::Base.default_timezone = :local
+  end
+
+  def test_multiparameter_attributes_on_time_with_time_zone
+    ActiveRecord::Base.default_timezone = :utc
+    Time.zone = TimeZone[-28800]
+    attributes = {
+      "written_on(1i)" => "2004", "written_on(2i)" => "6", "written_on(3i)" => "24",
+      "written_on(4i)" => "16", "written_on(5i)" => "24", "written_on(6i)" => "00"
+    }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    assert_equal Time.utc(2004, 6, 24, 23, 24, 0).in_current_time_zone, topic.written_on
+  ensure
+    ActiveRecord::Base.default_timezone = :local
+    Time.zone = nil
+  end
+
-  def test_multiparameter_attributes_on_time_with_empty_seconds
-    attributes = {
-      "written_on(1i)" => "2004", "written_on(2i)" => "6", "written_on(3i)" => "24",

activerecord/lib/active_record/attribute_methods.rb

@@ -8 +8 @@
-      base.attribute_method_suffix(*DEFAULT_SUFFIXES)
-      base.cattr_accessor :attribute_types_cached_by_default, :instance_writer => false
-      base.attribute_types_cached_by_default = ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
+      base.cattr_accessor :time_zone_aware_attributes, :instance_writer => false
+      base.time_zone_aware_attributes = false
+      base.cattr_accessor :skip_time_zone_conversion_for_attributes, :instance_writer => false
+      base.skip_time_zone_conversion_for_attributes = []
-    end
-
-    # Declare and check for suffixed attribute methods.
@@ -64 +68 @@
-          unless instance_method_already_implemented?(name)
-            if self.serialized_attributes[name]
-              define_read_method_for_serialized_attribute(name)
+            elsif create_time_zone_conversion_attribute?(name, column)
+              define_read_method_for_time_zone_conversion(name)
-            else
-              define_read_method(name.to_sym, name, column)
-            end
-          end
-
-          unless instance_method_already_implemented?("#{name}=")
-
+
+
+
+
+
-          end
-
-          unless instance_method_already_implemented?("#{name}?")
@@ -121 +131 @@
-          @@attribute_method_suffixes ||= []
-        end
-        
+        def create_time_zone_conversion_attribute?(name, column)
+          time_zone_aware_attributes && !skip_time_zone_conversion_for_attributes.include?(name.to_sym) && [:datetime, :timestamp].include?(column.type)
+        end
+        
-        # Define an attribute reader method.  Cope with nil column.
-        def define_read_method(symbol, attr_name, column)
-          cast_code = column.type_cast_code('v') if column
@@ -140 +154 @@
-        def define_read_method_for_serialized_attribute(attr_name)
-          evaluate_attribute_method attr_name, "def #{attr_name}; unserialize_attribute('#{attr_name}'); end"
-        end
+        
+        def define_read_method_for_time_zone_conversion(attr_name)
+          method_body = <<-EOV
+            def #{attr_name}(reload = false)
+              cached = @attributes_cache['#{attr_name}']
+              return cached if cached && !reload
+              time = read_attribute('#{attr_name}')
+              @attributes_cache['#{attr_name}'] = time.acts_like?(:time) ? time.in_current_time_zone : time
+            end
+          EOV
+          evaluate_attribute_method attr_name, method_body
+        end
-
-        # Define an attribute ? method.
-        def define_question_method(attr_name)
@@ -149 +175 @@
-        def define_write_method(attr_name)
-          evaluate_attribute_method attr_name, "def #{attr_name}=(new_value);write_attribute('#{attr_name}', new_value);end", "#{attr_name}="
-        end
+        
+        def define_write_method_for_time_zone_conversion(attr_name)
+          method_body = <<-EOV
+            def #{attr_name}=(time)
+              if time
+                time = time.to_time rescue time unless time.acts_like?(:time)
+                time = time.in_current_time_zone if time.acts_like?(:time)
+              end
+              write_attribute(:#{attr_name}, time)
+            end
+          EOV
+          evaluate_attribute_method attr_name, method_body, "#{attr_name}="
+        end
-
-        # Evaluate the definition for an attribute related method
-        def evaluate_attribute_method(attr_name, method_definition, method_name=attr_name)
@@ -303 +342 @@
-      end
-      super
-    end
-    
-
-    private
-    

activerecord/lib/active_record/base.rb

@@ -2471 +2471 @@
-
-      # Includes an ugly hack for Time.local instead of Time.new because the latter is reserved by Time itself.
-      def instantiate_time_object(*values)
-
+
+
+
+
+
-      end
-
-      def execute_callstack_for_multiparameter_attributes(callstack)

railties/lib/initializer.rb

@@ -81 +81 @@
-      initialize_dependency_mechanism
-      initialize_whiny_nils
-      initialize_temporary_session_directory
+      initialize_time_zone
-      initialize_framework_settings
-
-      add_support_load_paths
@@ -316 +317 @@
-      end
-    end
-
+    def initialize_time_zone
+      if configuration.time_zone
+        Time.zone_default = TimeZone[configuration.time_zone]
+        if configuration.frameworks.include?(:active_record)
+          ActiveRecord::Base.time_zone_aware_attributes = true
+          ActiveRecord::Base.default_timezone = :utc
+        end
+      end
+    end
+
-    # Initializes framework-specific settings for each of the loaded frameworks
-    # (Configuration#frameworks). The available settings map to the accessors
-    # on each of the corresponding Base classes.
@@ -456 +467 @@
-    end
-    alias_method :breakpoint_server=, :breakpoint_server
-
+    # Sets the default time_zone.  Setting this will enable time_zone
+    # awareness for ActiveRecord models and set the ActiveRecord default
+    # timezone to :utc.
+    attr_accessor :time_zone
+
-    # Create a new Configuration instance, initialized with the default
-    # values.
-    def initialize