summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-05 01:57:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-05 01:57:26 +0000
commit10ce99866f4c335e8015b462bc1c0c2278aa8a74 (patch)
treef7f49610a5903308df571c71da8132d0f4dc9c67 /lib
parent530f543e4601b3a49607d666c4285f8b2e7fe09b (diff)
ostruct.rb: append suffixes to protected methods
* lib/ostruct.rb (modifiable?, new_ostruct_member!, table!): append suffixes to protected methods so that they will not clash with assigned members. [Fix GH-806] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/ostruct.rb28
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index f51eb7b..9e2761d 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -90,7 +90,7 @@ class OpenStruct
hash.each_pair do |k, v|
k = k.to_sym
@table[k] = v
- new_ostruct_member(k)
+ new_ostruct_member!(k)
end
end
end
@@ -99,7 +99,7 @@ class OpenStruct
def initialize_copy(orig)
super
@table = @table.dup
- @table.each_key{|key| new_ostruct_member(key)}
+ @table.each_key{|key| new_ostruct_member!(key)}
end
#
@@ -141,14 +141,14 @@ class OpenStruct
#
def marshal_load(x)
@table = x
- @table.each_key{|key| new_ostruct_member(key)}
+ @table.each_key{|key| new_ostruct_member!(key)}
end
#
# Used internally to check if the OpenStruct is able to be
# modified before granting access to the internal Hash table to be modified.
#
- def modifiable
+ def modifiable?
begin
@modifiable = true
rescue
@@ -156,22 +156,22 @@ class OpenStruct
end
@table
end
- protected :modifiable
+ protected :modifiable?
#
# Used internally to defined properties on the
# OpenStruct. It does this by using the metaprogramming function
# define_singleton_method for both the getter method and the setter method.
#
- def new_ostruct_member(name)
+ def new_ostruct_member!(name)
name = name.to_sym
unless respond_to?(name)
define_singleton_method(name) { @table[name] }
- define_singleton_method("#{name}=") { |x| modifiable[name] = x }
+ define_singleton_method("#{name}=") { |x| modifiable?[name] = x }
end
name
end
- protected :new_ostruct_member
+ protected :new_ostruct_member!
def method_missing(mid, *args) # :nodoc:
mname = mid.id2name
@@ -180,7 +180,7 @@ class OpenStruct
if len != 1
raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
end
- modifiable[new_ostruct_member(mname)] = args[0]
+ modifiable?[new_ostruct_member!(mname)] = args[0]
elsif len == 0
@table[mid]
else
@@ -207,7 +207,7 @@ class OpenStruct
# person.age # => 42
#
def []=(name, value)
- modifiable[new_ostruct_member(name)] = value
+ modifiable?[new_ostruct_member!(name)] = value
end
#
@@ -255,7 +255,9 @@ class OpenStruct
alias :to_s :inspect
attr_reader :table # :nodoc:
- protected :table
+ alias table! table
+ undef table
+ protected :table!
#
# Compares this object and +other+ for equality. An OpenStruct is equal to
@@ -264,7 +266,7 @@ class OpenStruct
#
def ==(other)
return false unless other.kind_of?(OpenStruct)
- @table == other.table
+ @table == other.table!
end
#
@@ -274,7 +276,7 @@ class OpenStruct
#
def eql?(other)
return false unless other.kind_of?(OpenStruct)
- @table.eql?(other.table)
+ @table.eql?(other.table!)
end
# Compute a hash-code for this OpenStruct.