pubid-itu 1.15.16 → 1.15.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0173efa7fcb8c1334fdbe4596b630795f39eb23954d3f33abe2ab6f06a4765c7
-  data.tar.gz: 7a94f9638233370ca5fe732b053458b817280a80603d9255821729da2a480525
+  metadata.gz: 75cf2bd0db5b8886773447a81ce45b3d504613e5bec7ab44aec53230c3fdf993
+  data.tar.gz: c1767e747034ed893f5df74ab4431f4fe69f6fb1a2f14a30a10764830b9f71d2
 SHA512:
-  metadata.gz: e6ea6fe6cce8e426c5d00c77f3159886537b57f7f77e389ab9d880b35e0374974bf7a25c0d706c89a538fd84391fe4e28da5ee4191ec483ae7051ff5ad3e9840
-  data.tar.gz: 5fa45a2c94bc5b29f19a7e8e77d7b203a1c62f41de6706341fa211f91379818c09df3d438e6b2a81843bec73f6f1fee263c7dea1d41ca4f49d2fbad5320f0dd1
+  metadata.gz: 7fe022744f0e235c3562a23411d50cedd8514f54029e407328cb0197e6dbddaedf7382c714d4056fd26a011a1f9c6b8c1a6efce8c33b812ff73abfd828288414
+  data.tar.gz: 1045e68b4f6e16ecbeb2c36d7da3c0d28609707ac597b3a58cb1dee237f7502955b03e41d204108f2787ed4243ec0c7897a1ad59d5684cc2870ea8fcd442f764

data/i18n.yaml

@@ -9,5 +9,28 @@ type:
     ru: Рек.
     es: Rec.
     fr: Rec.
-    cn: 建议书
+    zh: 建议书
     ar: "التوصية"
+
+# Translation of the "Annex to" prefix used when an annex has no number
+# (i.e. the document IS the annex of a Special Publication, not a sub-annex).
+# For Arabic the value is positioned as a postfix instead of a prefix.
+# Languages with an annex_long entry below (fr/es/ru/zh) intentionally have
+# no entry here — they use the long-form template for short rendering too,
+# so French short matches French long etc. This avoids mixing the English
+# "OB" abbreviation with localized text; ITU itself uses the localized
+# abbreviation (e.g. "BE" in French/Spanish).
+# German is not an official ITU language so no long template exists.
+annex_to:
+  ar: "ملحق"
+  de: Anhang zum
+
+# Long-form (title-style) templates for "Annex to ..." identifiers.
+# Used both for to_s(format: :long) and for short rendering when no
+# annex_to entry exists for the language.
+annex_long:
+  fr: "Annexe au BE de l'UIT %{number}"
+  es: "Anexo al BE de la UIT N.º %{number}"
+  ar: "ملحق ابلنشرة التشغيلية رقم %{number}"
+  ru: "Приложение к ОБ МСЭ %{number}"
+  zh: "国际电联操作公报附件 第 %{number} 期"

data/lib/pubid/itu/identifier/base.rb

@@ -17,6 +17,11 @@ module Pubid::Itu
       def initialize(publisher: "ITU", series: nil, sector: nil, part: nil,
                      date: nil, amendment: nil, subseries: nil, number: nil,
                      second_number: nil, annex: nil, range: nil, **opts)
+        if series.to_s == "OB" && sector
+          raise ArgumentError,
+                "OB (Operational Bulletin) is a cross-bureau ITU publication; " \
+                "sector must not be set"
+        end
 
         super(**opts.merge(publisher: publisher, number: number))
         @series = series
@@ -30,7 +35,17 @@ module Pubid::Itu
         @range = range
       end
 
+      # Render identifier as a string.
+      #
+      # @param i18n_lang [Symbol, String] language for identifier text
+      #   translation (e.g. :fr renders "Annex to" as "Annexe au"). Distinct
+      #   from the identifier's `language` attribute, which is the document's
+      #   own language and produces the trailing suffix like "-F".
+      # @param language [Symbol, String] deprecated alias for i18n_lang.
+      # @param format [Symbol] :long for title-style rendering of supported
+      #   identifiers, otherwise the default short form.
       def to_s(**opts)
+        opts[:i18n_lang] = opts.delete(:language) if opts.key?(:language) && !opts.key?(:i18n_lang)
         self.class.get_renderer_class.new(to_h(deep: false)).render(**opts)
       end
 
@@ -68,6 +83,11 @@ module Pubid::Itu
             get_transformer_class.new.apply(k => v)
           end.inject({}, :merge)
 
+          # OB is a cross-bureau ITU publication; legacy strings like
+          # "ITU-T OB.1096" round-trip by silently dropping the bureau here.
+          # Direct Identifier.create with sector+OB still raises.
+          identifier_params.delete(:sector) if identifier_params[:series].to_s == "OB"
+
           %i(supplement amendment corrigendum annex addendum appendix).each do |type|
             return transform_supplements(type, identifier_params) if identifier_params[type]
           end

data/lib/pubid/itu/renderer/base.rb

@@ -2,6 +2,8 @@ module Pubid::Itu::Renderer
   class Base < Pubid::Core::Renderer::Base
     TYPE_PREFIX = "".freeze
 
+    LANGUAGES = Pubid::Core::Renderer::Base::LANGUAGES.merge("zh" => "C").freeze
+
     def render(**args)
       render_base_identifier(**args) + @prerendered_params[:language].to_s
     end
@@ -20,28 +22,64 @@ module Pubid::Itu::Renderer
     # can prepend entity, can postpend, can use item holder
 
     def render_identifier(params, opts)
-      postfix = prefix = ""
       if @params[:annex] && @params[:annex][:number].nil?
-        prefix += "Annex to "
-      elsif opts[:language] &&
-          (type_translation = Pubid::Itu::I18N["type"][@params[:type]]&.fetch(opts[:language].to_s, nil))
-        if opts[:language] == :cn
-          postfix =+ type_translation
-        elsif opts[:language] == :ar
-          postfix += " #{type_translation}"
-        else
-          prefix += "#{type_translation} "
-        end
+        return render_annex_to_identifier(params, opts)
       end
 
-      "#{prefix}%{publisher}-%{sector} #{render_type_series(params)}%{number}%{subseries}"\
+      prefix, postfix = type_translation_affixes(opts)
+      "#{prefix}#{render_structural(params)}#{postfix}"
+    end
+
+    # Render "Annex to ..." identifier (annex of a Special Publication, where
+    # the annex itself has no number). Three forms:
+    #   * default (no language): English structural, "Annex to ITU OB No. 1000"
+    #   * short with language: structural translation using annex_to
+    #   * long with language: per-language annex_long template (title-style)
+    # Languages without an annex_to entry (ru, zh) use the long template for
+    # the short form too.
+    def render_annex_to_identifier(params, opts)
+      lang = opts[:i18n_lang]&.to_s
+      long_template = lang && Pubid::Itu::I18N["annex_long"]&.fetch(lang, nil)
+
+      if opts[:format] == :long && long_template
+        return long_template % { number: @params[:number] }
+      end
+
+      annex_translation = lang && Pubid::Itu::I18N["annex_to"]&.fetch(lang, nil)
+
+      if annex_translation
+        return "#{render_structural(params)} #{annex_translation}" if lang == "ar"
+
+        return "#{annex_translation} #{render_structural(params)}"
+      end
+
+      return long_template % { number: @params[:number] } if long_template
+
+      "Annex to #{render_structural(params)}"
+    end
+
+    def render_structural(params)
+      pub_sector = params[:sector].to_s.empty? ? "%{publisher}" : "%{publisher}-%{sector}"
+      "#{pub_sector} #{render_type_series(params)}%{number}%{subseries}"\
       "%{part}%{second_number}%{range}%{annex}%{amendment}%{corrigendum}%{supplement}"\
-      "%{addendum}%{appendix}%{date}#{postfix}" % params
+      "%{addendum}%{appendix}%{date}" % params
+    end
+
+    def type_translation_affixes(opts)
+      type_translation = opts[:i18n_lang] &&
+        Pubid::Itu::I18N["type"][@params[:type]]&.fetch(opts[:i18n_lang].to_s, nil)
+      return ["", ""] unless type_translation
+
+      case opts[:i18n_lang]
+      when :zh then ["", type_translation]
+      when :ar then ["", " #{type_translation}"]
+      else ["#{type_translation} ", ""]
+      end
     end
 
     def render_publisher(publisher, opts, params)
-      if opts[:language] &&
-          (publisher_translation = Pubid::Itu::I18N["publisher"][publisher]&.fetch(opts[:language].to_s, nil))
+      if opts[:i18n_lang] &&
+          (publisher_translation = Pubid::Itu::I18N["publisher"][publisher]&.fetch(opts[:i18n_lang].to_s, nil))
         return super(publisher_translation, opts, params)
       end
 
@@ -121,7 +159,8 @@ module Pubid::Itu::Renderer
     end
 
     def render_language(language, _opts, _params)
-      "-#{LANGUAGES[language]}"
+      code = LANGUAGES[language]
+      code ? "-#{code}" : nil
     end
   end
 end

data/lib/pubid/itu/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Itu
-    VERSION = "1.15.16".freeze
+    VERSION = "1.15.18".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-itu
 version: !ruby/object:Gem::Version
-  version: 1.15.16
+  version: 1.15.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-30 00:00:00.000000000 Z
+date: 2026-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.16
+        version: 1.15.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.16
+        version: 1.15.18
 description: Library to generate, parse and manipulate ITU PubID.
 email:
 - open.source@ribose.com