ostruct.rb: fix NameError

* lib/ostruct.rb (delete_field): do not raise NameError for
  existing keys.  [Fix GH-1033]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index eeea22042c..a48ae9af05 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -220,8 +220,13 @@ class OpenStruct
   #
   def delete_field(name)
     sym = name.to_sym
-    singleton_class.__send__(:remove_method, sym, "#{sym}=")
-    @table.delete sym
+    begin
+      singleton_class.__send__(:remove_method, sym, "#{sym}=")
+    rescue NameError
+    end
+    @table.delete(sym) do
+      raise NameError.new("no field `#{sym}' in #{self}", sym)
+    end
   end
 
   InspectKey = :__inspect_key__ # :nodoc: