metaschema 0.1.2 → 0.2.1

data/lib/metaschema/schema_version.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Metaschema
+  class SchemaVersion < Lutaml::Model::Type::String
+    xml do
+      namespace ::Metaschema::Namespace
+    end
+  end
+end

data/lib/metaschema/scope.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'assembly'
-require_relative 'field'
-require_relative 'flag'
-
 module Metaschema
   class Scope < Lutaml::Model::Serializable
     attribute :metaschema_namespace, :string
@@ -15,14 +9,14 @@ module Metaschema
     attribute :flag, Flag, collection: true
 
     xml do
-      root 'scope'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "scope"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'metaschema-namespace', to: :metaschema_namespace
-      map_attribute 'metaschema-short-name', to: :metaschema_short_name
-      map_element 'field', to: :field
-      map_element 'assembly', to: :assembly
-      map_element 'flag', to: :flag
+      map_attribute "metaschema-namespace", to: :metaschema_namespace
+      map_attribute "metaschema-short-name", to: :metaschema_short_name
+      map_element "field", to: :field
+      map_element "assembly", to: :assembly
+      map_element "flag", to: :flag
     end
   end
 end

data/lib/metaschema/short_name.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Metaschema
+  class ShortName < Lutaml::Model::Type::String
+    xml do
+      namespace ::Metaschema::Namespace
+    end
+  end
+end

data/lib/metaschema/table_cell_type.rb

@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'anchor_type'
-require_relative 'code_type'
-require_relative 'image_type'
-require_relative 'inline_markup_type'
-require_relative 'insert_type'
-
 module Metaschema
   class TableCellType < Lutaml::Model::Serializable
-    attribute :content, :string
-    attribute :align, :string, default: -> { 'left' }
+    attribute :content, :string, collection: true
+    attribute :align, :string, default: -> { "left" }
     attribute :a, AnchorType, collection: true
     attribute :insert, InsertType, collection: true
     attribute :br, :string, collection: true
@@ -26,23 +18,24 @@ module Metaschema
     attribute :img, ImageType, collection: true
 
     xml do
-      root 'tableCellType', mixed: true
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "tableCellType"
+      mixed_content
+      namespace ::Metaschema::Namespace
 
       map_content to: :content
-      map_attribute 'align', to: :align
-      map_element 'a', to: :a
-      map_element 'insert', to: :insert
-      map_element 'br', to: :br
-      map_element 'code', to: :code
-      map_element 'em', to: :em
-      map_element 'i', to: :i
-      map_element 'b', to: :b
-      map_element 'strong', to: :strong
-      map_element 'sub', to: :sub
-      map_element 'sup', to: :sup
-      map_element 'q', to: :q
-      map_element 'img', to: :img
+      map_attribute "align", to: :align
+      map_element "a", to: :a
+      map_element "insert", to: :insert
+      map_element "br", to: :br
+      map_element "code", to: :code
+      map_element "em", to: :em
+      map_element "i", to: :i
+      map_element "b", to: :b
+      map_element "strong", to: :strong
+      map_element "sub", to: :sub
+      map_element "sup", to: :sup
+      map_element "q", to: :q
+      map_element "img", to: :img
     end
   end
 end

data/lib/metaschema/table_row_type.rb

@@ -1,20 +1,16 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'table_cell_type'
-
 module Metaschema
   class TableRowType < Lutaml::Model::Serializable
     attribute :td, TableCellType, collection: true
     attribute :th, TableCellType, collection: true
 
     xml do
-      root 'tableRowType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "tableRowType"
+      namespace ::Metaschema::Namespace
 
-      map_element 'td', to: :td
-      map_element 'th', to: :th
+      map_element "td", to: :td
+      map_element "th", to: :th
     end
   end
 end

data/lib/metaschema/table_type.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'table_row_type'
-
 module Metaschema
   class TableType < Lutaml::Model::Serializable
     attribute :tr, TableRowType, collection: true
 
     xml do
-      root 'tableType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "tableType"
+      namespace ::Metaschema::Namespace
 
-      map_element 'tr', to: :tr
+      map_element "tr", to: :tr
     end
   end
 end

data/lib/metaschema/targeted_allowed_values_constraint_type.rb

@@ -1,39 +1,32 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'allowed_value_type'
-require_relative 'markup_line_datatype'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class TargetedAllowedValuesConstraintType < Lutaml::Model::Serializable
     attribute :id, :string
-    attribute :level, :string, default: -> { 'ERROR' }
-    attribute :allow_other, :string, default: -> { 'no' }
-    attribute :extensible, :string, default: -> { 'external' }
+    attribute :level, :string, default: -> { "ERROR" }
+    attribute :allow_other, :string, default: -> { "no" }
+    attribute :extensible, :string, default: -> { "external" }
     attribute :target, :string
-    attribute :formal_name, :string
+    attribute :formal_name, FormalName
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
     attribute :enum, AllowedValueType, collection: true
     attribute :remarks, RemarksType
 
     xml do
-      root 'TargetedAllowedValuesConstraintType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "TargetedAllowedValuesConstraintType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'id', to: :id
-      map_attribute 'level', to: :level
-      map_attribute 'allow-other', to: :allow_other
-      map_attribute 'extensible', to: :extensible
-      map_attribute 'target', to: :target
-      map_element 'formal-name', to: :formal_name
-      map_element 'description', to: :description
-      map_element 'prop', to: :prop
-      map_element 'enum', to: :enum
-      map_element 'remarks', to: :remarks
+      map_attribute "id", to: :id
+      map_attribute "level", to: :level
+      map_attribute "allow-other", to: :allow_other
+      map_attribute "extensible", to: :extensible
+      map_attribute "target", to: :target
+      map_element "formal-name", to: :formal_name
+      map_element "description", to: :description
+      map_element "prop", to: :prop
+      map_element "enum", to: :enum
+      map_element "remarks", to: :remarks
     end
   end
 end

data/lib/metaschema/targeted_expect_constraint_type.rb

@@ -1,36 +1,30 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'markup_line_datatype'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class TargetedExpectConstraintType < Lutaml::Model::Serializable
     attribute :id, :string
-    attribute :level, :string, default: -> { 'ERROR' }
+    attribute :level, :string, default: -> { "ERROR" }
     attribute :test, :string
     attribute :target, :string
-    attribute :formal_name, :string
+    attribute :formal_name, FormalName
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
     attribute :message, :string
     attribute :remarks, RemarksType
 
     xml do
-      root 'TargetedExpectConstraintType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "TargetedExpectConstraintType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'id', to: :id
-      map_attribute 'level', to: :level
-      map_attribute 'test', to: :test
-      map_attribute 'target', to: :target
-      map_element 'formal-name', to: :formal_name
-      map_element 'description', to: :description
-      map_element 'prop', to: :prop
-      map_element 'message', to: :message
-      map_element 'remarks', to: :remarks
+      map_attribute "id", to: :id
+      map_attribute "level", to: :level
+      map_attribute "test", to: :test
+      map_attribute "target", to: :target
+      map_element "formal-name", to: :formal_name
+      map_element "description", to: :description
+      map_element "prop", to: :prop
+      map_element "message", to: :message
+      map_element "remarks", to: :remarks
     end
   end
 end

data/lib/metaschema/targeted_has_cardinality_constraint_type.rb

@@ -1,36 +1,30 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'markup_line_datatype'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class TargetedHasCardinalityConstraintType < Lutaml::Model::Serializable
     attribute :id, :string
-    attribute :level, :string, default: -> { 'ERROR' }
+    attribute :level, :string, default: -> { "ERROR" }
     attribute :target, :string
     attribute :min_occurs, :integer
     attribute :max_occurs, :integer
-    attribute :formal_name, :string
+    attribute :formal_name, FormalName
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
     attribute :remarks, RemarksType
 
     xml do
-      root 'TargetedHasCardinalityConstraintType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "TargetedHasCardinalityConstraintType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'id', to: :id
-      map_attribute 'level', to: :level
-      map_attribute 'target', to: :target
-      map_attribute 'min-occurs', to: :min_occurs
-      map_attribute 'max-occurs', to: :max_occurs
-      map_element 'formal-name', to: :formal_name
-      map_element 'description', to: :description
-      map_element 'prop', to: :prop
-      map_element 'remarks', to: :remarks
+      map_attribute "id", to: :id
+      map_attribute "level", to: :level
+      map_attribute "target", to: :target
+      map_attribute "min-occurs", to: :min_occurs
+      map_attribute "max-occurs", to: :max_occurs
+      map_element "formal-name", to: :formal_name
+      map_element "description", to: :description
+      map_element "prop", to: :prop
+      map_element "remarks", to: :remarks
     end
   end
 end

data/lib/metaschema/targeted_index_constraint_type.rb

@@ -1,37 +1,30 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'key_field'
-require_relative 'markup_line_datatype'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class TargetedIndexConstraintType < Lutaml::Model::Serializable
     attribute :id, :string
-    attribute :level, :string, default: -> { 'ERROR' }
+    attribute :level, :string, default: -> { "ERROR" }
     attribute :target, :string
     attribute :name, :string
-    attribute :formal_name, :string
+    attribute :formal_name, FormalName
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
     attribute :key_field, KeyField, collection: true
     attribute :remarks, RemarksType
 
     xml do
-      root 'TargetedIndexConstraintType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "TargetedIndexConstraintType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'id', to: :id
-      map_attribute 'level', to: :level
-      map_attribute 'target', to: :target
-      map_attribute 'name', to: :name
-      map_element 'formal-name', to: :formal_name
-      map_element 'description', to: :description
-      map_element 'prop', to: :prop
-      map_element 'key-field', to: :key_field
-      map_element 'remarks', to: :remarks
+      map_attribute "id", to: :id
+      map_attribute "level", to: :level
+      map_attribute "target", to: :target
+      map_attribute "name", to: :name
+      map_element "formal-name", to: :formal_name
+      map_element "description", to: :description
+      map_element "prop", to: :prop
+      map_element "key-field", to: :key_field
+      map_element "remarks", to: :remarks
     end
   end
 end

data/lib/metaschema/targeted_index_has_key_constraint_type.rb

@@ -1,37 +1,30 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'key_field'
-require_relative 'markup_line_datatype'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class TargetedIndexHasKeyConstraintType < Lutaml::Model::Serializable
     attribute :id, :string
-    attribute :level, :string, default: -> { 'ERROR' }
+    attribute :level, :string, default: -> { "ERROR" }
     attribute :name, :string
     attribute :target, :string
-    attribute :formal_name, :string
+    attribute :formal_name, FormalName
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
     attribute :key_field, KeyField, collection: true
     attribute :remarks, RemarksType
 
     xml do
-      root 'TargetedIndexHasKeyConstraintType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "TargetedIndexHasKeyConstraintType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'id', to: :id
-      map_attribute 'level', to: :level
-      map_attribute 'name', to: :name
-      map_attribute 'target', to: :target
-      map_element 'formal-name', to: :formal_name
-      map_element 'description', to: :description
-      map_element 'prop', to: :prop
-      map_element 'key-field', to: :key_field
-      map_element 'remarks', to: :remarks
+      map_attribute "id", to: :id
+      map_attribute "level", to: :level
+      map_attribute "name", to: :name
+      map_attribute "target", to: :target
+      map_element "formal-name", to: :formal_name
+      map_element "description", to: :description
+      map_element "prop", to: :prop
+      map_element "key-field", to: :key_field
+      map_element "remarks", to: :remarks
     end
   end
 end

data/lib/metaschema/targeted_key_constraint_type.rb

@@ -1,35 +1,28 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'key_field'
-require_relative 'markup_line_datatype'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class TargetedKeyConstraintType < Lutaml::Model::Serializable
     attribute :id, :string
-    attribute :level, :string, default: -> { 'ERROR' }
+    attribute :level, :string, default: -> { "ERROR" }
     attribute :target, :string
-    attribute :formal_name, :string
+    attribute :formal_name, FormalName
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
     attribute :key_field, KeyField, collection: true
     attribute :remarks, RemarksType
 
     xml do
-      root 'TargetedKeyConstraintType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "TargetedKeyConstraintType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'id', to: :id
-      map_attribute 'level', to: :level
-      map_attribute 'target', to: :target
-      map_element 'formal-name', to: :formal_name
-      map_element 'description', to: :description
-      map_element 'prop', to: :prop
-      map_element 'key-field', to: :key_field
-      map_element 'remarks', to: :remarks
+      map_attribute "id", to: :id
+      map_attribute "level", to: :level
+      map_attribute "target", to: :target
+      map_element "formal-name", to: :formal_name
+      map_element "description", to: :description
+      map_element "prop", to: :prop
+      map_element "key-field", to: :key_field
+      map_element "remarks", to: :remarks
     end
   end
 end

data/lib/metaschema/targeted_matches_constraint_type.rb

