Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove unused JSON methods. [#164 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
commit 8f2f88f128104355b100487008800aeb369ca425 1 parent 10fdf44
@chuyeow chuyeow authored lifo committed
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove unused JSON::RESERVED_WORDS, JSON.valid_identifier? and JSON.reserved_word? methods. Resolves #164. [Cheah Chu Yeow]
+
* Adding Date.current, which returns Time.zone.today if config.time_zone is set; otherwise returns Date.today [Geoff Buesing]
* TimeWithZone: date part getter methods (#year #mon #day etc) are defined on class; no longer relying on method_missing [Geoff Buesing]
View
29 activesupport/lib/active_support/json.rb
@@ -1,5 +1,3 @@
-
-
module ActiveSupport
# If true, use ISO 8601 format for dates and times. Otherwise, fall back to the ActiveSupport legacy format.
mattr_accessor :use_standard_json_time_format
@@ -19,33 +17,6 @@ def escape_html_entities_in_json=(value)
@escape_html_entities_in_json = value
end
end
-
- module JSON
- RESERVED_WORDS = %w(
- abstract delete goto private transient
- boolean do if protected try
- break double implements public typeof
- byte else import return var
- case enum in short void
- catch export instanceof static volatile
- char extends int super while
- class final interface switch with
- const finally long synchronized
- continue float native this
- debugger for new throw
- default function package throws
- ) #:nodoc:
-
- class << self
- def valid_identifier?(key) #:nodoc:
- key.to_s =~ /^[[:alpha:]_$][[:alnum:]_$]*$/ && !reserved_word?(key)
- end
-
- def reserved_word?(key) #:nodoc:
- RESERVED_WORDS.include?(key.to_s)
- end
- end
- end
end
require 'active_support/json/encoding'
Please sign in to comment.
Something went wrong with that request. Please try again.