sts 0.3.4 → 0.4.0

data/lib/sts/niso_sts/inline_formula.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "../tbx_iso_tml/math"
 
 module Sts
   module NisoSts
     class InlineFormula < Lutaml::Model::Serializable
-      attribute :math, TbxIsoTml::Math
+      attribute :math, ::Sts::TbxIsoTml::Math
 
       xml do
-        root "inline-formula"
+        element "inline-formula"
 
-        map_element "math", to: :math,
-                            namespace: "http://www.w3.org/1998/Math/MathML",
-                            prefix: "mml"
+        map_element "math", to: :math
       end
     end
   end

data/lib/sts/niso_sts/label.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "../tbx_iso_tml/sup"
-
 module Sts
   module NisoSts
     class Label < Lutaml::Model::Serializable
@@ -11,7 +7,7 @@ module Sts
       attribute :sup, Sts::TbxIsoTml::Sup
 
       xml do
-        root "label"
+        element "label"
 
         map_content to: :content
         map_element "sup", to: :sup

data/lib/sts/niso_sts/list.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
-require_relative "list_item"
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class List < Lutaml::Model::Serializable
       attribute :text, :string
       attribute :list_type, :string
-      attribute :list_item, ListItem, collection: true
+      attribute :list_item, ::Sts::NisoSts::ListItem, collection: true
 
       xml do
-        root "list"
+        element "list"
 
         map_content to: :text
         map_attribute "list-type", to: :list_type
-        map_element "list-item", to: :list_item, namespace: nil, prefix: nil
+        map_element "list-item", to: :list_item
       end
     end
   end

data/lib/sts/niso_sts/list_item.rb

@@ -1,27 +1,22 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "list"
-require_relative "non_normative_example"
 
 module Sts
   module NisoSts
-    class Paragraph < Lutaml::Model::Serializable; end
-    class List < Lutaml::Model::Serializable; end
-
     class ListItem < Lutaml::Model::Serializable
-      attribute :label, Label
-      attribute :list, List
-      attribute :non_normative_example, NonNormativeExample
-      attribute :p, Sts::NisoSts::Paragraph
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :list, ::Sts::NisoSts::List
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
-        root "list-item"
+        element "list-item"
 
-        map_element :label, to: :label
-        map_element :list, to: :list
+        map_element "label", to: :label
+        map_element "list", to: :list
         map_element "non-normative-example", to: :non_normative_example
-        map_element :p, to: :p
+        map_element "p", to: :p
       end
     end
   end

data/lib/sts/niso_sts/meta_date.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class MetaDate < Lutaml::Model::Serializable
@@ -9,7 +7,7 @@ module Sts
       attribute :type, :string
 
       xml do
-        root "meta-date"
+        element "meta-date"
 
         map_content to: :content
 

data/lib/sts/niso_sts/meta_note.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "paragraph"
-
 module Sts
   module NisoSts
     class MetaNote < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
-      attribute :p, Paragraph, collection: true
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
       attribute :title, :string
 
       xml do
-        root "meta-note", mixed: true
+        element "meta-note"
+        mixed_content
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type

data/lib/sts/niso_sts/metadata_iso.rb

@@ -1,39 +1,28 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "custom_meta_group"
-require_relative "document_identification"
-require_relative "meta_date"
-require_relative "page_count"
-require_relative "permissions"
-require_relative "standard_identification"
-require_relative "standard_ref"
-require_relative "std_cross_reference"
-require_relative "title_wrap"
-
 module Sts
   module NisoSts
     class MetadataIso < Lutaml::Model::Serializable
       attribute :comm_ref, :string
       attribute :content_language, :string
-      attribute :custom_meta_group, CustomMetaGroup
-      attribute :doc_ident, DocumentIdentification
+      attribute :custom_meta_group, ::Sts::NisoSts::CustomMetaGroup
+      attribute :doc_ident, ::Sts::NisoSts::DocumentIdentification
       attribute :doc_ref, :string
       attribute :ics, :string
-      attribute :meta_date, MetaDate
-      attribute :page_count, PageCount
-      attribute :permissions, Permissions
+      attribute :meta_date, ::Sts::NisoSts::MetaDate
+      attribute :page_count, ::Sts::NisoSts::PageCount
+      attribute :permissions, ::Sts::NisoSts::Permissions
       attribute :pub_date, :string
       attribute :release_date, :string
       attribute :secretariat, :string
