sts 0.3.3 → 0.4.0

data/lib/sts/tbx_iso_tml/term.rb

@@ -1,47 +1,31 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "italic"
-require_relative "math"
-require_relative "named_content"
-require_relative "xref"
-
-require_relative "../niso_sts/inline_formula"
-
 module Sts
   module TbxIsoTml
     class Term < Lutaml::Model::Serializable
-      attribute :id, Lutaml::Model::Type::String
-      attribute :script, Lutaml::Model::Type::String
-      attribute :value, Lutaml::Model::Type::String
-      attribute :italic, Sts::TbxIsoTml::Italic
-      attribute :bold, Lutaml::Model::Type::String
-      attribute :sub, Lutaml::Model::Type::String
-      attribute :math, Sts::TbxIsoTml::Math
-      attribute :xref, Sts::TbxIsoTml::Xref
-      attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
-      attribute :named_content, Sts::TbxIsoTml::NamedContent
+      attribute :id, :string
+      attribute :script, :string
+      attribute :value, :string
+      attribute :italic, ::Sts::TbxIsoTml::Italic
+      attribute :bold, :string
+      attribute :sub, :string
+      attribute :math, ::Sts::TbxIsoTml::Math
+      attribute :xref, ::Sts::TbxIsoTml::Xref
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
 
       xml do
-        root "term", mixed: true
-        # namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "term"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "id", to: :id
         map_attribute "script", to: :script
-        map_element "inline-formula", to: :inline_formula,
-                                      namespace: nil,
-                                      prefix: nil
-        map_element "named-content", to: :named_content,
-                                     namespace: nil,
-                                     prefix: nil
-        map_element "italic", to: :italic, namespace: nil, prefix: nil
-        map_element "bold", to: :bold, namespace: nil, prefix: nil
-        map_element "sub", to: :sub, namespace: nil, prefix: nil
-        map_element "xref", to: :xref, namespace: nil, prefix: nil
-        map_element "math", to: :math,
-                            namespace: "http://www.w3.org/1998/Math/MathML",
-                            prefix: "mml"
+        map_element "inline-formula", to: :inline_formula
+        map_element "italic", to: :italic
+        map_element "bold", to: :bold
+        map_element "sub", to: :sub
+        map_element "xref", to: :xref
+        map_element "math", to: :math
         map_content to: :value
       end
     end

data/lib/sts/tbx_iso_tml/term_entry.rb

@@ -1,20 +1,16 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "lang_set"
-require_relative "external_graphic"
-
 module Sts
   module TbxIsoTml
     class TermEntry < Lutaml::Model::Serializable
-      attribute :id, Lutaml::Model::Type::String
-      attribute :lang_set, LangSet, collection: true
-      attribute :x_graphic, ExternalGraphic, collection: true
+      attribute :id, :string
+      attribute :lang_set, ::Sts::TbxIsoTml::LangSet, collection: true
+      attribute :x_graphic, ::Sts::TbxIsoTml::ExternalGraphic, collection: true
 
       xml do
-        root "termEntry", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "termEntry"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "id", to: :id
         map_element "langSet", to: :lang_set

data/lib/sts/tbx_iso_tml/term_information_group.rb

@@ -1,32 +1,23 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "term"
-require_relative "part_of_speech"
-require_relative "normative_authorization"
-require_relative "geographical_usage"
-require_relative "grammatical_gender"
-require_relative "grammatical_number"
-require_relative "term_type"
-
 module Sts
   module TbxIsoTml
     class TermInformationGroup < Lutaml::Model::Serializable
