summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--lib/ostruct.rb24
-rw-r--r--test/ostruct/test_ostruct.rb17
3 files changed, 34 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 3c2040f..61b0af5 100644
--- a/NEWS
+++ b/NEWS
@@ -118,6 +118,7 @@ with all sufficient information, see the ChangeLog file.
* ostruct
* new methods:
+ * OpenStruct#[], []=
* OpenStruct#each_pair
* OpenStruct#eql?
* OpenStruct#hash
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index 17b3ab0..b291f08 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -176,18 +176,38 @@ class OpenStruct
def method_missing(mid, *args) # :nodoc:
mname = mid.id2name
len = args.length
- if mname.chomp!('=') && mid != :[]=
+ if mname.chomp!('=')
if len != 1
raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
end
modifiable[new_ostruct_member(mname)] = args[0]
- elsif len == 0 && mid != :[]
+ elsif len == 0
@table[mid]
else
raise NoMethodError, "undefined method `#{mid}' for #{self}", caller(1)
end
end
+ # Returns the value of a member.
+ #
+ # person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
+ # person[:age] # => 70, same as ostruct.age
+ #
+ def [](name)
+ @table[name.to_sym]
+ end
+
+ #
+ # Sets the value of a member.
+ #
+ # person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
+ # person[:age] = 42 # => equivalent to ostruct.age = 42
+ # person.age # => 42
+ #
+ def []=(name, value)
+ modifiable[new_ostruct_member(name)] = value
+ end
+
#
# Remove the named field from the object. Returns the value that the field
# contained if it was defined.
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
index 491f950..d82bab9 100644
--- a/test/ostruct/test_ostruct.rb
+++ b/test/ostruct/test_ostruct.rb
@@ -70,14 +70,19 @@ class TC_OpenStruct < Test::Unit::TestCase
assert_equal(a, 'a')
end
- def test_method_missing_handles_square_bracket_equals
- o = OpenStruct.new
- assert_raise(NoMethodError) { o[:foo] = :bar }
+ def test_setter
+ os = OpenStruct.new
+ os[:foo] = :bar
+ assert_equal :bar, os.foo
+ os['foo'] = :baz
+ assert_equal :baz, os.foo
end
- def test_method_missing_handles_square_brackets
- o = OpenStruct.new
- assert_raise(NoMethodError) { o[:foo] }
+ def test_getter
+ os = OpenStruct.new
+ os.foo = :bar
+ assert_equal :bar, os[:foo]
+ assert_equal :bar, os['foo']
end
def test_to_h