sts 0.3.4 → 0.4.0

data/lib/sts/niso_sts/standard.rb

@@ -1,31 +1,27 @@
 # frozen_string_literal: true
 
-require_relative "front"
-require_relative "body"
-require_relative "back"
-
 module Sts
   module NisoSts
     class Standard < Lutaml::Model::Serializable
-      attribute :front, Front
-      attribute :body, Body
-      attribute :back, Back
+      attribute :front, ::Sts::NisoSts::Front
+      attribute :body, ::Sts::NisoSts::Body
+      attribute :back, ::Sts::NisoSts::Back
       attribute :id, :string
-      attribute :lang, :string
+      attribute :lang, Lutaml::Xml::W3c::XmlLangType
       attribute :mml, :string
       attribute :tbx, :string
       attribute :xlink, :string
 
       xml do
-        root "standard"
-        # namespace "urn:iso:std:iso:30042:ed-1", "tbx"
-        # namespace "http://www.w3.org/1998/Math/MathML", "mml"
-        # namespace "http://www.w3.org/1999/xlink", "xlink"
+        element "standard"
+        namespace_scope [
+          ::Sts::Namespaces::MathmlNamespace,
+          ::Sts::Namespaces::TbxNamespace,
+          ::Lutaml::Xml::W3c::XlinkNamespace,
+        ]
 
         map_attribute "id", to: :id
-        map_attribute "lang", to: :lang,
-                              namespace: "http://www.w3.org/XML/1998/namespace",
-                              prefix: "xml"
+        map_attribute "lang", to: :lang
         map_element "front", to: :front
         map_element "body", to: :body
         map_element "back", to: :back

data/lib/sts/niso_sts/standard_identification.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "std_id_group"
-
 module Sts
   module NisoSts
     class StandardIdentification < Lutaml::Model::Serializable
@@ -13,10 +9,11 @@ module Sts
       attribute :edition, :string
       attribute :version, :string
       attribute :part_number, :string
-      attribute :std_id_group, StdIdGroup
+      attribute :std_id_group, ::Sts::NisoSts::StdIdGroup
 
       xml do
-        root "std-ident", mixed: true
+        element "std-ident"
+        mixed_content
 
         map_element "originator", to: :originator
         map_element "doc-type", to: :doc_type

data/lib/sts/niso_sts/standard_ref.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class StandardRef < Lutaml::Model::Serializable
@@ -9,7 +7,7 @@ module Sts
       attribute :value, :string
 
       xml do
-        root "std-ref"
+        element "std-ref"
         map_attribute "type", to: :type
         map_content to: :value
       end

data/lib/sts/niso_sts/std_cross_reference.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class StdCrossReference < Lutaml::Model::Serializable
       attribute :type, :string
-      attribute :std_ref, StandardRef, collection: true
+      attribute :std_ref, ::Sts::NisoSts::StandardRef, collection: true
 
       xml do
-        root "std-xref"
+        element "std-xref"
 
         map_attribute "type", to: :type
         map_element "std-ref", to: :std_ref

data/lib/sts/niso_sts/std_id.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class StdId < Lutaml::Model::Serializable
@@ -11,7 +9,7 @@ module Sts
       attribute :content, :string
 
       xml do
-        root "std-id"
+        element "std-id"
 
         map_attribute "std-id-link-type", to: :std_id_link_type
         map_attribute "std-id-type", to: :std_id_type

data/lib/sts/niso_sts/std_id_group.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "std_id"
-
 module Sts
   module NisoSts
     class StdIdGroup < Lutaml::Model::Serializable
-      attribute :std_id, StdId, collection: true
+      attribute :std_id, ::Sts::NisoSts::StdId, collection: true
 
       xml do
-        root "std-id-group"
+        element "std-id-group"
 
         map_element "std-id", to: :std_id
       end

data/lib/sts/niso_sts/term.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class Term < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :rid, :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, ::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
+      attribute :specific_use, :string,
+                values: ["abbreviation", "acronym", "equation", "formula", "fullForm", "symbol", "variant"]
+      attribute :term_status, :string,
+                values: ["admitted", "non-preferred", "preferred"], collection: true
+      attribute :term_type, :string,
+                values: ["abbreviation", "acronym", "equation", "formula", "fullForm", "symbol", "variant"]
+      attribute :vocab, :string
+      attribute :vocab_identifier, :string
+      attribute :vocab_term, :string
+      attribute :vocab_term_identifier, :string
+      # attribute :lang, :string
+      attribute :named_content, ::Sts::NisoSts::NamedContent, collection: true
+
+      xml do
+        element "term"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "rid", to: :rid
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "term-status", to: :term_status
+        map_attribute "term-type", to: :term_type
+        map_attribute "vocab", to: :vocab
+        map_attribute "vocab-identifier", to: :vocab_identifier
+        map_attribute "vocab-term", to: :vocab_term
+        map_attribute "vocab-term-identifier", to: :vocab_term_identifier
+        # map_attribute "xml:lang", to: :lang
+
+        map_content to: :text
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "list", to: :list
+        map_element "def-list", to: :def_list
+        map_element "named-content", to: :named_content
+        map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
+        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
+        map_element "uri", to: :uri
+        map_element "std", to: :std
+        map_element "xref", to: :xref
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/term_display.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "paragraph"
-require_relative "non_normative_note"
-
 module Sts
   module NisoSts
     class TermDisplay < Lutaml::Model::Serializable
-      attribute :p, Paragraph, collection: true
-      attribute :non_normative_note, NonNormativeNote, collection: true
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
+                collection: true
 
       xml do
-        root "term-display"
+        element "term-display"
 
         map_element "p", to: :p
         map_element "non-normative-note", to: :non_normative_note

data/lib/sts/niso_sts/term_section.rb

@@ -1,30 +1,23 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "../tbx_iso_tml"
-require_relative "term_display"
-require_relative "../tbx_iso_tml/term_entry"
-
 module Sts
   module NisoSts
     class TermSection < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :sec_type, :string
-      attribute :label, Label
-      attribute :term_entry, Sts::TbxIsoTml::TermEntry # , collection: true
-      attribute :term_display, TermDisplay # , collection: true
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :term_entry, ::Sts::TbxIsoTml::TermEntry # , collection: true
+      attribute :term_display, ::Sts::NisoSts::TermDisplay # , collection: true
 
       xml do
-        root "term-sec", mixed: true
+        element "term-sec"
+        mixed_content
         map_attribute "id", to: :id
         map_attribute "sec-type", to: :sec_type
 
         map_element "label", to: :label
         map_element "term-display", to: :term_display
-        map_element "termEntry", to: :term_entry,
-                                 namespace: "urn:iso:std:iso:30042:ed-1",
-                                 prefix: "tbx"
+        map_element "termEntry", to: :term_entry
       end
     end
   end

data/lib/sts/niso_sts/title.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "section"
-require_relative "inline_formula"
-
 module Sts
   module NisoSts
     class Title < Lutaml::Model::Serializable
@@ -12,7 +7,8 @@ module Sts
       attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
 
       xml do
-        root "title", mixed: true
+        element "title"
+        mixed_content
 
         map_content to: :content
         map_element "inline-formula", to: :inline_formula

data/lib/sts/niso_sts/title_compl.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class TitleCompl < TitleFull
+      xml do
+        element "compl"
+
+        map_content to: :content
+        map_element "std", to: :std
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/title_full.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class TitleFull < Lutaml::Model::Serializable
+      attribute :content, :string
+      attribute :std, ::Sts::NisoSts::ReferenceStandard
+
+      xml do
+        element "full"
+        mixed_content
+
+        map_content to: :content
+        map_element "std", to: :std
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/title_wrap.rb

@@ -1,45 +1,40 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "reference_list"
-require_relative "reference_standard"
-
 module Sts
   module NisoSts
     class TitleFull < Lutaml::Model::Serializable
       attribute :content, :string
-      attribute :std, ReferenceStandard
+      attribute :std, ::Sts::NisoSts::ReferenceStandard
 
       xml do
-        root "full", mixed: true
+        element "full"
+        mixed_content
 
         map_content to: :content
-        map_element "std", to: :std, namespace: nil, prefix: nil
+        map_element "std", to: :std
       end
     end
 
     class TitleCompl < TitleFull
       xml do
-        root "compl"
+        element "compl"
 
         map_content to: :content
-        map_element "std", to: :std, namespace: nil, prefix: nil
+        map_element "std", to: :std
       end
     end
 
     class TitleWrap < Lutaml::Model::Serializable
       attribute :intro, :string
       attribute :main, :string
-      attribute :full, TitleFull
-      attribute :compl, TitleCompl
-      attribute :lang, :string
+      attribute :full, ::Sts::NisoSts::TitleFull
+      attribute :compl, ::Sts::NisoSts::TitleCompl
+      attribute :lang, Lutaml::Xml::W3c::XmlLangType
 
       xml do
-        root "title-wrap", mixed: true
-        map_attribute "lang", to: :lang,
-                              namespace: "http://www.w3.org/XML/1998/namespace",
-                              prefix: "xml"
+        element "title-wrap"
+        mixed_content
+        map_attribute "lang", to: :lang
 
         map_element "intro", to: :intro
         map_element "main", to: :main

data/lib/sts/niso_sts.rb

@@ -2,23 +2,61 @@
 
 module Sts
   module NisoSts
