rng 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c85f9f544d78d663a1f36cffdf7d3bca10fced07581fb5f6d52d63a548c895
-  data.tar.gz: 7fb492448f01443ede4f66af235787407bf44846a9d9ac0526fd6d1def565027
+  metadata.gz: ebbcb6ae7f7313b3343ba5b95d4378759edc347a45bbac8ba6963ea38481cd96
+  data.tar.gz: ea8e1aef28333c0de0d3ec1ebbbf33724e98657cdd7d61c15794f9b241227a20
 SHA512:
-  metadata.gz: 9e65688496d4bcf2b380b4a8c543847e3e977995b94a4763300f3ca29c19b137c93bfe0de80e8358a292ee196fb76656641d2cdbe51db5624815047fe3a0e905
-  data.tar.gz: 1f9fa36285707a5393acdb6a0d1b7fcc5637d63a95c065afbaf5b75bdcefae237aa0fa016f408ede1bf4aba5878b6992fa478a4b7300c2f1315f419233113173
+  metadata.gz: 8bf076f9915632658de9b5ed92a5f25ade9dab9c379da1faf02cfb26868db548cf1cc7b102de344c441a479731059364012af79929b67b50c0876b05c43ba4b5
+  data.tar.gz: 32dbfd869f762de72565c6110c4965b8e907a47373824b5f7ce0d7f32af605250310ddf677a76e3cd6588acdda9f37af19ea877acd380273e0b57884089054ff

data/lib/rng/external_ref_resolver.rb

@@ -216,10 +216,30 @@ module Rng
 
     # Deep dup a pattern object
     #
+    # Uses recursive copying instead of Marshal to handle objects
+    # containing Nokogiri::XML::Element nodes (stored in element_order
+    # by lutaml-model), which cannot be serialized by Marshal.
+    #
     # @param obj [Object] Object to deep copy
     # @return [Object] Deep copy of object
     def deep_dup(obj)
-      Marshal.load(Marshal.dump(obj))
+      case obj
+      when Lutaml::Model::Serializable
+        result = obj.class.new
+        obj.class.attributes.each_key do |attr_name|
+          value = obj.public_send(attr_name)
+          result.public_send(:"#{attr_name}=", deep_dup(value))
+        end
+        result
+      when Array
+        obj.map { |o| deep_dup(o) }
+      when Hash
+        obj.each_with_object({}) { |(k, v), h| h[deep_dup(k)] = deep_dup(v) }
+      when NilClass, Symbol, Numeric, TrueClass, FalseClass
+        obj
+      else
+        obj.dup
+      end
     end
 
     # Resolve a single include directive

data/lib/rng/include.rb

@@ -4,7 +4,7 @@ module Rng
   class Include < Lutaml::Model::Serializable
     attribute :href, :string
     attribute :ns, :string
-    attribute :define, Define
+    attribute :define, Define, collection: true, initialize_empty: true
     attribute :grammar, Grammar
 
     xml do

data/lib/rng/include_processor.rb

@@ -321,7 +321,8 @@ module Rng
           override[:definitions].each do |override_def|
             # Check if names match
             next unless source_def[:name] && override_def[:name] &&
-                        extract_string(source_def[:name][:identifier]) == extract_string(override_def[:name][:identifier])
+                        extract_name_from_identifier(source_def) ==
+                        extract_name_from_identifier(override_def)
 
             # Use override instead of source
             target_tree[:definitions] << override_def
@@ -343,7 +344,8 @@ module Rng
 
         source_tree[:definitions]&.each do |source_def|
           next unless source_def[:name] && override_def[:name] &&
-                      extract_string(source_def[:name][:identifier]) == extract_string(override_def[:name][:identifier])
+                      extract_name_from_identifier(source_def) ==
+                      extract_name_from_identifier(override_def)
 
           matched = true
           break
@@ -354,6 +356,27 @@ module Rng
       end
     end
 
+    # Extract identifier string from a definition name hash.
+    # Handles both {:identifier => "name"} and
+    # {:identifier_parts => [{:char => "n"}, ...]} structures.
+    def extract_name_from_identifier(defn)
+      name = defn[:name]
+      return nil unless name.is_a?(Hash)
+
+      if name[:identifier]
+        extract_string(name[:identifier])
+      elsif name[:identifier_parts]
+        name[:identifier_parts].map do |part|
+          if part.is_a?(Hash) && part[:char]
+            c = part[:char]
+            c.respond_to?(:str) ? c.str : c.to_s
+          else
+            part.to_s
+          end
+        end.join
+      end
+    end
+
     # Helper method to extract clean string without Parslet position markers
     #
     # @param obj [Object] Parslet::Slice or String

data/lib/rng/name.rb

@@ -9,7 +9,6 @@ module Rng
 
     xml do
       element 'name'
-      ordered
 
       namespace ::Rng::Namespaces::RngNamespace
 

data/lib/rng/param.rb

@@ -10,7 +10,6 @@ module Rng
 
     xml do
       element 'param'
-      ordered
 
       namespace ::Rng::Namespaces::RngNamespace
 

data/lib/rng/parse_tree_processor.rb

@@ -585,10 +585,14 @@ module Rng
     # @param text [String] Grammar block content
     # @return [Hash] Parsed structure
     def parse_grammar_with_scope(text)
+      # Convert ## doc comments to # regular comments so the parser's whitespace
+      # rule can consume them. This preserves parseability while keeping the
+      # text structure intact (just loses ## -> # for whitespace handling).
+      processed = text.gsub(/^(\s*)##/, '\1#')
       parser = Rng::RncParser.new
 
       # Parse using grammar rule
-      parser.grammar.parse(text.strip)
+      parser.grammar.parse(processed.strip)
 
       # Return grammar structure
     rescue Parslet::ParseFailed => e

data/lib/rng/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rng
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rng
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-04 00:00:00.000000000 Z
+date: 2026-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model