sts 0.6.2 → 0.6.3

data/lib/sts/iso_sts/version.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <version> as type="xs:string" -- no attributes.
+    # ISOSTS declares <version> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class Version < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "version"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/volume.rb

@@ -8,6 +8,7 @@ module Sts
       attribute :seq, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
+      attribute :id, :string
 
       xml do
         element "volume"
@@ -17,6 +18,7 @@ module Sts
         map_attribute "seq", to: :seq
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/year.rb

@@ -7,6 +7,7 @@ module Sts
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
+      attribute :id, :string
 
       xml do
         element "year"
@@ -15,6 +16,7 @@ module Sts
         map_attribute "content-type", to: :content_type
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/tbx_iso_tml/table_wrap_foot.rb

@@ -4,13 +4,13 @@ module Sts
   module TbxIsoTml
     class TableWrapFoot < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :fn_group, ::Sts::TbxIsoTml::FnGroup
+      attribute :fn_group, ::Sts::NisoSts::FnGroup
       attribute :attrib, ::Sts::NisoSts::Attrib
       attribute :permissions, ::Sts::NisoSts::Permissions
       attribute :paragraph, ::Sts::NisoSts::Paragraph
       attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote
       attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample
-      attribute :fn, ::Sts::TbxIsoTml::Fn
+      attribute :fn, ::Sts::NisoSts::Fn
 
       xml do
         element "table-wrap-foot"

data/lib/sts/tbx_iso_tml/td.rb

@@ -91,7 +91,7 @@ module Sts
       attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
 
       # simple-link.class
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
       attribute :target, ::Sts::NisoSts::Target, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
 

data/lib/sts/tbx_iso_tml/th.rb

@@ -92,7 +92,7 @@ module Sts
       attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
 
       # simple-link.class
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
       attribute :target, ::Sts::NisoSts::Target, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
 

data/lib/sts/tbx_iso_tml.rb

@@ -11,8 +11,6 @@ module Sts
     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"

data/lib/sts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sts
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Ribose
@@ -94,6 +94,18 @@ files:
 - Gemfile
 - README.adoc
 - Rakefile
+- TODO.finalize/00-overview.md
+- TODO.finalize/01-investigation-findings.md
+- TODO.finalize/02-delete-tbxisotml-fn-fngroup.md
+- TODO.finalize/03-repoint-isosts-call-sites.md
+- TODO.finalize/04-repoint-tbxisotml-call-sites.md
+- TODO.finalize/05-sts-regression-specs.md
+- TODO.finalize/06-lutaml-model-element-builder-fix.md
+- TODO.finalize/07-lutaml-model-specs.md
+- TODO.finalize/08-sts-ruby-pr.md
+- TODO.finalize/09-lutaml-model-pr.md
+- TODO.finalize/10-audit-other-duplicates.md
+- TODO.finalize/11-strengthen-anti-patterns-spec.md
 - TODO.sts-refactor/00-overview.md
 - TODO.sts-refactor/01-mathml-delegation.md
 - TODO.sts-refactor/02-type-resolution.md
@@ -561,8 +573,6 @@ files:
 - lib/sts/tbx_iso_tml/example.rb
 - lib/sts/tbx_iso_tml/external_graphic.rb
 - lib/sts/tbx_iso_tml/external_source.rb
-- lib/sts/tbx_iso_tml/fn.rb
-- lib/sts/tbx_iso_tml/fn_group.rb
 - lib/sts/tbx_iso_tml/geographical_usage.rb
 - lib/sts/tbx_iso_tml/grammatical_gender.rb
 - lib/sts/tbx_iso_tml/grammatical_number.rb

data/lib/sts/tbx_iso_tml/fn.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Sts
-  module TbxIsoTml
-    class Fn < Lutaml::Model::Serializable
-      attribute :id, :string
-      attribute :label, ::Sts::NisoSts::Label
-      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
-
-      xml do
-        element "fn"
-        ordered
-
-        map_attribute "id", to: :id
-        map_element "label", to: :label
-        map_element "p", to: :p
-      end
-    end
-  end
-end

data/lib/sts/tbx_iso_tml/fn_group.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Sts
-  module TbxIsoTml
-    class FnGroup < Lutaml::Model::Serializable
-      attribute :id, :string
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
-
-      xml do
-        element "fn-group"
-
-        map_attribute "id", to: :id
-
-        map_element "fn", to: :fn
-      end
-    end
-  end
-end