+    autoload :Adoption, "#{__dir__}/niso_sts/adoption"
+    autoload :AdoptionFront, "#{__dir__}/niso_sts/adoption_front"
+    autoload :App, "#{__dir__}/niso_sts/app"
+    autoload :AppGroup, "#{__dir__}/niso_sts/app_group"
+    autoload :Back, "#{__dir__}/niso_sts/back"
+    autoload :Body, "#{__dir__}/niso_sts/body"
+    autoload :Caption, "#{__dir__}/niso_sts/caption"
+    autoload :CustomMeta, "#{__dir__}/niso_sts/custom_meta"
+    autoload :CustomMetaGroup, "#{__dir__}/niso_sts/custom_meta_group"
+    autoload :Def, "#{__dir__}/niso_sts/def"
+    autoload :DefItem, "#{__dir__}/niso_sts/def_item"
+    autoload :DefList, "#{__dir__}/niso_sts/def_list"
+    autoload :DisplayFormula, "#{__dir__}/niso_sts/display_formula"
+    autoload :DocumentIdentification,
+             "#{__dir__}/niso_sts/document_identification"
+    autoload :ExtLink, "#{__dir__}/niso_sts/ext_link"
+    autoload :Figure, "#{__dir__}/niso_sts/figure"
+    autoload :Fn, "#{__dir__}/niso_sts/fn"
+    autoload :FnGroup, "#{__dir__}/niso_sts/fn_group"
+    autoload :Front, "#{__dir__}/niso_sts/front"
+    autoload :Graphic, "#{__dir__}/niso_sts/graphic"
+    autoload :InlineFormula, "#{__dir__}/niso_sts/inline_formula"
+    autoload :Label, "#{__dir__}/niso_sts/label"
+    autoload :List, "#{__dir__}/niso_sts/list"
+    autoload :ListItem, "#{__dir__}/niso_sts/list_item"
+    autoload :MetadataIso, "#{__dir__}/niso_sts/metadata_iso"
+    autoload :MetadataStd, "#{__dir__}/niso_sts/metadata_std"
+    autoload :MetaDate, "#{__dir__}/niso_sts/meta_date"
+    autoload :MetaNote, "#{__dir__}/niso_sts/meta_note"
+    autoload :MixedCitation, "#{__dir__}/niso_sts/mixed_citation"
+    autoload :NamedContent, "#{__dir__}/niso_sts/named_content"
+    autoload :NonNormativeExample, "#{__dir__}/niso_sts/non_normative_example"
+    autoload :NonNormativeNote, "#{__dir__}/niso_sts/non_normative_note"
+    autoload :ObjectId, "#{__dir__}/niso_sts/object_id"
+    autoload :PageCount, "#{__dir__}/niso_sts/page_count"
+    autoload :Paragraph, "#{__dir__}/niso_sts/paragraph"
+    autoload :Permissions, "#{__dir__}/niso_sts/permissions"
+    autoload :Reference, "#{__dir__}/niso_sts/reference"
+    autoload :ReferenceList, "#{__dir__}/niso_sts/reference_list"
+    autoload :ReferenceStandard, "#{__dir__}/niso_sts/reference_standard"
+    autoload :Section, "#{__dir__}/niso_sts/section"
+    autoload :SectionArray, "#{__dir__}/niso_sts/section_array"
+    autoload :Standard, "#{__dir__}/niso_sts/standard"
+    autoload :StandardIdentification,
+             "#{__dir__}/niso_sts/standard_identification"
+    autoload :StandardRef, "#{__dir__}/niso_sts/standard_ref"
+    autoload :StdCrossReference, "#{__dir__}/niso_sts/std_cross_reference"
+    autoload :StdId, "#{__dir__}/niso_sts/std_id"
+    autoload :StdIdGroup, "#{__dir__}/niso_sts/std_id_group"
+    autoload :Term, "#{__dir__}/niso_sts/term"
+    autoload :TermDisplay, "#{__dir__}/niso_sts/term_display"
+    autoload :TermSection, "#{__dir__}/niso_sts/term_section"
+    autoload :Title, "#{__dir__}/niso_sts/title"
+    autoload :TitleCompl, "#{__dir__}/niso_sts/title_compl"
+    autoload :TitleFull, "#{__dir__}/niso_sts/title_full"
+    autoload :TitleWrap, "#{__dir__}/niso_sts/title_wrap"
   end
 end
-
-require_relative "niso_sts/back"
-require_relative "niso_sts/body"
-require_relative "niso_sts/front"
-require_relative "niso_sts/list"
-require_relative "niso_sts/metadata_iso"
-require_relative "niso_sts/non_normative_note"
-require_relative "niso_sts/list_item"
-require_relative "niso_sts/paragraph"
-require_relative "niso_sts/reference"
-require_relative "niso_sts/reference_list"
-require_relative "niso_sts/reference_standard"
-require_relative "niso_sts/section"
-require_relative "niso_sts/standard"
-require_relative "niso_sts/adoption"
-require_relative "niso_sts/adoption_front"
-require_relative "niso_sts/term_display"
-require_relative "niso_sts/term_section"

