sts 0.3.2 → 0.3.4

data/lib/sts/niso_sts/caption.rb

@@ -1,4 +1,4 @@
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "paragraph"
 require_relative "title"
@@ -30,13 +30,13 @@ require_relative "non_normative_note"
 
 module Sts
   module NisoSts
-    class Caption < Sts::Mapper
+    class Caption < Lutaml::Model::Serializable
       attribute :title, Title
       attribute :paragraphs, Paragraph, collection: true
       attribute :non_normative_note, NonNormativeNote, collection: true
 
       xml do
-        root "caption"
+        root "caption", mixed: true
 
         map_element "p", to: :paragraphs
         map_element "non-normative-note", to: :non_normative_note

data/lib/sts/niso_sts/custom_meta.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class CustomMeta < Sts::Mapper
-      attribute :lang, Shale::Type::String
-      attribute :meta_name, Shale::Type::String
-      attribute :meta_value, Shale::Type::String
+    class CustomMeta < Lutaml::Model::Serializable
+      attribute :lang, :string
+      attribute :meta_name, :string
+      attribute :meta_value, :string
 
       xml do
         root "custom-meta"

data/lib/sts/niso_sts/custom_meta_group.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "custom_meta"
 
 module Sts
   module NisoSts
-    class CustomMetaGroup < Sts::Mapper
+    class CustomMetaGroup < Lutaml::Model::Serializable
       attribute :custom_meta, CustomMeta, collection: true
 
       xml do

data/lib/sts/niso_sts/def.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "paragraph"
 
 module Sts
   module NisoSts
-    class Def < Sts::Mapper
+    class Def < Lutaml::Model::Serializable
       attribute :paragraph, Paragraph
 
       xml do

data/lib/sts/niso_sts/def_item.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "def"
 require_relative "../tbx_iso_tml/term"
 
 module Sts
   module NisoSts
-    class DefItem < Sts::Mapper
-      attribute :specific_use, Shale::Type::String
+    class DefItem < Lutaml::Model::Serializable
+      attribute :specific_use, :string
       attribute :term, TbxIsoTml::Term
       attribute :definition, Def
 

data/lib/sts/niso_sts/def_list.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "def_item"
 
 module Sts
   module NisoSts
-    class DefList < Sts::Mapper
-      attribute :title, Shale::Type::String
-      attribute :specific_use, Shale::Type::String
-      attribute :list_type, Shale::Type::String
+    class DefList < Lutaml::Model::Serializable
+      attribute :title, :string
+      attribute :specific_use, :string
+      attribute :list_type, :string
       attribute :def_item, DefItem, collection: true
       attribute :def_list, DefList
 

data/lib/sts/niso_sts/display_formula.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "shale"
-
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "../tbx_iso_tml/math"
 
 module Sts
   module NisoSts
-    class DisplayFormula < Sts::Mapper
-      attribute :id, Shale::Type::String
+    class DisplayFormula < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :label, Label
       attribute :math, TbxIsoTml::Math
 

data/lib/sts/niso_sts/document_identification.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class DocumentIdentification < Sts::Mapper
-      attribute :sdo, Shale::Type::String
-      attribute :proj_id, Shale::Type::String
-      attribute :language, Shale::Type::String
-      attribute :release_version, Shale::Type::String
-      attribute :urn, Shale::Type::String
+    class DocumentIdentification < Lutaml::Model::Serializable
+      attribute :sdo, :string
+      attribute :proj_id, :string
+      attribute :language, :string
+      attribute :release_version, :string
+      attribute :urn, :string
 
       xml do
-        root "doc-iden"
+        root "doc-ident"
 
         map_element "sdo", to: :sdo
         map_element "proj-id", to: :proj_id

data/lib/sts/niso_sts/ext_link.rb

@@ -1,13 +1,13 @@
 # frozen_striing_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class ExtLink < Sts::Mapper
-      attribute :ext_link_type, Shale::Type::String
-      attribute :href, Shale::Type::String
-      attribute :content, Shale::Type::String
+    class ExtLink < Lutaml::Model::Serializable
+      attribute :ext_link_type, :string
+      attribute :href, :string
+      attribute :content, :string
 
       xml do
         root "ext-link"

data/lib/sts/niso_sts/figure.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "caption"
 require_relative "graphic"
@@ -14,18 +14,18 @@ require_relative "def_list"
 
 module Sts
   module NisoSts
-    class Caption < Sts::Mapper; end
+    class Caption < Lutaml::Model::Serializable; end
 
