pubid 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.3

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

@@ -1,9 +1,4 @@
-require_relative "../single_identifier"
 # frozen_string_literal: true
-require_relative "../components/publisher"
-require_relative "../components/code"
-require_relative "../components/vap_suffix"
-require_relative "../components/trf_info"
 
 module Pubid
   module Iec
@@ -12,33 +7,21 @@ module Pubid
       # Inherits from SingleIdentifier to get common functionality
       # Single Responsibility: Common IEC identifier attributes and behavior
       class Base < SingleIdentifier
-        # IEC-specific attributes
-        attribute :vap_suffix, Components::VapSuffix, default: -> {}
+        # IEC-specific attributes. VAP codes live on VapIdentifier, not here.
         attribute :trf_info, Components::TrfInfo, default: -> {}
         attribute :database, :boolean, default: -> { false }
         attribute :fragment, :string, default: -> {}
         attribute :version, :string, default: -> {}
         attribute :decision_sheet, :string, default: -> {}
 
-        def to_s(_format = :short)
-          parts = []
-
-          # Publisher and type portion (from typed_stage) - uses inherited method
-          parts << publisher_portion
-
-          # Number portion (number with part/subpart)
-          parts << number_portion
-
-          # Edition if present - add space before edition
-          parts << " #{edition}" if edition&.number
-
-          # VAP suffix
-          parts << vap_suffix.render_with_space if vap_suffix
-
-          # Database flag
-          parts << " DB" if database
+        # database is the only Base-specific serialized key (emitted when set);
+        # merged onto the common map inherited from Identifier.
+        key_value do
+          map "database", to: :database, render_default: false
+        end
 
-          parts.compact.join
+        def to_s(**opts)
+          render(format: :human, **opts)
         end
 
         def number_portion
@@ -66,9 +49,6 @@ module Pubid
         def validate!
           super if defined?(super)
 
-          # Validate VAP suffix if present
-          vap_suffix&.validate!
-
           # Validate TRF info if present
           trf_info&.validate! if trf_info && !trf_info.empty?
         end

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

@@ -1,5 +1,4 @@
-require_relative "base"
-require_relative "../../components/typed_stage"
+# frozen_string_literal: true
 
 module Pubid
   module Iec
@@ -20,7 +19,8 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :cs, title: "Component Specification", short: "CS" }
+          { key: :cs,
+            web: :component_specification, title: "Component Specification", short: "CS" }
         end
 
         # Override publisher_portion to add CS

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

@@ -1,5 +1,4 @@
-require_relative "base"
-require_relative "../../components/typed_stage"
+# frozen_string_literal: true
 
 module Pubid
   module Iec

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

@@ -1,4 +1,3 @@
-require_relative "../identifier"
 # frozen_string_literal: true
 
 module Pubid
@@ -11,31 +10,33 @@ module Pubid
       class ConsolidatedIdentifier < Identifier
         attribute :identifiers, Identifier, polymorphic: true, collection: true
 
-        def to_s(lang: :en, lang_single: false, with_edition: false)
-          identifiers.map.with_index do |id, idx|
-            if idx.zero?
-              # First identifier renders normally
-              id.to_s(lang: lang, lang_single: lang_single,
-                      with_edition: with_edition)
-            elsif id.is_a?(Amendment)
-              # Subsequent identifiers render with + prefix
-              # For amendments, just show +AMDn:year part (or +AMDn if no date)
-              if id.date&.year && !id.date.year.empty?
-                "+AMD#{id.number}:#{id.date.year}"
-              else
-                "+AMD#{id.number}"
-              end
-            elsif id.is_a?(Corrigendum)
-              if id.date&.year && !id.date.year.empty?
-                "+COR#{id.number}:#{id.date.year}"
-              else
-                "+COR#{id.number}"
-              end
-            else
-              "+#{id.to_s(lang: lang, lang_single: lang_single,
-                          with_edition: with_edition)}"
-            end
-          end.join
+        # Common fields are delegated to identifiers.first, so suppress the
+        # inherited common maps and serialize the wrapped identifiers (base
+        # document + supplements) instead. Route each nested hash back through
+        # Identifier.from_hash so its concrete subclass is reconstructed.
+        include Pubid::Iec::DelegatedFieldSuppression
+
+        key_value do
+          map "identifiers",
+              with: { to: :identifiers_to_kv, from: :identifiers_from_kv }
+        end
+
+        def identifiers_to_kv(model, doc)
+          return unless model.identifiers&.any?
+
+          doc.add_child(Lutaml::KeyValue::DataModel::Element.new(
+                          "identifiers", model.identifiers.map(&:to_hash)
+                        ))
+        end
+
+        def identifiers_from_kv(model, value)
+          model.identifiers = Array(value).map do |h|
+            ::Pubid::Iec::Identifier.from_hash(h)
+          end
+        end
+
+        def to_s(**opts)
+          render(format: :human, **opts)
         end
 
         # Delegate common attributes to first identifier (base document)
@@ -59,10 +60,6 @@ module Pubid
           identifiers&.first&.date
         end
 
-        def type
-          :consolidated
-        end
-
         def stage
           identifiers&.first&.stage
         end

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

@@ -1,6 +1,4 @@
-require_relative "../supplement_identifier"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -86,7 +84,8 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :cor, title: "Corrigendum", short: "COR" }
+          { key: :cor,
+            web: :corrigendum, title: "Corrigendum", short: "COR" }
         end
       end
     end

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

@@ -1,6 +1,4 @@
-require_relative "../identifier"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -13,7 +11,39 @@ module Pubid
         attribute :base_identifier, Identifier, polymorphic: true
         attribute :fragment_number, :string
         attribute :edition, ::Pubid::Components::Edition, default: -> {}
-        attribute :typed_stage, ::Pubid::Components::TypedStage
+        # 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_identifier, 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_identifier
+          return unless base
+
+          doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
+                                                                base.to_hash))
+        end
+
+        def base_from_kv(model, value)
+          model.base_identifier = ::Pubid::Iec::Identifier.from_hash(value) if value
+        end
 
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
@@ -84,27 +114,12 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :frag, title: "Fragment", short: "FRAG" }
+          { key: :frag,
+            web: :fragment_identifier, title: "Fragment", short: "FRAG" }
         end
 
-        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
+        def to_s(**opts)
+          render(format: :human, **opts)
         end
 
         # Delegate common attributes to base_identifier
@@ -128,10 +143,6 @@ module Pubid
           base_identifier&.date
         end
 
-        def type
-          :frag
-        end
-
         def stage
           typed_stage&.to_stage || base_identifier&.stage
         end

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

@@ -1,6 +1,4 @@
-require_relative "base"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec

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

@@ -1,6 +1,4 @@
-require_relative "base"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -139,7 +137,8 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :is, title: "International Standard", short: nil }
+          { key: :is,
+            web: :international_standard, title: "International Standard", short: nil }
         end
       end
     end

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

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

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

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

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

@@ -1,6 +1,4 @@
-require_relative "base"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -80,7 +78,8 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :pas, title: "Publicly Available Specification", short: "PAS" }
+          { key: :pas,
+            web: :publicly_available_specification, title: "Publicly Available Specification", short: "PAS" }
         end
 
         # Override publisher_portion to add PAS or DPAS stage

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

@@ -1,4 +1,3 @@
-require_relative "../identifier"
 # frozen_string_literal: true
 
 module Pubid
@@ -12,20 +11,31 @@ module Pubid
         attribute :sheet_number, :string
         attribute :year, :string, default: -> {}
 
-        def to_s(lang: :en, lang_single: false, with_edition: false)
-          parts = []
+        # Common fields are delegated to base_identifier, 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
 
-          # Render base identifier
-          parts << base_identifier.to_s(lang: lang, lang_single: lang_single,
-                                        with_edition: with_edition)
+        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
+
+        def base_to_kv(model, doc)
+          base = model.base_identifier
+          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_identifier = ::Pubid::Iec::Identifier.from_hash(value) if value
+        end
 
-          parts.join
+        def to_s(**opts)
+          render(format: :human, **opts)
         end
 
         # Delegate common attributes to base_identifier
@@ -49,10 +59,6 @@ module Pubid
           base_identifier&.date
         end
 
-        def type
-          :sheet
-        end
-
         def stage
           base_identifier&.stage
         end

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

@@ -1,5 +1,4 @@
-require_relative "base"
-require_relative "../../components/typed_stage"
+# frozen_string_literal: true
 
 module Pubid
   module Iec
@@ -20,7 +19,8 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :sttr, title: "Societal and Technology Trend Report",
+          { key: :sttr,
+            web: :societal_technology_trend_report, title: "Societal and Technology Trend Report",
             short: "Trend Report" }
         end
 

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

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

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

@@ -1,6 +1,4 @@
-require_relative "base"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -106,7 +104,8 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :tr, title: "Technical Report", short: "TR" }
+          { key: :tr,
+            web: :technical_report, title: "Technical Report", short: "TR" }
         end
 
         # Override publisher_portion to handle TR formatting

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

@@ -1,6 +1,4 @@
-require_relative "base"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -106,7 +104,8 @@ module Pubid
         }.freeze
 
         def self.type
-          { key: :ts, title: "Technical Specification", short: "TS" }
+          { key: :ts,
+            web: :technical_specification, title: "Technical Specification", short: "TS" }
         end
 
         # Override publisher_portion to handle TS formatting

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

@@ -1,5 +1,4 @@
-require_relative "base"
-require_relative "../../components/typed_stage"
+# frozen_string_literal: true
 
 module Pubid
   module Iec

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

@@ -1,6 +1,4 @@
-require_relative "base"
 # frozen_string_literal: true
-require_relative "../../components/typed_stage"
 
 module Pubid
   module Iec
@@ -26,7 +24,8 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :trf, title: "Test Report Form", short: "TRF" }
+          { key: :trf,
+            web: :test_report_form, title: "Test Report Form", short: "TRF" }
         end
 
         # Override publisher_portion to add TRF with space
@@ -40,37 +39,9 @@ module Pubid
           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
+        # TRF uses special rendering via the Renderer
+        def to_s(**opts)
+          render(format: :human, **opts)
         end
       end
     end

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

@@ -1,6 +1,4 @@
-require_relative "../identifier"
 # frozen_string_literal: true
-require_relative "../components/vap_suffix"
 
 module Pubid
   module Iec
@@ -10,9 +8,32 @@ module Pubid
       # Examples: "IEC 61666:2010+AMD1:2021 CSV"
       class VapIdentifier < Identifier
         attribute :base_identifier, Identifier, polymorphic: true
-        attribute :vap_suffix, Components::VapSuffix
+        # One or more VAP codes (e.g. ["CSV"] or ["EXV", "CMV"]). Plain strings.
+        attribute :vap, :string, collection: true
         attribute :edition, ::Pubid::Components::Edition, default: -> {}
 
+        # number/date/publisher/stage are delegated to base_identifier, so
+        # serialize the wrapped identifier under "base" plus the vap array; the
+        # common fields live inside "base", not at the top level.
+        include Pubid::Iec::DelegatedFieldSuppression
+
+        key_value do
+          map "base", with: { to: :base_to_kv, from: :base_from_kv }
+          map "vap", to: :vap, render_default: false
+        end
+
+        def base_to_kv(model, doc)
+          base = model.base_identifier
+          return unless base
+
+          doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
+                                                                base.to_hash))
+        end
+
+        def base_from_kv(model, value)
+          model.base_identifier = ::Pubid::Iec::Identifier.from_hash(value) if value
+        end
+
         # VAP types mapping
         TYPE_MAP = {
           "CSV" => "Consolidated version (with Supplements)",
@@ -21,22 +42,8 @@ module Pubid
           "SER" => "Serial version",
         }.freeze
 
-        def to_s(lang: :en, lang_single: false, with_edition: false)
-          parts = []
-
-          # Render base identifier WITHOUT edition (edition goes at VAP level)
-          parts << base_identifier.to_s(lang: lang, lang_single: lang_single,
-                                        with_edition: false)
-
-          # Add VAP suffix with space
-          if vap_suffix
-            parts << " #{vap_suffix}"
-          end
-
-          # Add edition after VAP suffix if present
-          parts << " #{edition}" if edition&.number
-
-          parts.compact.join
+        def to_s(**opts)
+          render(format: :human, **opts)
         end
 
         # Delegate common attributes to base_identifier
@@ -60,10 +67,6 @@ module Pubid
           base_identifier&.date
         end
 
-        def type
-          :vap
-        end
-
         def stage
           base_identifier&.stage
         end

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

@@ -1,5 +1,4 @@
-require_relative "base"
-require_relative "../../components/typed_stage"
+# frozen_string_literal: true
 
 module Pubid
   module Iec
@@ -20,7 +19,8 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :wp, title: "White Paper", short: "White Paper" }
+          { key: :wp,
+            web: :white_paper, title: "White Paper", short: "White Paper" }
         end
 
         # Override publisher_portion to add White Paper