lutaml-lml 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44e08a243084f376e006dfa845a878267d5867d1c07e9cb2f957cadfdf593af
-  data.tar.gz: 56b169b4f31489f51713071e48002ec2b0babc8f6b510aa6660e7b02976b0f93
+  metadata.gz: c34192e0a5b3532ebb204def3335546bf9accac1852e603b2871290244d53825
+  data.tar.gz: ff0dbbc23ce3738f3e0e4e073923701bc214cdebfddcae308ae2dba18c20b345
 SHA512:
-  metadata.gz: 12590d775d46b14bbefe7733610b6b60c08ddaa169e6aa3e4010b13979e565d36bde270adffc5e7ef6cdb37c9fbcadedb16d66b0bbc1e6404d74c46da5b2c1ec
-  data.tar.gz: 1dcf78fc5244594d03992cdb8dd4b2e286c0069741b3985bad2667ea1752eab19534aa16878e9e2c80ac3ab4b0c5c2381756634590a99df1070e72a0e6b7bf83
+  metadata.gz: b9de9426a07f60623c905352fee21e78c12c8352a15c924cd3a1085fec39980bc691b1ad6cab840b5dbcf89f01741cd61b2eb48c6e3acdf232295474c70dd784
+  data.tar.gz: 1d24bf1caa90301837f55a6e0b3fa68d9b5527647d2634547c89281a9f090ec54ad2836a07d1dd83ee992036d0baa10ce55ae7cf2b33a29da428f3f1bd17854c

data/lib/lutaml/lml/data_processor/attribute_processing.rb

@@ -3,6 +3,9 @@
 module Lutaml
   module Lml
     class DataProcessor
+      # Normalizes attribute entries from the parse tree: merges
+      # comma-form groups, extracts names/types/values, and applies the
+      # nested attribute/property structure.
       module AttributeProcessing
         EXCLUDED_PASS_THROUGH_KEYS = %i[key value comments add attributes properties type_literal].freeze
 
@@ -57,7 +60,11 @@ module Lutaml
         end
 
         def merge_collection_value(existing, value)
-          current = existing.is_a?(Array) ? existing : (existing ? [existing] : [])
+          current = if existing.is_a?(Array)
+                      existing
+                    else
+                      (existing ? [existing] : [])
+                    end
           current + (value.is_a?(Array) ? value : [value])
         end
 
@@ -115,6 +122,7 @@ module Lutaml
         # `default: "Clear"` uses the colon separator (RS 3001 §Attribute);
         # the colon lands in the captured name and must not.
         def strip_argument_colon(name)
+          name = name[:string] if name.is_a?(Hash) && name.key?(:string)
           name.to_s.sub(/:\z/, "")
         end
       end

data/lib/lutaml/lml/data_processor/value_declaration_processing.rb

@@ -38,7 +38,14 @@ module Lutaml
           if member.key?(:definition)
             (inner[:attributes] ||= []) << { name: 'description', type: unwrap_string(member[:definition]) }
           elsif member.key?(:instance)
-            (inner[:instances] ||= []).concat(Array(member[:instance]))
+            # The bare `instance { ... }` capture is the instance-body
+            # hash; it must go through instance processing so its
+            # members become attribute entries, not raw pairs.
+            bodies = member[:instance].is_a?(Hash) ? [member[:instance]] : Array(member[:instance])
+            bodies.each do |body|
+              entry = body.is_a?(Hash) ? process_instance(body) : body
+              (inner[:instances] ||= []) << entry
+            end
           elsif member.key?(:attributes)
             (inner[:properties] ||= []) << member[:attributes]
           elsif member.key?(:key)

data/lib/lutaml/lml/document_builder.rb

@@ -158,7 +158,19 @@ module Lutaml
       # the same member shape the bare-identifier shortcut produces.
       def expand_value_declaration(model, hash)
         decl = hash.delete(:value_decl) or return
-        apply_attribute(model, :attributes, decl.fetch(:attributes))
+        inner = decl.fetch(:attributes)
+
+        # Route the value block's members onto the entry: descriptions
+        # and payload pairs ride the nested attributes, instance bodies
+        # become the entry's instances (RS 3001 §Enums values carrying
+        # instances).
+        entry = { name: inner[:name] }
+        entry[:attributes] = inner[:attributes] if inner[:attributes]
+        entry[:properties] = Array(inner[:properties]).flat_map do |pair|
+          pair.is_a?(Hash) ? [pair] : Array(pair)
+        end if inner[:properties]
+        entry[:instances] = inner[:instances] if inner[:instances]
+        apply_attribute(model, :attributes, entry)
       end
 
       # Namespace declaration bodies arrive as keyword-line members

data/lib/lutaml/lml/format/adapter/standard_adapter.rb

@@ -77,7 +77,18 @@ module Lutaml
             lines.join("\n")
           end
 
+          def format_key(key)
+            key = key.to_s
+            return key if key.match?(BARE_WORD)
+
+            # Same escaping as quote_value: a key may contain any
+            # character, and the emitted form must re-parse (issue #78).
+            escaped = key.gsub('\\') { |bs| bs * 2 }.gsub('"') { |q| "\\#{q}" }
+            "\"#{escaped}\""
+          end
+
           def format_value(prefix, key, value, indent)
+            key = format_key(key)
             return "#{prefix}#{key} = ref:(#{value[:reference]})" if reference_value?(value)
 
             case value
@@ -142,7 +153,7 @@ module Lutaml
             # every value is representable in double quotes.
             # gsub replacement strings re-interpret backslash pairs, so
             # the backslash doubling uses the block form.
-            escaped = str.gsub('\\') { |bs| bs + bs }.gsub('"') { |q| '\\' + q }
+            escaped = str.gsub('\\') { |bs| bs * 2 }.gsub('"') { |q| "\\#{q}" }
             "\"#{escaped}\""
           end
         end

data/lib/lutaml/lml/formatter/svg_pdf.rb

@@ -65,6 +65,10 @@ module Lutaml
       # Depth-first walk applying cumulative translate(x,y).
       def walk(node, dx, dy)
         node.children.each do |child|
+          # Whitespace between elements arrives as text nodes under
+          # some moxml adapters; only elements carry geometry.
+          next unless child.element?
+
           cdx, cdy = translate_of(child)
           case child.name
           when 'g'

data/lib/lutaml/lml/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Lml
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-lml
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-11 00:00:00.000000000 Z
+date: 2026-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.114
 - !ruby/object:Gem::Dependency
   name: parsanol
   requirement: !ruby/object:Gem::Requirement