Skip to content

Commit

Permalink
* lib/ostruct.rb: Add [] and []=, base on a patch by Thomas Sawyer
Browse files Browse the repository at this point in the history
[ruby-core:42779] [Feature #6056]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
marcandre committed Oct 28, 2012
1 parent 3785d26 commit e44e356
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 8 deletions.
1 change: 1 addition & 0 deletions NEWS
Expand Up @@ -118,6 +118,7 @@ with all sufficient information, see the ChangeLog file.

* ostruct
* new methods:
* OpenStruct#[], []=
* OpenStruct#each_pair
* OpenStruct#eql?
* OpenStruct#hash
Expand Down
24 changes: 22 additions & 2 deletions lib/ostruct.rb
Expand Up @@ -176,18 +176,38 @@ def new_ostruct_member(name)
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.
Expand Down
17 changes: 11 additions & 6 deletions test/ostruct/test_ostruct.rb
Expand Up @@ -70,14 +70,19 @@ def test_delete_field
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
Expand Down

0 comments on commit e44e356

Please sign in to comment.