metaschema 0.2.1 → 0.2.3

data/lib/metaschema/ruby_source_emitter.rb

@@ -365,17 +365,23 @@ module Metaschema
       # Content mapping
       content = xml_map.instance_variable_get(:@content_mapping)
       if content
-        lines << "      map_content to: :#{content.to}"
+        opts = ["to: :#{content.to}"]
+        opts << "delegate: :#{content.delegate}" if content.delegate
+        lines << "      map_content #{opts.join(', ')}"
       end
 
       # Attribute mappings
       xml_map.instance_variable_get(:@attributes)&.each do |xml_name, rule|
-        lines << "      map_attribute \"#{xml_name}\", to: :#{rule.to}"
+        opts = ["\"#{xml_name}\"", "to: :#{rule.to}"]
+        opts << "delegate: :#{rule.delegate}" if rule.delegate
+        lines << "      map_attribute #{opts.join(', ')}"
       end
 
       # Element mappings
       xml_map.instance_variable_get(:@elements)&.each do |xml_name, rule|
-        lines << "      map_element \"#{xml_name}\", to: :#{rule.to}"
+        opts = ["\"#{xml_name}\"", "to: :#{rule.to}"]
+        opts << "delegate: :#{rule.delegate}" if rule.delegate
+        lines << "      map_element #{opts.join(', ')}"
       end
 
       lines << "    end"
@@ -390,17 +396,21 @@ module Metaschema
       end
       return nil unless kv_map
 
-      mappings = kv_map.instance_variable_get(:@mappings)
-      return nil unless mappings && !mappings.empty?
+      # lutaml-model 0.8.56+ stores key-value rules as per-key arrays
+      # (when_attribute partitions share a wire key); the public `mappings`
+      # reader returns the flattened rules.
+      mappings = kv_map.mappings
+      return nil if mappings.nil? || mappings.empty?
 
       lines = []
       lines << ""
       lines << "    key_value do"
 
-      root_name = kv_map.instance_variable_get(:@root_name)
+      root_name = kv_map.root_name
       lines << "      root \"#{root_name}\"" if root_name && !root_name.empty?
 
-      mappings.each do |json_name, rule|
+      mappings.each do |rule|
+        json_name = rule.name
         custom = rule.custom_methods
         if custom && (custom[:from] || custom[:to])
           opts = []
@@ -414,7 +424,7 @@ module Metaschema
           opts << opts_parts.join
           lines << "      map \"#{json_name}\", #{opts.join(', ')}"
         else
-          render_empty = rule.instance_variable_get(:@render_empty)
+          render_empty = rule.render_empty
           lines << if render_empty
                      "      map \"#{json_name}\", to: :#{rule.to}, render_empty: true"
                    else
@@ -808,8 +818,9 @@ module Metaschema
       end
       return nil unless kv_map
 
-      mappings = kv_map.instance_variable_get(:@mappings)
-      mappings&.each do |json_name, rule|
+      mappings = kv_map.mappings
+      mappings&.each do |rule|
+        json_name = rule.name
         if rule.custom_methods[:to]&.to_s == method_name.to_s
           return json_name
         end
@@ -826,8 +837,9 @@ module Metaschema
       end
       return nil unless kv_map
 
-      mappings = kv_map.instance_variable_get(:@mappings)
-      mappings&.each do |json_name, rule|
+      mappings = kv_map.mappings
+      mappings&.each do |rule|
+        json_name = rule.name
         if rule.custom_methods[:from]&.to_s == method_name.to_s
           return json_name
         end
@@ -845,8 +857,8 @@ module Metaschema
       return nil unless kv_map
 
       ms = method_name.to_s
-      mappings = kv_map.instance_variable_get(:@mappings)
-      mappings&.each_value do |rule|
+      mappings = kv_map.mappings
+      mappings&.each do |rule|
         custom = rule.custom_methods
         if custom[:to]&.to_s == ms || custom[:from]&.to_s == ms
           return rule.to.to_s