-    class Figure < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :orientation, Shale::Type::String
+    class Figure < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :orientation, :string
       attribute :caption, Caption
       attribute :def_list, DefList
       attribute :label, Label
       attribute :graphic, Graphic, collection: true
 
       xml do
-        root "fig"
+        root "fig", mixed: true
 
         map_attribute "id", to: :id
         map_attribute "orientation", to: :orientation

data/lib/sts/niso_sts/fn.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "label"
 require_relative "paragraph"
 
 module Sts
   module NisoSts
-    class Fn < Sts::Mapper
-      attribute :id, Shale::Type::String
+    class Fn < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :label, Label
       attribute :paragraph, Paragraph
 

data/lib/sts/niso_sts/fn_group.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "fn"
 
 module Sts
   module NisoSts
-    class FnGroup < Sts::Mapper
+    class FnGroup < Lutaml::Model::Serializable
       attribute :fn, Fn, collection: true
 
       xml do

data/lib/sts/niso_sts/front.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "metadata_iso"
 require_relative "metadata_std"
@@ -8,7 +8,7 @@ require_relative "section"
 
 module Sts
   module NisoSts
-    class Front < Sts::Mapper
+    class Front < Lutaml::Model::Serializable
       attribute :iso_meta, MetadataIso
       attribute :std_meta, MetadataStd
       attribute :sec, Section, collection: true

data/lib/sts/niso_sts/graphic.rb

@@ -1,4 +1,4 @@
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "object_id"
 
@@ -12,8 +12,8 @@ require_relative "object_id"
 
 module Sts
   module NisoSts
-    class Graphic < Sts::Mapper
-      attribute :href, Shale::Type::String
+    class Graphic < Lutaml::Model::Serializable
+      attribute :href, :string
       attribute :object_id, ObjectId, collection: true
 
       xml do

data/lib/sts/niso_sts/inline_formula.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require "shale"
-
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "../tbx_iso_tml/math"
 
 module Sts
   module NisoSts
-    class InlineFormula < Sts::Mapper
+    class InlineFormula < Lutaml::Model::Serializable
       attribute :math, TbxIsoTml::Math
 
       xml do

data/lib/sts/niso_sts/label.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "../tbx_iso_tml/sup"
 
 module Sts
   module NisoSts
-    class Label < Sts::Mapper
-      attribute :content, Shale::Type::String
+    class Label < Lutaml::Model::Serializable
+      attribute :content, :string
       attribute :sup, Sts::TbxIsoTml::Sup
 
       xml do

data/lib/sts/niso_sts/list.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "shale"
-
 require_relative "list_item"
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class List < Sts::Mapper
-      attribute :text, Shale::Type::String
-      attribute :list_type, Shale::Type::String
+    class List < Lutaml::Model::Serializable
+      attribute :text, :string
+      attribute :list_type, :string
       attribute :list_item, ListItem, collection: true
 
       xml do

data/lib/sts/niso_sts/list_item.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "list"
 require_relative "non_normative_example"
 
 module Sts
   module NisoSts
-    class Paragraph < Sts::Mapper; end
-    class List < Sts::Mapper; end
+    class Paragraph < Lutaml::Model::Serializable; end
+    class List < Lutaml::Model::Serializable; end
 
-    class ListItem < Sts::Mapper
+    class ListItem < Lutaml::Model::Serializable
       attribute :label, Label
       attribute :list, List
       attribute :non_normative_example, NonNormativeExample

data/lib/sts/niso_sts/meta_date.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class MetaDate < Sts::Mapper
-      attribute :content, Shale::Type::String
-      attribute :type, Shale::Type::String
+    class MetaDate < Lutaml::Model::Serializable
+      attribute :content, :string
+      attribute :type, :string
 
       xml do
         root "meta-date"

data/lib/sts/niso_sts/meta_note.rb

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

data/lib/sts/niso_sts/metadata_iso.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "custom_meta_group"
 require_relative "document_identification"
@@ -14,28 +14,29 @@ require_relative "title_wrap"
 
 module Sts
   module NisoSts
-    class MetadataIso < Sts::Mapper
-      attribute :comm_ref, Shale::Type::String
-      attribute :content_language, Shale::Type::String
+    class MetadataIso < Lutaml::Model::Serializable
+      attribute :comm_ref, :string
+      attribute :content_language, :string
       attribute :custom_meta_group, CustomMetaGroup
       attribute :doc_ident, DocumentIdentification
