expressir 2.4.28 → 2.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45dd9d5d13614ca549340d534defb9a674a5fca35a9f3b16f5ef345b73e263eb
-  data.tar.gz: f5a14e8e4cb49ebebe7823d9015de7296459735b3f8ea06edc3494e072b0877f
+  metadata.gz: b184252cfd74dc73c8b656d0845145da64c9b895d24228f5478b35dad5b0b257
+  data.tar.gz: 100a50bd158b0ef4884171572f01e266edb334baf253e463b47ff6c8fe579321
 SHA512:
-  metadata.gz: d46d905d2f0ca978c614cba3574a398fa38809f38296930115905b9e97cf1e223e8b0882c1c7431e026dc97015579f7e820f067173da4645ede0be33a00c6842
-  data.tar.gz: bc103128faa28cbaafdb27a61117431c9b17d77913b4dcc038db64638b815f19be7e90c4366ca45ef378196f360445296244cd40c435997038280d776de94dd1
+  metadata.gz: fb99828d597bd207b51619f71ef1085ace7da40950d43573df25b704f1afb3381d444dbbff85f516a16161eb783b769640cd5c16d273543866118e755f268325
+  data.tar.gz: 4ae05fe7e5dec49cdb04027545f62fe3fb25f240ed430eb6eff8e18bc612d3bb76cfbbe0a044d80395089c5535ed3d323a87b2f97c94fd801830dfe3cabf13da

data/.github/scripts/test_installed_gem.rb

@@ -26,4 +26,9 @@ sc = Expressir::Express::Parser.from_exp(src).schemas.first.subtype_constraints.
 abort "FAIL: subtype constraint ABSTRACT body (#462)" unless sc&.abstract == true
 puts "#462 form: ok"
 
+# The platform gems force-build the Rust compiled-set writer; a leg that
+# shipped a non-loadable expressir_core would otherwise pass this smoke.
+abort "FAIL: core_set_available is false" unless Expressir::Express::Parser.core_set_available?
+puts "compiled-set core: ok"
+
 puts "SMOKE OK"

data/.github/workflows/native-gems.yml

@@ -52,12 +52,14 @@ jobs:
           EXPRESSIR_CORE_FORCE: "1"
         with:
           platform: ${{ matrix.ruby-platform }}
-          # Dock images provision cross rubies for 3.2-3.4 only; a 4.0
-          # leg silently falls back to the dock's host toolchain and
-          # fails linking (or worse, links against the wrong ruby).
-          # Ruby 4.0 users on these platforms get the pure-Ruby parser
-          # fallback until the images ship 4.0 cross rubies.
-          ruby-versions: "3.2,3.3,3.4"
+          # Must include the dock image's HOST ruby (4.0): when the
+          # running ruby is absent from this list, rake-compiler adds an
+          # extra leg for it built from the host toolchain's RbConfig,
+          # and rb-sys correctly refuses to generate bindings against a
+          # different target_os. Current rb-sys-dock images ship cross
+          # rubies for 3.2-4.0 (parsanol-ruby's identical cross-gem
+          # setup builds a working x86_64-mingw-ucrt ruby-4.0.2 leg).
+          ruby-versions: "3.2,3.3,3.4,4.0"
 
       - uses: actions/upload-artifact@v4
         with:

data/expressir.gemspec

@@ -24,6 +24,11 @@ Gem::Specification.new do |spec|
   spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  # Source gem builds on the ruby platform; declaring it keeps
+  # rake-compiler's `gem` task from rebuilding the extension for the
+  # host ruby during cross builds (rb-sys then sees a windows
+  # CARGO_BUILD_TARGET with linux headers and refuses).
+  spec.platform = Gem::Platform::RUBY
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|

data/lib/expressir/express/core.rb

@@ -13,10 +13,21 @@ module Expressir
         true
       rescue LoadError
         begin
-          require_relative "../../../ext/expressir_core/expressir_core"
+          # Platform gems carry the fat-binary layout
+          # (lib/expressir/<major.minor>/expressir_core.so); rubygems
+          # does not resolve versioned dirs under a nested require path,
+          # so the version segment is explicit - same contract as
+          # parsanol's loader.
+          ruby_version = RUBY_VERSION.split(".").take(2).join(".")
+          require "expressir/#{ruby_version}/expressir_core"
           true
         rescue LoadError
-          false
+          begin
+            require_relative "../../../ext/expressir_core/expressir_core"
+            true
+          rescue LoadError
+            false
+          end
         end
       end
 

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.28".freeze
+    VERSION = "2.4.29".freeze
   end
 end

data/rakelib/native.rake

@@ -7,43 +7,16 @@
 # artifact in lib/expressir/, which core.rb's first require finds.
 begin
   require "rb_sys/extensiontask"
-  require "rb_sys/toolchain_info"
 
   gemspec = Gem::Specification.load("expressir.gemspec")
 
   RbSys::ExtensionTask.new("expressir_core", gemspec) do |ext|
     ext.lib_dir = "lib/expressir"
-
-    ext.cross_compiling do |spec|
-      next if spec.platform == Gem::Platform::RUBY
-
-      plat = spec.platform.to_s
-      triple = begin
-        RbSys::ToolchainInfo::DATA.fetch(plat).fetch("rust-target")
-      rescue KeyError
-        { "arm-linux-musl" => "arm-unknown-linux-musleabihf" }.fetch(plat)
-      end
-
-      # rb-sys's cargo build already ran for the cross target; stage the
-      # artifact from the tree (rake-compiler stages callback-added files).
-      # rb_sys uses a per-package target dir unless the crate is a
-      # workspace member (then the root target/ holds artifacts) — glob
-      # both layouts.
-      art = Dir["target/#{triple}/release/expressir_core.{so,dylib,dll}",
-                "target/#{triple}/release/libexpressir_core.{so,dylib}",
-                "ext/expressir_core/target/#{triple}/release/expressir_core.{so,dylib,dll}",
-                "ext/expressir_core/target/#{triple}/release/libexpressir_core.{so,dylib}"].first
-      raise "binding artifact not found for #{plat} (#{triple})" unless art
-
-      # core.rb requires "expressir/expressir_core", so the staged file
-      # must sit at the canonical Ruby extension path/name — cargo's
-      # lib- prefixed or .dll/.dylib-suffixed names are renamed to
-      # expressir_core.so (Ruby's require accepts .so on every target:
-      # DLEXT on linux/windows, DLEXT2 on darwin).
-      dest = "lib/expressir/expressir_core.so"
-      cp art, dest
-      spec.files << dest
-    end
+    # rb-sys stages the cross-built artifact itself; a manual cp into
+    # lib_dir here would claim the file rake-compiler's own
+    # copy:expressir_core:<host-platform> task owns, and the cross gem's
+    # dependency chain would then force a host-ruby build (rb-sys
+    # refuses windows bindings from linux headers).
   end
 rescue LoadError
   # rake-compiler/rb_sys not installed (consumer checkouts); the native

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.28
+  version: 2.4.29
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-30 00:00:00.000000000 Z
+date: 2026-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys