metaschema 0.1.2 → 0.2.1

data/lib/metaschema/namespace.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Metaschema
+  class Namespace < Lutaml::Xml::Namespace
+    uri "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+    prefix_default "m"
+  end
+end

data/lib/metaschema/namespace_binding_type.rb

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

data/lib/metaschema/namespace_value.rb

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

data/lib/metaschema/ordered_list_type.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-# require_relative "list_item_type"
-
 module Metaschema
   class ListItemType < Lutaml::Model::Serializable; end
 
@@ -12,11 +8,11 @@ module Metaschema
     attribute :li, ListItemType, collection: true
 
     xml do
-      root 'orderedListType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "orderedListType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'start', to: :start
-      map_element 'li', to: :li
+      map_attribute "start", to: :start
+      map_element "li", to: :li
     end
   end
 end

data/lib/metaschema/preformatted_type.rb

@@ -1,16 +1,8 @@
 # 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 PreformattedType < Lutaml::Model::Serializable
-    attribute :content, :string
+    attribute :content, :string, collection: true
     attribute :a, AnchorType, collection: true
     attribute :insert, InsertType, collection: true
     attribute :br, :string, collection: true
@@ -25,22 +17,23 @@ module Metaschema
     attribute :img, ImageType, collection: true
 
     xml do
-      root 'preformattedType', mixed: true
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "preformattedType"
+      mixed_content
+      namespace ::Metaschema::Namespace
 
       map_content to: :content
-      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_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/property_type.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
 module Metaschema
   class PropertyType < Lutaml::Model::Serializable
-    attribute :namespace, :string, default: -> { 'http://csrc.nist.gov/ns/oscal/metaschema/1.0' }
+    attribute :namespace, :string, default: -> { "http://csrc.nist.gov/ns/oscal/metaschema/1.0" }
     attribute :name, :string
     attribute :value, :string
 
     xml do
-      root 'PropertyType'
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "PropertyType"
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'namespace', to: :namespace
-      map_attribute 'name', to: :name
-      map_attribute 'value', to: :value
+      map_attribute "namespace", to: :namespace
+      map_attribute "name", to: :name
+      map_attribute "value", to: :value
     end
   end
 end

data/lib/metaschema/remarks_type.rb

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'block_quote_type'
-require_relative 'image_type'
-require_relative 'inline_markup_type'
-require_relative 'list_type'
-require_relative 'ordered_list_type'
-require_relative 'preformatted_type'
-require_relative 'table_type'
-
 module Metaschema
   class RemarksType < Lutaml::Model::Serializable
     attribute :klass, :string
@@ -29,24 +19,25 @@ module Metaschema
     attribute :img, ImageType, collection: true
 
     xml do
-      root 'RemarksType', mixed: true
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "RemarksType"
+      mixed_content
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'class', to: :klass
-      map_element 'h1', to: :h1
-      map_element 'h2', to: :h2
-      map_element 'h3', to: :h3
-      map_element 'h4', to: :h4
-      map_element 'h5', to: :h5
-      map_element 'h6', to: :h6
-      map_element 'ul', to: :ul
-      map_element 'ol', to: :ol
-      map_element 'pre', to: :pre
-      map_element 'hr', to: :hr
-      map_element 'blockquote', to: :blockquote
-      map_element 'p', to: :p
-      map_element 'table', to: :table
-      map_element 'img', to: :img
+      map_attribute "class", to: :klass
+      map_element "h1", to: :h1
+      map_element "h2", to: :h2
+      map_element "h3", to: :h3
+      map_element "h4", to: :h4
+      map_element "h5", to: :h5
+      map_element "h6", to: :h6
+      map_element "ul", to: :ul
+      map_element "ol", to: :ol
+      map_element "pre", to: :pre
+      map_element "hr", to: :hr
+      map_element "blockquote", to: :blockquote
+      map_element "p", to: :p
+      map_element "table", to: :table
+      map_element "img", to: :img
     end
   end
 end

data/lib/metaschema/root.rb

@@ -1,24 +1,13 @@
 # frozen_string_literal: true
 
-require 'lutaml/model'
-
-require_relative 'global_assembly_definition_type'
-require_relative 'global_field_definition_type'
-require_relative 'global_flag_definition_type'
-require_relative 'markup_line_datatype'
-require_relative 'metaschema_import_type'
-require_relative 'namespace_binding_type'
-require_relative 'property_type'
-require_relative 'remarks_type'
-
 module Metaschema
   class Root < Lutaml::Model::Serializable
-    attribute :abstract, :string, default: -> { 'no' }
+    attribute :abstract, :string, default: -> { "no" }
     attribute :schema_name, MarkupLineDatatype
-    attribute :schema_version, :string
-    attribute :short_name, :string
-    attribute :namespace, :string
-    attribute :json_base_uri, :string
+    attribute :schema_version, SchemaVersion
+    attribute :short_name, ShortName
+    attribute :namespace, NamespaceValue
+    attribute :json_base_uri, JsonBaseUri
     attribute :prop, PropertyType, collection: true
     attribute :remarks, RemarksType
     attribute :import, MetaschemaImportType, collection: true
@@ -26,24 +15,27 @@ module Metaschema
     attribute :define_assembly, GlobalAssemblyDefinitionType, collection: true
     attribute :define_field, GlobalFieldDefinitionType, collection: true
     attribute :define_flag, GlobalFlagDefinitionType, collection: true
+    attribute :augment, AugmentType, collection: true
 
     xml do
-      root 'METASCHEMA', ordered: true
-      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
+      element "METASCHEMA"
+      ordered
+      namespace ::Metaschema::Namespace
 
-      map_attribute 'abstract', to: :abstract
-      map_element 'schema-name', to: :schema_name
-      map_element 'schema-version', to: :schema_version
-      map_element 'short-name', to: :short_name
-      map_element 'namespace', to: :namespace
-      map_element 'json-base-uri', to: :json_base_uri
-      map_element 'prop', to: :prop
-      map_element 'remarks', to: :remarks
-      map_element 'import', to: :import
-      map_element 'namespace-binding', to: :namespace_binding
-      map_element 'define-assembly', to: :define_assembly
-      map_element 'define-field', to: :define_field
-      map_element 'define-flag', to: :define_flag
+      map_attribute "abstract", to: :abstract
+      map_element "schema-name", to: :schema_name
+      map_element "schema-version", to: :schema_version
+      map_element "short-name", to: :short_name
+      map_element "namespace", to: :namespace
+      map_element "json-base-uri", to: :json_base_uri
+      map_element "prop", to: :prop
+      map_element "remarks", to: :remarks
+      map_element "import", to: :import
+      map_element "namespace-binding", to: :namespace_binding
+      map_element "define-assembly", to: :define_assembly
+      map_element "define-field", to: :define_field
+      map_element "define-flag", to: :define_flag
+      map_element "augment", to: :augment
     end
   end
 end

data/lib/metaschema/root_name.rb

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