-      attribute :doc_ref, Shale::Type::String
-      attribute :ics, Shale::Type::String
+      attribute :doc_ref, :string
+      attribute :ics, :string
       attribute :meta_date, MetaDate
       attribute :page_count, PageCount
       attribute :permissions, Permissions
-      attribute :pub_date, Shale::Type::String
-      attribute :release_date, Shale::Type::String
-      attribute :secretariat, Shale::Type::String
+      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
 
       xml do
-        root "iso-meta"
+        root "iso-meta", mixed: true
 
-        map_element "comm-ref", to: :comm_ref
+        map_element "comm-ref", to: :comm_ref,
+                                value_map: { to: { empty: :empty } }
         map_element "content-language", to: :content_language
         map_element "custom-meta-group", to: :custom_meta_group
         map_element "doc-ident", to: :doc_ident

data/lib/sts/niso_sts/metadata_std.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "title_wrap"
 require_relative "document_identification"
 require_relative "standard_identification"
@@ -13,28 +13,28 @@ require_relative "permissions"
 
 module Sts
   module NisoSts
-    class MetadataStd < Sts::Mapper
-      attribute :id, Shale::Type::String
+    class MetadataStd < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :title_wrap, TitleWrap, collection: true
-      attribute :content_language, Shale::Type::String
+      attribute :content_language, :string
       attribute :std_ident, StandardIdentification
       attribute :doc_ident, DocumentIdentification
       attribute :std_ref, StandardRef, collection: true
-      attribute :doc_ref, Shale::Type::String
-      attribute :pub_date, Shale::Type::String
-      attribute :release_date, Shale::Type::String
-      attribute :release_version, Shale::Type::String
-      attribute :comm_ref, Shale::Type::String
-      attribute :secretariat, Shale::Type::String
+      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 :ics, Shale::Type::String
+      attribute :ics, :string
       attribute :std_xref, StdCrossReference
       attribute :permissions, Permissions
       attribute :meta_note, MetaNote, collection: true
       attribute :custom_meta_group, CustomMetaGroup, collection: true
 
       xml do
-        root "std-meta"
+        root "std-meta", mixed: true
 
         map_attribute "id", to: :id
 
@@ -47,8 +47,10 @@ module Sts
         map_element "pub-date", to: :pub_date
         map_element "release-date", to: :release_date
         map_element "release-version", to: :release_version
-        map_element "comm-ref", to: :comm_ref, render_nil: true
-        map_element "secretariat", to: :secretariat, render_nil: true
+        map_element "comm-ref", to: :comm_ref,
+                                value_map: { to: { empty: :empty } }
+        map_element "secretariat", to: :secretariat,
+                                   value_map: { to: { empty: :empty } }
         map_element "page-count", to: :page_count
         map_element "ics", to: :ics
         map_element "std-xref", to: :std_xref

data/lib/sts/niso_sts/mixed_citation.rb

@@ -1,22 +1,22 @@
 # frozen_striing_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "ext_link"
 require_relative "reference_standard"
 
 module Sts
   module NisoSts
-    class MixedCitation < Sts::Mapper
-      attribute :content, Shale::Type::String
-      attribute :bold, Shale::Type::String
-      attribute :italic, Shale::Type::String
-      attribute :publication_type, Shale::Type::String
-      attribute :std, ReferenceStandard
+    class MixedCitation < Lutaml::Model::Serializable
+      attribute :content, :string
+      attribute :bold, :string
+      attribute :italic, :string
+      attribute :publication_type, :string
+      attribute :std, ReferenceStandard, collection: true
       attribute :ext_link, ExtLink
 
       xml do
-        root "mixed-citation"
+        root "mixed-citation", mixed: true
 
         map_content to: :content
 

data/lib/sts/niso_sts/non_normative_example.rb

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

data/lib/sts/niso_sts/non_normative_note.rb

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

data/lib/sts/niso_sts/object_id.rb

@@ -4,13 +4,13 @@
 # <object-id pub-id-type="publisher-id">fig-1</object-id>
 # rubocop:enable Layout/LineLength
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class ObjectId < Sts::Mapper
-      attribute :pub_id_type, Shale::Type::String
-      attribute :content, Shale::Type::String
+    class ObjectId < Lutaml::Model::Serializable
+      attribute :pub_id_type, :string
+      attribute :content, :string
 
       xml do
         root "object-id"

data/lib/sts/niso_sts/page_count.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class PageCount < Sts::Mapper
-      attribute :count, Shale::Type::Integer
+    class PageCount < Lutaml::Model::Serializable
+      attribute :count, :integer
 
       xml do
         root "page-count"