breaker_machines 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5137f3692641c76411b86e725df03e901220a09d18a9bc1ba64fc1834d93b811
-  data.tar.gz: f5f0c05289c82dfe6aa1fe23322a531fbfd9faa1b8e9f29575eb5c801aacf712
+  metadata.gz: 922f6ca105785c7276dc4bb80bb8e6d093b671f96cf8239ce570e8e98a6b9b25
+  data.tar.gz: 423412d5402092df0358418360718847cf7ef8f7d50676537719f629c5a25889
 SHA512:
-  metadata.gz: 1150d77d3823b038277fb4bd7ee2c28bb39ea0307fefe227f2346c220ceb961f89349bfadc0d8b7bbcea01d7c0bd319ad96177c2de0eb24b6df82f57ee8001f6
-  data.tar.gz: 3673de4be4d9784ea7135da34e0d02aae91c4b2f8a0c04bc3e058cb01e7f250feb9e6526c4f638d555cc7a3e35a4d3ffb75ffcd770db867442e234ecf43f58a7
+  metadata.gz: dffbafc7ce58e54b5250624afd09fb208d8af9aaca253edb5a8278463da824f7bc2ea195ec643e34ccf91a95ff40a113130fb379b66658c1d903b8d60d587c68
+  data.tar.gz: 5287c44c22803c61d1e090ba4c631a30560e925e45c1b56ac4d222961898a396bc9535273e8aa9c65b466d0211ae767549dee6c76baacfff2d9bfc22fe598bc0

data/ext/breaker_machines_native/ffi/extconf.rb

@@ -27,9 +27,7 @@ def create_noop_makefile(message)
   exit 0
 end
 
-unless cargo_available?
-  create_noop_makefile('Skipping native extension (Cargo not found)')
-end
+create_noop_makefile('Skipping native extension (Cargo not found)') unless cargo_available?
 
 # Use rb_sys to compile the Rust extension
 require 'mkmf'
@@ -55,7 +53,7 @@ begin
   if File.exist?(makefile_path)
     manifest_path = File.expand_path(__dir__)
     contents = File.read(makefile_path)
-    contents.gsub!(%r{^RB_SYS_CARGO_MANIFEST_DIR \?=.*$}, "RB_SYS_CARGO_MANIFEST_DIR ?= #{manifest_path}")
+    contents.gsub!(/^RB_SYS_CARGO_MANIFEST_DIR \?=.*$/, "RB_SYS_CARGO_MANIFEST_DIR ?= #{manifest_path}")
     File.write(makefile_path, contents)
   end
 rescue LoadError => e

data/lib/breaker_machines/native_extension.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'rbconfig'
+require 'active_support/core_ext/object/blank'
+
 module BreakerMachines
   # Handles loading and status of the optional native extension
   module NativeExtension
@@ -17,18 +20,23 @@ module BreakerMachines
           return false
         end
 
-        @loaded = true
-        require 'breaker_machines_native/breaker_machines_native'
-        BreakerMachines.instance_variable_set(:@native_available, true)
-        BreakerMachines.log(:info, 'Native extension loaded successfully')
-        true
-      rescue LoadError => e
+        errors = []
+
+        native_library_candidates.each do |require_path|
+          try_require(require_path)
+          @loaded = true
+          BreakerMachines.instance_variable_set(:@native_available, true)
+          BreakerMachines.log(:info, "Native extension loaded successfully (#{require_path})")
+          return true
+        rescue LoadError => e
+          errors << "#{require_path}: #{e.message}"
+        end
+
         @loaded = false
         BreakerMachines.instance_variable_set(:@native_available, false)
 
-        # Only log if it's not JRuby (expected failure) and logging is enabled
         if RUBY_ENGINE != 'jruby'
-          BreakerMachines.log(:warn, "Native extension not available: #{e.message}")
+          BreakerMachines.log(:warn, "Native extension not available: #{errors.join(' | ')}") unless errors.empty?
           BreakerMachines.log(:warn, 'Using pure Ruby backend (slower but functional)')
         end
 
@@ -39,6 +47,40 @@ module BreakerMachines
       def loaded?
         defined?(@loaded) && @loaded
       end
+
+      private
+
+      def native_library_candidates
+        dlext = RbConfig::CONFIG['DLEXT']
+        base_dir = File.expand_path('../breaker_machines_native', __dir__)
+        ruby_version = RbConfig::CONFIG['ruby_version']
+        arch = RbConfig::CONFIG['arch']
+        platform = Gem::Platform.local.to_s
+
+        matches = Dir.glob(File.join(base_dir, '**', "breaker_machines_native.#{dlext}"))
+
+        prioritized = matches.sort_by do |path|
+          score = 0
+          score -= 3 if path.include?(ruby_version)
+          score -= 2 if path.include?(arch)
+          score -= 1 if path.include?(platform)
+          [score, path]
+        end
+
+        candidates = prioritized.map { |full_path| require_path_for(full_path, dlext) }.presence
+        candidates ||= ['breaker_machines_native/breaker_machines_native']
+        candidates.uniq
+      end
+
+      def require_path_for(full_path, dlext)
+        root = File.expand_path('..', __dir__)
+        relative = full_path.sub(%r{^#{Regexp.escape(root)}/?}, '')
+        relative.sub(/\.#{Regexp.escape(dlext)}\z/, '')
+      end
+
+      def try_require(require_path)
+        require require_path
+      end
     end
   end
 end

data/lib/breaker_machines/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BreakerMachines
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breaker_machines
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -52,47 +52,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: state_machines
+  name: rb_sys
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.100.4
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.100.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: state_machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.100.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.100.4
 - !ruby/object:Gem::Dependency
-  name: rb_sys
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement