sts 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c758f04c86a04df1adb4bc66d09aac7f31477d8ce6879bb9cd8935d86a7ae616
-  data.tar.gz: 56893d54b3e2193926f95a8a988d0a12dc73b31a85d9223e90edfe46adf80b07
+  metadata.gz: 3b2dc3b9e743744a3b9abc12a0701c6f61fa1de79ae247779a0f479316b903d5
+  data.tar.gz: 87e8b2b99cf0c4fdbe0607169cfffd5843204f711d71b863fc213f4dac72d198
 SHA512:
-  metadata.gz: e2444f3c73074bd001445a89a5712854e112b429180b7a96feff1e01e303dfd5791a7ab6e81eb27498ba859078a8a647793a8e40276ec6e2cab2d90c9b7a4517
-  data.tar.gz: d3b0d7c1ba7721b108ae509b5847e1a21917d4cc5507581d7581af2d71a0f742d16b316fc53a3d8c263b11816ee074a6b5a17547b9773dd3f99e472959db9069
+  metadata.gz: c3d627845f41f3e00cfd8f2c0448fab122eb3b46225924118f52adec2289dd86de0497a727986da0e7dbe0efabac7e061da39d0bb61f57bd1a396ae0886e7beb
+  data.tar.gz: abe325652f4622f140e7aa936ecf47695bdd4550bab690e61b29e0f0b46783f17f7c21852e7e4ff99118d54f229fd0665f93517a9652058eaf8ac346255a8d07

data/TODO.sts-refactor/00-overview.md

@@ -19,7 +19,7 @@
 |---|------|----------|----------|--------------|
 | 01 | `01-mathml-delegation.md` | Anti-Pattern Fix | DONE | — |
 | 02 | `02-type-resolution.md` | Anti-Pattern Fix | DONE | — |
-| 03 | `03-namespace-coupling.md` | Architecture | IN PROGRESS (63→16 refs) | 01, 02 |
+| 03 | `03-namespace-coupling.md` | Architecture | IN PROGRESS (63→13 refs) | 01, 02 |
 | 04 | `04-register-versioning.md` | Architecture | HIGH | 01, 02 |
 | 05 | `05-missing-elements.md` | Feature Gap | MOSTLY DONE | 04 |
 | 06 | `06-missing-attributes.md` | Feature Gap | DONE | 04 |
@@ -166,7 +166,7 @@ grep -r "method_missing|respond_to_missing|Object.const_get|\.send" lib/
 - ~~Expand StringName usage (in contrib, element-citation, related-article — NISO STS 1.2)~~ → DONE: added to name-alternatives; already in person-group and mixed-citation
 
 ### Architectural Items (High Effort)
-- `03-namespace-coupling.md` — IN PROGRESS: 63→16 IsoSts→NisoSts references
+- `03-namespace-coupling.md` — IN PROGRESS: 63→13 IsoSts→NisoSts references
   remaining (issue #40). ISOSTS.xsd governs content models and all non-`@id`
   attributes; the `@id` follows the 86948b9 convention.
 - `04-register-versioning.md` — Version the models via lutaml-model Registers
@@ -193,12 +193,13 @@ the **NISO** XSD and applied the result to IsoSts.
 
 ## Next Action
 Two independent tracks:
-1. Finish `03` — the 16 remaining refs split evenly between seven recursive
-   roots and five child-bearing roots. The first 15 high-reuse dependency
-   leaves are now modelled, reducing the unresolved closures to 78–84
-   not-yet-modelled ISOSTS elements before existing IsoSts boundaries. The
-   remaining work still needs an architecture decision for the recursive
-   content core.
+1. Finish `03` — the 13 remaining refs split across five recursive roots
+   (`ElementCitation`, `PersonGroup`, `Collab`, `Source`, `TermDisplay`) and
+   five child-bearing roots. `DispQuote` and `BoxedText` themselves are now
+   IsoSts classes. The first 15 high-reuse dependency leaves are modelled,
+   reducing the unresolved closures to 78–84 not-yet-modelled ISOSTS elements
+   before existing IsoSts boundaries. The remaining work still needs an
+   architecture decision for the recursive content core.
 2. The remaining schema-conformance follow-up above — the 7 spurious attributes
    on 5 models and the 6 classes without `@id`. (The dropped-attribute data loss
    is now fixed.)

data/TODO.sts-refactor/03-namespace-coupling.md

@@ -3,7 +3,7 @@
 **Priority**: HIGH
 **Category**: Architecture
 **Estimated Effort**: High
-**Status**: Partially done — 63 → 16 references (GitHub issue #40)
+**Status**: Partially done — 63 → 13 references (GitHub issue #40)
 
 ## Problem
 
@@ -12,7 +12,8 @@ independent of NisoSts (ADR 2026-05-07): ISOSTS is frozen legacy, NISO STS
 evolves, so coupling them violates OCP.
 
 PR #31 reduced this from 157 to 63 references. Issue #40 reduced it further,
-from 63 to 16.
+from 63 to 16. The `IsoSts::DispQuote` / `IsoSts::BoxedText` addition then
+reduced it from 16 to 13 (Body#disp_quote, Sec#disp_quote, Sec#boxed_text).
 
 ## Content models from ISOSTS.xsd; `@id` from the 86948b9 convention
 
@@ -69,6 +70,16 @@ Non-`@id` attribute lists must be **generated** from the XSD, never hand-read:
 - **3 Niso-only child refs deleted** — `std-meta` from `Front` and
   `editing-instruction` from `Body` and `Sec`. Neither element exists in
   ISOSTS.xsd, so adding IsoSts equivalents would incorrectly expand the schema.
+- **`DispQuote` and `BoxedText` added** — modelled from ISOSTS.xsd (not copied
+  from NisoSts, which disagrees: `NisoSts::DispQuote` lacks `xml_lang` and
+  `title`; `NisoSts::BoxedText` carries `form_type`/`is_form` that ISOSTS does
+  not define). Children limited to existing IsoSts types; omitted children
+  (`attrib`, `speech`, `statement`, `verse-group`, `address`, `alternatives`,
+  `array`, `chem-struct-wrap`, `fig-group`, `media`, `supplementary-material`,
+  `table-wrap`, `table-wrap-group`, `disp-formula-group`, `mml:math`,
+  `related-article`, `related-object`, `glossary`) are tracked below.
+  `BoxedText#sts_object_id` (not `:object_id`) follows the `NisoSts::Graphic`
+  convention to avoid clashing with `Object#object_id`. 3 refs.
 
 ### Why classes and not plain `:string`
 
@@ -79,12 +90,13 @@ round-trip. For a scalar, `render_empty: :empty` recovers it; for a collection
 to `[]`, destroying the information at parse time before any render option
 applies. Content-only classes round-trip every case.
 
-## Remaining — 16 refs
+## Remaining — 13 refs
 
-**8 refs to 7 recursive roots**: `ElementCitation`, `PersonGroup`, `Collab`,
-`Source`, `DispQuote`, `TermDisplay`, and `BoxedText`. Each reaches the same
-78–79-element mutually-recursive core before existing IsoSts boundaries
-(`sec` → `p` → `disp-quote` → `p`). No direct one-file path remains.
+**5 refs to 5 recursive roots**: `ElementCitation`, `PersonGroup`, `Collab`,
+`Source`, `TermDisplay`. Each reaches the same 78–79-element
+mutually-recursive core before existing IsoSts boundaries (`sec` → `p` →
+`disp-quote` → `p`). `DispQuote` and `BoxedText` themselves are now IsoSts
+classes and no longer in this list.
 
 **8 refs to 5 child-bearing roots**, now measured after the first dependency
 layer: `attrib` (:1082) reaches 78 not-yet-modelled ISOSTS elements before

data/lib/sts/iso_sts/body.rb

@@ -22,7 +22,7 @@ module Sts
       attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
       attribute :array, ::Sts::IsoSts::Array, collection: true
       attribute :ref_list, ::Sts::IsoSts::RefList, collection: true
-      attribute :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
+      attribute :disp_quote, ::Sts::IsoSts::DispQuote, collection: true
 
       xml do
         element "body"

data/lib/sts/iso_sts/boxed_text.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class BoxedText < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :position, :string
+      attribute :orientation, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content_type, :string
+      attribute :originator, :string
+      attribute :sts_object_id, ::Sts::IsoSts::ObjectId, collection: true
+      attribute :label, ::Sts::IsoSts::Label
+      attribute :caption, ::Sts::IsoSts::Caption
+      attribute :paragraph, ::Sts::IsoSts::Paragraph, collection: true
+      attribute :list, ::Sts::IsoSts::List, collection: true
+      attribute :def_list, ::Sts::IsoSts::DefList, collection: true
+      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
+                collection: true
+      attribute :preformat, ::Sts::IsoSts::Preformat, collection: true
+      attribute :fig, ::Sts::IsoSts::Fig, collection: true
+      attribute :graphic, ::Sts::IsoSts::Graphic, collection: true
+      attribute :disp_formula, ::Sts::IsoSts::DispFormula, collection: true
+      attribute :disp_quote, ::Sts::IsoSts::DispQuote, collection: true
+      attribute :boxed_text, ::Sts::IsoSts::BoxedText, collection: true
+      attribute :sec, ::Sts::IsoSts::Sec, collection: true
+      attribute :term_sec, ::Sts::IsoSts::TermSec, collection: true
+      attribute :fn_group, ::Sts::IsoSts::FnGroup, collection: true
+      attribute :ref_list, ::Sts::IsoSts::RefList, collection: true
+      attribute :permissions, ::Sts::IsoSts::Permissions, collection: true
+
+      xml do # rubocop:disable Metrics/BlockLength
+        element "boxed-text"
+        ordered
+
+        map_attribute "id", to: :id
+        map_attribute "position", to: :position
+        map_attribute "orientation", to: :orientation
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+        map_attribute "content-type", to: :content_type
+        map_attribute "originator", to: :originator
+
+        map_element "object-id", to: :sts_object_id
+        map_element "label", to: :label
+        map_element "caption", to: :caption
+        map_element "p", to: :paragraph
+        map_element "list", to: :list
+        map_element "def-list", to: :def_list
+        map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
+        map_element "preformat", to: :preformat
+        map_element "fig", to: :fig
+        map_element "graphic", to: :graphic
+        map_element "disp-formula", to: :disp_formula
+        map_element "disp-quote", to: :disp_quote
+        map_element "boxed-text", to: :boxed_text
+        map_element "sec", to: :sec
+        map_element "term-sec", to: :term_sec
+        map_element "fn-group", to: :fn_group
+        map_element "ref-list", to: :ref_list
+        map_element "permissions", to: :permissions
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/disp_quote.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class DispQuote < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :originator, :string
+      attribute :label, ::Sts::IsoSts::Label
+      attribute :title, ::Sts::IsoSts::Title
+      attribute :paragraph, ::Sts::IsoSts::Paragraph, collection: true
+      attribute :list, ::Sts::IsoSts::List, collection: true
+      attribute :def_list, ::Sts::IsoSts::DefList, collection: true
+      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
+                collection: true
+      attribute :preformat, ::Sts::IsoSts::Preformat, collection: true
+      attribute :fig, ::Sts::IsoSts::Fig, collection: true
+      attribute :graphic, ::Sts::IsoSts::Graphic, collection: true
+      attribute :disp_formula, ::Sts::IsoSts::DispFormula, collection: true
+      attribute :disp_quote, ::Sts::IsoSts::DispQuote, collection: true
+      attribute :permissions, ::Sts::IsoSts::Permissions, collection: true
+
+      xml do
+        element "disp-quote"
+        ordered
+
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+        map_attribute "originator", to: :originator
+
+        map_element "label", to: :label
+        map_element "title", to: :title
+        map_element "p", to: :paragraph
+        map_element "list", to: :list
+        map_element "def-list", to: :def_list
+        map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
+        map_element "preformat", to: :preformat
+        map_element "fig", to: :fig
+        map_element "graphic", to: :graphic
+        map_element "disp-formula", to: :disp_formula
+        map_element "disp-quote", to: :disp_quote
+        map_element "permissions", to: :permissions
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/sec.rb

@@ -33,9 +33,9 @@ module Sts
       attribute :uri, ::Sts::IsoSts::Uri, collection: true
       attribute :sec, ::Sts::IsoSts::Sec, collection: true
       attribute :term_sec, ::Sts::IsoSts::TermSec, collection: true
-      attribute :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
+      attribute :disp_quote, ::Sts::IsoSts::DispQuote, collection: true
       attribute :fn, ::Sts::IsoSts::Fn, collection: true
-      attribute :boxed_text, ::Sts::NisoSts::BoxedText, collection: true
+      attribute :boxed_text, ::Sts::IsoSts::BoxedText, collection: true
 
       xml do # rubocop:disable Metrics/BlockLength
         element "sec"

data/lib/sts/iso_sts.rb

@@ -88,6 +88,8 @@ module Sts
     autoload :Label, "#{__dir__}/iso_sts/label"
     autoload :Title, "#{__dir__}/iso_sts/title"
     autoload :Bold, "#{__dir__}/iso_sts/bold"
+    autoload :BoxedText, "#{__dir__}/iso_sts/boxed_text"
+    autoload :DispQuote, "#{__dir__}/iso_sts/disp_quote"
     autoload :Italic, "#{__dir__}/iso_sts/italic"
     autoload :Monospace, "#{__dir__}/iso_sts/monospace"
     autoload :NamedContent, "#{__dir__}/iso_sts/named_content"

data/lib/sts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sts
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-24 00:00:00.000000000 Z
+date: 2026-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -130,6 +130,7 @@ files:
 - lib/sts/iso_sts/back.rb
 - lib/sts/iso_sts/body.rb
 - lib/sts/iso_sts/bold.rb
+- lib/sts/iso_sts/boxed_text.rb
 - lib/sts/iso_sts/break.rb
 - lib/sts/iso_sts/caption.rb
 - lib/sts/iso_sts/col.rb
@@ -145,6 +146,7 @@ files:
 - lib/sts/iso_sts/def_item.rb
 - lib/sts/iso_sts/def_list.rb
 - lib/sts/iso_sts/disp_formula.rb
+- lib/sts/iso_sts/disp_quote.rb
 - lib/sts/iso_sts/doc_number.rb
 - lib/sts/iso_sts/doc_ref.rb
 - lib/sts/iso_sts/doc_type.rb