pubid 2.0.0.pre.alpha.7 → 2.0.0.pre.alpha.9

data/lib/pubid/iec/builder.rb

@@ -9,6 +9,11 @@ module Pubid
           return Identifiers::WorkingDocument
         end
 
+        # Check for technical group (committee identifier, no document number)
+        if parsed_hash[:technical_committee] && !parsed_hash[:wd_number]
+          return Identifiers::TechnicalGroup
+        end
+
         # Check for working document
         if parsed_hash[:technical_committee] && parsed_hash[:wd_number]
           return Identifiers::WorkingDocument
@@ -24,15 +29,15 @@ module Pubid
 
       def build(parsed_hash)
         # Handle sheet_supplement_identifier pattern:
-        # {base_identifier: {...}, sheet_number: ..., sheet_year: ..., type_with_stage: "COR", number_with_part: "1", date: "1995"}
+        # {base: {...}, sheet_number: ..., sheet_year: ..., type_with_stage: "COR", number_with_part: "1", date: "1995"}
         # This is a Corrigendum/Amendment wrapping a SheetIdentifier
-        if parsed_hash[:base_identifier] && (parsed_hash[:sheet_number] || parsed_hash[:sheet_year]) && parsed_hash[:type_with_stage]
+        if parsed_hash[:base] && (parsed_hash[:sheet_number] || parsed_hash[:sheet_year]) && parsed_hash[:type_with_stage]
           # Extract sheet info first
           sheet_number = parsed_hash.delete(:sheet_number)
           sheet_year = parsed_hash.delete(:sheet_year)
 
           # Build the base identifier (IEC 60695-2-1 with /1:1994 -> SheetIdentifier)
-          base_parsed = parsed_hash[:base_identifier].dup
+          base_parsed = parsed_hash[:base].dup
           base_parsed[:sheet_number] = sheet_number
           base_parsed[:sheet_year] = sheet_year if sheet_year
           sheet_id = wrap_with_sheet(build(base_parsed), sheet_number,
@@ -68,10 +73,10 @@ module Pubid
           return wrap_with_supplement(sheet_id, supplement)
         end
 
-        # Handle sheet_identifier pattern: {base_identifier: {...}, sheet_number: ..., sheet_year: ...}
-        if parsed_hash[:base_identifier] && (parsed_hash[:sheet_number] || parsed_hash[:sheet_year])
+        # Handle sheet_identifier pattern: {base: {...}, sheet_number: ..., sheet_year: ...}
+        if parsed_hash[:base] && (parsed_hash[:sheet_number] || parsed_hash[:sheet_year])
           # Build the base identifier first
-          base_id = build(parsed_hash[:base_identifier])
+          base_id = build(parsed_hash[:base])
           # Wrap with SheetIdentifier
           sheet_number = parsed_hash.delete(:sheet_number)
           sheet_year = parsed_hash.delete(:sheet_year)
@@ -105,8 +110,8 @@ module Pubid
           fragment_edition = parsed_hash.delete(:edition)
 
           # Build the base identifier (Amendment/Corrigendum) directly
-          if parsed_hash[:base_identifier]
-            base_id = build(parsed_hash[:base_identifier])
+          if parsed_hash[:base]
+            base_id = build(parsed_hash[:base])
             return wrap_with_fragment(base_id, fragment_number,
                                       fragment_edition, fragment_typed_stage)
           end
@@ -235,10 +240,10 @@ module Pubid
       end
 
       # Wrap identifier with FragmentIdentifier for /FRAGN notation
-      def wrap_with_fragment(base_identifier, fragment_number,
+      def wrap_with_fragment(base, fragment_number,
       edition_data = nil, typed_stage = nil)
         fragment = Identifiers::FragmentIdentifier.new(
-          base_identifier: base_identifier,
+          base: base,
           fragment_number: fragment_number,
         )
 
@@ -254,25 +259,25 @@ module Pubid
       end
 
       # Wrap identifier with SheetIdentifier for /N:YEAR notation
-      def wrap_with_sheet(base_identifier, sheet_number, sheet_year)
+      def wrap_with_sheet(base, sheet_number, sheet_year)
         # Only pass year if it's present
         year_value = sheet_year&.to_s
 
         Identifiers::SheetIdentifier.new(
-          base_identifier: base_identifier,
+          base: base,
           sheet_number: sheet_number.to_s,
           year: year_value,
         )
       end
 
       # Wrap base identifier with supplement (Amendment/Corrigendum)
-      def wrap_with_supplement(base_identifier, supplement)
-        supplement.base_identifier = base_identifier
+      def wrap_with_supplement(base, supplement)
+        supplement.base = base
         supplement
       end
 
       # Wrap identifier with ConsolidatedIdentifier for +AMD chains
-      def wrap_with_consolidated(base_identifier, supplements_data)
+      def wrap_with_consolidated(base, supplements_data)
         supplements = supplements_data.filter_map do |supp|
           type = supp[:supplement_type].to_s
           number = supp[:supplement_number].to_s
@@ -295,31 +300,31 @@ module Pubid
         end
 
         Identifiers::ConsolidatedIdentifier.new(
-          identifiers: [base_identifier] + supplements,
+          identifiers: [base] + supplements,
         )
       end
 
       # Wrap identifier with VapIdentifier for one or more VAP codes
       # (e.g. "CSV" or "EXV-CMV").
-      def wrap_with_vap(base_identifier, vap_suffix_data)
+      def wrap_with_vap(base, vap_suffix_data)
         vap = vap_suffix_data.to_s.split("-")
 
         # Extract edition - need to go deep for ConsolidatedIdentifier
         edition = nil
-        if base_identifier.is_a?(Identifiers::ConsolidatedIdentifier)
+        if base.is_a?(Identifiers::ConsolidatedIdentifier)
           # Edition is on the first identifier (base document)
-          base_first = base_identifier.identifiers.first
+          base_first = base.identifiers.first
           if base_first && base_first.class.attributes.key?(:edition)
             edition = base_first.edition
             base_first.edition = nil
           end
-        elsif base_identifier.class.attributes.key?(:edition)
-          edition = base_identifier.edition
-          base_identifier.edition = nil
+        elsif base.class.attributes.key?(:edition)
+          edition = base.edition
+          base.edition = nil
         end
 
         Identifiers::VapIdentifier.new(
-          base_identifier: base_identifier,
+          base: base,
           vap: vap,
           edition: edition,
         )
@@ -339,7 +344,7 @@ module Pubid
 
       def cast(type, value)
         case type
-        when :base_identifier
+        when :base
           # If it has a base identifier, we need to build a supplement
           # We assume that the base identifier is already a valid Identifier object
           build(value)
@@ -356,7 +361,7 @@ module Pubid
             end
           end
 
-        when :technical_committee, :wd_number, :wd_stage, :wd_language, :wp_stage, :wp_type
+        when :technical_committee, :subcommittee, :wd_number, :wd_stage, :wd_language, :wp_stage, :wp_type
           # Working document/programme fields - just return as string
           value.to_s
 
@@ -400,6 +405,11 @@ module Pubid
         when :date
           parse_date(value)
 
+        when :undated_marker
+          # ISO/IEC undated reference (e.g. "IEC 60050:--") — explicit
+          # publication-date slot with no year; round-trips via date.render.
+          { date: Pubid::Components::Date.new(undated: true) }
+
         when :edition
           # Coerce to String: the parsed value may be a Parslet::Slice, which
           # Edition.number (Type::Value) would store verbatim and serialize as a

data/lib/pubid/iec/identifier.rb

@@ -84,6 +84,7 @@ module Pubid
         "pubid:iec:societal-technology-trend-report" => "Pubid::Iec::Identifiers::SocietalTechnologyTrendReport",
         "pubid:iec:systems-reference-document" => "Pubid::Iec::Identifiers::SystemsReferenceDocument",
         "pubid:iec:technology-report" => "Pubid::Iec::Identifiers::TechnologyReport",
+        "pubid:iec:technical-group" => "Pubid::Iec::Identifiers::TechnicalGroup",
         "pubid:iec:test-report-form" => "Pubid::Iec::Identifiers::TestReportForm",
         "pubid:iec:white-paper" => "Pubid::Iec::Identifiers::WhitePaper",
         "pubid:iec:working-document" => "Pubid::Iec::Identifiers::WorkingDocument",
@@ -129,8 +130,13 @@ module Pubid
         map "subpart", with: { to: :subpart_to_kv, from: :subpart_from_kv }
         map "stage_iteration",
             with: { to: :stage_iteration_to_kv, from: :stage_iteration_from_kv }
-        # IEC dates are year-only, so flatten the Date component to a scalar year.
+        # date serialized flat as year/month/day, nils omitted.
         map "year", with: { to: :year_to_kv, from: :year_from_kv }
+        map "month", with: { to: :month_to_kv, from: :month_from_kv }
+        map "day", with: { to: :day_to_kv, from: :day_from_kv }
+        # IEC undated reference (e.g. IEC 60050:--). The `false` default is
+        # omitted; only the meaningful `true` round-trips via to_hash.
+        map "undated", with: { to: :undated_to_kv, from: :undated_from_kv }
         map "edition", to: :edition, render_default: false
         map "languages", to: :languages, render_default: false
         # publisher emitted only when the primary isn't the IEC default;
@@ -183,7 +189,7 @@ module Pubid
           ::Pubid::Components::Iteration.new(number: value.to_s)
       end
 
-      # --- date <-> scalar year (IEC dates are year-only) ---
+      # --- date serialized flat as year/month/day ---
       def year_to_kv(model, doc)
         y = model.date&.year
         return if y.nil? || y.to_s.empty?
@@ -197,6 +203,45 @@ module Pubid
         (model.date ||= ::Pubid::Components::Date.new).year = value.to_s
       end
 
+      def month_to_kv(model, doc)
+        m = model.date&.month
+        return if m.nil? || m.to_s.empty?
+
+        doc.add_child(Lutaml::KeyValue::DataModel::Element.new("month", m.to_s))
+      end
+
+      def month_from_kv(model, value)
+        return if value.nil? || value.to_s.empty?
+
+        (model.date ||= ::Pubid::Components::Date.new).month = value.to_s
+      end
+
+      def day_to_kv(model, doc)
+        d = model.date&.day
+        return if d.nil? || d.to_s.empty?
+
+        doc.add_child(Lutaml::KeyValue::DataModel::Element.new("day", d.to_s))
+      end
+
+      def day_from_kv(model, value)
+        return if value.nil? || value.to_s.empty?
+
+        (model.date ||= ::Pubid::Components::Date.new).day = value.to_s
+      end
+
+      # --- date undated flag (IEC undated reference, e.g. IEC 60050:--) ---
+      # The `false` default is omitted; only the meaningful `true` round-trips
+      # via to_hash / from_hash.
+      def undated_to_kv(model, doc)
+        return unless model.date&.undated?
+
+        doc.add_child(Lutaml::KeyValue::DataModel::Element.new("undated", true))
+      end
+
+      def undated_from_kv(model, value)
+        (model.date ||= ::Pubid::Components::Date.new).undated = value.to_s == "true"
+      end
+
       # --- publisher: primary only when non-default; copublishers as a list ---
       def publisher_to_kv(model, doc)
         pub = model.publisher&.body

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

@@ -31,8 +31,8 @@ module Pubid
           # Add subpart if present
           result += "-#{subpart}" if subpart && subpart.to_s != ""
 
-          # Add date if present
-          result += ":#{date.year}" if date
+          # Render the date (year[-month[-day]], or `--` for undated).
+          result += ":#{date.render}" if date
 
           result
         end

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

@@ -69,6 +69,12 @@ module Pubid
           identifiers&.first
         end
 
+        # The origin document. A consolidated bundle stores its members in
+        # `identifiers` (not `base`), so walk the first member to its root.
+        def root
+          identifiers&.first&.root || self
+        end
+
         # Get all supplements (identifiers after first)
         def supplements
           identifiers&.drop(1) || []

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

@@ -8,7 +8,7 @@ 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, Identifier, polymorphic: true
+        attribute :base, Identifier, polymorphic: true
         attribute :fragment_number, :string
         attribute :edition, ::Pubid::Components::Edition, default: -> {}
         # Fragments have their own lifecycle; default to the published FRAG stage
@@ -16,7 +16,7 @@ module Pubid
         attribute :typed_stage, ::Pubid::Components::TypedStage,
                   default: -> { self.class.published_typed_stage }
 
-        # number/date/publisher delegate to base_identifier, but the fragment's
+        # 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).
@@ -34,7 +34,7 @@ module Pubid
         def copublishers_to_kv(_model, _doc); end
 
         def base_to_kv(model, doc)
-          base = model.base_identifier
+          base = model.base
           return unless base
 
           doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
@@ -42,7 +42,7 @@ module Pubid
         end
 
         def base_from_kv(model, value)
-          model.base_identifier = ::Pubid::Iec::Identifier.from_hash(value) if value
+          model.base = ::Pubid::Iec::Identifier.from_hash(value) if value
         end
 
         TYPED_STAGES = [
@@ -118,29 +118,29 @@ module Pubid
             web: :fragment_identifier, title: "Fragment", short: "FRAG" }
         end
 
-        # Delegate common attributes to base_identifier
+        # Delegate common attributes to base
         def publisher
-          base_identifier&.publisher
+          base&.publisher
         end
 
         def copublishers
-          base_identifier&.copublishers
+          base&.copublishers
         end
 
         def code
-          base_identifier&.code
+          base&.code
         end
 
         def number
-          base_identifier&.number
+          base&.number
         end
 
         def date
-          base_identifier&.date
+          base&.date
         end
 
         def stage
-          typed_stage&.to_stage || base_identifier&.stage
+          typed_stage&.to_stage || base&.stage
         end
       end
     end

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

@@ -13,7 +13,7 @@ module Pubid
             code: :pwi,
             stage_code: :pwi,
             type_code: :is,
-            abbr: ["PWI"],
+            abbr: %w[PWI PNW NWIP BWG AWIN AMW],
             name: "Preliminary Work Item",
             harmonized_stages: %w[00.00 00.20 00.60 00.98 00.99],
           ),
@@ -45,7 +45,9 @@ module Pubid
             code: :cd,
             stage_code: :cd,
             type_code: :is,
-            abbr: ["CD"],
+            abbr: %w[CD 2CD 3CD 4CD 5CD 6CD 7CD 8CD 9CD
+                     ACD A2CD A3CD A4CD A5CD A6CD A7CD A8CD A9CD
+                     CDM],
             name: "Committee Draft",
             harmonized_stages: %w[30.00 30.20 30.60 30.92 30.98 30.99],
           ),
@@ -53,7 +55,7 @@ module Pubid
             code: :cdv,
             stage_code: :cdv,
             type_code: :is,
-            abbr: ["CDV"],
+            abbr: %w[CDV ACDV CCDV CDVM NCDV],
             name: "Committee Draft for Vote",
             harmonized_stages: %w[40.00 40.20 40.60 40.92 40.98 40.99],
           ),
@@ -61,7 +63,7 @@ module Pubid
             code: :fdis,
             stage_code: :fdis,
             type_code: :is,
-            abbr: ["FDIS", "PRF"],
+            abbr: %w[FDIS PRF NFDIS NADIS RDISH RFDIS CFDIS],
             name: "Final Draft International Standard",
             harmonized_stages: %w[50.00 50.20 50.60 50.92 50.98 50.99],
           ),
@@ -69,7 +71,8 @@ module Pubid
             code: :is,
             stage_code: :published,
             type_code: :is,
-            abbr: [""],
+            abbr: ["", "BPUB", "PPUB", "APUB", "WPUB", "DELPUB",
+                   "RR", "CAN"],
             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],

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

@@ -7,11 +7,11 @@ 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, Identifier, polymorphic: true
+        attribute :base, Identifier, polymorphic: true
         attribute :sheet_number, :string
         attribute :year, :string, default: -> {}
 
