moxml 0.5.174 → 0.5.175

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f92e477a3f081f711febd54ab9425573ead518fd44ff6341744ce5e421a485
-  data.tar.gz: 1c7f9d77b19a460b90dc6f8ca0cb1af76c3d1a95f36e484d4a56bf2cd7be03c5
+  metadata.gz: 14463613d8081db0efee985379ddcae7740f8044d9f0f7a8192f5f1828337a27
+  data.tar.gz: 7fcb65b5d65fedc5d9766d31f409441eafba5f78b8212478a854bcd17ffdf167
 SHA512:
-  metadata.gz: 654e595f1b8e8e847761e670a73565b8ef7b783a09942586bb93ae6199951d192c267359cd6f8c4f7968ed125d593119f5a47b92a04a907505bb7f1b9e1da6d0
-  data.tar.gz: 04f8045e8e42310697de9a141e163a41e1bde33f9a3f9451a463c5f68683e21928cac81770112cd9c30b8c2c0acaaa04a913a7ff212d4a38f660a778eb7b35bb
+  metadata.gz: b7c402c813be0883260893a9e47290653e61104cf870702d7d46b155299d87752f8ec5662455ebb0b75c4b776d8962502d7ed223a3b5fca0764fb2600ae67488
+  data.tar.gz: cc0a50d550e12d1496c0f31a623c9e1c3a7569fe1d65b7796b97a1a30d63d994812d02c28cd6cfcfd22352a11d0fc9ed25d4a2488bda768ac0898342dad7837a

data/lib/moxml/adapter/leptris.rb

@@ -335,9 +335,18 @@ module Moxml
         # consumers ask for them by name; the internal routing gates
         # the floor made constant are absent by design. Frozen; the
         # keys are the model's capability names.
+        #
+        # Two versions, never conflated (the binding vendors the
+        # engine; the numbers differ): +binding_version+ is the gem's
+        # (Leptris::VERSION), +engine_version+ is libleptris's own
+        # (the leptris_version() C face, face-probed — nil on a
+        # binding without it).
         def capabilities
           @capabilities ||= {
-            engine_version: ::Leptris::VERSION,
+            binding_version: ::Leptris::VERSION,
+            engine_version:
+              (::Leptris::XML::FFI.leptris_version if
+                ::Leptris::XML::FFI.respond_to?(:leptris_version)),
             native_read_layer: !NATIVE_READ_LAYER.nil?,
             native_xpath_seams: !NATIVE_XPATH_SEAMS.nil?,
             bulk_xpath_rows: BULK_XPATH_ROWS,

data/lib/moxml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Moxml
-  VERSION = "0.5.174"
+  VERSION = "0.5.175"
 end

data/spec/moxml/adapter_capabilities_spec.rb

@@ -8,11 +8,13 @@ require "spec_helper"
 # what the installed binding+engine serves — queried once at attach,
 # the replacement for the version-gate-constant class. Only
 # runtime-variable faces appear; anything the floor makes
-# unconditional is absent by design.
+# unconditional is absent by design. The two versions are never
+# conflated: the binding vendors the engine, and the numbers differ.
 RSpec.describe "engine capability report" do
-  it "answers for leptris with the engine version and known faces" do
+  it "answers for leptris with both versions and known faces" do
     caps = Moxml::Adapter::Leptris.capabilities
     expect(caps).to be_frozen
+    expect(caps[:binding_version]).to eq(Leptris::VERSION)
     expect(caps[:engine_version]).to match(/\A1\.\d+\.\d+/)
     expect(caps.keys).to include(
       :native_read_layer, :native_plan_structs, :native_plan_typed,
@@ -20,9 +22,21 @@ RSpec.describe "engine capability report" do
     )
   end
 
-  it "reports only booleans beyond the version" do
+  it "answers the ENGINE's version under engine_version, not the binding's" do
     caps = Moxml::Adapter::Leptris.capabilities
-    caps.except(:engine_version).each_value do |value|
+    engine = Leptris::XML::FFI.leptris_version
+    expect(caps[:engine_version]).to eq(engine)
+    if Gem::Version.new(Leptris::VERSION) != Gem::Version.new(engine)
+      expect(caps[:binding_version]).not_to eq(caps[:engine_version]),
+                                            "binding and engine versions are " \
+                                            "different numbers; the report must " \
+                                            "never conflate them"
+    end
+  end
+
+  it "reports only booleans beyond the versions" do
+    caps = Moxml::Adapter::Leptris.capabilities
+    caps.except(:binding_version, :engine_version).each_value do |value|
       expect(value).to eql(true).or eql(false)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.174
+  version: 0.5.175
 platform: ruby
 authors:
 - Ribose Inc.