pubid 2.0.0.pre.alpha.11 → 2.0.0.pre.alpha.12

data/lib/pubid/oiml/identifiers/bulletin.rb

@@ -33,49 +33,43 @@ module Pubid
         # carried in the structured form and the roman volume in citations.
         BASE_YEAR_OFFSET = 1959
 
-        # Zero-padded issue number within the year ("01".."04", plus "07"/"10"
-        # for the online-bulletin series). Always 2 digits.
-        attribute :issue, :string
+        # The issue: the zero-padded number within the volume ("01".."04",
+        # plus "07"/"10" for the online-bulletin series). Always 2 digits. The
+        # year is the volume and the issue is the number, as in the citation
+        # form "LXVII(2)".
+        #
+        # Declared as `number`, so it is the relaton index key
+        # (`id.root.number.to_s`) and every index row with an issue shows a
+        # `number`. The key puts the same issue number of all volumes in one
+        # bucket; the MR slug keeps each article distinct.
+        #
+        # Declared on this LEAF, which has no subclasses. It redefines the
+        # `Components::Code number` of ::Pubid::Identifier as a :string, and a
+        # redefinition on a class that other classes inherit is the
+        # multi-flavor determinism landmine (see Identifiers::CodeNumber).
+        #
+        # nil for a volume ("OIML Bulletin 1960") and for the bare periodical
+        # reference "OIML Bulletin", which name no issue.
+        attribute :number, :string
         # Zero-padded sequence within the issue ("00" = editorial, "01"+ for
         # articles). Always 2 digits.
         attribute :sequence, :string
 
         key_value do
-          map "issue", to: :issue
+          map "number", to: :number
           map "sequence", to: :sequence
         end
 
-        # relaton-index keys on `id.root.number.to_s`. Bulletin is the one OIML
-        # leaf with no code (it does not include Identifiers::CodeNumber), so
-        # it derives the key from the year it already stores: every issue and
-        # article of a volume clusters into one bucket, with per-article
-        # distinctness coming from the MR slug instead. That is the BIPM
-        # Metrologia-volume precedent recorded in CLAUDE.md.
-        #
-        # A DERIVED READER, deliberately not an attribute: storing it would
-        # duplicate `year` in every row, and the key_value block above maps no
-        # "number", so nothing is added to the wire format. Safe as a plain
-        # method because Bulletin declares no `number` attribute of its own
-        # (the ITU itu/identifiers/base.rb precedent).
-        #
-        # nil for the bare periodical reference "OIML Bulletin", which names no
-        # year — a deliberate gap, pinned in spec/pubid/oiml/root_number_spec.rb.
-        def number
-          date&.year&.to_s
-        end
-
-        # The index key above is deliberately coarse — a whole volume in one
-        # bucket — which is only defensible because the MR slug stays
-        # per-article. The inherited hook reads through `code`, which Bulletin
-        # does not have, so it would return nil and collapse every article of a
-        # year onto `oiml.bulletin.<year>`; `to_slug` is an output FILENAME, so
-        # that is an overwrite. Emit the rest of the locator instead.
+        # The inherited hook reads through `code`, which Bulletin does not
+        # have, so it would return nil and collapse every article of a year
+        # onto `oiml.bulletin.<year>`; `to_slug` is an output FILENAME, so that
+        # is an overwrite. Emit the rest of the locator instead.
         #
         # The year is deliberately NOT included: Renderers::MrString already
         # gives it its own segment (`mr_year`), so repeating it here would
         # render `oiml.bulletin.1960-03-01.1960`.
         def mr_number_with_part
-          segments = [issue, sequence].compact
+          segments = [number, sequence].compact
           return nil if segments.empty?
 
           segments.join("-")
@@ -96,18 +90,18 @@ module Pubid
         # Volume as a roman-numeral string ("LXVII"), derived from the year.
         # nil when the year is absent.
         def volume_roman
-          number = volume_arabic&.to_i
-          return nil unless number&.positive?
+          volume = volume_arabic&.to_i
+          return nil unless volume&.positive?
 
-          self.class.to_roman(number)
+          self.class.to_roman(volume)
         end
 
         # 8-digit oiml.org article id ("20260211"). Composed by concatenating
-        # year + issue + sequence. nil unless all three are present.
+        # year + issue (number) + sequence. nil unless all three are present.
         def article_id
-          return nil unless date&.year && issue && sequence
+          return nil unless date&.year && number && sequence
 
-          "#{date.year}#{issue}#{sequence}"
+          "#{date.year}#{number}#{sequence}"
         end
 
         class << self

data/lib/pubid/oiml/identifiers/code_number.rb

@@ -28,8 +28,8 @@ module Pubid
       #
       # Bulletin deliberately does NOT include this module. It carries no code
       # at all (its locator is the year/issue/sequence tuple), so it would only
-      # gain a permanently-nil `number` and a `number` key that never appears.
-      # It derives its index key from the year instead; see bulletin.rb.
+      # gain permanently-nil part/subpart/suffix columns. It declares its own
+      # `number` (the issue) instead; see bulletin.rb.
       module CodeNumber
         def self.included(base)
           install_attributes(base)

data/lib/pubid/oiml/parser.rb

@@ -122,9 +122,14 @@ module Pubid
         ).as(:edition_format) # Wrap entire match to capture that Edition was used
       end
 
-      # Date - year after colon OR edition portion (with optional space before year)
+      # Date - year after colon, the VIM's paren-year form ("OIML V 2-200
+      # (2000)" — space + (YYYY) instead of :YYYY, the shape #342 flags as
+      # the one real-world spelling that did not parse), OR edition portion
+      # (with optional space before year)
       rule(:date) do
-        edition_portion | (colon >> space.maybe >> year_digits.as(:year))
+        edition_portion |
+          (colon >> space.maybe >> year_digits.as(:year)) |
+          (space.maybe >> lparen >> year_digits.as(:year) >> rparen)
       end
 
       # Draft stage - WD or CD with optional iteration

data/lib/pubid/oiml/renderer.rb

@@ -65,7 +65,7 @@ module Pubid
         result = "#{id.publisher} Bulletin"
         if id.date&.year
           result += " #{id.date.year}"
-          result += "-#{id.issue}" if id.issue
+          result += "-#{id.number}" if id.number
           result += "-#{id.sequence}" if id.sequence
         end
         result += " (#{id.language})" if id.language
@@ -77,9 +77,9 @@ module Pubid
       # structured since OIML's citation format doesn't define volume-only
       # or issue-only variants.
       def render_bulletin_citation(id)
-        return render_bulletin_structured(id) unless id.date&.year && id.issue && id.sequence
+        return render_bulletin_structured(id) unless id.date&.year && id.number && id.sequence
 
-        "#{id.publisher} Bulletin #{id.volume_roman}(#{id.issue.to_i}) #{id.article_id}"
+        "#{id.publisher} Bulletin #{id.volume_roman}(#{id.number.to_i}) #{id.article_id}"
       end
 
       def effective_format(id)

data/lib/pubid/oiml/single_identifier.rb

@@ -24,7 +24,7 @@ module Pubid
       # concrete leaf, because redefining the inherited `number` on this class
       # — which every leaf inherits — is the multi-flavor determinism landmine.
       # Keeping the mapping with the attribute is also what lets Bulletin, the
-      # one leaf with no code, omit both.
+      # one leaf with no code, declare its own `number` (the issue) and map it.
       key_value do
         map "publisher", to: :publisher
         map "year", with: { to: :year_to_kv, from: :year_from_kv }

data/lib/pubid/oiml/urn_generator.rb

@@ -64,12 +64,12 @@ module Pubid
       end
 
       # Structured locator "YYYY-II-SS" (or "YYYY-II" / "YYYY") for a Bulletin.
-      # Built directly from the date year and the issue/sequence attributes so
-      # the URN is identical regardless of whether the input was the structured
-      # or citation form.
+      # Built directly from the date year and the number (the issue) and
+      # sequence attributes so the URN is identical regardless of whether the
+      # input was the structured or citation form.
       def bulletin_locator
         locator = identifier.date.year.to_s
-        locator += "-#{identifier.issue}" if identifier.issue
+        locator += "-#{identifier.number}" if identifier.number
         locator += "-#{identifier.sequence}" if identifier.sequence
         locator
       end

data/lib/pubid/renderers/directives_renderer.rb

@@ -37,7 +37,9 @@ module Pubid
           abbr = annotate(abbr, typed_stage_css(@id.typed_stage), 
                           annotated: ann)
         end
-        subgroup_str = @id.subgroup.render(context:) if @id.subgroup
+        if @id.subgroup
+          subgroup_str = render_component(@id.subgroup, context)
+        end
 
         [
           pub_str,

data/lib/pubid/sae/builder.rb

@@ -20,7 +20,7 @@ module Pubid
         when :type
           Components::Type.new(abbr: value.to_s)
         when :number
-          Components::Code.new(value: value.to_s)
+          value.to_s
         when :year
           { date: Components::Date.new(year: value.to_i) }
         else

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

@@ -22,7 +22,10 @@ module Pubid
 
       attribute :publisher, :string, default: -> { "SAE" }
       attribute :type, Sae::Components::Type
-      attribute :number, Sae::Components::Code
+      # A plain :string, like every converted flavor. Sae::Components::Code was
+      # a bare alias of the shared component and never carried more than
+      # `value`, so this is a representation change only.
+      attribute :number, :string
       attribute :date, Sae::Components::Date
 
       def self.type

data/lib/pubid/sae/urn_generator.rb

@@ -12,7 +12,7 @@ module Pubid
       def urn_number
         return nil unless identifier.number
 
-        identifier.number.render(context: URN_CONTEXT)
+        identifier.number.to_s
       end
 
       def generate

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.0.pre.alpha.11"
+  VERSION = "2.0.0.pre.alpha.12"
 end

data/lib/tasks/docs.rake

@@ -8,17 +8,19 @@ namespace :docs do
     output_dir = File.join(__dir__, "..", "..", "docs", "identifier-patterns")
     FileUtils.mkdir_p(output_dir)
 
-    flavors = Dir[File.join(__dir__, "..", "..", "lib", "pubid",
-                            "*")].select do |d|
-      File.directory?(d)
-    end
-      .map do |d|
-      File.basename(d)
-    end
-      .reject do |f|
-      %w[core components rendering
-         parser serializable utils].include?(f)
-    end
+    lib_root = File.join(__dir__, "..", "..", "lib", "pubid")
+    # The registry is the authoritative flavor list. This replaces a
+    # filesystem glob over lib/pubid/* directories, whose reject list kept
+    # going stale and swept internal modules (parsers, renderers, lutaml,
+    # builder, utils, ...) in as "flavors". The module-derived directory
+    # (CenCenelec -> cen_cenelec, W3c -> w3c) must exist on disk.
+    Pubid.eager_load_flavors!
+    flavors = Pubid::Registry.flavor_names.filter_map do |name|
+      mod = Pubid::Registry.get(name)
+      dir = mod.name.split("::").last
+               .gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
+      dir if File.directory?(File.join(lib_root, dir))
+    end.uniq.sort
 
     flavors.each do |flavor|
       puts "Generating docs for #{flavor}..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.11
+  version: 2.0.0.pre.alpha.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-15 00:00:00.000000000 Z
+date: 2026-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -245,7 +245,6 @@ files:
 - lib/pubid/ccsds/identifier.rb
 - lib/pubid/ccsds/identifiers.rb
 - lib/pubid/ccsds/identifiers/base.rb
-- lib/pubid/ccsds/identifiers/base_BASE_88929.rb
 - lib/pubid/ccsds/identifiers/corrigendum.rb
 - lib/pubid/ccsds/parser.rb
 - lib/pubid/ccsds/single_identifier.rb
@@ -557,6 +556,7 @@ files:
 - lib/pubid/ieee/nesc/parser.rb
 - lib/pubid/ieee/parser.rb
 - lib/pubid/ieee/pre_parser.rb
+- lib/pubid/ieee/project_renderer.rb
 - lib/pubid/ieee/renderer.rb
 - lib/pubid/ieee/typed_stages.rb
 - lib/pubid/ieee/urn_generator.rb
@@ -604,7 +604,6 @@ files:
 - lib/pubid/iso/bundled_identifier.rb
 - lib/pubid/iso/combined_identifier.rb
 - lib/pubid/iso/components.rb
-- lib/pubid/iso/components/code.rb
 - lib/pubid/iso/components/publisher.rb
 - lib/pubid/iso/format_resolver.rb
 - lib/pubid/iso/identifier.rb
@@ -653,6 +652,7 @@ files:
 - lib/pubid/itu/identifiers/appendix_of_recommendation.rb
 - lib/pubid/itu/identifiers/base.rb
 - lib/pubid/itu/identifiers/combined_identifier.rb
+- lib/pubid/itu/identifiers/contribution.rb
 - lib/pubid/itu/identifiers/corrigendum.rb
 - lib/pubid/itu/identifiers/errata.rb
 - lib/pubid/itu/identifiers/handbook.rb

data/lib/pubid/ccsds/identifiers/base_BASE_88929.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require "lutaml/model"
-require_relative "../../serializable"
-require_relative "../urn_generator"
-
-module Pubid
-  module Ccsds
-    module Identifiers
-      # CCSDS identifier
-      # Format: CCSDS NUMBER.PART-TYPE-EDITION[-SUFFIX]
-      # Example: CCSDS 120.0-G-4, CCSDS 100.0-G-1-S
-      class Base < Lutaml::Model::Serializable
-        include Pubid::Serializable
-
-        # Generate URN for this identifier
-        #
-        # @return [String] URN representation
-        def to_urn
-          UrnGenerator.new(self).generate
-        end
-
-        # Include CCSDS-specific attributes in serialization
-        def base_hash
-          hash = super
-          # CCSDS uses plain strings for type, edition, suffix
-          hash[:type] = type if type
-          hash[:suffix] = suffix if suffix
-          hash[:language] = language if language
-          hash
-        end
-
-        attribute :number, :string
-        attribute :part, :string
-        attribute :type, :string # B, G, M, R, Y, O, etc.
-        attribute :edition, :string
-        attribute :suffix, :string # Optional suffix like -S
-        attribute :language, :string # Language metadata (e.g., "French", "Russian")
-
-        def publisher
-          "CCSDS"
-        end
-
-        def to_s
-          result = "#{publisher} #{number}"
-          result += ".#{part}" if part
-          result += "-#{type}" if type
-          result += "-#{edition}" if edition
-          result += "-#{suffix}" if suffix
-
-          # Add language metadata
-          result += " - #{language} Translated" if language
-
-          result
-        end
-
-        def ==(other)
-          return false unless other.is_a?(Base)
-
-          number == other.number &&
-            part == other.part &&
-            type == other.type &&
-            edition == other.edition &&
-            suffix == other.suffix &&
-            language == other.language
-        end
-      end
-    end
-  end
-end

data/lib/pubid/iso/components/code.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Pubid
-  module Iso
-    module Components
-      # Code component for ISO identifiers.
-      #
-      # Inherits +value+ and +parts+ from the shared Code; overrides
-      # rendering to join parts with "-" (ISO convention). Equality and
-      # hash are inherited from the shared Code (compare all fields).
-      class Code < ::Pubid::Components::Code
-        def to_s
-          result = value.to_s
-          result += parts.map { |p| "-#{p}" }.join if parts&.any?
-          result
-        end
-
-        def render(context: nil)
-          to_s
-        end
-      end
-    end
-  end
-end