data/lib/metaschema/type_mapper.rb

@@ -21,21 +21,34 @@ module Metaschema
       "dateTime" => :date_time,
       "date-with-timezone" => :date,
       "date-time-with-timezone" => :date_time,
+      "day-time-duration" => :string,
 
       # String subtypes
       "uuid" => :string,
       "uri" => :string,
+      "uri-reference" => :string,
       "email" => :string,
+      "email-address" => :string,
       "hostname" => :string,
       "ip-address" => :string,
+      "ip-v4-address" => :string,
+      "ip-v6-address" => :string,
+      "base64" => :string,
 
       # Markup types — use Metaschema's own types
       "markup-line" => Metaschema::MarkupLineDatatype,
-      "markup-multiline" => Metaschema::MarkupLineDatatype,
+      "markup-multiline" => Metaschema::MarkupMultilineDatatype,
     }.freeze
 
     MARKUP_TYPES = %w[markup-line markup-multiline].freeze
 
+    # Default JSON value key by data type. Determines the JSON property
+    # name that holds a field's content value when serialized.
+    JSON_VALUE_KEY = {
+      "markup-line" => "RICHTEXT",
+      "markup-multiline" => "prose",
+    }.freeze
+
     class << self
       def map(as_type)
         TYPE_MAP[as_type.to_s] || :string
@@ -49,6 +62,13 @@ module Metaschema
         as_type.to_s == "markup-multiline"
       end
 
+      # Returns the default JSON value key for the given data type.
+      # E.g. "markup-line" -> "RICHTEXT", "markup-multiline" -> "prose",
+      # everything else -> "STRVALUE".
+      def json_value_key(as_type)
+        JSON_VALUE_KEY[as_type.to_s] || "STRVALUE"
+      end
+
       # Register format-specific serializers for types that lutaml-model
       # doesn't handle correctly out of the box.
       def register_serializers!

data/lib/metaschema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Metaschema
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/metaschema.rb

@@ -63,6 +63,7 @@ module Metaschema
   autoload :ListItemType, "metaschema/list_item_type"
   autoload :ListType, "metaschema/list_type"
   autoload :MarkupLineDatatype, "metaschema/markup_line_datatype"
+  autoload :MarkupMultilineDatatype, "metaschema/markup_multiline_datatype"
   autoload :MatchesConstraintType, "metaschema/matches_constraint_type"
   autoload :MetaschemaImportType, "metaschema/metaschema_import_type"
   autoload :MetaschemaConstraints, "metaschema/metaschema_constraints"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaschema
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-23 00:00:00.000000000 Z
+date: 2026-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -16,16 +16,16 @@ 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: tabulo
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: tabulo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: Parser and generator for NIST Metaschema
 email:
 - open.source@ribose.com'
@@ -117,11 +131,18 @@ files:
 - lib/metaschema/list_type.rb
 - lib/metaschema/markdown_doc_generator.rb
 - lib/metaschema/markup_line_datatype.rb
+- lib/metaschema/markup_multiline_datatype.rb
 - lib/metaschema/matches_constraint_type.rb
 - lib/metaschema/metapath_evaluator.rb
 - lib/metaschema/metaschema_constraints.rb
 - lib/metaschema/metaschema_import_type.rb
 - lib/metaschema/model_generator.rb
+- lib/metaschema/model_generator/assembly_factory.rb
+- lib/metaschema/model_generator/field_factory.rb
+- lib/metaschema/model_generator/services/collapsibles_collapser.rb
+- lib/metaschema/model_generator/services/field_deserializer.rb
+- lib/metaschema/model_generator/services/field_serializer.rb
+- lib/metaschema/model_generator/utils.rb
 - lib/metaschema/namespace.rb
 - lib/metaschema/namespace_binding_type.rb
 - lib/metaschema/namespace_value.rb