metaschema 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96ded33102abf61d6bebf9eeb5ae94432fa3ef93317d7cc63fefeada76cf3e1b
-  data.tar.gz: fb9b812a3407d39927a7fb3d4955c902e3559338a393f0edeed8223212745803
+  metadata.gz: 64b2cc9bd51c2759ae43653efcea7545ff2220e028f157aeb0df32cafed795eb
+  data.tar.gz: 05034bac6e8b89d8bdd9a9af304260328091856b644c0a30d27aaaf3086d042d
 SHA512:
-  metadata.gz: d4e7ea5033073e84c24375688b351f59be2c9b2787968160ab79f71a5c4e46346262710ff5952647529d0927b88d982d8c76ec178bf9e0a5b974e60e218a5405
-  data.tar.gz: 6e3b3ee833410b6fa2398e7ada654e0f7ec3d3b1ff87a440d0cdef046b4d3379d28707799c1f0ed644ed6bb0a4ccefcf3a352f5c715c4a99bc14e85b0d9efac3
+  metadata.gz: 2bb0686cdde7fbd7095e96c515440a45bffaa3bb423fd57788d37264a59f9cb4e8d2843730761ba16f886b202d5f684a56aee771c306fde0eb0a7f1f4b78ab95
+  data.tar.gz: 5a75499492d19b3eaf5c5bb4f4f7189e3621275619a89cbf0a5a79a2d59c58bbad9d6bab87792cd9073085dd1143561ddb56b0730aaac5909b167f049a7ddca2

data/.rspec_status

@@ -0,0 +1,64 @@
+example_id                          | status | run_time        |
+----------------------------------- | ------ | --------------- |
+./spec/metaschema_spec.rb[1:1:1:1]  | passed | 0.00694 seconds |
+./spec/metaschema_spec.rb[1:1:1:2]  | passed | 0.00481 seconds |
+./spec/metaschema_spec.rb[1:1:2:1]  | passed | 0.00441 seconds |
+./spec/metaschema_spec.rb[1:1:2:2]  | passed | 0.00358 seconds |
+./spec/metaschema_spec.rb[1:1:3:1]  | passed | 0.0022 seconds  |
+./spec/metaschema_spec.rb[1:1:3:2]  | passed | 0.00179 seconds |
+./spec/metaschema_spec.rb[1:1:4:1]  | passed | 0.00314 seconds |
+./spec/metaschema_spec.rb[1:1:4:2]  | passed | 0.00219 seconds |
+./spec/metaschema_spec.rb[1:1:5:1]  | passed | 0.00289 seconds |
+./spec/metaschema_spec.rb[1:1:5:2]  | passed | 0.002 seconds   |
+./spec/metaschema_spec.rb[1:1:6:1]  | passed | 0.0042 seconds  |
+./spec/metaschema_spec.rb[1:1:6:2]  | passed | 0.00309 seconds |
+./spec/metaschema_spec.rb[1:1:7:1]  | passed | 0.00576 seconds |
+./spec/metaschema_spec.rb[1:1:7:2]  | passed | 0.00391 seconds |
+./spec/metaschema_spec.rb[1:1:8:1]  | passed | 0.00269 seconds |
+./spec/metaschema_spec.rb[1:1:8:2]  | passed | 0.00189 seconds |
+./spec/metaschema_spec.rb[1:1:9:1]  | passed | 0.00346 seconds |
+./spec/metaschema_spec.rb[1:1:9:2]  | passed | 0.00259 seconds |
+./spec/metaschema_spec.rb[1:1:10:1] | passed | 0.00244 seconds |
+./spec/metaschema_spec.rb[1:1:10:2] | passed | 0.00228 seconds |
+./spec/metaschema_spec.rb[1:1:11:1] | passed | 0.00318 seconds |
+./spec/metaschema_spec.rb[1:1:11:2] | passed | 0.00254 seconds |
+./spec/metaschema_spec.rb[1:1:12:1] | passed | 0.00298 seconds |
+./spec/metaschema_spec.rb[1:1:12:2] | passed | 0.00275 seconds |
+./spec/metaschema_spec.rb[1:1:13:1] | passed | 0.00334 seconds |
+./spec/metaschema_spec.rb[1:1:13:2] | passed | 0.00253 seconds |
+./spec/metaschema_spec.rb[1:1:14:1] | passed | 0.0035 seconds  |
+./spec/metaschema_spec.rb[1:1:14:2] | passed | 0.00255 seconds |
+./spec/metaschema_spec.rb[1:1:15:1] | passed | 0.00547 seconds |
+./spec/metaschema_spec.rb[1:1:15:2] | passed | 0.00424 seconds |
+./spec/metaschema_spec.rb[1:1:16:1] | passed | 0.00248 seconds |
+./spec/metaschema_spec.rb[1:1:16:2] | passed | 0.00201 seconds |
+./spec/metaschema_spec.rb[1:1:17:1] | passed | 0.00249 seconds |
+./spec/metaschema_spec.rb[1:1:17:2] | passed | 0.00185 seconds |
+./spec/metaschema_spec.rb[1:1:18:1] | passed | 0.00229 seconds |
+./spec/metaschema_spec.rb[1:1:18:2] | passed | 0.00182 seconds |
+./spec/metaschema_spec.rb[1:1:19:1] | passed | 0.00252 seconds |
+./spec/metaschema_spec.rb[1:1:19:2] | passed | 0.00183 seconds |
+./spec/metaschema_spec.rb[1:1:20:1] | passed | 0.00284 seconds |
+./spec/metaschema_spec.rb[1:1:20:2] | passed | 0.00204 seconds |
+./spec/metaschema_spec.rb[1:1:21:1] | passed | 0.00755 seconds |
+./spec/metaschema_spec.rb[1:1:21:2] | passed | 0.00568 seconds |
+./spec/metaschema_spec.rb[1:1:22:1] | passed | 0.00272 seconds |
+./spec/metaschema_spec.rb[1:1:22:2] | passed | 0.0018 seconds  |
+./spec/metaschema_spec.rb[1:1:23:1] | passed | 0.0024 seconds  |
+./spec/metaschema_spec.rb[1:1:23:2] | passed | 0.00169 seconds |
+./spec/metaschema_spec.rb[1:1:24:1] | passed | 0.0039 seconds  |
+./spec/metaschema_spec.rb[1:1:24:2] | passed | 0.0032 seconds  |
+./spec/metaschema_spec.rb[1:1:25:1] | passed | 0.00356 seconds |
+./spec/metaschema_spec.rb[1:1:25:2] | passed | 0.0026 seconds  |
+./spec/metaschema_spec.rb[1:1:26:1] | passed | 0.00482 seconds |
+./spec/metaschema_spec.rb[1:1:26:2] | passed | 0.00368 seconds |
+./spec/metaschema_spec.rb[1:1:27:1] | passed | 0.00508 seconds |
+./spec/metaschema_spec.rb[1:1:27:2] | passed | 0.00346 seconds |
+./spec/metaschema_spec.rb[1:1:28:1] | passed | 0.00368 seconds |
+./spec/metaschema_spec.rb[1:1:28:2] | passed | 0.00311 seconds |
+./spec/metaschema_spec.rb[1:1:29:1] | passed | 0.0038 seconds  |
+./spec/metaschema_spec.rb[1:1:29:2] | passed | 0.00259 seconds |
+./spec/metaschema_spec.rb[1:1:30:1] | passed | 0.00279 seconds |
+./spec/metaschema_spec.rb[1:1:30:2] | passed | 0.002 seconds   |
+./spec/metaschema_spec.rb[1:1:31:1] | passed | 0.02414 seconds |
+./spec/metaschema_spec.rb[1:1:31:2] | passed | 0.01733 seconds |

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,76 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-10-28 08:35:06 UTC using RuboCop version 1.67.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: leading, trailing
+Layout/DotPosition:
+  Exclude:
+    - 'spec/metaschema_spec.rb'
+
+# Offense count: 65
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Layout/MultilineMethodCallIndentation:
+  Exclude:
+    - 'spec/metaschema_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
+Metrics/BlockLength:
+  Max: 44
+
+# Offense count: 66
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 65
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'split_files.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'spec/metaschema_spec.rb'
+
+# Offense count: 1120
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArguments:
+  Exclude:
+    - 'spec/metaschema_spec.rb'

data/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 

data/exe/metaschema

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative "../lib/metaschema"
-require_relative "../lib/metaschema/cli"
+require_relative '../lib/metaschema'
+require_relative '../lib/metaschema/cli'
 
 Metaschema::Cli::Commands.start(ARGV)

data/lib/metaschema/allowed_value_type.rb

@@ -1,10 +1,12 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-require_relative "anchor_type"
-require_relative "code_type"
-require_relative "image_type"
-require_relative "inline_markup_type"
-require_relative "insert_type"
+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 AllowedValueType < Lutaml::Model::Serializable
@@ -25,24 +27,24 @@ module Metaschema
     attribute :img, ImageType, collection: true
 
     xml do
-      root "AllowedValueType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'AllowedValueType', mixed: true
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
       map_content to: :content
-      map_attribute "value", to: :value
-      map_attribute "deprecated", to: :deprecated
-      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 'value', to: :value
+      map_attribute 'deprecated', to: :deprecated
+      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/allowed_values_type.rb

@@ -1,16 +1,18 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-require_relative "allowed_value_type"
-require_relative "markup_line_datatype"
-require_relative "property_type"
-require_relative "remarks_type"
+require 'lutaml/model'
+
+require_relative 'allowed_value_type'
+require_relative 'markup_line_datatype'
+require_relative 'property_type'
+require_relative 'remarks_type'
 
 module Metaschema
   class AllowedValuesType < 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 :formal_name, :string
     attribute :description, MarkupLineDatatype
     attribute :prop, PropertyType, collection: true
@@ -18,18 +20,18 @@ module Metaschema
     attribute :remarks, RemarksType
 
     xml do
-      root "AllowedValuesType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'AllowedValuesType'
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
-      map_attribute "id", to: :id
-      map_attribute "level", to: :level
-      map_attribute "allow-other", to: :allow_other
-      map_attribute "extensible", to: :extensible
-      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_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/anchor_type.rb

@@ -1,8 +1,10 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-require_relative "code_type"
-require_relative "image_type"
-require_relative "inline_markup_type"
+require 'lutaml/model'
+
+require_relative 'code_type'
+require_relative 'image_type'
+require_relative 'inline_markup_type'
 
 module Metaschema
   class AnchorType < Lutaml::Model::Serializable
@@ -20,21 +22,21 @@ module Metaschema
     attribute :img, ImageType, collection: true
 
     xml do
-      root "anchorType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'anchorType', mixed: true
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
       map_content to: :content
-      map_attribute "href", to: :href
-      map_attribute "title", to: :title
-      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 'href', to: :href
+      map_attribute 'title', to: :title
+      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/any_type.rb

@@ -1,10 +1,12 @@
-require "lutaml/model"
+# frozen_string_literal: true
+
+require 'lutaml/model'
 
 module Metaschema
   class AnyType < Lutaml::Model::Serializable
     xml do
-      root "AnyType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'AnyType'
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
     end
   end
 end

data/lib/metaschema/assembly.rb

@@ -1,14 +1,16 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-require_relative "constraint_let_type"
-require_relative "remarks_type"
-require_relative "targeted_allowed_values_constraint_type"
-require_relative "targeted_expect_constraint_type"
-require_relative "targeted_has_cardinality_constraint_type"
-require_relative "targeted_index_constraint_type"
-require_relative "targeted_index_has_key_constraint_type"
-require_relative "targeted_key_constraint_type"
-require_relative "targeted_matches_constraint_type"
+require 'lutaml/model'
+
+require_relative 'constraint_let_type'
+require_relative 'remarks_type'
+require_relative 'targeted_allowed_values_constraint_type'
+require_relative 'targeted_expect_constraint_type'
+require_relative 'targeted_has_cardinality_constraint_type'
+require_relative 'targeted_index_constraint_type'
+require_relative 'targeted_index_has_key_constraint_type'
+require_relative 'targeted_key_constraint_type'
+require_relative 'targeted_matches_constraint_type'
 
 module Metaschema
   class Assembly < Lutaml::Model::Serializable
@@ -24,19 +26,19 @@ module Metaschema
     attribute :remarks, RemarksType
 
     xml do
-      root "assembly"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'assembly'
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
-      map_attribute "target", to: :target
-      map_element "let", to: :let
-      map_element "allowed-values", to: :allowed_values
-      map_element "matches", to: :matches
-      map_element "index-has-key", to: :index_has_key
-      map_element "expect", to: :expect
-      map_element "index", to: :index
-      map_element "is-unique", to: :is_unique
-      map_element "has-cardinality", to: :has_cardinality
-      map_element "remarks", to: :remarks
+      map_attribute 'target', to: :target
+      map_element 'let', to: :let
+      map_element 'is-unique', to: :is_unique
+      map_element 'allowed-values', to: :allowed_values
+      map_element 'matches', to: :matches
+      map_element 'index-has-key', to: :index_has_key
+      map_element 'expect', to: :expect
+      map_element 'index', to: :index
+      map_element 'has-cardinality', to: :has_cardinality
+      map_element 'remarks', to: :remarks
     end
   end
 end

data/lib/metaschema/assembly_model_type.rb

@@ -1,12 +1,14 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-require_relative "any_type"
-require_relative "assembly_reference_type"
-require_relative "choice_type"
-require_relative "field_reference_type"
-require_relative "grouped_choice_type"
-require_relative "inline_assembly_definition_type"
-require_relative "inline_field_definition_type"
+require 'lutaml/model'
+
+require_relative 'any_type'
+require_relative 'assembly_reference_type'
+require_relative 'choice_type'
+require_relative 'field_reference_type'
+require_relative 'grouped_choice_type'
+require_relative 'inline_assembly_definition_type'
+require_relative 'inline_field_definition_type'
 
 module Metaschema
   class AssemblyModelType < Lutaml::Model::Serializable
