pubid 2.0.25 → 2.0.27

data/lib/pubid/etsi_pfs/renderer.rb

@@ -3,7 +3,35 @@ module Pubid
     # Human renderer, generated from the canonical template.
     class Renderer < ::Pubid::Renderers::Base
       def render(**_opts)
-        "ETSI #{@id.type} #{@id.number}"
+        f = render_fields(@id)
+        "ETSI #{f[:type]} #{f[:number]}#{(" #{f[:minor]}") if f[:minor]}#{("#{f[:parts]}") if f[:parts]}#{f[:supplements]}#{if f[:version]; " V#{f[:version]}" elsif f[:edition]; " ed.#{f[:edition]}"; end}#{(" (#{f[:year]}-#{f[:month]})") if f[:year] && f[:month]}"
+      end
+
+      private
+
+      # The field view: a supplement wrapper reads through to
+      # the wrapped standard and carries the notation run
+      # ("/A1/C1", outermost last); the fold's target renders
+      # only outside the fold flag (the V/ed faces are mutually
+      # exclusive by grammar).
+      def render_fields(id)
+        root = id
+        run = +""
+        while root.is_a?(Identifiers::Supplement)
+          run.prepend("/#{root.supplement_notation}")
+          root = root.base
+        end
+        {
+          type: root.type,
+          number: root.number,
+          minor: root.minor,
+          parts: root.parts.any? ? root.parts.map { |item| "-#{item}" }.join : nil,
+          version: root.is_edition ? nil : root.version,
+          edition: root.is_edition ? root.version : nil,
+          year: root.year,
+          month: root.month,
+          supplements: run.empty? ? nil : run,
+        }
       end
     end
   end

data/lib/pubid/etsi_pfs/urn_generator.rb

@@ -1,12 +1,49 @@
 module Pubid
   module EtsiPfs
-    # The official URN generator, pinned to the scheme's declared
-    # namespace ("etsi") so to_urn stays
-    # scheme-canonical under the compiled flavor key.
+    # The official URN generator: the scheme's declared namespace
+    # ("etsi") and the ordered segments the
+    # definition's urn.official declares — an absent field leaves no
+    # segment, a date group joins its fields with "-", a compose
+    # slots its fields with the declared glue, and a fold target
+    # switches to its edition affix while the flag holds.
     class UrnGenerator < ::Pubid::UrnGenerator::Base
       def urn_namespace
         "etsi"
       end
+
+      def generate
+        parts = ["urn", urn_namespace]
+        parts.concat(official_segments)
+        parts.join(":")
+      end
+
+      private
+
+      # A supplement wrapper reads through to the wrapped
+      # standard (the coded generator's own delegation shape).
+      def subject
+        current = @identifier
+        current = current.base while current.is_a?(Identifiers::Supplement)
+        current
+      end
+
+      def official_segments
+        segments = []
+        segments << subject.type.to_s.downcase if subject.type
+        code = []
+        code << subject.number.to_s if subject.number
+        code << " " + subject.minor.to_s if subject.minor
+        subject.parts.each { |item| code << "-" + item } if subject.parts.any?
+        segments << code.join unless code.empty?
+        if subject.is_edition
+          segments << "ed." + subject.version.to_s.downcase
+        elsif subject.version
+          segments << "v" + subject.version.to_s.downcase
+        end
+        date = [subject.year, subject.month].compact
+        segments << date.join("-") unless date.empty?
+        segments
+      end
     end
   end
 end

data/lib/pubid/etsi_pfs.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # PFS-generated flavor — DO NOT EDIT BY HAND.
-# Source: definitions/etsi.pfs (pfs:1) sha256:9343088bf087b55ea790057e6be0bbebe2272407ee81f035b52e5f9a4d5c7b76
+# Source: definitions/etsi.pfs (pfs:1) sha256:490ba9435f44dbd2d59429ae6d9527909c39444f19fec5a33a8cad91e89e3581
 # Compiler: pubid/grammar/pfs 0.1.0 (baked with parsanol 1.3.126)
 # Regenerate: ruby scripts/pfs compile definitions/etsi.pfs --as etsi_pfs --ruby-out <dir>
 
@@ -16,6 +16,7 @@ module Pubid
     extend Pubid::PrefixesSupport
 
     PREFIXES = ["ETSI"].freeze
+    
 
     autoload :Builder, "#{__dir__}/etsi_pfs/builder"
     autoload :Identifier, "#{__dir__}/etsi_pfs/identifier"

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.25"
+  VERSION = "2.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.0.27
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-13 00:00:00.000000000 Z
+date: 2026-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -404,10 +404,25 @@ files:
 - lib/pubid/cen_cenelec/urn_generator.rb
 - lib/pubid/cen_cenelec/urn_parser.rb
 - lib/pubid/cen_pfs.rb
+- lib/pubid/cen_pfs/adopted_base.rb
 - lib/pubid/cen_pfs/builder.rb
 - lib/pubid/cen_pfs/identifier.rb
 - lib/pubid/cen_pfs/identifiers.rb
+- lib/pubid/cen_pfs/identifiers/adopted_european_norm.rb
+- lib/pubid/cen_pfs/identifiers/amendment.rb
+- lib/pubid/cen_pfs/identifiers/cen_report.rb
+- lib/pubid/cen_pfs/identifiers/cen_workshop_agreement.rb
+- lib/pubid/cen_pfs/identifiers/consolidated_identifier.rb
+- lib/pubid/cen_pfs/identifiers/corrigendum.rb
 - lib/pubid/cen_pfs/identifiers/european_norm.rb
+- lib/pubid/cen_pfs/identifiers/european_prestandard.rb
+- lib/pubid/cen_pfs/identifiers/european_specification.rb
+- lib/pubid/cen_pfs/identifiers/fragment.rb
+- lib/pubid/cen_pfs/identifiers/guide.rb
+- lib/pubid/cen_pfs/identifiers/harmonization_document.rb
+- lib/pubid/cen_pfs/identifiers/supplement.rb
+- lib/pubid/cen_pfs/identifiers/technical_report.rb
+- lib/pubid/cen_pfs/identifiers/technical_specification.rb
 - lib/pubid/cen_pfs/parser.rb
 - lib/pubid/cen_pfs/pubid_urn_schema.rb
 - lib/pubid/cen_pfs/renderer.rb
@@ -551,7 +566,10 @@ files:
 - lib/pubid/etsi_pfs/builder.rb
 - lib/pubid/etsi_pfs/identifier.rb
 - lib/pubid/etsi_pfs/identifiers.rb
+- lib/pubid/etsi_pfs/identifiers/amendment.rb
+- lib/pubid/etsi_pfs/identifiers/corrigendum.rb
 - lib/pubid/etsi_pfs/identifiers/standard.rb
+- lib/pubid/etsi_pfs/identifiers/supplement.rb
 - lib/pubid/etsi_pfs/parser.rb
 - lib/pubid/etsi_pfs/pubid_urn_schema.rb
 - lib/pubid/etsi_pfs/renderer.rb