kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Changed the default ActiveSupport.use_standard_json_time_format from false to true and

Browse source 
ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults [DHH]
This commit is contained in:
David Heinemeier Hansson 2010-01-03 19:20:43 -08:00
parent 532b11690f
commit 6042067c0b
4 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
activesupport/CHANGELOG
View file

@ -1,5 +1,8 @@
*Edge* *Edge*
* Changed the default ActiveSupport.use_standard_json_time_format from false to true and
ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults [DHH]
* Added Object#presence that returns the object if it's #present? otherwise returns nil [DHH/Colin Kelley] * Added Object#presence that returns the object if it's #present? otherwise returns nil [DHH/Colin Kelley]
* Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if !x.include?/else calls [DHH] * Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if !x.include?/else calls [DHH]

3
activesupport/lib/active_support/json/encoding.rb
View file

@ -114,7 +114,8 @@ module ActiveSupport
end end
end end
self.escape_html_entities_in_json = true self.use_standard_json_time_format = true
self.escape_html_entities_in_json = false
end end
CircularReferenceError = Deprecation::DeprecatedConstantProxy.new('ActiveSupport::JSON::CircularReferenceError', Encoding::CircularReferenceError) CircularReferenceError = Deprecation::DeprecatedConstantProxy.new('ActiveSupport::JSON::CircularReferenceError', Encoding::CircularReferenceError)

7
activesupport/lib/active_support/time_with_zone.rb
View file

@ -32,7 +32,6 @@ module ActiveSupport
# t.is_a?(Time) # => true # t.is_a?(Time) # => true
# t.is_a?(ActiveSupport::TimeWithZone) # => true # t.is_a?(ActiveSupport::TimeWithZone) # => true
class TimeWithZone class TimeWithZone
def self.name def self.name
'Time' # Report class name as 'Time' to thwart type checking 'Time' # Report class name as 'Time' to thwart type checking
end end
@ -114,9 +113,9 @@ module ActiveSupport
end end
alias_method :iso8601, :xmlschema alias_method :iso8601, :xmlschema
# Coerces the date to a string for JSON encoding. # Coerces the date to a string for JSON encoding. The default format is ISO 8601. You can get
# # %Y/%m/%d %H:%M:%S +offset style by setting ActiveSupport::JSON::Encoding.use_standard_json_time_format
# ISO 8601 format is used if ActiveSupport::JSON::Encoding.use_standard_json_time_format is set. # to false.
# #
# ==== Examples # ==== Examples
# #

10
railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb
View file

@ -4,16 +4,6 @@
# for Rails 3. You can remove this initializer when Rails 3 is released. # for Rails 3. You can remove this initializer when Rails 3 is released.
if defined?(ActiveRecord) if defined?(ActiveRecord)
# Include Active Record class name as root for JSON serialized output.
ActiveRecord::Base.include_root_in_json = true
# Store the full class name (including module namespace) in STI type column. # Store the full class name (including module namespace) in STI type column.
ActiveRecord::Base.store_full_sti_class = true ActiveRecord::Base.store_full_sti_class = true
end end
# Use ISO 8601 format for JSON serialized times and dates.
ActiveSupport.use_standard_json_time_format = true
# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
# if you're including raw json in an HTML page.
ActiveSupport.escape_html_entities_in_json = false