data/lib/sts/tbx_iso_tml/bold.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Bold < Lutaml::Model::Serializable
       attribute :value, :string
 
       xml do
-        root "bold"
+        element "bold"
         namespace nil, nil
 
         map_content to: :value

data/lib/sts/tbx_iso_tml/caption.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Caption < Lutaml::Model::Serializable
       attribute :p, :string
 
       xml do
-        root "caption"
+        element "caption"
 
         map_element "p", to: :p
       end

data/lib/sts/tbx_iso_tml/col.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Col < Lutaml::Model::Serializable
@@ -11,7 +9,7 @@ module Sts
       attribute :span, :string
 
       xml do
-        root "col"
+        element "col"
 
         map_attribute "width", to: :width
         map_attribute "char", to: :char, value_map: { to: { empty: :empty } }

data/lib/sts/tbx_iso_tml/cross_reference.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Sts
+  module TbxIsoTml
+    class CrossReference < Lutaml::Model::Serializable
+      attribute :value, :string
+
+      xml do
+        element "crossReference"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
+
+        map_content to: :value
+      end
+    end
+  end
+end

data/lib/sts/tbx_iso_tml/definition.rb

@@ -1,38 +1,30 @@
 # frozen_string_literal: true
 
-require_relative "entailed_term"
-require_relative "note"
-require_relative "italic"
-require_relative "math"
-require_relative "../niso_sts/list"
-require_relative "../niso_sts/reference_standard"
-
 module Sts
   module TbxIsoTml
     class Definition < Lutaml::Model::Serializable
-      attribute :entailed_term, EntailedTerm, collection: true
-      attribute :note, Note
+      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm, collection: true
+      attribute :note, ::Sts::TbxIsoTml::Note
       attribute :value, :string
-      attribute :italic, Italic
-      attribute :math, Sts::TbxIsoTml::Math
+      attribute :italic, ::Sts::TbxIsoTml::Italic
+      attribute :math, ::Sts::TbxIsoTml::Math
       attribute :sub, :string
-      attribute :list, Sts::NisoSts::List, collection: true
-      attribute :std, Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
 
       xml do
-        root "definition", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "definition"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_content to: :value
         map_element "entailedTerm", to: :entailed_term
         map_element "note", to: :note
-        map_element "italic", to: :italic, namespace: nil, prefix: nil
-        map_element "sub", to: :sub, namespace: nil, prefix: nil
-        map_element "list", to: :list, namespace: nil, prefix: nil
-        map_element "std", to: :std, namespace: nil, prefix: nil
-        map_element "math", to: :math,
-                            namespace: "http://www.w3.org/1998/Math/MathML",
-                            prefix: "mml"
+        map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "list", to: :list
+        map_element "std", to: :std
+        map_element "math", to: :math
       end
     end
   end

data/lib/sts/tbx_iso_tml/entailed_term.rb

@@ -1,24 +1,20 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class EntailedTerm < Lutaml::Model::Serializable
       attribute :target, :string
       attribute :xtarget, :string
-      attribute :lang, :string
+      attribute :lang, Lutaml::Xml::W3c::XmlLangType
       attribute :value, :string
 
       xml do
-        root "entailedTerm"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "entailedTerm"
+        namespace ::Sts::Namespaces::TbxNamespace
 
-        map_attribute :target, to: :target
-        map_attribute :xtarget, to: :xtarget
-        map_attribute :lang, to: :lang,
-                             namespace: "http://www.w3.org/XML/1998/namespace",
-                             prefix: "xml"
+        map_attribute "target", to: :target
+        map_attribute "xtarget", to: :xtarget
+        map_attribute "lang", to: :lang
         map_content to: :value
       end
     end

data/lib/sts/tbx_iso_tml/example.rb

@@ -1,30 +1,26 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "entailed_term"
-
-require_relative "../niso_sts/inline_formula"
 
 module Sts
   module TbxIsoTml
     class Example < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :value, :string
-      attribute :entailed_term, EntailedTerm, collection: true
-      attribute :inline_formula, Sts::NisoSts::InlineFormula
+      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm, collection: true
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula
 
       xml do
-        root "example", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "example"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_content to: :value
 
         map_attribute "id", to: :id
 
         map_element "entailedTerm", to: :entailed_term
-        map_element "inline-formula", to: :inline_formula,
-                                      namespace: nil,
-                                      prefix: nil
+        map_element "inline-formula", to: :inline_formula
       end
     end
   end