expressir 2.4.29-x86_64-linux → 2.4.31-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c503db95cc37f406c3bae75ac01467827c99a86835415059959433c88ac1faa6
-  data.tar.gz: fd066553d69941bccc3f2ce5f61a758203f28a732dceecf4512a0626e38c4908
+  metadata.gz: 48ddbee40a47febda3a26577196114e5d64a41dbd53ead30b70a496fac792798
+  data.tar.gz: 2aa5f102ed661e63bf59768b052c9160f81f9534f9065e8b4b8d4db9dd9e5bd3
 SHA512:
-  metadata.gz: 77e412d0f4e203a7c2c14dfddd050dd88ae729870630bd14d5157dabb6e2e0272fcb76ed5693197ec75d0b88b55a617790f94781c75a783532b8a5e9fde7b1bd
-  data.tar.gz: ebe7d135c61b105991149af05ca186b0581cd490c9556330189b3476017481ecea75053d3b16e6edb24ebce3043c715d37b418a05629fb124d4669db5fe92b1f
+  metadata.gz: 8636b926948dcd0a7d6e4f0d0ec18f0bb168ace9b7668574b0881597c077d5f36937f1f167e5957e1ffa9498288800465b86660e6e19b2403ce5fd9141474946
+  data.tar.gz: 55a118765bed43bda7eb42ec1d563a6cc41bb0edfafdb3f925ec670c73115eb5a1714be0279fc6309a467aeb0e840b618e1456346ae8f374fd2661e18ea7430b

data/.github/scripts/test_installed_gem.rb

@@ -5,8 +5,19 @@
 # active and the parser must handle the standard and #462 forms.
 require "expressir"
 
-abort "FAIL: NATIVE_AVAILABLE is false" unless Expressir::Express::Core::NATIVE_AVAILABLE
-puts "native binding: active"
+if Gem.win_platform? && !Expressir::Express::Core::NATIVE_AVAILABLE
+  # Interim expressir#487 guard: native is intentionally disabled on
+  # windows until the ancestor-walk fix (#499) merges and the guard
+  # reverts. The platform gem must still SHIP a loadable extension -
+  # that is this leg's contract while the guard stands.
+  gem_dir = Gem.loaded_specs["expressir"].gem_dir
+  shipped = Dir.glob(File.join(gem_dir, "**", "expressir_core.{so,dll}"))
+  abort "FAIL: expressir_core not shipped in the platform gem" if shipped.empty?
+  puts "native binding: deferred (windows guard, expressir#487)"
+else
+  abort "FAIL: NATIVE_AVAILABLE is false" unless Expressir::Express::Core::NATIVE_AVAILABLE
+  puts "native binding: active"
+end
 
 repo = Expressir::Express::Parser.from_exp(
   "SCHEMA smoke; ENTITY e; a : STRING; END_ENTITY; END_SCHEMA;",
@@ -28,7 +39,10 @@ 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"
+# Windows under the #487 guard runs the pure-Ruby fallback instead.
+unless Gem.win_platform? && !Expressir::Express::Core::NATIVE_AVAILABLE
+  abort "FAIL: core_set_available is false" unless Expressir::Express::Parser.core_set_available?
+  puts "compiled-set core: ok"
+end
 
 puts "SMOKE OK"

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

@@ -197,5 +197,8 @@ jobs:
       - name: Push to rubygems
         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,6 +7,7 @@ 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.
+    #
     module Core
       NATIVE_AVAILABLE = begin
         require "expressir/expressir_core"

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
@@ -604,7 +626,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: x86_64-linux
 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: base64
@@ -16,14 +16,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
@@ -70,16 +70,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
@@ -112,16 +112,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
@@ -145,7 +145,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
@@ -155,7 +155,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
@@ -174,16 +174,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
@@ -448,7 +448,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