pubid 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.4

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

@@ -1,4 +1,3 @@
-require_relative "../identifier"
 # frozen_string_literal: true
 
 module Pubid
@@ -11,31 +10,29 @@ 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
 
         # Delegate common attributes to first identifier (base document)

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,8 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :frag, 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
+          { key: :frag,
+            web: :fragment_identifier, title: "Fragment", short: "FRAG" }
         end
 
         # Delegate common attributes to base_identifier

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,27 @@ 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
 
-          # Add sheet notation /N
-          parts << "/#{sheet_number}"
+        def base_to_kv(model, doc)
+          base = model.base_identifier
+          return unless base
 
-          # Add year if present
-          parts << ":#{year}" if year
+          doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
+                                                                 base.to_hash))
+        end
 
-          parts.join
+        def base_from_kv(model, value)
+          model.base_identifier = ::Pubid::Iec::Identifier.from_hash(value) if value
         end
 
         # Delegate common attributes to base_identifier

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,38 +39,7 @@ 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
-        end
+        # TRF uses special rendering via the Renderer
       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,24 +42,6 @@ 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
-        end
-
         # Delegate common attributes to base_identifier
         def publisher
           base_identifier&.publisher

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

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

@@ -1,6 +1,4 @@
-require_relative "base"
 # frozen_string_literal: true
-require_relative "../../components/stage"
 
 module Pubid
   module Iec
@@ -26,7 +24,8 @@ module Pubid
         PROJECT_STAGES = {}.freeze
 
         def self.type
-          { key: :wd, title: "Working Document", short: "WD" }
+          { key: :wd,
+            web: :working_document, title: "Working Document", short: "WD" }
         end
 
         # Return stage object for PWI/PNW stage
@@ -43,53 +42,6 @@ module Pubid
 
           @stage ||= ::Pubid::Components::Stage.new(stage_code: stage_code)
         end
-
-        def to_s(_format = :short)
-          # Working Programme format: "PWI TR 100-36 ED1" or "IEC/PWI 60038"
-          if wp_stage
-            parts = []
-            # Include publisher if present (for IEC/PWI format)
-            if publisher
-              parts << publisher.body
-              if copublishers&.any?
-                parts << "/#{copublishers.map(&:body).join('/')}"
-              end
-              parts << "/"
-            end
-            parts << wp_stage
-            # Only add wp_type if it exists and is not empty/whitespace
-            if wp_type && !wp_type.strip.empty?
-              parts << " #{wp_type.strip}"
-            end
-
-            # Render full number with parts
-            if number
-              num_str = number.to_s
-              num_str += "-#{part}" if part && part.to_s != ""
-              num_str += "-#{subpart}" if subpart && subpart.to_s != ""
-              parts << " #{num_str}"
-            end
-
-            parts << " #{edition}" if edition&.number
-            return parts.join
-          end
-
-          # Working Document format: "100/3705(F)/FDIS"
-          parts = []
-
-          parts << technical_committee if technical_committee
-
-          # Number with optional language
-          if wd_number
-            num_part = wd_number.to_s
-            num_part += "(#{wd_language})" if wd_language
-            parts << num_part
-          end
-
-          parts << wd_stage if wd_stage
-
-          parts.join("/")
-        end
       end
     end
   end

data/lib/pubid/iec/identifiers.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Iec
+    module Identifiers
+      autoload :Amendment, "#{__dir__}/identifiers/amendment"
+      autoload :Base, "#{__dir__}/identifiers/base"
+      autoload :ComponentSpecification, "#{__dir__}/identifiers/component_specification"
+      autoload :ConformityAssessment, "#{__dir__}/identifiers/conformity_assessment"
+      autoload :ConsolidatedIdentifier, "#{__dir__}/identifiers/consolidated_identifier"
+      autoload :Corrigendum, "#{__dir__}/identifiers/corrigendum"
+      autoload :FragmentIdentifier, "#{__dir__}/identifiers/fragment_identifier"
+      autoload :Guide, "#{__dir__}/identifiers/guide"
+      autoload :InternationalStandard, "#{__dir__}/identifiers/international_standard"
+      autoload :InterpretationSheet, "#{__dir__}/identifiers/interpretation_sheet"
+      autoload :OperationalDocument, "#{__dir__}/identifiers/operational_document"
+      autoload :PubliclyAvailableSpecification, "#{__dir__}/identifiers/publicly_available_specification"
+      autoload :SheetIdentifier, "#{__dir__}/identifiers/sheet_identifier"
+      autoload :SocietalTechnologyTrendReport, "#{__dir__}/identifiers/societal_technology_trend_report"
+      autoload :SystemsReferenceDocument, "#{__dir__}/identifiers/systems_reference_document"
+      autoload :TechnicalReport, "#{__dir__}/identifiers/technical_report"
+      autoload :TechnicalSpecification, "#{__dir__}/identifiers/technical_specification"
+      autoload :TechnologyReport, "#{__dir__}/identifiers/technology_report"
+      autoload :TestReportForm, "#{__dir__}/identifiers/test_report_form"
+      autoload :VapIdentifier, "#{__dir__}/identifiers/vap_identifier"
+      autoload :WhitePaper, "#{__dir__}/identifiers/white_paper"
+      autoload :WorkingDocument, "#{__dir__}/identifiers/working_document"
+    end
+  end
+end

data/lib/pubid/iec/parser.rb

@@ -1,9 +1,5 @@
 require "parslet"
 # frozen_string_literal: true
-require_relative "../parser/common_parse_rules"
-require_relative "../parser/common_parse_methods"
-require_relative "identifier"
-require_relative "supplement_identifier"
 
 module Pubid
   module Iec
@@ -14,10 +10,9 @@ module Pubid
       DASH_CHARS = ["-", "‑", "‐"].freeze
 
       # We need to sort by length to match longest first because that's how Parslet works
-      TYPED_STAGES = Pubid::Iec::Scheme.typed_stages
-        .map(&:abbr).flatten.sort_by(&:length).reverse
-      TYPED_STAGES_SUPPLEMENTS = Pubid::Iec::Scheme.supplement_typed_stages
+      TYPED_STAGES = Pubid::Iec.all_typed_stages
         .map(&:abbr).flatten.sort_by(&:length).reverse
+      TYPED_STAGES_SUPPLEMENTS = TYPED_STAGES
 
       root :identifier
 
@@ -277,16 +272,22 @@ module Pubid
       # EXV = Example version
       # PAC = Package
       # PRV = Preview version
-      rule(:vap_suffix) do
-        space >> (
-          str("CSV") |
+      # Internal helper (no `.as`): a single VAP code. The capture key stays
+      # :vap_suffix below; this rule just lets the suffix be one or more codes.
+      rule(:vap_code) do
+        str("CSV") |
           str("CMV") |
           str("RLV") |
           str("SER") |
           str("EXV") |
           str("PAC") |
           str("PRV")
-        ).as(:vap_suffix)
+      end
+
+      # One or more VAP codes joined by "-", captured whole, e.g. "CSV" or
+      # "EXV-CMV"; the builder splits it into the VapIdentifier `vap` array.
+      rule(:vap_suffix) do
+        space >> (vap_code >> (str("-") >> vap_code).repeat).as(:vap_suffix)
       end
 
       # Database suffix: " DB"
@@ -358,7 +359,7 @@ module Pubid
       end
 
       rule(:iso_identifier) do
-        Iso::Parser.new.identifier
+        Pubid::Iso.joint_grammar_atom(:identifier)
       end
 
       rule(:supplement_type_with_stage) do