sts 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29fa738a2be8fa8ad9b9deac71cf0ff7e6e84fdb4f6fdeef1cc7695b4eb0848d
-  data.tar.gz: 3b2538ea0daeca072954ff6ff95c78ed43da784024de3151c6fc8ffca47fb552
+  metadata.gz: 53893d88ea3c686e0c78692259ffd84b95ed767ed288f325d071cd29bd959680
+  data.tar.gz: 249dad626f684d0e7d8e069ee6e97a21beccb4152373c7f0261593bb4cf10185
 SHA512:
-  metadata.gz: 2cc9dc6d6365b1c8bc92ba833a9064bf1e2e4961bad763655eaecf2ccdaa872622755a27308d292491b5a5b3803b74803630e944f86c21331eb11821ed47143b
-  data.tar.gz: 928162548cc113a5438b997c6b8ea208d91858b446e663a70ffacb7f7a16886fdf12cd21f8de2039b50e6ee21ca539b62e7667f973132b5edd47504e4aaa7f63
+  metadata.gz: a97fc37e13758ee81ca7a09470b53d911c332d3881e10e60c5d13b29b4d4b1fe0c419c0ca4c3b6c79e660c7330cf42b8d78387acaae33009a5709b6b05cf614a
+  data.tar.gz: 339ab9c2b2bcad8ed9f0563c4a9af87738f060e7721a409b8cbc22f8ab26d5d090efddffcb95a1d029c0019b7a6edc787807cadefaf190ca2d7921a2f93b5bfc

data/lib/sts/niso_sts/adoption.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative "standard"
+require_relative "adoption_front"
+
+module Sts
+  module NisoSts
+    class Adoption < Sts::Mapper
+      attribute :front, AdoptionFront
+      attribute :back, Back
+      attribute :id, Shale::Type::String
+      attribute :lang, Shale::Type::String
+      attribute :adoptions, Adoption, collection: true
+      attribute :standard, Standard
+
+      xml do
+        root "adoption"
+
+        map_attribute "id", to: :id
+        map_attribute "lang", to: :lang,
+                              namespace: "http://www.w3.org/XML/1998/namespace",
+                              prefix: "xml"
+        map_element "adoption-front", to: :front
+        map_element "back", to: :back
+        map_element "adoption", to: :adoptions
+        map_element "standard", to: :standard
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/adoption_front.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "front"
+
+module Sts
+  module NisoSts
+    class AdoptionFront < Front
+      xml do
+        root "adoption-front"
+        map_element "iso-meta", to: :iso_meta
+        map_element "std-meta", to: :std_meta
+        map_element "sec", to: :sec
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/custom_meta_group.rb

@@ -11,7 +11,7 @@ module Sts
 
       xml do
         root "custom-meta-group"
-        map_attribute "custom-meta", to: :custom_meta
+        map_element "custom-meta", to: :custom_meta
       end
     end
   end

data/lib/sts/niso_sts/front.rb

@@ -4,11 +4,10 @@ require_relative "../mapper"
 
 require_relative "metadata_iso"
 require_relative "metadata_std"
+require_relative "section"
 
 module Sts
   module NisoSts
-    class Section < Sts::Mapper; end
-
     class Front < Sts::Mapper
       attribute :iso_meta, MetadataIso
       attribute :std_meta, MetadataStd

data/lib/sts/niso_sts/non_normative_note.rb

@@ -8,12 +8,16 @@ module Sts
   module NisoSts
     class NonNormativeNote < Sts::Mapper
       attribute :id, Shale::Type::String
+      attribute :content_type, Shale::Type::String
       attribute :p, Paragraph
       attribute :label, Shale::Type::String
 
       xml do
         root "non-normative-note"
+
+        map_attribute "content-type", to: :content_type
         map_attribute "id", to: :id
+
         map_element "p", to: :p
         map_element "label", to: :label
       end

data/lib/sts/niso_sts/section.rb

@@ -13,12 +13,6 @@ require_relative "title"
 
 require_relative "../tbx_iso_tml/table_wrap"
 
-module Sts
-  module TbxIsoTml
-    class TableWrap < Sts::Mapper; end
-  end
-end
-
 module Sts
   module NisoSts
     class Title < Sts::Mapper; end
@@ -39,7 +33,7 @@ module Sts
       attribute :figures, Figure, collection: true
       attribute :fig, Figure, collection: true
 
-      attribute :table_wrap, Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
 
       xml do
         root "sec"
@@ -48,7 +42,7 @@ module Sts
         map_attribute "sec-type", to: :type
         map_attribute "specific-use", to: :specific_use
 
-        map_element "label", to: :label
+        map_element "label", to: :label, render_nil: true
         map_element "title", to: :title
         map_element "p", to: :paragraphs
         map_element "sec", to: :sec

data/lib/sts/niso_sts/title_wrap.rb

@@ -3,14 +3,34 @@
 require_relative "../mapper"
 
 require_relative "reference_list"
+require_relative "reference_standard"
 
 module Sts
   module NisoSts
+    class TitleFull < Sts::Mapper
+      attribute :content, Shale::Type::String
+      attribute :std, ReferenceStandard
+
+      xml do
+        root "full"
+        map_content to: :content
+        map_element "std", to: :std, namespace: nil, prefix: nil
+      end
+    end
+
+    class TitleCompl < TitleFull
+      xml do
+        root "compl"
+        map_content to: :content
+        map_element "std", to: :std, namespace: nil, prefix: nil
+      end
+    end
+
     class TitleWrap < Sts::Mapper
       attribute :intro, Shale::Type::String
       attribute :main, Shale::Type::String
-      attribute :full, Shale::Type::String
-      attribute :compl, Shale::Type::String
+      attribute :full, TitleFull
+      attribute :compl, TitleCompl
       attribute :lang, Shale::Type::String
 
       xml do

data/lib/sts/niso_sts.rb

@@ -18,5 +18,7 @@ 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/table_wrap.rb

@@ -5,18 +5,19 @@ require_relative "../mapper"
 require_relative "table"
 require_relative "table_wrap_foot"
 
-require_relative "../niso_sts/caption"
-
 module Sts
   module TbxIsoTml
     class TableWrap < Sts::Mapper
       attribute :id, Shale::Type::String
       attribute :orientation, Shale::Type::String
       attribute :label, Shale::Type::String
-      attribute :caption, Sts::NisoSts::Caption
       attribute :table, Sts::TbxIsoTml::Table, collection: true
       attribute :table_wrap_foot, Sts::TbxIsoTml::TableWrapFoot
 
+      # TODO: This require will cause a loop when defined in header
+      require_relative "../niso_sts/caption"
+      attribute :caption, Sts::NisoSts::Caption
+
       xml do
         root "table-wrap"
 

data/lib/sts/tbx_iso_tml/td.rb

@@ -24,7 +24,7 @@ module Sts
       attribute :colspan, Shale::Type::String
       attribute :rowspan, Shale::Type::String
       attribute :valign, Shale::Type::String
-      attribute :inline_formula, Sts::NisoSts::InlineFormula
+      attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
       attribute :non_normative_note, Sts::NisoSts::NonNormativeNote
       attribute :list, Sts::NisoSts::List
       attribute :xref, Xref

data/lib/sts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - open.source@ribose.com
 executables: []
@@ -57,6 +57,8 @@ files:
 - 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
 - lib/sts/niso_sts/app.rb
 - lib/sts/niso_sts/app_group.rb
 - lib/sts/niso_sts/back.rb
@@ -160,7 +162,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
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -175,8 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Library to work with NISO STS and ISOSTS.
 test_files: []