diff options
| author | Cheah Chu Yeow <chuyeow@gmail.com> | 2008-05-11 13:50:19 +0800 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-11 19:49:47 +0100 |
| commit | 8f2f88f128104355b100487008800aeb369ca425 (patch) | |
| tree | 9b2e568713d93b6519440bfce634cca4839f3fc9 | |
| parent | 10fdf44236ea9abfd327fc59d83670d4bcb3e0ca (diff) | |
| download | rails-8f2f88f128104355b100487008800aeb369ca425.tar.gz rails-8f2f88f128104355b100487008800aeb369ca425.tar.bz2 rails-8f2f88f128104355b100487008800aeb369ca425.zip | |
Remove unused JSON methods. [#164 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json.rb | 29 |
2 files changed, 2 insertions, 29 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index f72825731e..185aff9088 100644 --- a/activesupport/CHANGELOG +++ b/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] diff --git a/activesupport/lib/active_support/json.rb b/activesupport/lib/active_support/json.rb index 914cf4f8fe..bbda2c9fa3 100644 --- a/activesupport/lib/active_support/json.rb +++ b/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 @@ module ActiveSupport @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' |