Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix issue with #class_inheritable_accessor saving updates to the pare…

…nt class when initialized with an Array or Hash [mojombo]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5218 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 928c84b65b6d34ca9cbfd698c1c01f8517d54ee1 1 parent 297ac55
@technoweenie technoweenie authored
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix issue with #class_inheritable_accessor saving updates to the parent class when initialized with an Array or Hash [mojombo]
+
* Hash#to_xml supports Bignum and BigDecimal. #6313 [edibiase]
* Don't undefine #class in OptionMerger [Rick]
View
7 activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -107,7 +107,12 @@ def reset_inheritable_attributes
private
def inherited_with_inheritable_attributes(child)
inherited_without_inheritable_attributes(child) if respond_to?(:inherited_without_inheritable_attributes)
- child.instance_variable_set('@inheritable_attributes', inheritable_attributes.dup)
+
+ new_inheritable_attributes = inheritable_attributes.inject({}) do |memo, (key, value)|
+ memo.update(key => (value.dup rescue value))
+ end
+
+ child.instance_variable_set('@inheritable_attributes', new_inheritable_attributes)
end
alias inherited_without_inheritable_attributes inherited
View
30 activesupport/test/class_inheritable_attributes_test.rb
@@ -137,4 +137,34 @@ def test_inheritance
assert_equal 'b', @klass.b
assert_equal 'B', @sub.b
end
+
+ def test_array_inheritance
+ @klass.class_inheritable_accessor :a
+ @klass.a = []
+
+ @sub = eval("class SubbyArray < @klass; end; SubbyArray")
+
+ assert_equal [], @klass.a
+ assert_equal [], @sub.a
+
+ @sub.a << :first
+
+ assert_equal [:first], @sub.a
+ assert_equal [], @klass.a
+ end
+
+ def test_array_inheritance
+ @klass.class_inheritable_accessor :a
+ @klass.a = {}
+
+ @sub = eval("class SubbyHash < @klass; end; SubbyHash")
+
+ assert_equal Hash.new, @klass.a
+ assert_equal Hash.new, @sub.a
+
+ @sub.a[:first] = :first
+
+ assert_equal 1, @sub.a.keys.size
+ assert_equal 0, @klass.a.keys.size
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.