expressir 2.4.29 → 2.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b184252cfd74dc73c8b656d0845145da64c9b895d24228f5478b35dad5b0b257
-  data.tar.gz: 100a50bd158b0ef4884171572f01e266edb334baf253e463b47ff6c8fe579321
+  metadata.gz: 061350f84465e77142b15dc708e0773f77626084711b2ae46e859775d0c07c5d
+  data.tar.gz: 41101569510c6b020847410ab0bc83cf403163d04b78743bfc8085ca863b80f3
 SHA512:
-  metadata.gz: fb99828d597bd207b51619f71ef1085ace7da40950d43573df25b704f1afb3381d444dbbff85f516a16161eb783b769640cd5c16d273543866118e755f268325
-  data.tar.gz: 4ae05fe7e5dec49cdb04027545f62fe3fb25f240ed430eb6eff8e18bc612d3bb76cfbbe0a044d80395089c5535ed3d323a87b2f97c94fd801830dfe3cabf13da
+  metadata.gz: 739f6f3d5ea7d153b0e701204d1390710e1ec99bd3602a3d934df28aa6d8f6df407f8a1d83e799f8ba5f93b65bdffa891f1b6abba1965da955ef8f782deae39e
+  data.tar.gz: 87c334b0480296cc1b6f8161c0b91fbb9b2d5641d537f6e4f129eb0780fab9361254ff6708e20ecc186342a1ee2c3b0877f82d2debde038740952ec8bc938603

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

@@ -172,19 +172,33 @@ jobs:
   release:
     name: Release gems to rubygems
     needs: [native, smoke-linux, smoke-linux-arm, smoke-macos-arm, smoke-macos-intel, smoke-windows, source]
-    if: startsWith(github.ref, 'refs/tags/v')
+    # workflow_dispatch lets a fix publish the already-tagged version when
+    # the tag's own run failed after the builds (reruns reuse the tag's
+    # workflow copy, so fixes cannot reach them any other way).
+    if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-22.04
-    environment: release
+    # No environment: the rubygems.org trusted publisher for native-gems.yml
+    # is registered without one; an environment claim would fail the match.
+    permissions:
+      id-token: write
     steps:
       - uses: actions/download-artifact@v4
         with:
           path: pkg/
           pattern: cross-gem-*
           merge-multiple: true
+      - uses: actions/download-artifact@v4
+        with:
+          path: pkg/
+          name: source-gem
+      # OIDC trusted publishing - the repo has no rubygems API-key secret;
+      # release.yml publishes through the same exchange.
+      - uses: rubygems/configure-rubygems-credentials@v2.1.0
       - name: Push to rubygems
-        env:
-          GEM_HOST_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
         run: |
           for gem in pkg/expressir-*.gem; do
-            gem push "$gem"
+            # Idempotent: a gem already on rubygems (e.g. the source gem
+            # shipped by release.yml ahead of the platform run) is a skip,
+            # not a failure.
+            gem push "$gem" || echo "::warning::$(basename "$gem") already published or rejected; continuing"
           done

data/expressir.gemspec

@@ -42,18 +42,18 @@ Gem::Specification.new do |spec|
   spec.extensions = ["ext/expressir_core/extconf.rb"]
   spec.add_dependency "rb_sys", "~> 0.9.130"
 
-  spec.add_dependency "base64"
+  spec.add_dependency "base64", ">= 0.1.0"
   spec.add_dependency "benchmark"
   spec.add_dependency "benchmark-ips"
   spec.add_dependency "csv"
-  spec.add_dependency "liquid"
+  spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "lutaml-model", "~> 0.8.76"
   spec.add_dependency "moxml"
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "~> 1.19"
   spec.add_dependency "paint"
-  spec.add_dependency "parsanol", "~> 1.3.9", ">= 1.3.9"
+  spec.add_dependency "parsanol", "~> 1.3.9", ">= 1.3.89"
   spec.add_dependency "ruby-progressbar", "~> 1.11"
-  spec.add_dependency "rubyzip"
+  spec.add_dependency "rubyzip", "~> 3.7"
   spec.add_dependency "table_tennis"
   spec.add_dependency "thor", "~> 1.0"
   # Native YAML/JSON engine (lutaml-model opt-in by bundle contents)

data/lib/expressir/commands/parity_inputs.rb

@@ -113,7 +113,12 @@ module Expressir
       # Nearest ancestor directory NAMED `schemas`, or nil.
       def ancestor_schemas_dir(root_path)
         dir = File.dirname(File.expand_path(root_path))
-        until dir == "/"
+        # dirname reaches a fixed point at the filesystem root: "/" on
+        # POSIX, "D:/" (or a UNC root) on windows. Comparing against "/"
+        # alone spun forever on windows - every rake run since this
+        # shipped (e0f6651, 2026-09-24) burned the full 6h runner
+        # budget in the first expand example (#487).
+        until dir == "/" || dir == File.dirname(dir)
           return dir if File.basename(dir) == "schemas"
 
           dir = File.dirname(dir)

data/lib/expressir/commands.rb

@@ -21,7 +21,7 @@ module Expressir
     autoload :Changes, "#{__dir__}/commands/changes"
     autoload :ChangesValidate, "#{__dir__}/commands/changes_validate"
     autoload :ChangesImportEengine, "#{__dir__}/commands/changes_import_eengine"
