lutaml-lml 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afdbd5bcb80896ee130f477fd40e21b475826cbe9ffcdac89b927e44ce77d5d
-  data.tar.gz: 194b68623da1d25a723af09a565948fdc6c567e340ebe7ac1efea5f8f925a6a1
+  metadata.gz: 43171296e53409193af9a65974a2e30adb2f425c8dd952eb5a08be556411cb6b
+  data.tar.gz: 8146fffb1c51f8fcd7d5061192596a8e73749c443a573f6a6e48c00c5885997c
 SHA512:
-  metadata.gz: 7f992466d0f04295e0808c199d37b31bc5ca16f8acc6e0a21ce519d932766437d7e87e604a7d5ea28b19ab89fe8ed3fa4f1b557882de7b36d41ec649be8f5a37
-  data.tar.gz: 57999ac9cba35e2ca2b515e40de8e99acf6d2ec00e4dc529c78a0344546f1e0c87ad66d42d116d55f53ccc38b137758a7c51c3a8a6500fa75431c3b579e06070
+  metadata.gz: e50bf16b938b8708125c81d828c2350224dc7ed7ef9526e6fd7a066f44041b7e990003bfd6f3315aee69cdc68628399691dab28aacc7c4c2a233074d43887f0d
+  data.tar.gz: ba5efefb14c289839ca8fcc03d9102847cc495797816ddf51ce5dd1177d9ba100324e415ff329bb2b74b88e8db32532baa08e040e94f4e8ffff2ae2c9f23f3d5

data/lib/lutaml/lml/grammar.rb

@@ -24,17 +24,20 @@ module Lutaml
         @artifact ||= load_artifact || compile_artifact
       end
 
+      # The grammar text and artifact carry UTF-8 (em-dashes in
+      # comments); pin the encoding so non-UTF-8 locales (LANG=C CI
+      # images) cannot raise InvalidByteSequenceError on read.
       def self.load_artifact
         return unless File.exist?(ARTIFACT_PATH)
 
-        envelope = JSON.parse(File.read(ARTIFACT_PATH))
-        return unless envelope['source'] == File.read(GRAMMAR_PATH)
+        envelope = JSON.parse(File.read(ARTIFACT_PATH, encoding: 'UTF-8'))
+        return unless envelope['source'] == File.read(GRAMMAR_PATH, encoding: 'UTF-8')
 
         Parsanol::PARG::Artifact.new(envelope, ARTIFACT_PATH, File.dirname(ARTIFACT_PATH))
       end
 
       def self.compile_artifact
-        document = Parsanol::PARG::Parser.new(File.read(GRAMMAR_PATH)).parse
+        document = Parsanol::PARG::Parser.new(File.read(GRAMMAR_PATH, encoding: 'UTF-8')).parse
         Parsanol::PARG::Artifact.new(
           Parsanol::PARG::Compiler.compile(document).envelope, nil, nil
         )

data/lib/lutaml/lml/model_compiler.rb

@@ -26,6 +26,7 @@ module Lutaml
         @compiled = {}
         @forward_refs = {}
         @enum_names = Set.new
+        @enum_classes = {}
       end
 
       def compile(input)
@@ -78,7 +79,7 @@ module Lutaml
         attrs = Array(instance.attributes)
         type_attr = attrs.find { |a| a.name == "type" }
         type_name = type_attr ? type_attr.value.to_s : instance.type
-        klass = @compiled[type_name]
+        klass = @compiled[demodulize(type_name)]
         unless klass
           errors << "#{path}: unknown type '#{type_name}'"
           return
@@ -158,15 +159,20 @@ module Lutaml
           key = name.to_sym
           next unless schema_keys.include?(key)
 
-          hash[key] = resolve_instance_value(value, nested)
+          hash[key] = resolve_instance_value(value, nested, klass.attributes[key])
         end
       end
 
-      def resolve_instance_value(value, nested)
+      def resolve_instance_value(value, nested, attr_def = nil)
         if nested.any?
           nested.map { |i| hydrate_instance(i) }
         elsif value.is_a?(Array)
           value
+        elsif enum_class = attr_def && enum_class_for(attr_def.type)
+          value_name = enum_value_name(value.to_s)
+          description = enum_class.values
+            .find { |v| v.name == value_name }&.description
+          enum_class.new(value: value_name, description: description)
         elsif !value.nil?
           value
         end
@@ -200,23 +206,28 @@ module Lutaml
 
       alias_method :compile_data_type, :compile_class
 
+      EnumValue = Struct.new(:name, :description)
+
       def compile_enum(enum_def)
         name = enum_def.name.to_s
         values = extract_enum_values(enum_def)
 
         compiled_klass = Class.new(Lutaml::Model::Serializable) do
-          attribute :value, :string, default: values.first.to_s
+          attribute :value, :string, default: values.first.name
+          attribute :description, :string
 
           define_method(:to_s) { value }
         end
 
-        values.each do |val|
-          compiled_klass.define_singleton_method(val) do
-            new(value: val.to_s)
+        values.each do |value|
+          compiled_klass.define_singleton_method(value.name) do
+            new(value: value.name, description: value.description)
           end
         end
+        compiled_klass.define_singleton_method(:values) { values }
 
         @enum_names << name
+        @enum_classes[name] = compiled_klass
         register(name, compiled_klass)
       end
 
@@ -288,7 +299,11 @@ module Lutaml
       def build_options(attr)
         options = {}
         card = attr.cardinality
-        return options unless card
+        unless card
+          # LML attributes without an explicit cardinality are optional (0..1)
+          options[:default] = nil
+          return options
+        end
 
         min = parse_cardinality_value(card.min)
         max = parse_cardinality_value(card.max)
@@ -313,10 +328,21 @@ module Lutaml
 
       def extract_enum_values(enum_def)
         enum_def.attributes.map do |attr|
-          attr.name.to_s
+          description = Array(attr.attributes).find do |nested|
+            nested.name == "description"
+          end
+          EnumValue.new(attr.name.to_s, description&.type)
         end
       end
 
+      def enum_class_for(type)
+        type.is_a?(Class) && @enum_classes.value?(type) and return type
+      end
+
+      def enum_value_name(raw)
+        raw.split("::").last
+      end
+
       def register(name, klass)
         @compiled[name] = klass
         return unless @namespace

data/lib/lutaml/lml/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Lml
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-lml
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-01 00:00:00.000000000 Z
+date: 2026-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model