pubid 2.0.0.pre.alpha.8 → 2.0.0.pre.alpha.11

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/societal_technology_trend_report.rb

@@ -24,16 +24,6 @@ module Pubid
             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

@@ -23,16 +23,6 @@ module Pubid
             web: :systems_reference_document, 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_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],
           ),
@@ -108,23 +108,6 @@ module Pubid
             web: :technical_report, 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

@@ -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],
           ),
@@ -108,23 +108,6 @@ module Pubid
             web: :technical_specification, 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

@@ -22,16 +22,6 @@ 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

@@ -28,17 +28,6 @@ module Pubid
             web: :test_report_form, title: "Test Report Form", short: "TRF" }
         end
 
-        # 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 via the Renderer
       end
     end

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/white_paper.rb

@@ -23,16 +23,6 @@ module Pubid
             web: :white_paper, title: "White Paper", short: "White Paper" }
         end
 
-        # Override publisher_portion to add White Paper
-        def publisher_portion
-          result = publisher.to_s
-
-          if typed_stage && typed_stage.abbreviation == "White Paper"
-            result += " White Paper"
-          end
-
-          result
-        end
       end
     end
   end

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

@@ -28,19 +28,33 @@ module Pubid
             web: :working_document, title: "Working Document", short: "WD" }
         end
 
-        # Return stage object for PWI/PNW stage
+        # A working document prints its committee, number, language and stage —
+        # `1/2457(F)/FDIS` — and none of those is the `number` the shared token
+        # table looks for, so it had no annotatable token. `wd_stage` is the
+        # printed stage token ("FDIS"); the derived `#stage` reader covers only
+        # the PWI/PNW work-programme form and is nil here.
+        def annotation_tokens
+          super + [
+            [:technical_committee, "docnumber"],
+            [:wd_number, "docnumber"],
+            [:wd_language, "language"],
+            [:wd_stage, "stage"],
+            [:wp_stage, "stage"],
+            [:wp_type, "doctype"],
+          ]
+        end
+
+        # Return stage object for the PWI/PNW work-programme stage.
+        #
+        # This used to build a bare Stage from a hand-written abbreviation map,
+        # so the stage carried no harmonized code and "pnw" existed as a stage
+        # code nowhere else in the registry. It now resolves through the shared
+        # registry, so PWI carries 00.* and PNW carries 10.20 — which is what
+        # the URN generator reads.
         def stage
           return nil unless wp_stage
 
-          # Map PWI/PNW to stage codes
-          stage_map = {
-            "PWI" => "pwi",
-            "PNW" => "pnw",
-          }
-          stage_code = stage_map[wp_stage]
-          return nil unless stage_code
-
-          @stage ||= ::Pubid::Components::Stage.new(stage_code: stage_code)
+          @stage ||= Pubid::Iec.locate_stage(wp_stage)&.to_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"

data/lib/pubid/iec/parser.rb

@@ -3,7 +3,7 @@ require "parslet"
 
 module Pubid
   module Iec
-    class Parser < Parslet::Parser
+    class Parser < ::Pubid::Parser::Grammar
       include ::Pubid::Parser::CommonParseRules
       include ::Pubid::Parser::CommonParseMethods
 
@@ -17,8 +17,8 @@ module Pubid
       root :identifier
 
       rule(:identifier) do
-        working_programme_with_publisher |
-          working_programme |
+        working_programme |
+          technical_group |
           working_document |
           sheet_supplement_identifier |
           sheet_identifier |
@@ -29,6 +29,42 @@ module Pubid
           identifier_copublishers
       end
 
+      # Technical Group identifier — names a committee rather than a document.
+      # Examples: "IEC TC 1", "ISO/IEC JTC 1", "ISO/IEC JTC 1/SC 7",
+      #           "IEC SC 100A", "CISPR", "CIS/A".
+      rule(:technical_group) do
+        technical_group_with_publisher | technical_group_bare
+      end
+
+      rule(:technical_group_with_publisher) do
+        prefix_sole_publisher >> copublishers.maybe >> space >>
+          tc_body.as(:technical_committee) >>
+          (str("/") >> space? >> sc_body).as(:subcommittee).maybe
+      end
+
+      rule(:technical_group_bare) do
+        # CISPR / CIS-letter forms and bare TYPE NUMBER forms both default
+        # publisher to "IEC" via the Base class default.
+        tc_body.as(:technical_committee) >>
+          (str("/") >> space? >> sc_body).as(:subcommittee).maybe
+      end
+
+      # Committee body forms accepted by the parser. Order matters: longer
+      # or more specific patterns first so they win the ordered choice.
+      rule(:tc_body) do
+        str("CISPR") |
+          (str("CIS") >> str("/") >> match("[A-Z]")) |
+          (tc_type >> space >> digits >> match("[A-Z]").maybe)
+      end
+
+      rule(:sc_body) do
+        str("SC") >> space >> digits >> match("[A-Z]").maybe
+      end
+
+      rule(:tc_type) do
+        str("JTC") | str("JPC") | str("TC") | str("SC") | str("PC")
+      end
+
       # Working Programme format: [PWI|PNW] [TR] number edition
       # Examples: "PWI TR 100-36 ED1", "PWI 100-44 ED1", "PNW 65-915 ED1"
       # TC-style names: "PWI TR SYCSMARTENERGY-1", "PWI SyCLVDC-1 ED1"
@@ -44,21 +80,6 @@ module Pubid
           (space >> edition).maybe
       end
 
-      # Working Programme with publisher prefix: IEC/PWI [TR] number edition
-      # Examples: "IEC/PWI 60038", "ISO/IEC/PWI TR 100-36 ED1"
-      rule(:working_programme_with_publisher) do
-        prefix_with_copublishers >> str("/") >>
-          (str("PWI") | str("PNW")).as(:wp_stage) >>
-          space >>
-          (
-            (str("TR") >> space) |
-            (str("TS") >> space) |
-            (str("SRD") >> space)
-          ).maybe.as(:wp_type) >>
-          wp_number >>
-          (space >> edition).maybe
-      end
-
       # Working programme numbers can be digits or TC names
       rule(:wp_number) do
         # TC-style: SYCSMARTENERGY-1, SyCLVDC-125
@@ -158,12 +179,16 @@ module Pubid
       end
 
       rule(:date) do
-        # :2005-02 or optional for DB without date
+        # :2005-02 or :-- (undated reference — ISO/IEC undated-reference form,
+        # e.g. IEC 60050:--, also accepted as the em-dash variant IEC 60050:—)
         (str(":") | dash) >>
-          (year_digits >>
-            (dash >> month_digits).maybe >>
-            (dash >> day_digits).maybe
-          ).as(:date)
+          (
+            (str("--") | str("—")).as(:undated_marker) |
+              (year_digits >>
+                (dash >> month_digits).maybe >>
+                (dash >> day_digits).maybe
+              ).as(:date)
+          )
       end
 
       rule(:part_and_subpart) do
@@ -251,14 +276,14 @@ module Pubid
       # IEC 60695-2-1/1:1994 (sheet 1 from year 1994)
       # IEC 60695-2-1/1 (sheet 1 without year)
       rule(:sheet_identifier) do
-        identifier_copublishers_no_third.as(:base_identifier) >>
+        identifier_copublishers_no_third.as(:base) >>
           (sheet_notation | sheet_notation_no_year)
       end
 
       # Sheet identifier followed by supplement: base/sheet/supplement
       # IEC 60695-2-1/1:1994/COR1:1995
       rule(:sheet_supplement_identifier) do
-        identifier_copublishers_no_third.as(:base_identifier) >>
+        identifier_copublishers_no_third.as(:base) >>
           sheet_notation >>
           str("/") >> supplement_type_with_stage >>
           space? >> second_part >> third_part
@@ -353,7 +378,7 @@ module Pubid
       # ISO/IEC 17025:2017 handles copublisher in copublishers rule
       # We handle this in identifier_copublishers already
       rule(:joint_identifier) do
-        identifier_copublishers_no_third.as(:base_identifier) >>
+        identifier_copublishers_no_third.as(:base) >>
           space? >> str("|") >> space? >>
           scope { iso_identifier }.as(:joint_identifier)
       end
@@ -381,7 +406,7 @@ module Pubid
 
       # IEC 60038:2009/Amd 1:2011
       rule(:supplement_identifier_no_third) do
-        identifier_copublishers_no_third.as(:base_identifier) >>
+        identifier_copublishers_no_third.as(:base) >>
           str("/") >> supplement_type_with_stage >>
           space? >> second_part
       end
@@ -392,7 +417,7 @@ module Pubid
 
       # IEC 60038:2009/Amd 1:2011/Cor 1:2012
       rule(:supplement_supplement_identifier) do
-        supplement_identifier_no_third.as(:base_identifier) >>
+        supplement_identifier_no_third.as(:base) >>
           str("/") >> supplement_type_with_stage >>
           space? >> second_part >> third_part
       end

data/lib/pubid/iec/renderer.rb

@@ -37,6 +37,8 @@ module Pubid
           render_fragment(id, opts, context)
         when Identifiers::WorkingDocument
           render_working_document(id, context)
+        when Identifiers::TechnicalGroup
+          render_technical_group(id, context)
         when Identifiers::TestReportForm
           render_test_report_form(id, context)
         when SupplementIdentifier
@@ -75,11 +77,11 @@ module Pubid
       end
 
       def render_supplement(id, opts, context)
-        id.ensure_base_identifier
+        id.ensure_base
 
         if id.synthetic_base?
           render_supplement_standalone(id, context)
-        elsif id.base_identifier
+        elsif id.base
           render_supplement_attached(id, opts, context)
         else
           render_single(id, opts, context)
@@ -87,22 +89,27 @@ module Pubid
       end
 
       def render_supplement_standalone(id, context)
+        # This is a second, independent publisher/stage join that
+        # SingleIdentifier#publisher_portion never reaches. It follows the same
+        # house style: the slash separates copublishers, and a SPACE separates
+        # the publisher from the stage abbreviation. See issue #360 item 2.
         parts = []
 
         if id.publisher
-          parts << id.publisher.render(context:)
+          publishers = [id.publisher.render(context:)]
           if id.copublishers&.any?
-            parts << "/#{id.copublishers.map { |c| c.render(context:) }.join('/')}"
+            publishers += id.copublishers.map { |c| c.render(context:) }
           end
+          parts << publishers.join("/")
         end
 
         abbr = id.typed_stage.abbr.first
-        number_str = id.base_identifier.number.to_s
+        number_str = id.base.number.to_s
         number_str += "-#{id.number}" if id.number
         number_str += "-#{id.subpart}" if id.subpart
         parts << "#{abbr} #{number_str}"
 
-        result = parts.join("/")
+        result = parts.join(" ")
         result += ":#{id.date.render(context:)}" if id.date
         result += " #{id.edition.render(context:)}" if id.edition&.number
         result
@@ -110,7 +117,7 @@ module Pubid
 
       def render_supplement_attached(id, opts, context)
         parts = []
-        parts << id.base_identifier.to_s(**opts)
+        parts << id.base.to_s(**opts)
 
         abbr = id.typed_stage.abbr.first.upcase
         supp_part = "/#{abbr}#{id.number}"
@@ -155,7 +162,7 @@ module Pubid
       def render_vap(id, opts, context)
         parts = []
 
-        parts << id.base_identifier.to_s(**opts.merge(with_edition: false))
+        parts << id.base.to_s(**opts.merge(with_edition: false))
         parts << " #{id.vap.join('-')}" if id.vap&.any?
         parts << " #{id.edition.render(context:)}" if id.edition&.number
 
@@ -164,7 +171,7 @@ module Pubid
 
       def render_sheet(id, opts, context)
         parts = []
-        parts << id.base_identifier.to_s(**opts)
+        parts << id.base.to_s(**opts)
         parts << "/#{id.sheet_number}"
         parts << ":#{id.year}" if id.year
         parts.join
@@ -172,9 +179,9 @@ module Pubid
 
       def render_fragment(id, opts, context)
         parts = []
-        parts << id.base_identifier.to_s(**opts)
+        parts << id.base.to_s(**opts)
 
-        parts << if id.base_identifier.is_a?(Identifiers::Corrigendum)
+        parts << if id.base.is_a?(Identifiers::Corrigendum)
                    "/FRAGC#{id.fragment_number}"
                  else
                    "/FRAG#{id.fragment_number}"
@@ -185,16 +192,22 @@ module Pubid
         parts.join
       end
 
+      def render_technical_group(id, _context)
+        parts = []
+        parts << id.publisher_portion
+        parts << " #{id.technical_committee}"
+        parts << id.subcommittee if id.subcommittee
+        parts.join
+      end
+
       def render_working_document(id, context)
         if id.wp_stage
+          # A work-programme registration renders bare, as it is written:
+          # "PNW 65-915 ED1", not "IEC/PNW 65-915 ED1". Its number is
+          # TC-scoped, not an IEC document number, and prefixing "IEC " would
+          # break idempotence — "IEC PNW 65-915 ED1" re-parses as an
+          # International Standard, so rendering would not be a fixed point.
           parts = []
-          if id.publisher
-            parts << id.publisher.render(context:)
-            if id.copublishers&.any?
-              parts << "/#{id.copublishers.map { |c| c.render(context:) }.join('/')}"
-            end
-            parts << "/"
-          end
           parts << id.wp_stage
           if id.wp_type && !id.wp_type.strip.empty?
             parts << " #{id.wp_type.strip}"