sts 0.3.2 → 0.3.3

data/lib/sts/tbx_iso_tml/tbody.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "tr"
 
 module Sts
   module TbxIsoTml
-    class Tbody < Sts::Mapper
+    class Tbody < Lutaml::Model::Serializable
       attribute :tr, Sts::TbxIsoTml::Tr, collection: true
-      attribute :char, Shale::Type::String
-      attribute :charoff, Shale::Type::String
-      attribute :valign, Shale::Type::String
+      attribute :char, Lutaml::Model::Type::String
+      attribute :charoff, Lutaml::Model::Type::String
+      attribute :valign, Lutaml::Model::Type::String
 
       xml do
         root "tbody"

data/lib/sts/tbx_iso_tml/td.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "italic"
 require_relative "xref"
@@ -14,30 +14,32 @@ require_relative "../niso_sts/paragraph"
 
 module Sts
   module TbxIsoTml
-    class Td < Sts::Mapper
-      attribute :content, Shale::Type::String
-      attribute :align, Shale::Type::String
-      attribute :scope, Shale::Type::String
-      attribute :style, Shale::Type::String
+    class Td < Lutaml::Model::Serializable
+      attribute :content, Lutaml::Model::Type::String
+      attribute :align, Lutaml::Model::Type::String
+      attribute :scope, Lutaml::Model::Type::String
+      attribute :style, Lutaml::Model::Type::String
       attribute :bold, Bold
       attribute :italic, Italic
-      attribute :content_type, Shale::Type::String
-      attribute :char, Shale::Type::String
-      attribute :charoff, Shale::Type::String
-      attribute :colspan, Shale::Type::String
-      attribute :rowspan, Shale::Type::String
-      attribute :valign, Shale::Type::String
+      attribute :content_type, Lutaml::Model::Type::String
+      attribute :char, Lutaml::Model::Type::String
+      attribute :charoff, Lutaml::Model::Type::String
+      attribute :colspan, Lutaml::Model::Type::String
+      attribute :rowspan, Lutaml::Model::Type::String
+      attribute :valign, Lutaml::Model::Type::String
       attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
-      attribute :non_normative_note, Sts::NisoSts::NonNormativeNote
+      attribute :non_normative_note,
+                Sts::NisoSts::NonNormativeNote,
+                collection: true
       attribute :list, Sts::NisoSts::List
-      attribute :xref, Xref
+      attribute :xref, Xref, collection: true
       attribute :std, Sts::NisoSts::ReferenceStandard
       attribute :graphic, Sts::NisoSts::Graphic
       attribute :def_list, Sts::NisoSts::DefList
       attribute :paragraph, Sts::NisoSts::Paragraph
 
       xml do
-        root "tr"
+        root "td", mixed: true
 
         map_content to: :content
 

data/lib/sts/tbx_iso_tml/term.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "italic"
 require_relative "math"
@@ -11,21 +11,21 @@ require_relative "../niso_sts/inline_formula"
 
 module Sts
   module TbxIsoTml
-    class Term < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :script, Shale::Type::String
-      attribute :value, Shale::Type::String
+    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, Shale::Type::String
-      attribute :sub, Shale::Type::String
+      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
+      attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
       attribute :named_content, Sts::TbxIsoTml::NamedContent
 
       xml do
-        root "term"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        root "term", mixed: true
+        # namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_attribute "id", to: :id
         map_attribute "script", to: :script

data/lib/sts/tbx_iso_tml/term_entry.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "lang_set"
 require_relative "external_graphic"
 
 module Sts
   module TbxIsoTml
-    class TermEntry < Sts::Mapper
-      attribute :id, Shale::Type::String
+    class TermEntry < Lutaml::Model::Serializable
+      attribute :id, Lutaml::Model::Type::String
       attribute :lang_set, LangSet, collection: true
       attribute :x_graphic, ExternalGraphic, collection: true
 
       xml do
-        root "termEntry"
+        root "termEntry", mixed: true
         namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_attribute "id", to: :id

data/lib/sts/tbx_iso_tml/term_information_group.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "term"
 require_relative "part_of_speech"
@@ -12,20 +12,20 @@ require_relative "term_type"
 
 module Sts
   module TbxIsoTml
-    class TermInformationGroup < Sts::Mapper
+    class TermInformationGroup < Lutaml::Model::Serializable
       attribute :term, Term
       attribute :pos, PartOfSpeech
-      attribute :id, Shale::Type::String
-      attribute :usage_note, Shale::Type::String
+      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, Shale::Type::String
+      attribute :pronunciation, Lutaml::Model::Type::String
       attribute :term_type, TermType
 
       xml do
-        root "tig"
+        root "tig", mixed: true
         namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_attribute "id", to: :id

data/lib/sts/tbx_iso_tml/term_type.rb