@@ -19,16 +21,16 @@ module Metaschema
     attribute :any, AnyType
 
     xml do
-      root "AssemblyModelType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'AssemblyModelType', ordered: true
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
-      map_element "assembly", to: :assembly
-      map_element "field", to: :field
-      map_element "define-assembly", to: :define_assembly
-      map_element "define-field", to: :define_field
-      map_element "choice", to: :choice
-      map_element "choice-group", to: :choice_group
-      map_element "any", to: :any
+      map_element 'field', to: :field
+      map_element 'define-assembly', to: :define_assembly
+      map_element 'assembly', to: :assembly
+      map_element 'define-field', to: :define_field
+      map_element 'choice', to: :choice
+      map_element 'choice-group', to: :choice_group
+      map_element 'any', to: :any
     end
   end
 end

data/lib/metaschema/assembly_reference_type.rb

@@ -1,17 +1,19 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-require_relative "group_as_type"
-require_relative "markup_line_datatype"
-require_relative "property_type"
-require_relative "remarks_type"
-require_relative "use_name_type"
+require 'lutaml/model'
+
+require_relative 'group_as_type'
+require_relative 'markup_line_datatype'
+require_relative 'property_type'
+require_relative 'remarks_type'
+require_relative 'use_name_type'
 
 module Metaschema
   class AssemblyReferenceType < Lutaml::Model::Serializable
     attribute :ref, :string
     attribute :index, :integer
-    attribute :min_occurs, :integer, default: -> { "0" }
-    attribute :max_occurs, :string, default: -> { "1" }
+    attribute :min_occurs, :integer, default: -> { '0' }
+    attribute :max_occurs, :string, default: -> { '1' }
     attribute :deprecated, :string
     attribute :formal_name, :string
     attribute :description, MarkupLineDatatype
@@ -21,20 +23,20 @@ module Metaschema
     attribute :remarks, RemarksType
 
     xml do
-      root "AssemblyReferenceType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'AssemblyReferenceType'
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
-      map_attribute "ref", to: :ref
-      map_attribute "index", to: :index
-      map_attribute "min-occurs", to: :min_occurs
-      map_attribute "max-occurs", to: :max_occurs
-      map_attribute "deprecated", to: :deprecated
-      map_element "formal-name", to: :formal_name
-      map_element "description", to: :description
-      map_element "prop", to: :prop
-      map_element "use-name", to: :use_name
-      map_element "group-as", to: :group_as
-      map_element "remarks", to: :remarks
+      map_attribute 'ref', to: :ref
+      map_attribute 'index', to: :index
+      map_attribute 'min-occurs', to: :min_occurs
+      map_attribute 'max-occurs', to: :max_occurs
+      map_attribute 'deprecated', to: :deprecated
+      map_element 'formal-name', to: :formal_name
+      map_element 'description', to: :description
+      map_element 'prop', to: :prop
+      map_element 'use-name', to: :use_name
+      map_element 'group-as', to: :group_as
+      map_element 'remarks', to: :remarks
     end
   end
 end

data/lib/metaschema/block_quote_type.rb

@@ -1,11 +1,13 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-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"
+require 'lutaml/model'
+
+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 BlockQuoteType < Lutaml::Model::Serializable
@@ -25,23 +27,23 @@ module Metaschema
     attribute :img, ImageType, collection: true
 
     xml do
-      root "blockQuoteType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'blockQuoteType', mixed: true
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
-      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_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/choice_type.rb

@@ -1,9 +1,11 @@
-require "lutaml/model"
+# frozen_string_literal: true
 
-require_relative "assembly_reference_type"
-require_relative "field_reference_type"
-require_relative "inline_assembly_definition_type"
-require_relative "inline_field_definition_type"
+require 'lutaml/model'
+
+require_relative 'assembly_reference_type'
+require_relative 'field_reference_type'
+require_relative 'inline_assembly_definition_type'
+require_relative 'inline_field_definition_type'
 
 module Metaschema
   class ChoiceType < Lutaml::Model::Serializable
@@ -13,13 +15,13 @@ module Metaschema
     attribute :define_field, InlineFieldDefinitionType, collection: true
 
     xml do
-      root "ChoiceType"
-      namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+      root 'ChoiceType'
+      namespace 'http://csrc.nist.gov/ns/oscal/metaschema/1.0'
 
-      map_element "assembly", to: :assembly
-      map_element "field", to: :field
-      map_element "define-assembly", to: :define_assembly
-      map_element "define-field", to: :define_field
+      map_element 'field', to: :field
+      map_element 'define-assembly', to: :define_assembly
+      map_element 'assembly', to: :assembly
+      map_element 'define-field', to: :define_field
     end
   end
 end