More updates to address the Rubinius/C-extensions bug.

Author: jdantonio

lib/concurrent/atomic.rb

@@ -57,19 +57,16 @@
   class Concurrent::Atomic < Concurrent::JavaAtomic
   end
 
-elsif defined? Concurrent::CAtomic
+elsif defined? Concurrent::RbxAtomic
 
-  # @!macro [attach] concurrent_update_error
-  #
-  # This exception may be thrown by methods that have detected concurrent
-  # modification of an object when such modification is not permissible.
-  class Concurrent::Atomic < Concurrent::CAtomic
+  # @!macro atomic_reference
+  class Concurrent::Atomic < Concurrent::RbxAtomic
   end
 
-elsif defined? Concurrent::RbxAtomic
+elsif Concurrent.allow_c_native_class?('CAtomic')
 
   # @!macro atomic_reference
-  class Concurrent::Atomic < Concurrent::RbxAtomic
+  class Concurrent::Atomic < Concurrent::CAtomic
   end
 
 else

lib/concurrent/atomic/atomic_boolean.rb

@@ -162,7 +162,7 @@ def make_false
     class AtomicBoolean < JavaAtomicBoolean
     end
 
-  elsif defined? Concurrent::CAtomicBoolean
+  elsif Concurrent.allow_c_native_class?('CAtomicBoolean')
 
     # @!macro atomic_boolean
     class CAtomicBoolean

lib/concurrent/atomic/atomic_fixnum.rb

@@ -166,7 +166,7 @@ def compare_and_set(expect, update)
     class AtomicFixnum < JavaAtomicFixnum
     end
 
-  elsif defined? Concurrent::CAtomicFixnum
+  elsif Concurrent.allow_c_native_class?('CAtomicFixnum')
 
     # @!macro atomic_fixnum
     class CAtomicFixnum

lib/extension_helper.rb

@@ -7,12 +7,14 @@ def self.allow_c_extensions?
 
   # @!visibility private
   def self.allow_c_native_class?(clazz)
-    allow_c_extensions? && defined?(clazz)
+    allow_c_extensions? && defined?(Kernel.const_get("Concurrent::#{clazz}"))
+  rescue
+    false
   end
 
   # @!visibility private
   def self.safe_require_c_extensions
-    require 'concurrent_ruby_ext'
+    require 'concurrent_ruby_ext' if allow_c_extensions?
   rescue LoadError
     warn 'Attempted to load C extensions on unsupported platform. Continuing with pure-Ruby.'
   end

spec/concurrent/atomic/atomic_boolean_spec.rb

@@ -158,22 +158,28 @@ module Concurrent
     end
   end
 
-  if RUBY_PLATFORM == 'java'
+  if TestHelpers.jruby?
 
     describe JavaAtomicBoolean do
       it_should_behave_like :atomic_boolean
     end
   end
 
   describe AtomicBoolean do
-    if defined? Concurrent::CAtomicBoolean
-      it 'inherits from CAtomicBoolean' do
-        expect(AtomicBoolean.ancestors).to include(CAtomicBoolean)
+    if RUBY_ENGINE != 'ruby'
+      it 'does not load the C extension' do
+        expect(defined?(Concurrent::CAtomicBoolean)).to be_falsey
       end
-    elsif RUBY_PLATFORM == 'java'
+    end
+
+    if TestHelpers.jruby?
       it 'inherits from JavaAtomicBoolean' do
         expect(AtomicBoolean.ancestors).to include(JavaAtomicBoolean)
       end
+    elsif defined? Concurrent::CAtomicBoolean
+      it 'inherits from CAtomicBoolean' do
+        expect(AtomicBoolean.ancestors).to include(CAtomicBoolean)
+      end
     else
       it 'inherits from MutexAtomicBoolean' do
         expect(AtomicBoolean.ancestors).to include(MutexAtomicBoolean)

spec/concurrent/atomic/atomic_fixnum_spec.rb

@@ -172,22 +172,28 @@ module Concurrent
     end
   end
 
-  if RUBY_PLATFORM == 'java'
+  if TestHelpers.jruby?
 
     describe JavaAtomicFixnum do
       it_should_behave_like :atomic_fixnum
     end
   end
 
   describe AtomicFixnum do
-    if defined? Concurrent::CAtomicFixnum
-      it 'inherits from CAtomicFixnum' do
-        expect(AtomicFixnum.ancestors).to include(CAtomicFixnum)
+    if RUBY_ENGINE != 'ruby'
+      it 'does not load the C extension' do
+        expect(defined?(Concurrent::CAtomicFixnum)).to be_falsey
       end
-    elsif RUBY_PLATFORM == 'java'
+    end
+
+    if TestHelpers.jruby?
       it 'inherits from JavaAtomicFixnum' do
         expect(AtomicFixnum.ancestors).to include(JavaAtomicFixnum)
       end
+    elsif defined? Concurrent::CAtomicFixnum
+      it 'inherits from CAtomicFixnum' do
+        expect(AtomicFixnum.ancestors).to include(CAtomicFixnum)
+      end
     else
       it 'inherits from MutexAtomicFixnum' do
         expect(AtomicFixnum.ancestors).to include(MutexAtomicFixnum)

spec/concurrent/atomic_spec.rb

@@ -152,14 +152,14 @@ module Concurrent
   end
 
   describe Atomic do
-    if TestHelpers.use_c_extensions?
-      it 'inherits from CAtomic' do
-        expect(Atomic.ancestors).to include(CAtomic)
-      end
-    elsif TestHelpers.jruby?
+    if TestHelpers.jruby?
       it 'inherits from JavaAtomic' do
         expect(Atomic.ancestors).to include(JavaAtomic)
       end
+    elsif TestHelpers.use_c_extensions?
+      it 'inherits from CAtomic' do
+        expect(Atomic.ancestors).to include(CAtomic)
+      end
     elsif TestHelpers.rbx?
       it 'inherits from RbxAtomic' do
         expect(Atomic.ancestors).to include(RbxAtomic)

spec/support/example_group_extensions.rb

@@ -12,15 +12,15 @@ def delta(v1, v2)
     end
 
     def mri?
-      RbConfig::CONFIG['ruby_install_name']=~ /^ruby$/i
+      RUBY_ENGINE == 'ruby'
     end
 
     def jruby?
-      RbConfig::CONFIG['ruby_install_name']=~ /^jruby$/i
+      RUBY_ENGINE == 'jruby'
     end
 
     def rbx?
-      RbConfig::CONFIG['ruby_install_name']=~ /^rbx$/i
+      RUBY_ENGINE == 'rbx'
     end
 
     def use_c_extensions?