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

data/lib/pubid/iec/identifiers/fragment_identifier.rb

@@ -1,4 +1,6 @@
+require_relative "../identifier"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -8,42 +10,10 @@ module Pubid
       # Example: "IEC 60050-191/AMD2/FRAG2 ED1" = Fragment 2 of Amendment 2
       # Fragments are independently approved and have their own lifecycle stages.
       class FragmentIdentifier < Identifier
-        attribute :base, Identifier, polymorphic: true
+        attribute :base_identifier, Identifier, polymorphic: true
         attribute :fragment_number, :string
         attribute :edition, ::Pubid::Components::Edition, default: -> {}
-        # Fragments have their own lifecycle; default to the published FRAG stage
-        # so an omitted "stage" reconstructs it on from_hash.
-        attribute :typed_stage, ::Pubid::Components::TypedStage,
-                  default: -> { self.class.published_typed_stage }
-
-        # number/date/publisher delegate to base, but the fragment's
-        # stage and edition are its own. Serialize the wrapped identifier under
-        # "base" plus the fragment number; suppress only the truly-delegated
-        # common maps (keep stage/edition from the inherited block).
-        key_value do
-          map "base", with: { to: :base_to_kv, from: :base_from_kv }
-          map "fragment_number", to: :fragment_number, render_default: false
-        end
-
-        def number_to_kv(_model, _doc); end
-        def part_to_kv(_model, _doc); end
-        def subpart_to_kv(_model, _doc); end
-        def stage_iteration_to_kv(_model, _doc); end
-        def year_to_kv(_model, _doc); end
-        def publisher_to_kv(_model, _doc); end
-        def copublishers_to_kv(_model, _doc); end
-
-        def base_to_kv(model, doc)
-          base = model.base
-          return unless base
-
-          doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
-                                                                 base.to_hash))
-        end
-
-        def base_from_kv(model, value)
-          model.base = ::Pubid::Iec::Identifier.from_hash(value) if value
-        end
+        attribute :typed_stage, ::Pubid::Components::TypedStage
 
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
@@ -114,33 +84,56 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :frag,
-            web: :fragment_identifier, title: "Fragment", short: "FRAG" }
+          { key: :frag, title: "Fragment", short: "FRAG" }
         end
 
-        # Delegate common attributes to base
+        def to_s(lang: :en, lang_single: false, with_edition: false)
+          parts = []
+
+          # Render base identifier (the amendment/corrigendum)
+          parts << base_identifier.to_s(lang: lang, lang_single: lang_single,
+                                        with_edition: with_edition)
+
+          # Add fragment notation /FRAGN or /FRAGCN depending on base type
+          parts << if base_identifier.is_a?(Identifiers::Corrigendum)
+                     "/FRAGC#{fragment_number}"
+                   else
+                     "/FRAG#{fragment_number}"
+                   end
+
+          # Add edition if present
+          parts << " #{edition}" if edition&.number
+
+          parts.join
+        end
+
+        # Delegate common attributes to base_identifier
         def publisher
-          base&.publisher
+          base_identifier&.publisher
         end
 
         def copublishers
-          base&.copublishers
+          base_identifier&.copublishers
         end
 
         def code
-          base&.code
+          base_identifier&.code
         end
 
         def number
-          base&.number
+          base_identifier&.number
         end
 
         def date
-          base&.date
+          base_identifier&.date
+        end
+
+        def type
+          :frag
         end
 
         def stage
-          typed_stage&.to_stage || base&.stage
+          typed_stage&.to_stage || base_identifier&.stage
         end
       end
     end

data/lib/pubid/iec/identifiers/guide.rb

@@ -1,4 +1,6 @@
+require_relative "base"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -80,6 +82,22 @@ module Pubid
           { key: :guide, title: "Guide", short: %w[Guide GUIDE] }
         end
 
+        # Override publisher_portion to handle Guide formatting
+        # If copublishers exist, use parent implementation
+        def publisher_portion
+          # If copublishers, delegate to parent (SingleIdentifier) which handles them
+          return super if copublishers&.any?
+
+          # No copublishers: simple Guide formatting
+          result = publisher.to_s
+
+          if typed_stage
+            abbr = typed_stage.abbreviation
+            result += " #{abbr}" unless abbr.empty?
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/international_standard.rb

@@ -1,4 +1,6 @@
+require_relative "base"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -13,7 +15,7 @@ module Pubid
             code: :pwi,
             stage_code: :pwi,
             type_code: :is,
-            abbr: %w[PWI NWIP BWG AWIN AMW],
+            abbr: ["PWI"],
             name: "Preliminary Work Item",
             harmonized_stages: %w[00.00 00.20 00.60 00.98 00.99],
           ),
@@ -23,20 +25,7 @@ module Pubid
             type_code: :is,
             abbr: ["NP"],
             name: "New Proposal",
-            harmonized_stages: %w[10.00 10.60 10.92 10.98],
-          ),
-          # PNW is a stage of its own, not an alias of PWI. IEC's portal and
-          # pubid-iec 1.x both give it harmonized code 10.20 ("New work item
-          # proposal"), which is why 10.20 is absent from :np above — the two
-          # must not both claim it, or a lookup by harmonized code is
-          # ambiguous. See issue #360 item 1.
-          Pubid::Components::TypedStage.new(
-            code: :pnw,
-            stage_code: :pnw,
-            type_code: :is,
-            abbr: ["PNW"],
-            name: "New work item proposal",
-            harmonized_stages: %w[10.20],
+            harmonized_stages: %w[10.00 10.20 10.60 10.92 10.98],
           ),
           Pubid::Components::TypedStage.new(
             code: :anw,
@@ -58,9 +47,7 @@ module Pubid
             code: :cd,
             stage_code: :cd,
             type_code: :is,
-            abbr: %w[CD 2CD 3CD 4CD 5CD 6CD 7CD 8CD 9CD
-                     ACD A2CD A3CD A4CD A5CD A6CD A7CD A8CD A9CD
-                     CDM],
+            abbr: ["CD"],
             name: "Committee Draft",
             harmonized_stages: %w[30.00 30.20 30.60 30.92 30.98 30.99],
           ),
@@ -68,7 +55,7 @@ module Pubid
             code: :cdv,
             stage_code: :cdv,
             type_code: :is,
-            abbr: %w[CDV ACDV CCDV CDVM NCDV],
+            abbr: ["CDV"],
             name: "Committee Draft for Vote",
             harmonized_stages: %w[40.00 40.20 40.60 40.92 40.98 40.99],
           ),
@@ -76,7 +63,7 @@ module Pubid
             code: :fdis,
             stage_code: :fdis,
             type_code: :is,
-            abbr: %w[FDIS PRF NFDIS NADIS RDISH RFDIS CFDIS],
+            abbr: ["FDIS", "PRF"],
             name: "Final Draft International Standard",
             harmonized_stages: %w[50.00 50.20 50.60 50.92 50.98 50.99],
           ),
@@ -84,8 +71,7 @@ module Pubid
             code: :is,
             stage_code: :published,
             type_code: :is,
-            abbr: ["", "BPUB", "PPUB", "APUB", "WPUB", "DELPUB",
-                   "RR", "CAN"],
+            abbr: [""],
             name: "International Standard",
             harmonized_stages: %w[60.00 60.60 90.20 90.60 90.92 90.93 90.99
                                   95.20 95.60 95.92 95.99],
@@ -153,8 +139,7 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :is,
-            web: :international_standard, title: "International Standard", short: nil }
+          { key: :is, title: "International Standard", short: nil }
         end
       end
     end

data/lib/pubid/iec/identifiers/interpretation_sheet.rb

@@ -1,4 +1,6 @@
+require_relative "../supplement_identifier"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -94,8 +96,7 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :ish,
-            web: :interpretation_sheet, title: "Interpretation Sheet", short: "ISH" }
+          { key: :ish, title: "Interpretation Sheet", short: "ISH" }
         end
       end
     end

data/lib/pubid/iec/identifiers/operational_document.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: true
+require_relative "base"
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -19,10 +20,19 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :od,
-            web: :operational_document, title: "Operational Document", short: "OD" }
+          { key: :od, title: "Operational Document", short: "OD" }
         end
 
+        # Override publisher_portion to add OD
+        def publisher_portion
+          result = publisher.to_s
+
+          if typed_stage && typed_stage.abbreviation == "OD"
+            result += " OD"
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/publicly_available_specification.rb

