moxml 0.5.139 → 0.5.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 271ff9c6c8d5502c0cd427efdc84e5ba8f123d0008e100a3e7303d478b4a47eb
-  data.tar.gz: c87777565ab89568a4195754e4f6c84fe5bd04e230416e0f4e2a5dc605945b54
+  metadata.gz: 40599a2ac65b555f44dd70acb32404c381886b86d1385e9d4cb9c516c613e3ae
+  data.tar.gz: 5ed6d5baf3ba27e62191b468da167f8ad1f844a961d6879fb6343308ca646b62
 SHA512:
-  metadata.gz: d5d766ba5edbce1fcba2e14c7227e22c5f3ca0d96a01ab1f2ae2dee5c97f76fc8bb5723e0b1349fe5aee90b026f3532aae07291e17bd2a785761a9f6a7d99e3e
-  data.tar.gz: e24616f241e0e846db54db729ad564bf1363f53c7fd7ea422ec6ee3a605138b934d79fe49627b2942c8716b1e2b6655909f2ef84fec0b9ca17fddaa022f23500
+  metadata.gz: 17709b3e62f6b7c19724b8c493dd1d46f44dc7f2c980d7c39a263be46d6118cad5be71f8493b2f23ed8a4ed214ab8e8c21be5790dfddf6e127302e280593f8d1
+  data.tar.gz: 8ff39e0c9ac39d25f9cfd931055461cc26da5852f12881a63d4bccebde698d4dacb29995c9f40b3242ca943a55a10b2a69a5ea524f88b00f0bf3f87bb9b5674d

data/lib/moxml/adapter/base.rb

@@ -303,6 +303,16 @@ module Moxml
         # validator raise; leptris gates on >= 1.9.321.0.
         XSD_SUPPORTED = false
 
+        # Issue #384: schema handles are adapter-native objects — a
+        # handle compiled through one adapter must not dispatch
+        # through another. Adapters with an XSD engine answer their
+        # handle type; the default (no engine) matches nothing, so a
+        # mismatched wrap raises a clear error at construction
+        # instead of a NoMethodError deep in the first validate.
+        def xsd_handle_match?(_handle)
+          false
+        end
+
         def xsd_compile(_schema_source)
           raise Moxml::NotImplementedError,
                 "XSD validation requires an adapter with an XSD engine"

data/lib/moxml/adapter/leptris.rb

@@ -302,6 +302,11 @@ module Moxml
           ::Leptris::XML::XSD.compile(schema_source)
         end
 
+        def xsd_handle_match?(handle)
+          defined?(::Leptris::XML::XSD::Schema) &&
+            handle.is_a?(::Leptris::XML::XSD::Schema)
+        end
+
         def xsd_compile_file(path)
           unless XSD_SUPPORTED && ::Leptris::XML::XSD.respond_to?(:compile_file)
             raise Moxml::NotImplementedError,

data/lib/moxml/adapter/nokogiri.rb

@@ -215,6 +215,10 @@ module Moxml
           ::Nokogiri::XML::Schema.new(schema_source.to_s)
         end
 
+        def xsd_handle_match?(handle)
+          handle.is_a?(::Nokogiri::XML::Schema)
+        end
+
         def xsd_compile_file(path)
           path = path.to_s
           # libxml2 resolves schemaLocation hrefs against the

data/lib/moxml/config.rb

@@ -47,7 +47,23 @@ module Moxml
       def runtime_default_adapter
         return opal_runtime_adapter if RUBY_ENGINE == "opal"
 
-        return PREFERRED_ADAPTER if leptris_preferred_available?
+        preferred = leptris_preferred_available?
+        return PREFERRED_ADAPTER if preferred == true
+
+        # Issue #384: a PRESENT-but-unusable leptris (broken native
+        # bundle, adapter load failure) must not degrade silently —
+        # validation semantics differ per adapter, so the
+        # substitution is announced. A machine without the gem at
+        # all is a normal nokogiri/rexml deployment: no noise.
+        if preferred == :broken
+          Kernel.warn(
+            "moxml: the leptris adapter is installed but unusable " \
+            "(see the preceding error); falling back to " \
+            "#{detect_loaded_adapter || FALLBACK_ADAPTER} — " \
+            "adapter-specific behavior (XSD validation, " \
+            "serialization) will differ",
+          )
+        end
 
         detect_loaded_adapter || FALLBACK_ADAPTER
       end
@@ -74,14 +90,19 @@ module Moxml
       def leptris_preferred_available?
         return @leptris_preferred_available if defined?(@leptris_preferred_available)
 
-        @leptris_preferred_available = begin
-          require "leptris"
-          Moxml::Adapter.load(:leptris)
-          Gem::Version.new(::Leptris::VERSION) >=
-            Gem::Version.new(Moxml::Adapter::Leptris::MINIMUM_BINDING_VERSION)
-        rescue LoadError, NameError
-          false
-        end
+        @leptris_preferred_available =
+          begin
+            require "leptris"
+            Moxml::Adapter.load(:leptris)
+            Gem::Version.new(::Leptris::VERSION) >=
+              Gem::Version.new(Moxml::Adapter::Leptris::MINIMUM_BINDING_VERSION)
+          rescue LoadError
+            # Not installed: a normal deployment shape, silent.
+            false
+          rescue NameError, Moxml::AdapterError
+            # Installed but unusable (adapter load failure): loud.
+            :broken
+          end
       end
 
       def detect_loaded_adapter