-      attribute :std_ident, StandardIdentification
-      attribute :std_ref, StandardRef
-      attribute :std_xref, StdCrossReference
-      attribute :title_wrap, TitleWrap
+      attribute :std_ident, ::Sts::NisoSts::StandardIdentification
+      attribute :std_ref, ::Sts::NisoSts::StandardRef
+      attribute :std_xref, ::Sts::NisoSts::StdCrossReference
+      attribute :title_wrap, ::Sts::NisoSts::TitleWrap
 
       xml do
-        root "iso-meta", mixed: true
+        element "iso-meta"
+        mixed_content
 
         map_element "comm-ref", to: :comm_ref,
                                 value_map: { to: { empty: :empty } }

data/lib/sts/niso_sts/metadata_std.rb

@@ -1,40 +1,33 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "title_wrap"
-require_relative "document_identification"
-require_relative "standard_identification"
-require_relative "standard_ref"
-require_relative "page_count"
-require_relative "std_cross_reference"
-require_relative "meta_note"
-require_relative "custom_meta_group"
-require_relative "permissions"
 
 module Sts
   module NisoSts
     class MetadataStd < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :title_wrap, TitleWrap, collection: true
+      attribute :title_wrap, ::Sts::NisoSts::TitleWrap, collection: true
       attribute :content_language, :string
-      attribute :std_ident, StandardIdentification
-      attribute :doc_ident, DocumentIdentification
-      attribute :std_ref, StandardRef, collection: true
+      attribute :std_ident, ::Sts::NisoSts::StandardIdentification
+      attribute :doc_ident, ::Sts::NisoSts::DocumentIdentification
+      attribute :std_ref, ::Sts::NisoSts::StandardRef, collection: true
       attribute :doc_ref, :string
       attribute :pub_date, :string
       attribute :release_date, :string
       attribute :release_version, :string
       attribute :comm_ref, :string
       attribute :secretariat, :string
-      attribute :page_count, PageCount
+      attribute :page_count, ::Sts::NisoSts::PageCount
       attribute :ics, :string
-      attribute :std_xref, StdCrossReference
-      attribute :permissions, Permissions
-      attribute :meta_note, MetaNote, collection: true
-      attribute :custom_meta_group, CustomMetaGroup, collection: true
+      attribute :std_xref, ::Sts::NisoSts::StdCrossReference
+      attribute :permissions, ::Sts::NisoSts::Permissions
+      attribute :meta_note, ::Sts::NisoSts::MetaNote, collection: true
+      attribute :custom_meta_group, ::Sts::NisoSts::CustomMetaGroup,
+                collection: true
 
       xml do
-        root "std-meta", mixed: true
+        element "std-meta"
+        mixed_content
 
         map_attribute "id", to: :id
 

data/lib/sts/niso_sts/mixed_citation.rb

@@ -1,10 +1,5 @@
 # frozen_striing_literal: true
 
-require "lutaml/model"
-
-require_relative "ext_link"
-require_relative "reference_standard"
-
 module Sts
   module NisoSts
     class MixedCitation < Lutaml::Model::Serializable
@@ -12,11 +7,12 @@ module Sts
       attribute :bold, :string
       attribute :italic, :string
       attribute :publication_type, :string
-      attribute :std, ReferenceStandard, collection: true
-      attribute :ext_link, ExtLink
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :ext_link, ::Sts::NisoSts::ExtLink
 
       xml do
-        root "mixed-citation", mixed: true
+        element "mixed-citation"
+        mixed_content
 
         map_content to: :content
 

data/lib/sts/{tbx_iso_tml → niso_sts}/named_content.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
-  module TbxIsoTml
+  module NisoSts
     class NamedContent < Lutaml::Model::Serializable
       attribute :content_type, :string
       attribute :content, :string
 
       xml do
-        root "named-content"
+        element "named-content"
 
         map_attribute "content-type", to: :content_type
-
         map_content to: :content
       end
     end

data/lib/sts/niso_sts/non_normative_example.rb

@@ -1,20 +1,15 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "paragraph"
-
 module Sts
   module NisoSts
-    class Paragraph < Lutaml::Model::Serializable; end
-
     class NonNormativeExample < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :p, Paragraph
-      attribute :label, Label
+      attribute :p, ::Sts::NisoSts::Paragraph
+      attribute :label, ::Sts::NisoSts::Label
 
       xml do
-        root "non-normative-example", mixed: true
+        element "non-normative-example"
+        mixed_content
 
         map_attribute "id", to: :id
         map_element "p", to: :p

