From e3c382e3d69e7f25593cf45a4acc1b74bb93d057 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Sun, 26 Jan 2014 20:39:16 +0000
Subject: Rename subsecond_fraction_digits option to time_precision

---
 activesupport/lib/active_support/json/encoding.rb  | 8 ++++----
 activesupport/lib/active_support/time_with_zone.rb | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 23896316e2..bafd629848 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -4,7 +4,7 @@ require 'active_support/core_ext/module/delegation'
 module ActiveSupport
   class << self
     delegate :use_standard_json_time_format, :use_standard_json_time_format=,
-      :subsecond_fraction_digits, :subsecond_fraction_digits=,
+      :time_precision, :time_precision=,
       :escape_html_entities_in_json, :escape_html_entities_in_json=,
       :encode_big_decimal_as_string, :encode_big_decimal_as_string=,
       :json_encoder, :json_encoder=,
@@ -106,9 +106,9 @@ module ActiveSupport
         # as a safety measure.
         attr_accessor :escape_html_entities_in_json
 
-        # Configures the inclusion of subsecond resolution when serializing instances
-        # of ActiveSupport::TimeWithZone.
-        attr_accessor :subsecond_fraction_digits
+        # Sets the precision of encoded time values.
+        # Defaults to 3 (equivalent to millisecond precision)
+        attr_accessor :time_precision
 
         # Sets the encoder used by Rails to encode Ruby objects into JSON strings
         # in +Object#to_json+ and +ActiveSupport::JSON.encode+.
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 26d4e686fd..1ed18fa473 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -154,7 +154,7 @@ module ActiveSupport
     #   # => "2005/02/01 05:15:10 -1000"
     def as_json(options = nil)
       if ActiveSupport::JSON::Encoding.use_standard_json_time_format
-        digits = ActiveSupport::JSON::Encoding.subsecond_fraction_digits || 3
+        digits = ActiveSupport::JSON::Encoding.time_precision || 3
         xmlschema(digits)
       else
         %(#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
-- 
cgit v1.2.3