@@ -1,36 +1,30 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'markup_line_datatype'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class TargetedMatchesConstraintType < Lutaml::Model::Serializable
     attribute :id, :string
-    attribute :level, :string, default: -> { 'ERROR' }
+    attribute :level, :string, default: -> { "ERROR" }
     attribute :regex, :string
     attribute :datatype, :string
     attribute :target, :string
-    attribute :formal_name, :string
+    attribute :formal_name, FormalName
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
     attribute :remarks, RemarksType
 
     xml do
-      root 'TargetedMatchesConstraintType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "TargetedMatchesConstraintType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'id', to: :id
-      map_attribute 'level', to: :level
-      map_attribute 'regex', to: :regex
-      map_attribute 'datatype', to: :datatype
-      map_attribute 'target', to: :target
-      map_element 'formal-name', to: :formal_name
-      map_element 'description', to: :description
-      map_element 'prop', to: :prop
-      map_element 'remarks', to: :remarks
+      map_attribute "id", to: :id
+      map_attribute "level", to: :level
+      map_attribute "regex", to: :regex
+      map_attribute "datatype", to: :datatype
+      map_attribute "target", to: :target
+      map_element "formal-name", to: :formal_name
+      map_element "description", to: :description
+      map_element "prop", to: :prop
+      map_element "remarks", to: :remarks
     end
   end
 end

data/lib/metaschema/type_mapper.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Metaschema
+  class TypeMapper
+    TYPE_MAP = {
+      # Basic types
+      "string" => :string,
+      "token" => :string,
+      "boolean" => :boolean,
+      "integer" => :integer,
+      "decimal" => :decimal,
+
+      # Integer subtypes
+      "positive-integer" => :integer,
+      "negative-integer" => :integer,
+      "non-positive-integer" => :integer,
+      "non-negative-integer" => :integer,
+
+      # Date/time types
+      "date" => :date,
+      "dateTime" => :date_time,
+      "date-with-timezone" => :date,
+      "date-time-with-timezone" => :date_time,
+
+      # String subtypes
+      "uuid" => :string,
+      "uri" => :string,
+      "email" => :string,
+      "hostname" => :string,
+      "ip-address" => :string,
+
+      # Markup types — use Metaschema's own types
+      "markup-line" => Metaschema::MarkupLineDatatype,
+      "markup-multiline" => Metaschema::MarkupLineDatatype,
+    }.freeze
+
+    MARKUP_TYPES = %w[markup-line markup-multiline].freeze
+
+    class << self
+      def map(as_type)
+        TYPE_MAP[as_type.to_s] || :string
+      end
+
+      def markup?(as_type)
+        MARKUP_TYPES.include?(as_type.to_s)
+      end
+
+      def multiline?(as_type)
+        as_type.to_s == "markup-multiline"
+      end
+
+      # Register format-specific serializers for types that lutaml-model
+      # doesn't handle correctly out of the box.
+      def register_serializers!
+        # Decimal JSON — BigDecimal#to_s defaults to scientific
+        # notation ("0.11e1"); JSON needs plain notation (1.1)
+        Lutaml::Model::Type::Value.register_format_type_serializer(
+          :json, Lutaml::Model::Type::Decimal,
+          to: lambda { |inst|
+            return nil unless inst.value
+
+            v = inst.value
+            v = Lutaml::Model::Type::Decimal.cast(v) unless v.is_a?(BigDecimal)
+            v.to_f
+          }
+        )
+
+        # Decimal XML — same scientific notation issue
+        Lutaml::Model::Type::Value.register_format_type_serializer(
+          :xml, Lutaml::Model::Type::Decimal,
+          to: lambda { |inst|
+            return nil unless inst.value
+
+            v = inst.value
+            v = Lutaml::Model::Type::Decimal.cast(v) unless v.is_a?(BigDecimal)
+            v.to_s("F")
+          }
+        )
+      end
+    end
+  end
+end

data/lib/metaschema/use_name_type.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
 module Metaschema
   class UseNameType < Lutaml::Model::Serializable
     attribute :content, :string
     attribute :index, :integer
 
     xml do
-      root 'UseNameType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "UseNameType"
+      namespace ::Metaschema::Namespace
 
       map_content to: :content
-      map_attribute 'index', to: :index
+      map_attribute "index", to: :index
     end
   end
 end

data/lib/metaschema/version.rb

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