data/lib/sts/niso_sts/non_normative_note.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "paragraph"
-
 module Sts
   module NisoSts
     class NonNormativeNote < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
-      attribute :p, Paragraph
-      attribute :label, Label
+      attribute :p, ::Sts::NisoSts::Paragraph
+      attribute :label, ::Sts::NisoSts::Label
 
       xml do
-        root "non-normative-note", mixed: true
+        element "non-normative-note"
+        mixed_content
 
         map_attribute "content-type", to: :content_type
         map_attribute "id", to: :id

data/lib/sts/niso_sts/object_id.rb

@@ -4,8 +4,6 @@
 # <object-id pub-id-type="publisher-id">fig-1</object-id>
 # rubocop:enable Layout/LineLength
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class ObjectId < Lutaml::Model::Serializable
@@ -13,7 +11,7 @@ module Sts
       attribute :content, :string
 
       xml do
-        root "object-id"
+        element "object-id"
 
         map_attribute "pub-id-type", to: :pub_id_type
         map_content to: :content

data/lib/sts/niso_sts/page_count.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class PageCount < Lutaml::Model::Serializable
       attribute :count, :integer
 
       xml do
-        root "page-count"
+        element "page-count"
         map_attribute "count", to: :count
       end
     end

data/lib/sts/niso_sts/paragraph.rb

@@ -1,42 +1,27 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "list"
-require_relative "inline_formula"
-require_relative "display_formula"
-require_relative "def_list"
-require_relative "non_normative_note"
-require_relative "non_normative_example"
-require_relative "reference_standard"
-require_relative "ext_link"
-require_relative "../tbx_iso_tml/entailed_term"
-require_relative "../tbx_iso_tml/xref"
-
 module Sts
   module NisoSts
-    class NonNormativeNote < Lutaml::Model::Serializable; end
-    class ReferenceStandard < Lutaml::Model::Serializable; end
-
     class Paragraph < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :text, :string
       attribute :italic, :string, collection: true
       attribute :bold, :string, collection: true
       attribute :uri, :string
-      attribute :list, Sts::NisoSts::List
-      attribute :def_list, DefList
-      attribute :non_normative_note, NonNormativeNote
-      attribute :non_normative_example, NonNormativeExample
-      attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
-      attribute :disp_formula, Sts::NisoSts::DisplayFormula, collection: true
-      attribute :xref, TbxIsoTml::Xref, collection: true
-      attribute :std, ReferenceStandard, collection: true
-      attribute :ext_link, ExtLink
-      attribute :entailed_term, Sts::TbxIsoTml::EntailedTerm
+      attribute :list, ::Sts::NisoSts::List
+      attribute :def_list, ::Sts::NisoSts::DefList
+      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
+      attribute :disp_formula, ::Sts::NisoSts::DisplayFormula, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :ext_link, ::Sts::NisoSts::ExtLink
+      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm
 
       xml do
-        root "p", mixed: true
+        element "p"
+        mixed_content
 
         map_attribute "id", to: :id
         map_content to: :text
@@ -49,12 +34,10 @@ module Sts
         map_element "inline-formula", to: :inline_formula
         map_element "disp-formula", to: :disp_formula
         map_element "ext-link", to: :ext_link
-        map_element "entailedTerm", to: :entailed_term,
-                                    namespace: "urn:iso:std:iso:30042:ed-1",
-                                    prefix: "tbx"
+        map_element "entailedTerm", to: :entailed_term
         map_element "uri", to: :uri
-        map_element "std", to: :std, namespace: nil, prefix: nil
-        map_element "xref", to: :xref, namespace: nil, prefix: nil
+        map_element "std", to: :std
+        map_element "xref", to: :xref
       end
     end
   end

data/lib/sts/niso_sts/permissions.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class Permissions < Lutaml::Model::Serializable
@@ -10,7 +8,7 @@ module Sts
       attribute :copyright_holder, :string
 
       xml do
-        root "permissions"
+        element "permissions"
         map_element "copyright-statement", to: :copyright_statement
         map_element "copyright-year", to: :copyright_year
         map_element "copyright-holder", to: :copyright_holder

data/lib/sts/niso_sts/reference.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
-require_relative "reference_standard"
-require_relative "mixed_citation"
-
 module Sts
   module NisoSts
     class Reference < Lutaml::Model::Serializable
       attribute :content_type, :string
       attribute :id, :string
-      attribute :label, Label
-      attribute :mixed_citation, MixedCitation
-      attribute :std, ReferenceStandard, collection: true
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :mixed_citation, ::Sts::NisoSts::MixedCitation
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
 
       xml do
-        root "ref"
+        element "ref"
         map_attribute "content-type", to: :content_type
         map_attribute "id", to: :id
         map_element "label", to: :label

data/lib/sts/niso_sts/reference_list.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "reference"
-
 module Sts
   module NisoSts
     class ReferenceList < Lutaml::Model::Serializable
@@ -9,11 +7,11 @@ module Sts
       attribute :id, :string
       attribute :specific_use, :string
       attribute :title, :string
-      attribute :label, Label
-      attribute :ref, Reference, collection: true
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :ref, ::Sts::NisoSts::Reference, collection: true
 
       xml do
-        root "ref-list"
+        element "ref-list"
 
         map_attribute "content-type", to: :content_type
         map_attribute "id", to: :id

data/lib/sts/niso_sts/reference_standard.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "standard_ref"
-require_relative "std_id_group"
-require_relative "fn"
-require_relative "../tbx_iso_tml/xref"
 
 module Sts
   module NisoSts
@@ -12,24 +8,23 @@ module Sts
       attribute :type, :string
       attribute :std_id, :string
       attribute :content, :string
-      attribute :std_ref, StandardRef
+      attribute :std_ref, ::Sts::NisoSts::StandardRef
       attribute :title, :string
-      attribute :fn, Fn, collection: true
-      attribute :std_id_group, StdIdGroup, collection: true
-      attribute :xref, Sts::TbxIsoTml::Xref, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :std_id_group, ::Sts::NisoSts::StdIdGroup, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
 
       xml do
-        root "std", mixed: true
+        element "std"
+        mixed_content
 
         map_attribute "type", to: :type
         map_attribute "std-id", to: :std_id
 
-        map_element "std-ref", to: :std_ref, namespace: nil, prefix: nil
-        map_element "fn", to: :fn, namespace: nil, prefix: nil
-        map_element "title", to: :title, namespace: nil, prefix: nil
-        map_element "std-id-group", to: :std_id_group,
-                                    namespace: nil,
-                                    prefix: nil
+        map_element "std-ref", to: :std_ref
+        map_element "fn", to: :fn
+        map_element "title", to: :title
+        map_element "std-id-group", to: :std_id_group
         map_element "xref", to: :xref
 
         map_content to: :content

data/lib/sts/niso_sts/section.rb

@@ -1,44 +1,31 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "paragraph"
-require_relative "list"
-require_relative "term_section"
-require_relative "reference_list"
-require_relative "non_normative_note"
-require_relative "non_normative_example"
-require_relative "figure"
-require_relative "title"
-require_relative "section_array"
-
-require_relative "../tbx_iso_tml/table_wrap"
-
 module Sts
   module NisoSts
-    class Title < Lutaml::Model::Serializable; end
-
     class Section < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :specific_use, :string
-      attribute :label, Label
-      attribute :title, Title
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :title, ::Sts::NisoSts::Title
       attribute :type, :string
-      attribute :array, SectionArray
-      attribute :paragraphs, Paragraph, collection: true
-      attribute :list, List, collection: true
-      attribute :term_sec, TermSection, collection: true
-      attribute :ref_list, ReferenceList, collection: true
-      attribute :non_normative_note, NonNormativeNote, collection: true
-      attribute :non_normative_example, NonNormativeExample, collection: true
-      attribute :sec, Section, collection: true
-      attribute :figures, Figure, collection: true
-      attribute :fig, Figure, collection: true
+      attribute :array, ::Sts::NisoSts::SectionArray
+      attribute :paragraphs, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :term_sec, ::Sts::NisoSts::TermSection, collection: true
+      attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
+      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
+      attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :figures, ::Sts::NisoSts::Figure, collection: true
+      attribute :fig, ::Sts::NisoSts::Figure, collection: true
 
       attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
 
       xml do
-        root "sec", mixed: true
+        element "sec"
+        mixed_content
 
         map_attribute "id", to: :id
         map_attribute "sec-type", to: :type

data/lib/sts/niso_sts/section_array.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "../tbx_iso_tml/table"
-
 module Sts
   module NisoSts
     class SectionArray < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :table, Sts::TbxIsoTml::Table
+      attribute :table, ::Sts::TbxIsoTml::Table
 
       xml do
-        root "array"
+        element "array"
 
         map_attribute "id", to: :id
         map_element "table", to: :table