-      attribute :term, Term
-      attribute :pos, PartOfSpeech
-      attribute :id, Lutaml::Model::Type::String
-      attribute :usage_note, Lutaml::Model::Type::String
-      attribute :normative_authorization, NormativeAuthorization
-      attribute :geographical_usage, GeographicalUsage
-      attribute :grammatical_gender, GrammaticalGender
-      attribute :grammatical_number, GrammaticalNumber
-      attribute :pronunciation, Lutaml::Model::Type::String
-      attribute :term_type, TermType
+      attribute :term, ::Sts::TbxIsoTml::Term
+      attribute :pos, ::Sts::TbxIsoTml::PartOfSpeech
+      attribute :id, :string
+      attribute :usage_note, :string
+      attribute :normative_authorization, ::Sts::TbxIsoTml::NormativeAuthorization
+      attribute :geographical_usage, ::Sts::TbxIsoTml::GeographicalUsage
+      attribute :grammatical_gender, ::Sts::TbxIsoTml::GrammaticalGender
+      attribute :grammatical_number, ::Sts::TbxIsoTml::GrammaticalNumber
+      attribute :pronunciation, ::Sts::TbxIsoTml::Pronunciation
+      attribute :term_type, ::Sts::TbxIsoTml::TermType
 
       xml do
-        root "tig", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "tig"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "id", to: :id
 

data/lib/sts/tbx_iso_tml/term_type.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class TermType < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String,
+      attribute :value, :string,
                 values: %w[acronym abbreviation equation formula fullForm symbol variant]
 
       xml do
-        root "termType"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "termType"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "value", to: :value
       end

data/lib/sts/tbx_iso_tml/th.rb

@@ -1,36 +1,28 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "bold"
-require_relative "italic"
-require_relative "table_break"
-require_relative "xref"
-require_relative "../niso_sts/reference_standard"
-require_relative "../niso_sts/inline_formula"
-
 module Sts
   module TbxIsoTml
     class Th < Lutaml::Model::Serializable
-      attribute :content, Lutaml::Model::Type::String
-      attribute :colspan, Lutaml::Model::Type::String
-      attribute :align, Lutaml::Model::Type::String
-      attribute :scope, Lutaml::Model::Type::String
-      attribute :style, Lutaml::Model::Type::String
-      attribute :rowspan, Lutaml::Model::Type::String
-      attribute :break, TableBreak
-      attribute :content_type, Lutaml::Model::Type::String
-      attribute :char, Lutaml::Model::Type::String
-      attribute :charoff, Lutaml::Model::Type::String
-      attribute :valign, Lutaml::Model::Type::String
-      attribute :italic, Italic
-      attribute :bold, Bold
-      attribute :std, Sts::NisoSts::ReferenceStandard
-      attribute :xref, Xref
-      attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
+      attribute :content, :string
+      attribute :colspan, :string
+      attribute :align, :string
+      attribute :scope, :string
+      attribute :style, :string
+      attribute :rowspan, :string
+      attribute :break, ::Sts::TbxIsoTml::TableBreak
+      attribute :content_type, :string
+      attribute :char, :string
+      attribute :charoff, :string
+      attribute :valign, :string
+      attribute :italic, ::Sts::TbxIsoTml::Italic
+      attribute :bold, ::Sts::TbxIsoTml::Bold
+      attribute :std, ::Sts::NisoSts::ReferenceStandard
+      attribute :xref, ::Sts::TbxIsoTml::Xref
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
 
       xml do
-        root "th", mixed: true
+        element "th"
+        mixed_content
 
         map_content to: :content
         map_attribute "colspan", to: :colspan
@@ -39,7 +31,7 @@ module Sts
         map_attribute "style", to: :style
         map_attribute "rowspan", to: :rowspan
         map_attribute "content-type", to: :content_type
-        map_attribute "char", to: :char
+        map_attribute "char", to: :char, value_map: { to: { empty: :empty } }
         map_attribute "charoff", to: :charoff
         map_attribute "valign", to: :valign
 

data/lib/sts/tbx_iso_tml/thead.rb

@@ -1,21 +1,17 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "tr"
-
 module Sts
   module TbxIsoTml
     class Thead < Lutaml::Model::Serializable
-      attribute :tr, Sts::TbxIsoTml::Tr, collection: true
-      attribute :char, Lutaml::Model::Type::String
-      attribute :charoff, Lutaml::Model::Type::String
-      attribute :valign, Lutaml::Model::Type::String
+      attribute :tr, ::Sts::TbxIsoTml::Tr, collection: true
+      attribute :char, :string
+      attribute :charoff, :string
+      attribute :valign, :string
 
       xml do
-        root "thead"
+        element "thead"
 
-        map_attribute "char", to: :char
+        map_attribute "char", to: :char, value_map: { to: { empty: :empty } }
         map_attribute "charoff", to: :charoff
         map_attribute "valign", to: :valign
 

data/lib/sts/tbx_iso_tml/tr.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "th"
-require_relative "td"
-
 module Sts
   module TbxIsoTml
     class Tr < Lutaml::Model::Serializable
-      attribute :th, Sts::TbxIsoTml::Th, collection: true
-      attribute :td, Sts::TbxIsoTml::Td, collection: true
+      attribute :th, ::Sts::TbxIsoTml::Th, collection: true
+      attribute :td, ::Sts::TbxIsoTml::Td, collection: true
 
       xml do
-        root "tr"
+        element "tr"
 
         map_element "th", to: :th
         map_element "td", to: :td

data/lib/sts/tbx_iso_tml/xref.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "sup"
 
 module Sts
   module TbxIsoTml
     class Xref < Lutaml::Model::Serializable
-      attribute :ref_type, Lutaml::Model::Type::String
-      attribute :rid, Lutaml::Model::Type::String
-      attribute :value, Lutaml::Model::Type::String
-      attribute :sup, Sup
+      attribute :ref_type, :string
+      attribute :rid, :string
+      attribute :value, :string
+      attribute :sup, ::Sts::TbxIsoTml::Sup
 
       xml do
-        root "xref"
+        element "xref"
 
         map_attribute "ref-type", to: :ref_type
         map_attribute "rid", to: :rid

data/lib/sts/tbx_iso_tml.rb

@@ -2,30 +2,57 @@
 
 module Sts
   module TbxIsoTml
