sts 0.6.2 → 0.6.4

data/lib/sts/iso_sts/uri.rb

@@ -7,6 +7,7 @@ module Sts
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :xlink_href, :string
+      attribute :xlink_type, :string
       attribute :xlink_role, :string
       attribute :xlink_title, :string
       attribute :xlink_show, :string
@@ -21,6 +22,7 @@ module Sts
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "xlink:href", to: :xlink_href
+        map_attribute "xlink:type", to: :xlink_type
         map_attribute "xlink:role", to: :xlink_role
         map_attribute "xlink:title", to: :xlink_title
         map_attribute "xlink:show", to: :xlink_show

data/lib/sts/iso_sts/urn.rb

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

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/iso_sts.rb

@@ -96,6 +96,23 @@ module Sts
     autoload :Underline, "#{__dir__}/iso_sts/underline"
     autoload :Uri, "#{__dir__}/iso_sts/uri"
 
+    # Shared model foundations
+    autoload :Abbrev, "#{__dir__}/iso_sts/abbrev"
+    autoload :Annotation, "#{__dir__}/iso_sts/annotation"
+    autoload :Country, "#{__dir__}/iso_sts/country"
+    autoload :Day, "#{__dir__}/iso_sts/day"
+    autoload :Etal, "#{__dir__}/iso_sts/etal"
+    autoload :Fax, "#{__dir__}/iso_sts/fax"
+    autoload :InlineGraphic, "#{__dir__}/iso_sts/inline_graphic"
+    autoload :Institution, "#{__dir__}/iso_sts/institution"
+    autoload :MilestoneEnd, "#{__dir__}/iso_sts/milestone_end"
+    autoload :MilestoneStart, "#{__dir__}/iso_sts/milestone_start"
+    autoload :Month, "#{__dir__}/iso_sts/month"
+    autoload :Num, "#{__dir__}/iso_sts/num"
+    autoload :ObjectId, "#{__dir__}/iso_sts/object_id"
+    autoload :Phone, "#{__dir__}/iso_sts/phone"
+    autoload :Season, "#{__dir__}/iso_sts/season"
+
     # List elements
     autoload :List, "#{__dir__}/iso_sts/list"
     autoload :ListItem, "#{__dir__}/iso_sts/list_item"
@@ -124,9 +141,13 @@ module Sts
     autoload :Graphic, "#{__dir__}/iso_sts/graphic"
 
     # Reference elements
-    autoload :RefList, "#{__dir__}/iso_sts/ref_list"
-    autoload :Ref, "#{__dir__}/iso_sts/ref"
+    autoload :Email, "#{__dir__}/iso_sts/email"
     autoload :MixedCitation, "#{__dir__}/iso_sts/mixed_citation"
+    autoload :Publisher, "#{__dir__}/iso_sts/publisher"
+    autoload :PublisherLoc, "#{__dir__}/iso_sts/publisher_loc"
+    autoload :PublisherName, "#{__dir__}/iso_sts/publisher_name"
+    autoload :Ref, "#{__dir__}/iso_sts/ref"
+    autoload :RefList, "#{__dir__}/iso_sts/ref_list"
 
     # Back matter
     autoload :AppGroup, "#{__dir__}/iso_sts/app_group"

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.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sts
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 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
@@ -108,8 +120,10 @@ files:
 - TODO.sts-refactor/11-duplicate-models.md
 - lib/sts.rb
 - lib/sts/iso_sts.rb
+- lib/sts/iso_sts/abbrev.rb
 - lib/sts/iso_sts/alt_text.rb
 - lib/sts/iso_sts/annex_type.rb
+- lib/sts/iso_sts/annotation.rb
 - lib/sts/iso_sts/app.rb
 - lib/sts/iso_sts/app_group.rb
 - lib/sts/iso_sts/array.rb
@@ -125,6 +139,8 @@ files:
 - lib/sts/iso_sts/copyright_holder.rb
 - lib/sts/iso_sts/copyright_statement.rb
 - lib/sts/iso_sts/copyright_year.rb
+- lib/sts/iso_sts/country.rb
+- lib/sts/iso_sts/day.rb
 - lib/sts/iso_sts/def.rb
 - lib/sts/iso_sts/def_item.rb
 - lib/sts/iso_sts/def_list.rb
@@ -134,7 +150,10 @@ files:
 - lib/sts/iso_sts/doc_type.rb
 - lib/sts/iso_sts/document_identification.rb
 - lib/sts/iso_sts/edition.rb
+- lib/sts/iso_sts/email.rb
+- lib/sts/iso_sts/etal.rb
 - lib/sts/iso_sts/ext_link.rb
+- lib/sts/iso_sts/fax.rb
 - lib/sts/iso_sts/fig.rb
 - lib/sts/iso_sts/fn.rb
 - lib/sts/iso_sts/fn_group.rb
@@ -143,6 +162,8 @@ files:
 - lib/sts/iso_sts/graphic.rb
 - lib/sts/iso_sts/ics.rb
 - lib/sts/iso_sts/inline_formula.rb
+- lib/sts/iso_sts/inline_graphic.rb
+- lib/sts/iso_sts/institution.rb
 - lib/sts/iso_sts/is_proof.rb
 - lib/sts/iso_sts/iso_meta.rb
 - lib/sts/iso_sts/issue.rb
@@ -156,22 +177,31 @@ files:
 - lib/sts/iso_sts/mathml2.rb
 - lib/sts/iso_sts/mathml2/math.rb
 - lib/sts/iso_sts/meta_date.rb
+- lib/sts/iso_sts/milestone_end.rb
+- lib/sts/iso_sts/milestone_start.rb
 - lib/sts/iso_sts/mixed_citation.rb
 - lib/sts/iso_sts/monospace.rb
+- lib/sts/iso_sts/month.rb
 - lib/sts/iso_sts/named_content.rb
 - lib/sts/iso_sts/nat_meta.rb
 - lib/sts/iso_sts/non_normative_example.rb
 - lib/sts/iso_sts/non_normative_note.rb
+- lib/sts/iso_sts/num.rb
+- lib/sts/iso_sts/object_id.rb
 - lib/sts/iso_sts/originator.rb
 - lib/sts/iso_sts/page_count.rb
 - lib/sts/iso_sts/page_range.rb
 - lib/sts/iso_sts/paragraph.rb
 - lib/sts/iso_sts/part_number.rb
 - lib/sts/iso_sts/permissions.rb
+- lib/sts/iso_sts/phone.rb
 - lib/sts/iso_sts/preformat.rb
 - lib/sts/iso_sts/proj_id.rb
 - lib/sts/iso_sts/pub_date.rb
 - lib/sts/iso_sts/pub_id.rb
+- lib/sts/iso_sts/publisher.rb
+- lib/sts/iso_sts/publisher_loc.rb
+- lib/sts/iso_sts/publisher_name.rb
 - lib/sts/iso_sts/ref.rb
 - lib/sts/iso_sts/ref_list.rb
 - lib/sts/iso_sts/reg_meta.rb
@@ -180,6 +210,7 @@ files:
 - lib/sts/iso_sts/release_version_id.rb
 - lib/sts/iso_sts/sc.rb
 - lib/sts/iso_sts/sdo.rb
+- lib/sts/iso_sts/season.rb
 - lib/sts/iso_sts/sec.rb
 - lib/sts/iso_sts/secretariat.rb
 - lib/sts/iso_sts/standard.rb
@@ -561,8 +592,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