rng 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b297a52ef81d423b4980c3b32b3b167296c733a293bc52c533926aaf7088f55
-  data.tar.gz: d85e507f79ab28d6f50e32128d4fdc7abe4dd9fae5cdccec2d57d23043271554
+  metadata.gz: ebbcb6ae7f7313b3343ba5b95d4378759edc347a45bbac8ba6963ea38481cd96
+  data.tar.gz: ea8e1aef28333c0de0d3ec1ebbbf33724e98657cdd7d61c15794f9b241227a20
 SHA512:
-  metadata.gz: 3d4cf91c1c619e39a9d923d409a741e455b32fcb364eb425e13a337438a1e2797943c605964fb85a804284d1a0ea2e4a64bc16959aa1960001b1d4f7b1744b00
-  data.tar.gz: 9fa1ceada50cc44fb707f7dee432718f0d8d3cd259c90991fef7b96402dc4ba5eb8cfa202644ec4fc6b9f1b586252b67c8b818094104fbb9ab2d418726993e8d
+  metadata.gz: 8bf076f9915632658de9b5ed92a5f25ade9dab9c379da1faf02cfb26868db548cf1cc7b102de344c441a479731059364012af79929b67b50c0876b05c43ba4b5
+  data.tar.gz: 32dbfd869f762de72565c6110c4965b8e907a47373824b5f7ce0d7f32af605250310ddf677a76e3cd6588acdda9f37af19ea877acd380273e0b57884089054ff

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/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.4'
+  VERSION = '0.3.5'
 end

metadata

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