@@ -1,4 +1,6 @@
+require_relative "base"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -78,10 +80,21 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :pas,
-            web: :publicly_available_specification, title: "Publicly Available Specification", short: "PAS" }
+          { key: :pas, title: "Publicly Available Specification", short: "PAS" }
         end
 
+        # Override publisher_portion to add PAS or DPAS stage
+        def publisher_portion
+          result = publisher.to_s
+
+          if typed_stage
+            abbr = typed_stage.abbreviation
+            # PAS uses space for all stages
+            result += " #{abbr}" unless abbr.empty?
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/sheet_identifier.rb

@@ -1,3 +1,4 @@
+require_relative "../identifier"
 # frozen_string_literal: true
 
 module Pubid
@@ -7,60 +8,57 @@ module Pubid
       # Single Responsibility: Wraps another identifier with sheet number and year
       # Example: "IEC 60695-2-1/1:1994" = Sheet 1 of IEC 60695-2-1 from 1994
       class SheetIdentifier < Identifier
-        attribute :base, Identifier, polymorphic: true
+        attribute :base_identifier, Identifier, polymorphic: true
         attribute :sheet_number, :string
         attribute :year, :string, default: -> {}
 
-        # Common fields are delegated to base, so serialize the
-        # wrapped identifier under "base" plus the sheet number/year; suppress
-        # the delegated common maps (they live inside "base").
-        include Pubid::Iec::DelegatedFieldSuppression
+        def to_s(lang: :en, lang_single: false, with_edition: false)
+          parts = []
 
-        key_value do
-          map "base", with: { to: :base_to_kv, from: :base_from_kv }
-          map "sheet_number", to: :sheet_number, render_default: false
-          map "sheet_year", to: :year, render_default: false
-        end
+          # Render base identifier
+          parts << base_identifier.to_s(lang: lang, lang_single: lang_single,
+                                        with_edition: with_edition)
 
-        def base_to_kv(model, doc)
-          base = model.base
-          return unless base
+          # Add sheet notation /N
+          parts << "/#{sheet_number}"
 
-          doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
-                                                                 base.to_hash))
-        end
+          # Add year if present
+          parts << ":#{year}" if year
 
-        def base_from_kv(model, value)
-          model.base = ::Pubid::Iec::Identifier.from_hash(value) if value
+          parts.join
         end
 
-        # Delegate common attributes to base
+        # Delegate common attributes to base_identifier
         def publisher
-          base&.publisher
+          base_identifier&.publisher
         end
 
         def copublishers
-          base&.copublishers
+          base_identifier&.copublishers
         end
 
         def code
-          base&.code
+          base_identifier&.code
         end
 
         def number
-          base&.number
+          base_identifier&.number
         end
 
         def date
-          base&.date
+          base_identifier&.date
+        end
+
+        def type
+          :sheet
         end
 
         def stage
-          base&.stage
+          base_identifier&.stage
         end
 
         def typed_stage
-          base&.typed_stage
+          base_identifier&.typed_stage
         end
       end
     end

data/lib/pubid/iec/identifiers/societal_technology_trend_report.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: true
+require_relative "base"
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -19,11 +20,20 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :sttr,
-            web: :societal_technology_trend_report, title: "Societal and Technology Trend Report",
+          { key: :sttr, title: "Societal and Technology Trend Report",
             short: "Trend Report" }
         end
 
+        # Override publisher_portion to add Trend Report
+        def publisher_portion
+          result = publisher.to_s
+
+          if typed_stage && typed_stage.abbreviation == "Trend Report"
+            result += " Trend Report"
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/systems_reference_document.rb

@@ -1,4 +1,6 @@
+require_relative "base"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -19,10 +21,19 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :srd,
-            web: :systems_reference_document, title: "Systems Reference Document", short: "SRD" }
+          { key: :srd, title: "Systems Reference Document", short: "SRD" }
         end
 
+        # Override publisher_portion to add SRD
+        def publisher_portion
+          result = publisher.to_s
+
+          if typed_stage && typed_stage.abbreviation == "SRD"
+            result += " SRD"
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/technical_report.rb

@@ -1,4 +1,6 @@
+require_relative "base"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -53,7 +55,7 @@ module Pubid
             code: :dtr,
             stage_code: :draft,
             type_code: :tr,
