diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 09:52:51 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 09:52:51 +0000 |
| commit | 4f85a89a9f661be2ed8b481991fa14f7253bb0af (patch) | |
| tree | 13ec87ccdd789adc20036ea3e7cf75de18423958 /lib | |
| parent | 4c1ac0bc07eb7ae03684761351953418ad5deb1b (diff) | |
merge revision(s) 53395,53396: [Backport #11901]
* lib/ostruct.rb: Fix new_ostruct_member to correctly avoid
redefinition [#11901]
* lib/ostruct.rb (freeze): define deferred accessors before
freezing to get rid of an error when just reading frozen
OpenStruct.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ostruct.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ostruct.rb b/lib/ostruct.rb index e7b8ed4609..17efcdc8d3 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -168,7 +168,7 @@ class OpenStruct # def new_ostruct_member(name) name = name.to_sym - unless respond_to?(name) + unless singleton_class.method_defined?(name) define_singleton_method(name) { @table[name] } define_singleton_method("#{name}=") { |x| modifiable[name] = x } end @@ -176,6 +176,11 @@ class OpenStruct end protected :new_ostruct_member + def freeze + @table.each_key {|key| new_ostruct_member(key)} + super + end + def respond_to_missing?(mid, include_private = false) mname = mid.to_s.chomp("=").to_sym @table.key?(mname) || super |