-        # Common fields are delegated to base_identifier, so serialize the
+        # 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
@@ -23,7 +23,7 @@ module Pubid
         end
 
         def base_to_kv(model, doc)
-          base = model.base_identifier
+          base = model.base
           return unless base
 
           doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
@@ -31,36 +31,36 @@ module Pubid
         end
 
         def base_from_kv(model, value)
-          model.base_identifier = ::Pubid::Iec::Identifier.from_hash(value) if value
+          model.base = ::Pubid::Iec::Identifier.from_hash(value) if value
         end
 
-        # Delegate common attributes to base_identifier
+        # Delegate common attributes to base
         def publisher
-          base_identifier&.publisher
+          base&.publisher
         end
 
         def copublishers
-          base_identifier&.copublishers
+          base&.copublishers
         end
 
         def code
-          base_identifier&.code
+          base&.code
         end
 
         def number
-          base_identifier&.number
+          base&.number
         end
 
         def date
-          base_identifier&.date
+          base&.date
         end
 
         def stage
-          base_identifier&.stage
+          base&.stage
         end
 
         def typed_stage
-          base_identifier&.typed_stage
+          base&.typed_stage
         end
       end
     end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Iec
+    module Identifiers
+      # Technical Group identifier — identifies a committee rather than a
+      # publication. Covers:
+      #
+      #   IEC TC 1             (Technical Committee)
+      #   IEC PC 118           (Project Committee)
+      #   ISO/IEC JTC 1        (Joint Technical Committee)
+      #   ISO/IEC JPC 2        (Joint Project Committee)
+      #   ISO/IEC JTC 1/SC 7   (Joint TC with Subcommittee)
+      #   IEC SC 100A          (Subcommittee with letter suffix)
+      #   CIS/A                (CISPR Subcommittee, bare form)
+      #   CISPR                (CISPR Committee, bare form)
+      class TechnicalGroup < Base
+        attribute :technical_committee, :string
+        attribute :subcommittee, :string
+
+        TYPED_STAGES = [].freeze
+
+        def self.type
+          { key: :tg,
+            web: :technical_group, title: "Technical Group", short: "TG" }
+        end
+      end
+    end
+  end
+end

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

@@ -53,7 +53,7 @@ module Pubid
             code: :dtr,
             stage_code: :draft,
             type_code: :tr,
-            abbr: ["DTR"],
+            abbr: %w[DTR ADTR CDTR DTRM NDTR DTSM DTRM],
             name: "Draft Technical Report",
             harmonized_stages: %w[50.00 50.20 50.60 50.92 50.98 50.99],
           ),

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

@@ -53,7 +53,7 @@ module Pubid
             code: :dts,
             stage_code: :draft,
             type_code: :ts,
-            abbr: ["DTS"],
+            abbr: %w[DTS ADTS CDTS NDTS],
             name: "Draft Technical Specification",
             harmonized_stages: %w[50.00 50.20 50.60 50.92 50.98 50.99],
           ),

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

@@ -7,12 +7,12 @@ module Pubid
       # Single Responsibility: Wraps another identifier with VAP type suffix
       # Examples: "IEC 61666:2010+AMD1:2021 CSV"
       class VapIdentifier < Identifier
-        attribute :base_identifier, Identifier, polymorphic: true
+        attribute :base, Identifier, polymorphic: true
         # 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
+        # number/date/publisher/stage are delegated to base, 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
@@ -23,7 +23,7 @@ module Pubid
         end
 
         def base_to_kv(model, doc)
-          base = model.base_identifier
+          base = model.base
           return unless base
 
           doc.add_child(Lutaml::KeyValue::DataModel::Element.new("base",
@@ -31,7 +31,7 @@ module Pubid
         end
 
         def base_from_kv(model, value)
-          model.base_identifier = ::Pubid::Iec::Identifier.from_hash(value) if value
+          model.base = ::Pubid::Iec::Identifier.from_hash(value) if value
         end
 
         # VAP types mapping
@@ -42,33 +42,33 @@ module Pubid
           "SER" => "Serial version",
         }.freeze
 
-        # Delegate common attributes to base_identifier
+        # Delegate common attributes to base
         def publisher
-          base_identifier&.publisher
+          base&.publisher
         end
 
         def copublishers
-          base_identifier&.copublishers
+          base&.copublishers
         end
 
         def code
-          base_identifier&.code
+          base&.code
         end
 
         def number
-          base_identifier&.number
+          base&.number
         end
 
         def date
-          base_identifier&.date
+          base&.date
         end
 
         def stage
-          base_identifier&.stage
+          base&.stage
         end
 
         def typed_stage
-          base_identifier&.typed_stage
+          base&.typed_stage
         end
       end
     end

data/lib/pubid/iec/identifiers.rb

@@ -20,6 +20,7 @@ module Pubid
       autoload :SystemsReferenceDocument, "#{__dir__}/identifiers/systems_reference_document"
       autoload :TechnicalReport, "#{__dir__}/identifiers/technical_report"
       autoload :TechnicalSpecification, "#{__dir__}/identifiers/technical_specification"
+      autoload :TechnicalGroup, "#{__dir__}/identifiers/technical_group"
       autoload :TechnologyReport, "#{__dir__}/identifiers/technology_report"
       autoload :TestReportForm, "#{__dir__}/identifiers/test_report_form"
       autoload :VapIdentifier, "#{__dir__}/identifiers/vap_identifier"