+    autoload :Bold, "#{__dir__}/tbx_iso_tml/bold"
+    autoload :Caption, "#{__dir__}/tbx_iso_tml/caption"
+    autoload :Col, "#{__dir__}/tbx_iso_tml/col"
+    autoload :CrossReference, "#{__dir__}/tbx_iso_tml/cross_reference"
+    autoload :Definition, "#{__dir__}/tbx_iso_tml/definition"
+    autoload :EntailedTerm, "#{__dir__}/tbx_iso_tml/entailed_term"
+    autoload :Example, "#{__dir__}/tbx_iso_tml/example"
+    autoload :ExternalGraphic, "#{__dir__}/tbx_iso_tml/external_graphic"
+    autoload :ExternalSource, "#{__dir__}/tbx_iso_tml/external_source"
+    autoload :Fn, "#{__dir__}/tbx_iso_tml/fn"
+    autoload :FnGroup, "#{__dir__}/tbx_iso_tml/fn_group"
+    autoload :GeographicalUsage, "#{__dir__}/tbx_iso_tml/geographical_usage"
+    autoload :GrammaticalGender, "#{__dir__}/tbx_iso_tml/grammatical_gender"
+    autoload :GrammaticalNumber, "#{__dir__}/tbx_iso_tml/grammatical_number"
+    autoload :Italic, "#{__dir__}/tbx_iso_tml/italic"
+    autoload :LangSet, "#{__dir__}/tbx_iso_tml/lang_set"
+    autoload :Math, "#{__dir__}/tbx_iso_tml/math"
+    autoload :Mfenced, "#{__dir__}/tbx_iso_tml/mfenced"
+    autoload :Mfrac, "#{__dir__}/tbx_iso_tml/mfrac"
+    autoload :Mi, "#{__dir__}/tbx_iso_tml/mi"
+    autoload :Mrow, "#{__dir__}/tbx_iso_tml/mrow"
+    autoload :Mspace, "#{__dir__}/tbx_iso_tml/mspace"
+    autoload :Mstyle, "#{__dir__}/tbx_iso_tml/mstyle"
+    autoload :Msub, "#{__dir__}/tbx_iso_tml/msub"
+    autoload :Msup, "#{__dir__}/tbx_iso_tml/msup"
+    autoload :Munder, "#{__dir__}/tbx_iso_tml/munder"
+    autoload :Munderover, "#{__dir__}/tbx_iso_tml/munderover"
+    autoload :NormativeAuthorization,
+             "#{__dir__}/tbx_iso_tml/normative_authorization"
+    autoload :Note, "#{__dir__}/tbx_iso_tml/note"
+    autoload :PartOfSpeech, "#{__dir__}/tbx_iso_tml/part_of_speech"
+    autoload :Pronunciation, "#{__dir__}/tbx_iso_tml/pronunciation"
+    autoload :See, "#{__dir__}/tbx_iso_tml/see"
+    autoload :Semantics, "#{__dir__}/tbx_iso_tml/semantics"
+    autoload :Source, "#{__dir__}/tbx_iso_tml/source"
+    autoload :SubjectField, "#{__dir__}/tbx_iso_tml/subject_field"
+    autoload :Sup, "#{__dir__}/tbx_iso_tml/sup"
+    autoload :Table, "#{__dir__}/tbx_iso_tml/table"
+    autoload :TableBreak, "#{__dir__}/tbx_iso_tml/table_break"
+    autoload :TableWrap, "#{__dir__}/tbx_iso_tml/table_wrap"
+    autoload :TableWrapFoot, "#{__dir__}/tbx_iso_tml/table_wrap_foot"
+    autoload :Tbody, "#{__dir__}/tbx_iso_tml/tbody"
+    autoload :Td, "#{__dir__}/tbx_iso_tml/td"
+    autoload :Term, "#{__dir__}/tbx_iso_tml/term"
+    autoload :TermEntry, "#{__dir__}/tbx_iso_tml/term_entry"
+    autoload :TermInformationGroup,
+             "#{__dir__}/tbx_iso_tml/term_information_group"
+    autoload :TermType, "#{__dir__}/tbx_iso_tml/term_type"
+    autoload :Th, "#{__dir__}/tbx_iso_tml/th"
+    autoload :Thead, "#{__dir__}/tbx_iso_tml/thead"
+    autoload :Tr, "#{__dir__}/tbx_iso_tml/tr"
+    autoload :Xref, "#{__dir__}/tbx_iso_tml/xref"
   end
 end
-
-require_relative "tbx_iso_tml/caption"
-require_relative "tbx_iso_tml/definition"
-require_relative "tbx_iso_tml/entailed_term"
-require_relative "tbx_iso_tml/example"
-require_relative "tbx_iso_tml/external_graphic"
-require_relative "tbx_iso_tml/external_source"
-require_relative "tbx_iso_tml/geographical_usage"
-require_relative "tbx_iso_tml/grammatical_gender"
-require_relative "tbx_iso_tml/lang_set"
-require_relative "tbx_iso_tml/normative_authorization"
-require_relative "tbx_iso_tml/note"
-require_relative "tbx_iso_tml/part_of_speech"
-require_relative "tbx_iso_tml/see"
-require_relative "tbx_iso_tml/source"
-require_relative "tbx_iso_tml/table_wrap"
-require_relative "tbx_iso_tml/table_wrap_foot"
-require_relative "tbx_iso_tml/tbody"
-require_relative "tbx_iso_tml/tr"
-require_relative "tbx_iso_tml/th"
-require_relative "tbx_iso_tml/td"
-require_relative "tbx_iso_tml/term"
-require_relative "tbx_iso_tml/term_entry"
-require_relative "tbx_iso_tml/term_information_group"
-require_relative "tbx_iso_tml/term_type"

data/lib/sts/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sts
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/sts.rb

@@ -1,18 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "sts/version"
 require "lutaml/model"
