diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-08 16:13:26 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-08 16:13:26 +0000 |
commit | 35232b26bb0ebb3bdbe3d1198c8b2fa02ea8b08c (patch) | |
tree | 53a2c60e61c289122ab5dd9047606c5e56d8dd01 | |
parent | fdcbfdc47088050b77c0d0568b7de538d16d481e (diff) |
Openstruct fix, and fix to test_file_exhaustive.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/ostruct.rb | 25 | ||||
-rw-r--r-- | test/ostruct/test_ostruct.rb | 29 | ||||
-rw-r--r-- | test/ruby/test_file_exhaustive.rb | 4 | ||||
-rw-r--r-- | version.h | 10 |
5 files changed, 57 insertions, 17 deletions
@@ -1,3 +1,9 @@ +Fri Aug 28 12:54:00 2009 Kirk Haines <khaines@ruby-lang.org> + + * Backport #1524 [ruby-core:23567]; lib/ostrct.rb (OpenStruct@new_ostruct_member): check if it's; also a little code cleanup to do a few things more efficiently. Tests adjusted accordingly. + + * test/ruby/test_file_exhaustive.rb: Fixed a mistake in the monkey patched String#start_with? method required by the test suite. + Tue Aug 25 11:48:00 2009 Kirk Haines <khaines@ruby-lang.org> * Backport #1168; Wrong result of File.extname for a path that contains a space before the extension. diff --git a/lib/ostruct.rb b/lib/ostruct.rb index ba7f061a22..45ebb8083e 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -67,28 +67,33 @@ class OpenStruct @table.each_key{|key| new_ostruct_member(key)} end + def modifiable + if self.frozen? + raise TypeError, "can't modify frozen #{self.class}", caller(2) + end + @table + end + protected :modifiable + def new_ostruct_member(name) name = name.to_sym unless self.respond_to?(name) - meta = class << self; self; end - meta.send(:define_method, name) { @table[name] } - meta.send(:define_method, :"#{name}=") { |x| @table[name] = x } + class << self; self; end.class_eval do + define_method(name) { @table[name] } + define_method("#{name}=") { |x| modifiable[name] = x } + end end + name end def method_missing(mid, *args) # :nodoc: mname = mid.id2name len = args.length - if mname =~ /=$/ + if mname.chomp!('=') if len != 1 raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1) end - if self.frozen? - raise TypeError, "can't modify frozen #{self.class}", caller(1) - end - mname.chop! - self.new_ostruct_member(mname) - @table[mname.intern] = args[0] + modifiable[new_ostruct_member(mname)] = args[0] elsif len == 0 @table[mid] else diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb index ef83db5d15..4d56102462 100644 --- a/test/ostruct/test_ostruct.rb +++ b/test/ostruct/test_ostruct.rb @@ -2,6 +2,21 @@ require 'test/unit' require 'ostruct' class TC_OpenStruct < Test::Unit::TestCase + def assert_not_respond_to(object, method, message="") + _wrap_assertion do + full_message = build_message(message, <<EOT, object, object.class, method) +<?> +of type <?> +expected not to respond_to\\?<?>. +EOT + _wrap_assertion do + if object.respond_to?(method) + raise Test::Unit::AssertionFailedError, full_message, caller(5) + end + end + end + end + def test_equality o1 = OpenStruct.new o2 = OpenStruct.new @@ -23,9 +38,23 @@ class TC_OpenStruct < Test::Unit::TestCase def test_inspect foo = OpenStruct.new + assert_equal("#<OpenStruct>", foo.inspect) + foo.bar = 1 + foo.baz = 2 + assert_equal("#<OpenStruct bar=1, baz=2>", foo.inspect) + + foo = OpenStruct.new foo.bar = OpenStruct.new assert_equal('#<OpenStruct bar=#<OpenStruct>>', foo.inspect) foo.bar.foo = foo assert_equal('#<OpenStruct bar=#<OpenStruct foo=#<OpenStruct ...>>>', foo.inspect) end + + def test_frozen + o = OpenStruct.new + o.a = 'a' + o.freeze + assert_raise(TypeError) {o.b = 'b'} + assert_not_respond_to(o, :b) + end end diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index aac0329713..75a7d779b0 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -3,8 +3,8 @@ require "fileutils" require "tmpdir" class String - def start_with(prefix) - self =~ /^#{prefix}/ + def start_with?(prefix) + self[0..(prefix.length - 1)] == prefix end end @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-08-26" +#define RUBY_RELEASE_DATE "2009-09-08" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090826 -#define RUBY_PATCHLEVEL 387 +#define RUBY_RELEASE_CODE 20090908 +#define RUBY_PATCHLEVEL 388 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 -#define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_MONTH 9 +#define RUBY_RELEASE_DAY 8 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |