[ruby/ostruct] Fix class and method as attribute names

https://github.com/ruby/ostruct/commit/7258535073

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index 4dccfc4c63..2b739beed7 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -246,7 +246,7 @@ class OpenStruct
       if owner.class == ::Class
         owner < ::OpenStruct
       else
-        self.class.ancestors.any? do |mod|
+        self.class!.ancestors.any? do |mod|
           return false if mod == ::OpenStruct
           mod == owner
         end
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
index 6487cc831c..256db7a0c7 100644
--- a/test/ostruct/test_ostruct.rb
+++ b/test/ostruct/test_ostruct.rb
@@ -406,4 +406,10 @@ class TC_OpenStruct < Test::Unit::TestCase
     o2 = Marshal.load(Marshal.dump(o))
     assert_equal o, o2
   end
+
+  def test_class
+    os = OpenStruct.new(class: 'my-class', method: 'post')
+    assert_equal('my-class', os.class)
+    assert_equal(OpenStruct, os.class!)
+  end
 end