sts 0.5.3 → 0.5.4

data/lib/sts/mathml.rb

@@ -1,67 +1,21 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
 require "mml"
 
 module Sts
   module Mathml
-    class Math < Lutaml::Model::Serializable
-      attribute :id, :string
-      attribute :display, :string
-      attribute :math, Mml::V3::Math
-
-      xml do
-        namespace ::Sts::Namespaces::MathmlNamespace
-        element "math"
-        mixed_content
-
-        map_attribute :id, to: :id
-        map_attribute :display, to: :display
-        map_element "math", to: :math
-      end
-
-      def id
-        @id ||= math&.id
-      end
-
-      def id=(value)
-        @id = value
-        math.id = value if math
-      end
-
-      def display
-        @display ||= math&.display
-      end
-
-      def display=(value)
-        @display = value
-        math.display = value if math
-      end
-
-      def method_missing(method_name, *args, &block)
-        if math.respond_to?(method_name)
-          math.send(method_name, *args, &block)
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method_name, include_private = false)
-        math.respond_to?(method_name, include_private) || super
-      end
-
-      def to_xml
-        math&.to_xml
-      end
-
-      def self.from_xml(input)
-        parsed = Mml::V3::Math.from_xml(input)
-        math = new
-        math.instance_variable_set(:@math, parsed)
-        math.id = parsed.id
-        math.display = parsed.display
-        math
-      end
+    # Wrapper around Mml::V3::Math for use within Sts document models.
+    #
+    # Mml::V3::Math is the actual serializable model. This class provides
+    # a typed namespace at Sts::Mathml and forwards the small subset of
+    # Mml::V3::Math interface used by Sts elements.
+    #
+    # All Mml element types (mi, mo, mn, mrow, etc.) are used directly
+    # from Mml::V3 — only the root <math> wrapper lives here.
+    class Math
+      # Type alias for callers that prefer the Sts namespace path.
+      # Maps directly to Mml::V3::Math with identical serialization.
+      Root = Mml::V3::Math
     end
   end
 end

data/lib/sts/namespaces.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sts
   module Namespaces
     class MathmlNamespace < Lutaml::Xml::Namespace

data/lib/sts/niso_sts/abstract.rb

@@ -4,6 +4,7 @@ module Sts
   module NisoSts
     class Abstract < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :originator, :string
       attribute :abstract_type, :string
       attribute :lang, Lutaml::Xml::W3c::XmlLangType
       attribute :title, :string
@@ -14,6 +15,7 @@ module Sts
         ordered
 
         map_attribute "id", to: :id
+        map_attribute "originator", to: :originator
         map_attribute "abstract-type", to: :abstract_type
         map_attribute "xml:lang", to: :lang
         map_element "title", to: :title

data/lib/sts/niso_sts/access_date.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class AccessDate < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "access-date"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/accrediting_organization.rb

@@ -3,9 +3,11 @@
 module Sts
   module NisoSts
     class AccreditingOrganization < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       xml do
         element "accrediting-organization"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/addr_line.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class AddrLine < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "addr-line"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/address.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class Address < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :addr_line, ::Sts::NisoSts::AddrLine, collection: true
       attribute :city, ::Sts::NisoSts::City
       attribute :state, ::Sts::NisoSts::State
@@ -14,6 +15,7 @@ module Sts
 
       xml do
         element "address"
+        map_attribute "id", to: :id
         ordered
 
         map_element "addr-line", to: :addr_line

data/lib/sts/niso_sts/aff_alternatives.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class AffAlternatives < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :aff, ::Sts::NisoSts::Aff, collection: true
 
       xml do
         element "aff-alternatives"
 
+        map_attribute "id", to: :id
+
         map_element "aff", to: :aff
       end
     end

data/lib/sts/niso_sts/alt_text.rb

@@ -3,9 +3,11 @@
 module Sts
   module NisoSts
     class AltText < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       xml do
         element "alt-text"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/alt_title.rb

@@ -3,9 +3,11 @@
 module Sts
   module NisoSts
     class AltTitle < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       xml do
         element "alt-title"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/alternatives.rb

@@ -3,8 +3,10 @@
 module Sts
   module NisoSts
     class Alternatives < Lutaml::Model::Serializable
+      attribute :id, :string
       xml do
         element "alternatives"
+        map_attribute "id", to: :id
         ordered
       end
     end

data/lib/sts/niso_sts/anonymous.rb

@@ -3,8 +3,11 @@
 module Sts
   module NisoSts
     class Anonymous < Lutaml::Model::Serializable
+      attribute :id, :string
       xml do
         element "anonymous"
+
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/niso_sts/app.rb

@@ -5,6 +5,7 @@ module Sts
     class App < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
+      attribute :originator, :string
       attribute :label, ::Sts::NisoSts::Label
       attribute :annex_type, :string
       attribute :title, ::Sts::NisoSts::Title
@@ -29,6 +30,7 @@ module Sts
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
+        map_attribute "originator", to: :originator
 
         map_element "label", to: :label
         map_element "annex-type", to: :annex_type

data/lib/sts/niso_sts/article_title.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class ArticleTitle < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "article-title"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/attrib.rb

@@ -3,9 +3,11 @@
 module Sts
   module NisoSts
     class Attrib < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       xml do
         element "attrib"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/authorization.rb

@@ -3,9 +3,11 @@
 module Sts
   module NisoSts
     class Authorization < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       xml do
         element "authorization"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/award_group.rb

@@ -3,19 +3,37 @@
 module Sts
   module NisoSts
     class AwardGroup < Lutaml::Model::Serializable
-      attribute :id, :string
       attribute :award_type, :string
+      attribute :id, :string
+      attribute :rid, :string
+      attribute :specific_use, :string
+      attribute :xlink_href, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :string
+      attribute :xml_lang, :string
       attribute :funding_source, ::Sts::NisoSts::FundingSource, collection: true
       attribute :award_id, ::Sts::NisoSts::AwardId, collection: true
-      attribute :principal_award_recipient, ::Sts::NisoSts::PrincipalAwardRecipient
-      attribute :principal_investigator, ::Sts::NisoSts::PrincipalInvestigator
+      attribute :principal_award_recipient,
+                ::Sts::NisoSts::PrincipalAwardRecipient, collection: true
+      attribute :principal_investigator, ::Sts::NisoSts::PrincipalInvestigator,
+                collection: true
 
       xml do
         element "award-group"
         ordered
 
-        map_attribute "id", to: :id
         map_attribute "award-type", to: :award_type
+        map_attribute "id", to: :id
+        map_attribute "rid", to: :rid
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xlink:href", to: :xlink_href
+        map_attribute "xlink:role", to: :xlink_role
+        map_attribute "xlink:title", to: :xlink_title
+        map_attribute "xlink:show", to: :xlink_show
+        map_attribute "xlink:actuate", to: :xlink_actuate
+        map_attribute "xml:lang", to: :xml_lang
 
         map_element "funding-source", to: :funding_source
         map_element "award-id", to: :award_id

data/lib/sts/niso_sts/award_id.rb

@@ -4,14 +4,20 @@ module Sts
   module NisoSts
     class AwardId < Lutaml::Model::Serializable
       attribute :award_id_type, :string
+      attribute :id, :string
       attribute :rid, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
       attribute :content, :string, collection: true
       xml do
         element "award-id"
         mixed_content
 
         map_attribute "award-id-type", to: :award_id_type
+        map_attribute "id", to: :id
         map_attribute "rid", to: :rid
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
         map_content to: :content
       end
     end

data/lib/sts/niso_sts/back.rb

@@ -3,19 +3,37 @@
 module Sts
   module NisoSts
     class Back < Lutaml::Model::Serializable
-      attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
+      attribute :id, :string
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :title, ::Sts::NisoSts::Title
+      attribute :ack, ::Sts::NisoSts::Ack, collection: true
       attribute :app_group, ::Sts::NisoSts::AppGroup, collection: true
-      attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :bio, ::Sts::NisoSts::Bio, collection: true
       attribute :fn_group, ::Sts::NisoSts::FnGroup, collection: true
+      attribute :glossary, ::Sts::NisoSts::Glossary, collection: true
+      attribute :index, ::Sts::NisoSts::Index, collection: true
+      attribute :notes, ::Sts::NisoSts::Notes, collection: true
+      attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
+      attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :toc, ::Sts::NisoSts::Toc, collection: true
 
       xml do
         element "back"
         ordered
 
-        map_element "ref-list", to: :ref_list
+        map_attribute "id", to: :id
+        map_element "label", to: :label
+        map_element "title", to: :title
+        map_element "ack", to: :ack
         map_element "app-group", to: :app_group
-        map_element "sec", to: :sec
+        map_element "bio", to: :bio
         map_element "fn-group", to: :fn_group
+        map_element "glossary", to: :glossary
+        map_element "index", to: :index
+        map_element "notes", to: :notes
+        map_element "ref-list", to: :ref_list
+        map_element "sec", to: :sec
+        map_element "toc", to: :toc
       end
     end
   end

data/lib/sts/niso_sts/body.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class Body < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :sec, ::Sts::NisoSts::Section, collection: true
       attribute :term_sec, ::Sts::NisoSts::TermSection, collection: true
       attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
@@ -26,6 +27,7 @@ module Sts
 
       xml do
         element "body"
+        map_attribute "id", to: :id
         ordered
 
         map_element "sec", to: :sec

data/lib/sts/niso_sts/boxed_text.rb

@@ -5,14 +5,32 @@ module Sts
     class BoxedText < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
+      attribute :form_type, :string
+      attribute :is_form, :string
       attribute :orientation, :string
+      attribute :originator, :string
       attribute :position, :string
       attribute :specific_use, :string
-      attribute :caption, ::Sts::NisoSts::Caption
+      attribute :xml_lang, :string
       attribute :label, ::Sts::NisoSts::Label
+      attribute :caption, ::Sts::NisoSts::Caption
       attribute :paragraphs, ::Sts::NisoSts::Paragraph, collection: true
-      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
       attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :fig, ::Sts::NisoSts::Figure, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :disp_formula, ::Sts::NisoSts::DisplayFormula, collection: true
+      attribute :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
+      attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :fn_group, ::Sts::NisoSts::FnGroup, 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 :attrib, ::Sts::NisoSts::Attrib, collection: true
+      attribute :permissions, ::Sts::NisoSts::Permissions
 
       xml do
         element "boxed-text"
@@ -20,15 +38,31 @@ module Sts
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
+        map_attribute "form-type", to: :form_type
+        map_attribute "is-form", to: :is_form
         map_attribute "orientation", to: :orientation
+        map_attribute "originator", to: :originator
         map_attribute "position", to: :position
         map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
 
-        map_element "caption", to: :caption
         map_element "label", to: :label
+        map_element "caption", to: :caption
         map_element "p", to: :paragraphs
-        map_element "preformat", to: :preformat
         map_element "list", to: :list
+        map_element "def-list", to: :def_list
+        map_element "preformat", to: :preformat
+        map_element "fig", to: :fig
+        map_element "graphic", to: :graphic
+        map_element "disp-formula", to: :disp_formula
+        map_element "disp-quote", to: :disp_quote
+        map_element "sec", to: :sec
+        map_element "fn-group", to: :fn_group
+        map_element "ref-list", to: :ref_list
+        map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
+        map_element "attrib", to: :attrib
+        map_element "permissions", to: :permissions
       end
     end
   end

data/lib/sts/niso_sts/break.rb

@@ -3,8 +3,11 @@
 module Sts
   module NisoSts
     class Break < Lutaml::Model::Serializable
+      attribute :id, :string
       xml do
         element "break"
+
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/niso_sts/caption.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Layout/LineLength
 # <caption>
 #   <title>Overview of risk assessment/risk reduction</title>
@@ -25,6 +27,9 @@
 module Sts
   module NisoSts
     class Caption < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
       attribute :title, ::Sts::NisoSts::Title
       attribute :paragraphs, ::Sts::NisoSts::Paragraph, collection: true
       attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
@@ -37,6 +42,9 @@ module Sts
         element "caption"
         ordered
 
+        map_attribute "id", to: :id
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
         map_element "p", to: :paragraphs
         map_element "non-normative-note", to: :non_normative_note
         map_element "title", to: :title

data/lib/sts/niso_sts/chapter_title.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class ChapterTitle < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "chapter-title"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/chem_struct.rb

@@ -3,9 +3,11 @@
 module Sts
   module NisoSts
     class ChemStruct < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       xml do
         element "chem-struct"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/citation_alternatives.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class CitationAlternatives < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :mixed_citation, ::Sts::NisoSts::MixedCitation
       attribute :element_citation, ::Sts::NisoSts::ElementCitation
       attribute :nlm_citation, ::Sts::NisoSts::NlmCitation
 
       xml do
         element "citation-alternatives"
+        map_attribute "id", to: :id
         ordered
 
         map_element "mixed-citation", to: :mixed_citation

data/lib/sts/niso_sts/city.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class City < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "city"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content