-            abbr: %w[DTR ADTR CDTR DTRM NDTR DTSM DTRM],
+            abbr: ["DTR"],
             name: "Draft Technical Report",
             harmonized_stages: %w[50.00 50.20 50.60 50.92 50.98 50.99],
           ),
@@ -104,10 +106,26 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :tr,
-            web: :technical_report, title: "Technical Report", short: "TR" }
+          { key: :tr, title: "Technical Report", short: "TR" }
         end
 
+        # Override publisher_portion to handle TR formatting
+        # If copublishers exist, use parent implementation
+        def publisher_portion
+          # If copublishers, delegate to parent (SingleIdentifier) which handles them
+          return super if copublishers&.any?
+
+          # No copublishers: simple TR formatting
+          result = publisher.to_s
+
+          if typed_stage
+            abbr = typed_stage.abbreviation
+            # For TR: always use space (IEC convention for ALL publishers)
+            result += " #{abbr}" unless abbr.empty?
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/technical_specification.rb

@@ -1,4 +1,6 @@
+require_relative "base"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -53,7 +55,7 @@ module Pubid
             code: :dts,
             stage_code: :draft,
             type_code: :ts,
-            abbr: %w[DTS ADTS CDTS NDTS],
+            abbr: ["DTS"],
             name: "Draft Technical Specification",
             harmonized_stages: %w[50.00 50.20 50.60 50.92 50.98 50.99],
           ),
@@ -104,10 +106,26 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :ts,
-            web: :technical_specification, title: "Technical Specification", short: "TS" }
+          { key: :ts, title: "Technical Specification", short: "TS" }
         end
 
+        # Override publisher_portion to handle TS formatting
+        # If copublishers exist, use parent implementation
+        def publisher_portion
+          # If copublishers, delegate to parent (SingleIdentifier) which handles them
+          return super if copublishers&.any?
+
+          # No copublishers: simple TS formatting
+          result = publisher.to_s
+
+          if typed_stage
+            abbr = typed_stage.abbreviation
+            # TS uses space for all stages
+            result += " #{abbr}" unless abbr.empty?
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/technology_report.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: true
+require_relative "base"
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -22,6 +23,16 @@ module Pubid
           { key: :tec, title: "Technology Report", short: "Technology Report" }
         end
 
+        # Override publisher_portion to add Technology Report
+        def publisher_portion
+          result = publisher.to_s
+
+          if typed_stage && typed_stage.abbreviation == "Technology Report"
+            result += " Technology Report"
+          end
+
+          result
+        end
       end
     end
   end

data/lib/pubid/iec/identifiers/test_report_form.rb

@@ -1,4 +1,6 @@
+require_relative "base"
 # frozen_string_literal: true
+require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -24,11 +26,52 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :trf,
-            web: :test_report_form, title: "Test Report Form", short: "TRF" }
+          { key: :trf, title: "Test Report Form", short: "TRF" }
         end
 
-        # TRF uses special rendering via the Renderer
+        # Override publisher_portion to add TRF with space
+        def publisher_portion
+          result = publisher.to_s
+
+          if typed_stage && typed_stage.abbreviation == "TRF"
+            result += " TRF"
+          end
+
+          result
+        end
+
+        # TRF uses special rendering
+        def to_s(_format = :short)
+          parts = []
+
+          # Publisher and type portion
+          parts << publisher_portion
+
+          # If CISPR identifier embedded, render it with TRF date
+          if cispr_identifier
+            cispr_parts = []
+            cispr_parts << cispr_identifier.publisher.body
+
+            # Build number portion with part
+            num_str = cispr_identifier.number.to_s
+            num_str += "-#{cispr_identifier.part}" if cispr_identifier.part && cispr_identifier.part.to_s != ""
+            cispr_parts << num_str
+
+            # Join with space and add TRF year
+            cispr_str = cispr_parts.join(" ")
+            cispr_str += ":#{date.year}" if date
+
+            parts << " #{cispr_str}"
+          else
+            # Normal TRF: number portion
+            parts << number_portion
+          end
+
+          # TRF info if present (handles version, decision sheet, etc.)
+          parts << trf_info.to_s if trf_info && !trf_info.empty?
+
+          parts.compact.join
+        end
       end
     end
   end