-require "lutaml/model/xml_adapter/nokogiri_adapter"
 
 module Sts
-  Lutaml::Model::Config.configure do |config|
-    config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
-  end
-
-  class Error < StandardError; end
-
-  # Your code goes here...
+  autoload :Namespaces, "#{__dir__}/sts/namespaces"
+  autoload :NisoSts, "#{__dir__}/sts/niso_sts"
+  autoload :VERSION, "#{__dir__}/sts/version"
+  autoload :TbxIsoTml, "#{__dir__}/sts/tbx_iso_tml"
 end
-
-require_relative "sts/tbx_iso_tml"
-require_relative "sts/niso_sts"

data/sts.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bigdecimal"
-  spec.add_dependency "lutaml-model", "~> 0.3.0"
+  spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "nokogiri"
 
   # spec.add_dependency "thor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sts
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - open.source@ribose.com
 executables: []
@@ -71,6 +71,7 @@ files:
 - README.adoc
 - Rakefile
 - lib/sts.rb
+- lib/sts/namespaces.rb
 - lib/sts/niso_sts.rb
 - lib/sts/niso_sts/adoption.rb
 - lib/sts/niso_sts/adoption_front.rb
@@ -101,6 +102,7 @@ files:
 - lib/sts/niso_sts/metadata_iso.rb
 - lib/sts/niso_sts/metadata_std.rb
 - lib/sts/niso_sts/mixed_citation.rb
+- lib/sts/niso_sts/named_content.rb
 - lib/sts/niso_sts/non_normative_example.rb
 - lib/sts/niso_sts/non_normative_note.rb
 - lib/sts/niso_sts/object_id.rb
@@ -118,14 +120,18 @@ files:
 - lib/sts/niso_sts/std_cross_reference.rb
 - lib/sts/niso_sts/std_id.rb
 - lib/sts/niso_sts/std_id_group.rb
+- lib/sts/niso_sts/term.rb
 - lib/sts/niso_sts/term_display.rb
 - lib/sts/niso_sts/term_section.rb
 - lib/sts/niso_sts/title.rb
+- lib/sts/niso_sts/title_compl.rb
+- lib/sts/niso_sts/title_full.rb
 - lib/sts/niso_sts/title_wrap.rb
 - lib/sts/tbx_iso_tml.rb
 - lib/sts/tbx_iso_tml/bold.rb
 - lib/sts/tbx_iso_tml/caption.rb
 - lib/sts/tbx_iso_tml/col.rb
+- lib/sts/tbx_iso_tml/cross_reference.rb
 - lib/sts/tbx_iso_tml/definition.rb
 - lib/sts/tbx_iso_tml/entailed_term.rb
 - lib/sts/tbx_iso_tml/example.rb
@@ -149,13 +155,14 @@ files:
 - lib/sts/tbx_iso_tml/msup.rb
 - lib/sts/tbx_iso_tml/munder.rb
 - lib/sts/tbx_iso_tml/munderover.rb
-- lib/sts/tbx_iso_tml/named_content.rb
 - lib/sts/tbx_iso_tml/normative_authorization.rb
 - lib/sts/tbx_iso_tml/note.rb
 - lib/sts/tbx_iso_tml/part_of_speech.rb
+- lib/sts/tbx_iso_tml/pronunciation.rb
 - lib/sts/tbx_iso_tml/see.rb
 - lib/sts/tbx_iso_tml/semantics.rb
 - lib/sts/tbx_iso_tml/source.rb
+- lib/sts/tbx_iso_tml/subject_field.rb
 - lib/sts/tbx_iso_tml/sup.rb
 - lib/sts/tbx_iso_tml/table.rb
 - lib/sts/tbx_iso_tml/table_break.rb
@@ -182,7 +189,7 @@ metadata:
   source_code_uri: https://github.com/metanorma/sts-ruby
   bug_tracker_uri: https://github.com/metanorma/sts-ruby/issues
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,8 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Library to work with NISO STS and ISOSTS.
 test_files: []