lutaml-xsd 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1534c767ed74c87ca337f399ec76413ce25851dcf0d744c0d7074803ef228850
-  data.tar.gz: 9656e981503e23f9c290e017f10a035b6522274e0aa0c81c26bb760f00402803
+  metadata.gz: e6278aec90450f0666ccb21d61f3afa2f7f77be209dac10da32c991841a31a7d
+  data.tar.gz: 5dc436d5d5e8323fec4bd2fe2928f0890de032e626d0f4bde19baf5570acaccb
 SHA512:
-  metadata.gz: c9809bb698c5914d29591513a1d809680e8e1f65a2536c340825f85a2f87265fed941dd446b38db6e81577aca4cabdfc4e39d144d4c9c3fb87f5435788f2e110
-  data.tar.gz: 55096747f4c344cb2b81cfd7226c7feebb1f33df1fb9c8d1c0cdd2dc672278079e349056930014b405bef80bc3846838105ca9a8d6be288d326176aa5bee1f6f
+  metadata.gz: 5491e6d47a6d39bbb0ff66ab75334aaafebfbc171de6117bfd9b5fae07badea0d53239941c1539d3d67c6e49dfda736e6420b489036a56529affca0f89431e17
+  data.tar.gz: 2e020487a42d0c3eaf86ad45040719632178147891edf4b35caa6d7d9d1fad310ed9682f4a5c70627429078d2db472997aa691e7da7f19e1d355b816afea0444

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-22 11:16:09 UTC using RuboCop version 1.86.1.
+# on 2026-04-25 09:44:01 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,6 +11,29 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'lutaml-xsd.gemspec'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_element, with_fixed_indentation
+Layout/ArrayAlignment:
+  Exclude:
+    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
+    - 'lib/lutaml/xsd/spa/utils/extract_enumeration.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: IndentationWidth.
+Layout/AssignmentIndentation:
+  Exclude:
+    - 'lib/lutaml/xsd/commands/package_command.rb'
+    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
+
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ClosingParenthesisIndentation:
+  Exclude:
+    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleAlignWith.
@@ -45,7 +68,7 @@ Layout/IndentationWidth:
   Exclude:
     - 'lib/lutaml/xsd/spa/schema_serializer.rb'
 
-# Offense count: 729
+# Offense count: 730
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -60,11 +83,14 @@ Layout/MultilineMethodCallBraceLayout:
   Exclude:
     - 'lib/lutaml/xsd/spa/schema_serializer.rb'
 
-# Offense count: 1
+# Offense count: 11
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
+    - 'lib/lutaml/xsd/commands/package_command.rb'
+    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
+    - 'lib/lutaml/xsd/spa/utils/extract_enumeration.rb'
     - 'lib/lutaml/xsd/spa/xml_instance_generator.rb'
 
 # Offense count: 11
@@ -222,6 +248,14 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - 'lib/lutaml/xsd/package_tree_formatter.rb'
 
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineIfModifier:
+  Exclude:
+    - 'lib/lutaml/xsd/commands/package_command.rb'
+    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
+    - 'lib/lutaml/xsd/spa/utils/extract_enumeration.rb'
+
 # Offense count: 1
 Style/OpenStructUse:
   Exclude:

data/docs/FAQ.adoc

@@ -457,7 +457,7 @@ Note: `marshal` format packages may not be compatible across different Ruby majo
 
 Yes! Lutaml::XSD is complementary to other XML tools:
 
-* **Nokogiri**: Use for XML parsing/validation
+* **Moxml**: Unified XML adapter layer
 * **REXML**: Use for lightweight XML processing
 * **Ox**: Use for fast XML parsing
 

data/docs/URL_FETCHING.adoc

@@ -603,12 +603,11 @@ Validate schema content after fetching:
 ====
 [source,ruby]
 ----
-require 'nokogiri'
+require 'moxml'
 
 def validate_schema_content(content)
-  doc = Nokogiri::XML(content) do |config|
-    config.strict.nonet # Disable network access during XML parsing
-  end
+  ctx = Moxml::Context.new
+  doc = ctx.parse(content)
 
   # Validate it's actually an XSD schema
   unless doc.root&.name == 'schema' &&
@@ -617,12 +616,12 @@ def validate_schema_content(content)
   end
 
   # Check for suspicious patterns
-  if doc.to_s.match?(/<!ENTITY|<!DOCTYPE/)
+  if doc.to_xml.match?(/<!ENTITY|<!DOCTYPE/)
     raise SecurityError, "Schema contains potentially dangerous XML entities"
   end
 
   content
-rescue Nokogiri::XML::SyntaxError => e
+rescue StandardError => e
   raise SecurityError, "Schema failed XML validation: #{e.message}"
 end
 ----

data/docs/advanced/INTEGRATION_PATTERNS.adoc

@@ -466,13 +466,13 @@ generator.generate('docs/api')
 
 === Integrating with XML validators
 
-.Using Lutaml::XSD with Nokogiri validation
+.Using Lutaml::XSD with XML validation
 [example]
 ====
 [source,ruby]
 ----
 require 'lutaml/xsd'
-require 'nokogiri'
+require 'moxml'
 
 class SchemaValidator
   def initialize(lxr_package_path)
@@ -488,14 +488,13 @@ class SchemaValidator
     xsd_file = result.schema_file
     xsd_content = load_xsd_content(xsd_file)
 
-    # Create Nokogiri XSD validator
-    xsd = Nokogiri::XML::Schema(xsd_content)
+    # Parse XML document using Moxml
+    ctx = Moxml::Context.new
+    doc = ctx.parse(xml_content)
 
-    # Parse XML document
-    doc = Nokogiri::XML(xml_content)
-
-    # Validate
-    errors = xsd.validate(doc)
+    # Validate against XSD schema
+    # (Use a dedicated XSD validation library for full schema validation)
+    errors = []
 
     {
       valid: errors.empty?,
@@ -538,7 +537,7 @@ end
 [source,ruby]
 ----
 require 'lutaml/xsd'
-require 'nokogiri'
+require 'moxml'
 
 class ValidationPipeline
   def initialize(schemas_package)
@@ -1031,7 +1030,7 @@ manager.deploy(:production, '/var/app/schemas.lxr')
 ----
 require 'lutaml/xsd'
 require 'liquid'
-require 'nokogiri'
+require 'moxml'
 
 class SchemaWorkflow
   def initialize(config_file)

data/docs/advanced/SCHEMA_MAPPING_PATTERNS.adoc

@@ -702,18 +702,19 @@ end
 [source,ruby]
 ----
 require 'lutaml/xsd'
-require 'nokogiri'
+require 'moxml'
 require 'yaml'
 
 def extract_imports_and_includes(xsd_file)
-  doc = Nokogiri::XML(File.read(xsd_file))
+  ctx = Moxml::Context.new
+  doc = ctx.parse(File.read(xsd_file))
 
   imports = doc.xpath('//xs:import/@schemaLocation',
                       'xs' => 'http://www.w3.org/2001/XMLSchema')
   includes = doc.xpath('//xs:include/@schemaLocation',
                        'xs' => 'http://www.w3.org/2001/XMLSchema')
 
-  (imports + includes).map(&:value).uniq
+  (imports + includes).map { |attr| attr.is_a?(Moxml::Attribute) ? attr.value : attr.text }.uniq
 end
 
 def suggest_mapping(schema_location)

data/examples/02-urban-function/scripts/map_uro_types.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
-require "nokogiri"
+require "moxml"
 require "yaml"
 
 # Parse both XSD files
-urban_function_doc = Nokogiri::XML(File.read("schemas/urbanFunction.xsd"))
-urban_object_doc = Nokogiri::XML(File.read("schemas/urbanObject.xsd"))
+ctx = Moxml::Context.new
+urban_function_doc = ctx.parse(File.read("schemas/urbanFunction.xsd"))
+urban_object_doc = ctx.parse(File.read("schemas/urbanObject.xsd"))
 
 # Define namespaces
 namespaces = {

data/lib/lutaml/xsd/commands/package_command.rb

@@ -524,7 +524,10 @@ module Lutaml
               metadata[:appearance] =
                 full_config["appearance"]
             end
-            metadata[:links] = metadata_config["links"] if metadata_config["links"]
+            if metadata_config["links"]
+              metadata[:links] =
+                metadata_config["links"]
+            end
             metadata
           end
 

data/lib/lutaml/xsd/definition_extractor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "moxml"
 
 module Lutaml
   module Xsd
@@ -183,7 +183,7 @@ module Lutaml
         return nil unless File.exist?(schema_file)
 
         content = File.read(schema_file)
-        doc = Nokogiri::XML(content)
+        doc = Moxml::Context.new.parse(content)
 
         # Find the definition node
         definition_node = find_definition_node(doc, name, type)
@@ -204,10 +204,10 @@ module Lutaml
       end
 
       # Find definition node in XML document
-      # @param node [Nokogiri::XML::Node] XML node to search
+      # @param node [Moxml::Document] XML document to search
       # @param name [String] Name to find
       # @param type [String] Type of definition
-      # @return [Nokogiri::XML::Element, nil] Found node or nil
+      # @return [Moxml::Element, nil] Found node or nil
       def find_definition_node(node, name, type)
         # Use XPath to find the definition
         xpath = case type.downcase
@@ -227,11 +227,10 @@ module Lutaml
       end
 
       # Extract XML from node as string
-      # @param node [Nokogiri::XML::Element] XML node
+      # @param node [Moxml::Element] XML node
       # @return [String] XML string
       def extract_node_xml(node)
-        # Use Nokogiri to serialize the node
-        node.to_xml(indent: 2)
+        node.to_xml
       rescue StandardError
         "<Could not extract XSD source>"
       end

data/lib/lutaml/xsd/package_builder.rb

@@ -64,6 +64,12 @@ module Lutaml
       def serialize_schema(schema, format)
         case format
         when :marshal
+          # Clear lazy XML element references that hold non-serializable
+          # adapter nodes throughout the object graph.
+          # lutaml-model's :lazy import_declaration_plan mode stores
+          # XmlElement references (containing Nokogiri nodes) on every
+          # model instance during deserialization.
+          clear_pending_plan_references(schema)
           Marshal.dump(schema)
         when :json
           schema.to_json
@@ -193,6 +199,39 @@ module Lutaml
 
       private
 
+      # Recursively walk an object graph and clear pending_plan_root_element
+      # on every Lutaml::Model::Serializable instance. This removes Nokogiri
+      # adapter_node references that prevent Marshal.dump from succeeding.
+      #
+      # @param root [Object] Root of the object graph to walk
+      # @param visited [Set] Track visited object IDs to prevent infinite loops
+      def clear_pending_plan_references(root, visited = Set.new)
+        return unless root
+        return if visited.include?(root.object_id)
+
+        visited << root.object_id
+
+        case root
+        when Array
+          root.each { |item| clear_pending_plan_references(item, visited) }
+        when Hash
+          root.each_value { |v| clear_pending_plan_references(v, visited) }
+        else
+          if root.respond_to?(:pending_plan_root_element=)
+            root.pending_plan_root_element = nil
+          end
+
+          root.instance_variables.each do |ivar|
+            value = root.instance_variable_get(ivar)
+            next if value.nil? || value.is_a?(Symbol) ||
+              value.is_a?(Integer) || value.is_a?(Float) ||
+              value.is_a?(TrueClass) || value.is_a?(FalseClass)
+
+            clear_pending_plan_references(value, visited)
+          end
+        end
+      end
+
       # Build metadata with package configuration
       # @param repository [SchemaRepository] Repository to package
       # @param additional [Hash] Additional metadata fields

data/lib/lutaml/xsd/spa/schema_serializer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "moxml"
 require "tmpdir"
 require "fileutils"
 require_relative "xml_instance_generator"
@@ -184,7 +185,8 @@ module Lutaml
           # Detect standard XML Schema namespace using parsed URI components
           begin
             uri = URI(ns)
-            if uri&.host && %w[w3.org www.w3.org].include?(uri.host) && uri.path&.include?("XMLSchema")
+            if uri&.host && %w[w3.org
+                               www.w3.org].include?(uri.host) && uri.path&.include?("XMLSchema")
               return "xs"
             end
           rescue URI::InvalidURIError
@@ -230,12 +232,12 @@ module Lutaml
           return nil unless schema
 
           schema_source = if file_path
-            begin
-              File.read(file_path)
-            rescue StandardError
-              nil
-            end
-          end
+                            begin
+                              File.read(file_path)
+                            rescue StandardError
+                              nil
+                            end
+                          end
 
           prefix = namespace_prefix_lookup[schema.target_namespace] || derive_prefix(
             schema.target_namespace, schema
@@ -248,14 +250,17 @@ module Lutaml
             file_path: clean_file_path(file_path),
             is_entrypoint: is_entrypoint?(file_path),
             elements: serialize_elements(
-              schema, prefix, schema_source, file_path),
+              schema, prefix, schema_source, file_path
+            ),
             complex_types: serialize_complex_types(
-              schema, prefix, schema_source, file_path),
+              schema, prefix, schema_source, file_path
+            ),
             simple_types: serialize_simple_types(schema, prefix),
             attributes: serialize_attributes(schema, prefix),
             groups: serialize_groups(schema, prefix),
             attribute_groups: serialize_attribute_groups(
-              schema, prefix, schema_source),
+              schema, prefix, schema_source
+            ),
             imports: serialize_imports(schema),
             includes: serialize_includes(schema),
           }
@@ -314,7 +319,8 @@ module Lutaml
             documentation: extract_documentation(element),
             instance_xml: generate_instance_xml(element),
             source: extract_source_by_type_key_value(
-              "element", "name", element.name, prefix, schema_source),
+              "element", "name", element.name, prefix, schema_source
+            ),
           }
 
           # Enriched fields
@@ -343,7 +349,8 @@ module Lutaml
           end
 
           # Add SVG diagram
-          element_data[:diagram_svg] = generate_diagram(element_data, :element, file_path)
+          element_data[:diagram_svg] =
+            generate_diagram(element_data, :element, file_path)
 
           element_data
         end
@@ -387,13 +394,15 @@ module Lutaml
         # @param prefix [String, nil] Optional prefix for IDs
         # @param schema_source [String, nil] Optional schema source for context
         # @return [Array<Hash>] Serialized complex types (sorted alphabetically by name)
-        def serialize_complex_types(schema, prefix = nil, schema_source = nil, file_path = nil)
+        def serialize_complex_types(schema, prefix = nil, schema_source = nil,
+file_path = nil)
           return [] unless schema.respond_to?(:complex_types) || schema.respond_to?(:complex_type)
 
           types = schema.respond_to?(:complex_types) ? schema.complex_types : schema.complex_type
           types.map.with_index do |type, index|
             serialize_complex_type(
-              type, index, prefix, schema_source, file_path)
+              type, index, prefix, schema_source, file_path
+            )
           end.sort_by { |t| t[:name] || "" }
         end
 
@@ -402,7 +411,8 @@ module Lutaml
         # @param type [ComplexType] Complex type object
         # @param index [Integer] Type index
         # @return [Hash] Serialized complex type
-        def serialize_complex_type(type, index, prefix = nil, schema_source = nil, file_path = nil)
+        def serialize_complex_type(type, index, prefix = nil,
+schema_source = nil, file_path = nil)
           content_model = extract_content_model(type)
           type_data = {
             id: complex_type_id(index, type, prefix),
@@ -418,15 +428,20 @@ module Lutaml
             documentation: extract_documentation(type),
             instance_xml: generate_instance_xml(type),
             source: extract_source_by_type_key_value(
-                "complexType", "name", type.name, prefix, schema_source),
+              "complexType", "name", type.name, prefix, schema_source
+            ),
           }
 
           # Collect attributes from inside extension for simpleContent/complexContent
           extension_attrs = collect_extension_attributes(type)
-          type_data[:extension_attributes] = extension_attrs unless extension_attrs.empty?
+          unless extension_attrs.empty?
+            type_data[:extension_attributes] =
+              extension_attrs
+          end
 
           # Add SVG diagram
-          type_data[:diagram_svg] = generate_diagram(type_data, :type, file_path)
+          type_data[:diagram_svg] =
+            generate_diagram(type_data, :type, file_path)
 
           type_data
         end
@@ -601,7 +616,8 @@ module Lutaml
         # @param prefix [String, nil] Optional prefix for IDs
         # @param schema_source [String, nil] Optional schema source for context
         # @return [Array<Hash>] Serialized attribute groups (sorted alphabetically by name)
-        def serialize_attribute_groups(schema, prefix = nil, schema_source = nil)
+        def serialize_attribute_groups(schema, prefix = nil,
+schema_source = nil)
           groups = if schema.respond_to?(:attribute_groups)
                      schema.attribute_groups
                    elsif schema.respond_to?(:attribute_group)
@@ -619,7 +635,8 @@ module Lutaml
               attributes: serialize_ag_attributes(ag),
               documentation: extract_documentation(ag),
               source: extract_source_by_type_key_value(
-                "attributeGroup", "name", ag.name, prefix, schema_source),
+                "attributeGroup", "name", ag.name, prefix, schema_source
+              ),
               instance_xml: generate_instance_xml(ag),
             }
           end.sort_by { |ag| ag[:name] || "" }
@@ -627,12 +644,13 @@ module Lutaml
 
         # Extract source information for an attribute group
         # from the schema
-        def extract_source_by_type_key_value(type, key, value, prefix = nil, source = nil)
+        def extract_source_by_type_key_value(type, key, value, prefix = nil,
+source = nil)
           return nil unless source && value
 
           # parse the schema source and find the attribute group by name
           begin
-            doc = Nokogiri::XML(source, &:noblanks)
+            doc = Moxml::Context.new.parse(source)
             xpath = if prefix
                       "//#{prefix}:#{type}[@#{key}='#{value}']"
                     else
@@ -941,8 +959,8 @@ module Lutaml
                 element_name = elem[:name] || elem[:ref]
                 if element_name
                   used_by[element_name] << { name: type[:name],
-                                            kind: "complexType",
-                                            schema: schema_label }
+                                             kind: "complexType",
+                                             schema: schema_label }
                 end
                 if elem[:type]
                   type_name = elem[:type].split(":").last || elem[:type]
@@ -988,7 +1006,7 @@ module Lutaml
               if elem[:type]
                 type_name = elem[:type].split(":").last || elem[:type]
                 used_by[type_name] << { name: elem[:name], kind: "element",
-                                       schema: schema_label }
+                                        schema: schema_label }
               end
             end
           end

data/lib/lutaml/xsd/spa/utils/extract_enumeration.rb

@@ -11,7 +11,10 @@ module Lutaml
           # @param attr [Attribute] Attribute object
           # @return [String, nil] Formatted enumeration default string
           def extract_enumeration_default(attr)
-            return [nil, nil] unless attr.respond_to?(:simple_type) && attr.simple_type
+            unless attr.respond_to?(:simple_type) && attr.simple_type
+              return [nil,
+                      nil]
+            end
 
             st = attr.simple_type
             if st.respond_to?(:restriction) && st.restriction

data/lib/lutaml/xsd/spa/xml_instance_generator.rb

@@ -39,7 +39,7 @@ module Lutaml
         private
 
         # Generate element instance with attributes and content
-        def generate_element_instance(element, indent: 1)          
+        def generate_element_instance(element, indent: 1)
           element_type = find_type(element.type)
           generate_type_instance(
             element_type, tag_name: element.name, indent: indent

data/lib/lutaml/xsd/validation/xml_navigator.rb

@@ -29,11 +29,11 @@ module Lutaml
         # Initialize a new XmlNavigator
         #
         # @param xml_content [String] The XML content to parse
-        # @param adapter [Symbol] The Moxml adapter to use (:nokogiri, :ox, :oga)
+        # @param adapter [Symbol] The Moxml adapter to use (defaults to Moxml default)
         #
         # @raise [ArgumentError] if xml_content is nil or empty
         # @raise [Moxml::ParseError] if XML parsing fails
-        def initialize(xml_content, adapter: :nokogiri)
+        def initialize(xml_content, adapter: nil)
           raise ArgumentError, "XML content cannot be nil" if xml_content.nil?
 
           if xml_content.empty?
@@ -173,7 +173,7 @@ module Lutaml
         # @return [Moxml::Document]
         # @raise [Moxml::ParseError] if parsing fails
         def parse_xml(content, adapter)
-          context = Moxml::Context.new(adapter)
+          context = adapter ? Moxml::Context.new(adapter) : Moxml::Context.new
           builder = Moxml::DocumentBuilder.new(context)
           builder.build(content)
         rescue StandardError => e

data/lib/lutaml/xsd/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Xsd
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

data/lib/lutaml/xsd.rb

@@ -3,9 +3,6 @@
 require "lutaml/model"
 require "lutaml/xml/schema/xsd"
 
-adapter = RUBY_ENGINE == "opal" ? :oga : :nokogiri
-Lutaml::Model::Config.xml_adapter_type = adapter
-
 module Lutaml
   module Xsd
     # Error class for lutaml-xsd specific errors

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xsd
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-23 00:00:00.000000000 Z
+date: 2026-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid