diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 4 | ||||
| -rw-r--r-- | activesupport/MIT-LICENSE | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/deprecation.rb | 13 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json.rb | 29 | ||||
| -rw-r--r-- | activesupport/lib/active_support/version.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/deprecation_test.rb | 10 |
7 files changed, 6 insertions, 56 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index f72825731e..e8821060f9 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,4 +1,6 @@ -*SVN* +*2.1.0 RC1 (May 11th, 2008)* + +* 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] diff --git a/activesupport/MIT-LICENSE b/activesupport/MIT-LICENSE index dbe78035ba..2ba4e17035 100644 --- a/activesupport/MIT-LICENSE +++ b/activesupport/MIT-LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2005-2007 David Heinemeier Hansson +Copyright (c) 2005-2008 David Heinemeier Hansson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb index 371d074d34..8724a492bf 100644 --- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb +++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb @@ -128,7 +128,7 @@ class Class # :nodoc: new_inheritable_attributes = EMPTY_INHERITABLE_ATTRIBUTES else new_inheritable_attributes = inheritable_attributes.inject({}) do |memo, (key, value)| - memo.update(key => (value.dup rescue value)) + memo.update(key => value.duplicable? ? value.dup : value) end end diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index 7613652c71..6aa379b550 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -176,19 +176,6 @@ module ActiveSupport end end - class DeprecatedInstanceVariable < Delegator #:nodoc: - def initialize(value, method) - super(value) - @method = method - @value = value - end - - def __getobj__ - ActiveSupport::Deprecation.warn("Instance variable @#{@method} is deprecated! Call instance method #{@method} instead.") - @value - end - end - end end 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' diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index 83fbaec62c..f3d141cf72 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -2,7 +2,7 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 2 MINOR = 0 - TINY = 2 + TINY = 991 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb index 11357e250f..ebfa405947 100644 --- a/activesupport/test/deprecation_test.rb +++ b/activesupport/test/deprecation_test.rb @@ -149,13 +149,3 @@ class DeprecationTest < Test::Unit::TestCase assert_nil @last_message end end - -class DeprecatedIvarTest < Test::Unit::TestCase - - def test_deprecated_ivar - @action = ActiveSupport::Deprecation::DeprecatedInstanceVariable.new("fubar", :foobar) - - assert_deprecated(/Instance variable @foobar is deprecated! Call instance method foobar instead/) { assert_equal "fubar", @action } - end - -end |