-    autoload :Version, "#{__dir__}/commands/version"
+    autoload :Version, "#{__dir__}/commands/version_command"
     autoload :Package, "#{__dir__}/commands/package"
     autoload :Manifest, "#{__dir__}/commands/manifest"
     autoload :MappingValidate, "#{__dir__}/commands/mapping_validate"

data/lib/expressir/express/core.rb

@@ -7,8 +7,15 @@ module Expressir
     # Ruby bridge to the expressir-core Rust crate (parse + model
     # extraction). Available when the native extension is built;
     # callers fall back to the pure-Ruby parser otherwise.
+    #
+    # Windows is excluded along with parsanol's native engine
+    # (Grammar::Parser.native_available?): the core embeds the
+    # parsanol-rs parse stack, whose x64-mingw build deadlocks the
+    # same way at first parse (expressir#487) - the compiled
+    # extension is present, so the gate is explicit rather than a
+    # LoadError consequence.
     module Core
-      NATIVE_AVAILABLE = begin
+      NATIVE_AVAILABLE = !Gem.win_platform? && begin
         require "expressir/expressir_core"
         true
       rescue LoadError

data/lib/expressir/express/grammar/parser.rb

@@ -27,6 +27,28 @@ module Expressir
         # Files above this use parse_fresh which has no packrat cache
         LARGE_FILE_THRESHOLD = 1024 * 1024 # 1 MB
 
+        # Whitespace rides the engine's injected trivia (parsanol-ruby
+        # #180's source-preserving mode, 1.3.82+): each unit records
+        # verbatim under :space and attaches to the next Named capture.
+        # Remarks stay OUT of the skip rule — they are product data,
+        # captured by the tailRemark/embeddedRemark rules and attached
+        # by RemarkScanner; tail remarks attach backward, the engine's
+        # next-capture channel is the wrong direction for them.
+        rule(:trivia) { match[" \r\n\t\f"].repeat(1) }
+        # exempt (parsanol#195, shipped 1.3.89): token rules whose bodies
+        # manage their own internals — injection before a char-class tail
+        # repetition absorbs the following token across whitespace
+        # ("RULE r FOR" parsed as one simpleId). simpleId additionally
+        # matches as a single quantified Re, which needs no exemption;
+        # the two mechanisms agree and stay for defense in depth.
+        # The whitespace/remark rules manage their own trivia end to end
+        # (they ARE the trivia surface for remarks); injection around
+        # them breaks consecutive remark lines on the Ruby engine
+        # ("-- X\n--\nSCHEMA ..." failed - the #487 windows follow-up,
+        # parsanol-ruby#195 family).
+        skip(:trivia, whitespace: :space,
+                      exempt: %i[simpleId digits spaces space embeddedRemark tailRemark])
+
         # Get cached parser instance (thread-safe)
         # Reusing the parser avoids the overhead of reinitializing all rule definitions
         def self.cached_parser
@@ -46,6 +68,15 @@ module Expressir
 
         # Check if native parsing is available
         def self.native_available?
+          # parsanol 1.3.54+ x64-mingw builds deadlock inside the native
+          # parse at runtime: the library loads (early examples run) but
+          # the first parse never returns (expressir#487 — every windows
+          # rake run since 2026-09-29 hit the 6h limit; the control at
+          # green-era leptris/moxml/yeptris still hangs, parsanol 1.3.53
+          # was green). The pure-Ruby engine is correct, so windows falls
+          # back to it until parsanol fixes the mingw build.
+          return false if Gem.win_platform?
+
           return @native_available unless @native_available.nil?
 
           @native_available = begin
@@ -604,7 +635,13 @@ module Expressir
           (unaryOp >> simpleFactorExpression).as(:simpleFactorUnaryExpression)
         end
         rule(:simpleId) do
-          anyKeyword.absent? >> cts((match["a-zA-Z_"] >> match["a-zA-Z0-9_"].repeat).as(:str)).as(:simpleId)
+          # One quantified Re, not lead >> tail-repeat: under skip
+          # injection the DSL interleaves trivia before the tail
+          # repetition, so a two-atom ident would absorb the following
+          # whitespace-separated identifier ("RULE r FOR (e)" parses
+          # "r FOR" as one simpleId). A quantified Re consumes the
+          # whole identifier in a single step — parsanol GH-69.
+          anyKeyword.absent? >> cts(match("[a-zA-Z_][a-zA-Z0-9_]*").as(:str)).as(:simpleId)
         end
         rule(:simpleStringLiteral) do
           cts((str("'") >> (str("'").absent? >> any).repeat >> str("'")).as(:str)).as(:simpleStringLiteral)

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.29".freeze
+    VERSION = "2.4.31".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.29
+  version: 2.4.31
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-03 00:00:00.000000000 Z
+date: 2026-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: 1.3.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.3.89
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: 1.3.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.3.89
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -188,16 +188,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: table_tennis
   requirement: !ruby/object:Gem::Requirement
@@ -463,7 +463,7 @@ files:
 - lib/expressir/commands/validate.rb
 - lib/expressir/commands/validate_ascii.rb
 - lib/expressir/commands/validate_load.rb
-- lib/expressir/commands/version.rb
+- lib/expressir/commands/version_command.rb
 - lib/expressir/commands/xsd.rb
 - lib/expressir/config.rb
 - lib/expressir/coverage.rb