@@ -1,20 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class TermType < Sts::Mapper
-      # TODO: can be:
-      # - acronym
-      # - abbreviation
-      # - equation
-      # - formula
-      # - fullForm
-      # - symbol
-      # - variant
-
-      attribute :value, Shale::Type::String
+    class TermType < Lutaml::Model::Serializable
+      attribute :value, Lutaml::Model::Type::String,
+                values: %w[acronym abbreviation equation formula fullForm symbol variant]
 
       xml do
         root "termType"

data/lib/sts/tbx_iso_tml/th.rb

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
-require_relative "italic"
 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 < Sts::Mapper
-      attribute :content, Shale::Type::String
-      attribute :colspan, Shale::Type::String
-      attribute :align, Shale::Type::String
-      attribute :scope, Shale::Type::String
-      attribute :style, Shale::Type::String
-      attribute :rowspan, Shale::Type::String
-      attribute :break, Shale::Type::String
-      attribute :content_type, Shale::Type::String
-      attribute :char, Shale::Type::String
-      attribute :charoff, Shale::Type::String
-      attribute :valign, Shale::Type::String
+    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
@@ -29,7 +30,7 @@ module Sts
       attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
 
       xml do
-        root "th"
+        root "th", mixed: true
 
         map_content to: :content
         map_attribute "colspan", to: :colspan
@@ -42,7 +43,7 @@ module Sts
         map_attribute "charoff", to: :charoff
         map_attribute "valign", to: :valign
 
-        map_element "break", to: :break, render_nil: true
+        map_element "break", to: :break
         map_element "italic", to: :italic
         map_element "bold", to: :bold
         map_element "std", to: :std

data/lib/sts/tbx_iso_tml/thead.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "tr"
 
 module Sts
   module TbxIsoTml
-    class Thead < Sts::Mapper
+    class Thead < Lutaml::Model::Serializable
       attribute :tr, Sts::TbxIsoTml::Tr, collection: true
-      attribute :char, Shale::Type::String
-      attribute :charoff, Shale::Type::String
-      attribute :valign, Shale::Type::String
+      attribute :char, Lutaml::Model::Type::String
+      attribute :charoff, Lutaml::Model::Type::String
+      attribute :valign, Lutaml::Model::Type::String
 
       xml do
-        root "tbody"
+        root "thead"
 
         map_attribute "char", to: :char
         map_attribute "charoff", to: :charoff

data/lib/sts/tbx_iso_tml/tr.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "th"
 require_relative "td"
 
 module Sts
   module TbxIsoTml
-    class Tr < Sts::Mapper
+    class Tr < Lutaml::Model::Serializable
       attribute :th, Sts::TbxIsoTml::Th, collection: true
       attribute :td, Sts::TbxIsoTml::Td, collection: true
 

data/lib/sts/tbx_iso_tml/xref.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "shale"
-
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "sup"
 
 module Sts
   module TbxIsoTml
-    class Xref < Sts::Mapper
-      attribute :ref_type, Shale::Type::String
-      attribute :rid, Shale::Type::String
-      attribute :value, Shale::Type::String
+    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
 
       xml do

data/lib/sts/version.rb

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

data/lib/sts.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
 require_relative "sts/version"
-require "shale"
-require "shale/adapter/nokogiri"
+require "lutaml/model"
+require "lutaml/model/xml_adapter/nokogiri_adapter"
 
 module Sts
-  Shale.xml_adapter = Shale::Adapter::Nokogiri
+  Lutaml::Model::Config.configure do |config|
+    config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+  end
 
   class Error < StandardError; end
+
   # Your code goes here...
 end
 
 require_relative "sts/tbx_iso_tml"
-require_relative "sts/mapper"
 require_relative "sts/niso_sts"

data/sts.gemspec

@@ -29,7 +29,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "bigdecimal"
+  spec.add_dependency "lutaml-model", "~> 0.3.0"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "shale"
+
   # spec.add_dependency "thor"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sts
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shale
+  name: lutaml-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -49,13 +63,14 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.adoc
 - Rakefile
 - lib/sts.rb
-- lib/sts/mapper.rb
 - lib/sts/niso_sts.rb
 - lib/sts/niso_sts/adoption.rb
 - lib/sts/niso_sts/adoption_front.rb
@@ -143,6 +158,7 @@ files:
 - lib/sts/tbx_iso_tml/source.rb
 - lib/sts/tbx_iso_tml/sup.rb
 - lib/sts/tbx_iso_tml/table.rb
+- lib/sts/tbx_iso_tml/table_break.rb
 - lib/sts/tbx_iso_tml/table_wrap.rb
 - lib/sts/tbx_iso_tml/table_wrap_foot.rb
 - lib/sts/tbx_iso_tml/tbody.rb
@@ -165,6 +181,7 @@ metadata:
   homepage_uri: https://github.com/metanorma/sts-ruby
   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: 
 rdoc_options: []
 require_paths: