Merge pull request #776 from Slike9/fix-struct-with-class-name-definition

Fix NameError on defining a struct with a name

Author: pitr-ch

lib/concurrent/synchronization/abstract_struct.rb

@@ -138,7 +138,7 @@ def ns_initialize(*values)
         end
         unless name.nil?
           begin
-            parent.send :remove_const, name if parent.const_defined? name
+            parent.send :remove_const, name if parent.const_defined?(name, false)
             parent.const_set(name, clazz)
             clazz
           rescue NameError

spec/concurrent/struct_shared.rb

@@ -10,6 +10,15 @@
       expect(clazz.ancestors).to include described_class
     end
 
+    it 'registers the class when given a class name which is defined in the ancestors' do
+      class_name = 'ValidClassName2'
+      Object.const_set(class_name, class_name)
+      clazz = described_class.new(class_name)
+      expect{ described_class.const_get(class_name) }.to_not raise_error
+      expect(clazz).to be_a Class
+      expect(clazz.ancestors).to include described_class
+    end
+
     it 'creates an anonymous class when given at least one member' do
       clazz = described_class.new(:foo)
       expect{ described_class.const_get(clazz.to_s) }.to raise_error(NameError)