diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/ostruct.rb | 7 | ||||
| -rw-r--r-- | test/ostruct/test_ostruct.rb | 17 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 35 insertions, 2 deletions
@@ -1,3 +1,14 @@ +Tue Mar 29 18:49:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/ostruct.rb (freeze): define deferred accessors before + freezing to get rid of an error when just reading frozen + OpenStruct. + +Tue Mar 29 18:49:54 2016 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/ostruct.rb: Fix new_ostruct_member to correctly avoid + redefinition [#11901] + Tue Mar 29 17:54:17 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/ostruct.rb (OpenStruct): make respond_to? working on 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 diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb index 8b0424d2d8..02c4c74152 100644 --- a/test/ostruct/test_ostruct.rb +++ b/test/ostruct/test_ostruct.rb @@ -164,4 +164,21 @@ class TC_OpenStruct < Test::Unit::TestCase e = assert_raise(ArgumentError) { os.send :foo=, true, true } assert_match(/#{__callee__}/, e.backtrace[0]) end + + def test_accessor_defines_method + os = OpenStruct.new(foo: 42) + assert os.respond_to? :foo + assert_equal([], os.singleton_methods) + assert_equal(42, os.foo) + assert_equal([:foo, :foo=], os.singleton_methods) + end + + def test_does_not_redefine + os = OpenStruct.new(foo: 42) + def os.foo + 43 + end + os.foo = 44 + assert_equal(43, os.foo) + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 44 +#define RUBY_PATCHLEVEL 45 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |