pubid 2.0.0.alpha.10 → 2.0.0.pre.alpha.1

data/lib/pubid/itu/identifiers/combined_identifier.rb

@@ -1,119 +1,45 @@
 # frozen_string_literal: true
 
+require_relative "base"
+
 module Pubid
   module Itu
     module Identifiers
-      # Combined (joint) recommendation — a single document published under two
-      # or more series/number designations at once.
-      # Format: ITU-T G.780/Y.1351         (dual)
-      #         ITU-T G.780/Y.1351/Z.1362  (triple)
-      #
-      # The primary designation lives on the base `series`/`code`; every
-      # additional designation is a Components::Designation in `combined`
-      # (one for a dual form, two+ for triple).
-      class CombinedIdentifier < Identifier
-        include StandardSerialization
-
-        attribute :combined, Pubid::Itu::Components::Designation,
-                  collection: true, default: -> { [] }
-
-        # Extra map merged on top of StandardSerialization: the additional
-        # designations as a flat list of { series, number, subseries?, parts? }.
-        key_value do
-          map "combined",
-              with: { to: :combined_to_kv, from: :combined_from_kv }
-        end
-
-        def combined_to_kv(model, doc)
-          designations = model.combined
-          return if designations.nil? || designations.empty?
-
-          rows = designations.map do |d|
-            row = { "series" => d.series&.series.to_s,
-                    "number" => d.code&.number.to_s }
-            row["subseries"] = d.code.subseries.to_s if d.code&.subseries
-            row["parts"] = d.code.parts.map(&:to_s) if d.code&.parts&.any?
-            # Each emitted only when set, so an ordinary joint designation's
-            # row keeps its existing two-key shape.
-            if d.code&.series_suffix
-              row["series_suffix"] = d.code.series_suffix.to_s
-              row["series_suffix_spaced"] = true if d.code.series_suffix_spaced
-            end
-            if d.code&.qualifier
-              row["qualifier"] = d.code.qualifier.to_s
-              row["qualifier_glued"] = true if d.code.qualifier_glued
-            end
-            row
-          end
-
-          doc.add_child(
-            Lutaml::KeyValue::DataModel::Element.new("combined", rows),
-          )
-        end
-
-        def combined_from_kv(model, value)
-          model.combined = Array(value).map do |row|
-            row = row.transform_keys(&:to_s)
-            Components::Designation.new(
-              series: Components::Series.new(series: row["series"].to_s),
-              code: Components::Code.new(
-                number: row["number"].to_s,
-                series_suffix: row["series_suffix"]&.to_s,
-                series_suffix_spaced: !!row["series_suffix_spaced"],
-                subseries: row["subseries"]&.to_s,
-                parts: Array(row["parts"]).map(&:to_s),
-                qualifier: row["qualifier"]&.to_s,
-                qualifier_glued: !!row["qualifier_glued"],
-              ),
-            )
-          end
-        end
-
-        # Rendering hooks into `render_base` (not `to_s`) so that any wrapper
-        # composing this identifier — AnnexOfRecommendation, which renders
-        # "<base.render_base> Annex <label>" — keeps the co-designations.
-        # Overriding `to_s` instead silently dropped the "/Y.1351" half.
-        # The inherited `to_s` adds the language suffix and common-text twin.
-        def render_base(**_opts)
+      # Combined identifier for dual-series recommendations
+      # Format: ITU-T G.780/Y.1351
+      # Example: ITU-T G.780/Y.1351 (2004)
+      class CombinedIdentifier < Base
+        attribute :combined_series, Pubid::Itu::Components::Series
+        attribute :combined_code, Pubid::Itu::Components::Code
+
+        def to_s
           result = "#{publisher}-#{sector}"
 
           # Add primary series and code
           result += if series
-                      " #{series}#{series_dash ? '-' : '.'}#{code}"
+                      " #{series}.#{code}"
                     else
                       " #{code}"
                     end
 
-          result += "-#{range_end}" if range_end
-
-          # Add additional designations
-          if combined&.any?
-            result += "/#{combined.join('/')}"
+          # Add combined series and code
+          if combined_series && combined_code
+            result += "/#{combined_series}.#{combined_code}"
           end
 
-          result += " series" if series_word
-          result += " attachment" if attachment
-
-          # Add version marker if present — always between code and date
-          result += " (V#{version})" if version
-
-          result + render_date_suffix
-        end
+          # Add date if present
+          if date
+            result += if date.month
+                        " (#{date.month}/#{date.year})"
+                      else
+                        " (#{date.year})"
+                      end
+          end
 
-        def ==(other)
-          return false unless other.is_a?(CombinedIdentifier)
+          # Add language
+          result += "-#{language}" if language
 
-          sector == other.sector &&
-            series == other.series &&
-            code == other.code &&
-            combined == other.combined &&
-            date == other.date &&
-            version == other.version &&
-            series_word == other.series_word &&
-            series_dash == other.series_dash &&
-            attachment == other.attachment &&
-            range_end == other.range_end &&
-            language == other.language
+          result
         end
       end
     end

data/lib/pubid/itu/identifiers/corrigendum.rb

@@ -1,33 +1,42 @@
 # frozen_string_literal: true
 
+require_relative "supplement"
+
 module Pubid
   module Itu
     module Identifiers
       # Corrigendum identifier (Cor.)
       # Pattern: "ITU-T Z.100 (1999) Cor. 1 (10/2001)"
       # Can be corrigendum of annex: "ITU-T G.729 Annex E (1998) Cor. 1 (02/2000)"
-      # A "Technical Corrigendum" — ITU's own spelling on 158 relaton-data-itu
-      # records ("ITU-T H.222.0 (1995) Technical Cor. 1 (02/1998)"). It is a
-      # distinct printed identifier from a plain "Cor. 1", so the qualifier is
-      # preserved as a flag and rendered back rather than normalized away.
-      # Named for the rarer form, so `false` is stripped from `to_hash` and no
-      # existing serialized Corrigendum row gains a key.
       class Corrigendum < Supplement
-        attribute :technical, :boolean, default: -> { false }
+        def to_s
+          result = base ? base.to_s : "#{publisher}-#{sector}"
 
-        key_value do
-          map "technical", to: :technical
-        end
+          # Add series if no base
+          if !base && series
+            result += " #{series}"
+          end
+
+          result += " Cor. #{number}"
 
-        def to_s(**opts)
-          annotate_plain_render(render_supplement(technical ? "Technical Cor." : "Cor."), **opts)
+          # Add date if present
+          if date
+            result += if date.month
+                        " (#{date.month}/#{date.year})"
+                      else
+                        " (#{date.year})"
+                      end
+          end
+
+          result
         end
 
-        # `super` already enforces instance_of?(self.class), so this only has
-        # to add the qualifier — "Cor. 1" and "Technical Cor. 1" of one base
-        # are different documents.
         def ==(other)
-          super && technical == other.technical
+          return false unless other.is_a?(Corrigendum)
+
+          base == other.base &&
+            number == other.number &&
+            date == other.date
         end
       end
     end

data/lib/pubid/itu/identifiers/recommendation.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
+require_relative "base"
+
 module Pubid
   module Itu
     module Identifiers
       # ITU Recommendation
       # Format: ITU-{SECTOR} {SERIES}.{NUMBER}[-PART]
       # Example: ITU-R V.1234-1
-      class Recommendation < Identifier
-        include StandardSerialization
-        # Type-specific rendering handled by Identifier
+      class Recommendation < Base
+        # Type-specific rendering handled by Base
       end
     end
   end

data/lib/pubid/itu/identifiers/special_publication.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "base"
+
 module Pubid
   module Itu
     module Identifiers
@@ -8,9 +10,7 @@ module Pubid
       # "ITU OB No. {number}" with optional date.
       #
       # Pattern: "ITU OB No. 1283 (01/2024)"
-      class SpecialPublication < Identifier
-        include StandardSerialization
-
+      class SpecialPublication < Base
         def render_base(**_opts)
           number = code&.number
           result = "#{publisher} #{series} No. #{number}"

data/lib/pubid/itu/identifiers/supplement.rb

@@ -1,147 +1,44 @@
 # frozen_string_literal: true
 
+require_relative "base"
+
 module Pubid
   module Itu
     module Identifiers
       # Supplement identifier (Suppl.)
       # Pattern: "ITU-T H Suppl. 1", "ITU-T E.156 Suppl. 2"
-      class Supplement < Identifier
-        attribute :base, Identifier, polymorphic: true
+      class Supplement < Base
+        attribute :base, Base, polymorphic: true
         attribute :number, :string
 
-        # Rendering-only flags for spellings ITU itself uses. Both name the
-        # RARE form so the `false` default is stripped from `to_hash` and no
-        # existing serialized row gains a key.
-        #
-        # `number_glued` — no space before the ordinal ("ITU-T E Suppl.1",
-        # "ITU-T D.211 Suppl.1"). Deliberately NOT part of `==`: "Suppl.1" and
-        # "Suppl. 1" are the same document.
-        #
-        # `slash_joined` — joined to the preceding supplement by "/" instead of
-        # a space ("ITU-T X.680 (1994) Amd. 1/Technical Cor. 1 (12/1997)").
-        attribute :number_glued, :boolean, default: -> { false }
-        attribute :slash_joined, :boolean, default: -> { false }
-
-        # Compact serialization: a supplement carries only its own ordinal
-        # `number`, its own date, and the nested (itself-flat) `base`. type/code
-        # are delegated to `base` and NOT re-emitted. sector/series are emitted
-        # ONLY for the base-less, series-only form ("ITU-T H Suppl. 1"); when a
-        # base is present they are redundant copies of the base's and are
-        # suppressed. Inherited by Amendment / Corrigendum / Errata / Addendum,
-        # of which only Corrigendum adds a key of its own.
-        key_value do
-          map "_type", to: :_type
-          map "sector",
-              with: { to: :supplement_sector_to_kv, from: :sector_from_kv }
-          map "series",
-              with: { to: :supplement_series_to_kv, from: :series_from_kv }
-          map "series_word",
-              with: { to: :supplement_series_word_to_kv,
-                      from: :series_word_from_kv }
-          map "number", to: :number
-          map "number_glued", to: :number_glued
-          map "slash_joined", to: :slash_joined
-          map "year", with: { to: :year_to_kv, from: :year_from_kv }
-          map "month", with: { to: :month_to_kv, from: :month_from_kv }
-          map "base", with: { to: :base_to_kv, from: :base_from_kv }
-          map "common_text_twin",
-              with: { to: :common_text_twin_to_kv,
-                      from: :common_text_twin_from_kv }
-        end
-
-        def supplement_sector_to_kv(model, doc)
-          return unless model.base.nil?
-
-          emit_kv(doc, "sector", model.sector&.sector)
-        end
-
-        def supplement_series_to_kv(model, doc)
-          return unless model.base.nil?
-
-          emit_kv(doc, "series", model.series&.series)
-        end
-
-        # Like sector/series above: the series group's "series" word is part of
-        # the base-less form's identity only. With a base it belongs to (and is
-        # serialized by) the base.
-        def supplement_series_word_to_kv(model, doc)
-          return unless model.base.nil?
-          return unless model.series_word
-
-          doc["series_word"] = true
-        end
-
-        def series_word_from_kv(model, value)
-          model.series_word = value
-        end
-
-        # A supplement carries no `mr_supplement_suffix`, so the shared MR
-        # renderer slugs it FLAT, from the sector/series/code Builder#build_
-        # supplement copied up from its base — which never consults the base's
-        # class. Without this, the supplement of a Report and the supplement of
-        # the same-numbered Recommendation produce one slug (and `to_slug` is an
-        # output filename, so one overwrites the other) — exactly the collision
-        # this type exists to prevent. `root` walks through an intervening annex
-        # or appendix, so a supplement of an annex of a Report is covered too.
-        def mr_type
-          type = super
-          return type unless root.is_a?(Report)
-
-          [type, "report"].compact.join(".")
-        end
-
-        # Shared by every supplement type — Suppl./Amd./Cor./Err./Add. differ
-        # only in the label, so each subclass supplies its own and nothing else.
-        #
-        # `label` is the canonical spelling with its period; the parser also
-        # accepts the period-less input (see Parser#supplement_type), which
-        # normalizes here.
-        def render_supplement(label)
+        def to_s
           result = base ? base.to_s : "#{publisher}-#{sector}"
 
           # Add series if no base
           if !base && series
             result += " #{series}"
-            result += " series" if series_word
           end
 
-          result += slash_joined ? "/" : " "
-          result += label
-          result += " " unless number_glued
-          result += number.to_s
+          result += " Suppl. #{number}"
 
-          result += render_date_suffix
+          # Add date if present
+          if date
+            result += if date.month
+                        " (#{date.month}/#{date.year})"
+                      else
+                        " (#{date.year})"
+                      end
+          end
 
           result
         end
 
-        def to_s(**opts)
-          annotate_plain_render(render_supplement("Suppl."), **opts)
-        end
-
-        # Shared by Amendment / Corrigendum / Errata.
-        #
-        # `instance_of?` (not `is_a?`) so a Suppl. never equals an Amd./Cor./
-        # Err. with the same ordinal, and so the comparison stays symmetric —
-        # with `is_a?` a Supplement accepted an Amendment but not the reverse.
-        #
-        # sector/series are compared ONLY for the base-less, series-only form
-        # ("ITU-T A Suppl. 2"), where they are the document's whole identity.
-        # When a base is present they are copies of the base's (set by
-        # Builder#build_supplement) and are deliberately not serialized (see
-        # supplement_sector_to_kv), so comparing them would make a parsed
-        # identifier unequal to the same identifier rebuilt via from_hash.
         def ==(other)
-          return false unless other.instance_of?(self.class)
+          return false unless other.is_a?(Supplement)
 
-          return false unless base == other.base &&
+          base == other.base &&
             number == other.number &&
             date == other.date
-
-          return true if base
-
-          sector == other.sector && series == other.series &&
-            series_word == other.series_word
         end
       end
     end

data/lib/pubid/itu/identifiers.rb

@@ -3,22 +3,13 @@
 module Pubid
   module Itu
     module Identifiers
-      autoload :Addendum, "#{__dir__}/identifiers/addendum"
       autoload :Amendment, "#{__dir__}/identifiers/amendment"
       autoload :Annex, "#{__dir__}/identifiers/annex"
-      autoload :AnnexOfRecommendation,
-               "#{__dir__}/identifiers/annex_of_recommendation"
-      autoload :AppendixOfRecommendation,
-               "#{__dir__}/identifiers/appendix_of_recommendation"
+      autoload :Base, "#{__dir__}/identifiers/base"
       autoload :CombinedIdentifier, "#{__dir__}/identifiers/combined_identifier"
       autoload :Corrigendum, "#{__dir__}/identifiers/corrigendum"
-      autoload :Errata, "#{__dir__}/identifiers/errata"
-      autoload :Handbook, "#{__dir__}/identifiers/handbook"
-      autoload :Question, "#{__dir__}/identifiers/question"
       autoload :Recommendation, "#{__dir__}/identifiers/recommendation"
-      autoload :Report, "#{__dir__}/identifiers/report"
       autoload :SpecialPublication, "#{__dir__}/identifiers/special_publication"
-      autoload :StandardSerialization, "#{__dir__}/identifiers/standard_serialization"
       autoload :Supplement, "#{__dir__}/identifiers/supplement"
     end
   end

data/lib/pubid/itu/model.rb

@@ -86,7 +86,7 @@ module Pubid
 
         # Add amendment
         if amendment
-          parts << "Amd. #{amendment}"
+          parts << "Amd #{amendment}"
         end
 
         # Add corrigendum