data/lib/moxml/version.rb

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

data/lib/moxml/xsd.rb

@@ -92,6 +92,29 @@ module Moxml
       def initialize(handle, context)
         @handle = handle
         @context = context
+        assert_adapter_matches_handle!
+      end
+
+      # Issue #384: the handle is an adapter-native object; routing
+      # it through a different adapter's xsd_validate surfaced as a
+      # distant NoMethodError. Fail at the wrap with the mismatch
+      # named.
+      def assert_adapter_matches_handle!
+        adapter = @context.config.adapter
+        return if adapter.xsd_handle_match?(@handle)
+
+        raise Moxml::AdapterError.new(
+          "schema handle mismatch: #{handle_class_name(@handle)} " \
+          "cannot be validated through the " \
+          "#{adapter.respond_to?(:adapter_name) ? adapter.adapter_name : adapter} " \
+          "adapter — compile the schema through the same adapter " \
+          "that will validate it",
+          operation: "xsd_compile",
+        )
+      end
+
+      def handle_class_name(handle)
+        handle.class.name.split("::").last(2).join("::")
       end
 
       # Validate a node or raw XML string. Returns [] when valid.

data/spec/moxml/config_degradation_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# Issue #384: when the preferred default adapter is installed but
+# unusable, the silent substitution to the fallback adapter changed
+# validation semantics invisibly. The degradation now announces
+# itself; an install without the gem at all stays silent (a normal
+# deployment shape).
+RSpec.describe "Config default-adapter degradation" do
+  def with_broken_leptris
+    old_default_adapter =
+      Moxml::Config.instance_variable_get(:@default_adapter)
+    Moxml::Config.remove_instance_variable(:@default_adapter) if old_default_adapter
+    # The state a broken install produces (adapter load failure with
+    # the gem present): present-but-unusable, not absent.
+    Moxml::Config.instance_variable_set(:@leptris_preferred_available, :broken)
+    yield
+  ensure
+    Moxml::Config.remove_instance_variable(:@leptris_preferred_available)
+    Moxml::Config.instance_variable_set(:@default_adapter, :nokogiri)
+  end
+
+  it "warns loudly and names the fallback" do
+    with_broken_leptris do
+      expect do
+        Moxml::Config.default_adapter
+      end.to output(/leptris adapter is installed but unusable/).to_stderr
+    end
+  end
+
+  it "still answers a usable adapter" do
+    with_broken_leptris do
+      expect(Moxml::Config.default_adapter).to eq(:nokogiri)
+    end
+  end
+
+  it "keeps a working leptris install silent" do
+    expect do
+      Moxml::Config.default_adapter
+    end.not_to output(/unusable/).to_stderr
+  end
+end

data/spec/moxml/xsd_handle_mismatch_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# Issue #384: a schema handle compiled through one adapter must not
+# dispatch through another — the misroute surfaced as a NoMethodError
+# far from its cause when a silently-degraded context resolved to
+# nokogiri while the handle came from the leptris API.
+RSpec.describe "Moxml::XSD::Schema handle/adapter matching" do
+  let(:leptris_ctx) { Moxml.new(:leptris) }
+  let(:nokogiri_ctx) { Moxml.new(:nokogiri) }
+
+  it "accepts a handle compiled through the same adapter" do
+    schema = leptris_ctx.xsd("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'/>")
+    expect(schema).to be_a(Moxml::XSD::Schema)
+  end
+
+  it "raises a named mismatch at the wrap, not a distant NoMethodError" do
+    handle = leptris_ctx.config.adapter.xsd_compile(
+      "<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'/>",
+    )
+
+    expect do
+      Moxml::XSD::Schema.new(handle, nokogiri_ctx)
+    end.to raise_error(Moxml::AdapterError, /schema handle mismatch/)
+  end
+
+  it "keeps same-adapter validation working end to end" do
+    schema = nokogiri_ctx.xsd(
+      "<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'>" \
+      "<xsd:element name='r'/></xsd:schema>",
+    )
+    expect(schema.valid?(nokogiri_ctx.parse("<r/>"))).to be(true)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.139
+  version: 0.5.140
 platform: ruby
 authors:
 - Ribose Inc.
@@ -491,6 +491,7 @@ files:
 - spec/moxml/cdata_spec.rb
 - spec/moxml/children_source_retention_spec.rb
 - spec/moxml/comment_spec.rb
+- spec/moxml/config_degradation_spec.rb
 - spec/moxml/config_spec.rb
 - spec/moxml/context_spec.rb
 - spec/moxml/css_spec.rb
@@ -585,6 +586,7 @@ files:
 - spec/moxml/xpath_capabilities_spec.rb
 - spec/moxml/xpath_spec.rb
 - spec/moxml/xsd_error_contract_spec.rb
+- spec/moxml/xsd_handle_mismatch_spec.rb
 - spec/moxml/xsd_release_spec.rb
 - spec/moxml/xsd_spec.rb
 - spec/moxml/xslt/stylesheet_spec.rb