pubid-iec 1.15.10 → 1.15.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e654ca4504342d555dec629448cd79724e9cd7f5f9d929161cee733598f655
-  data.tar.gz: ad9af0eac552a1c13a27d3047e91aaa797826b5218ce6c63f02e59874953b443
+  metadata.gz: efe5ce834b34e6bf882c6865106c3bb907785d6170a08d02d0a9890bc01c0529
+  data.tar.gz: c4dd107ef92b86593b096f0e159cc14e4291ffc57b92274db7cad8b04ec99b78
 SHA512:
-  metadata.gz: 48e9553910b266e31d698cd7813b7c87e9a31bd7649a6b099047bccfd0af1e0b6417b2dd37b3a2320c0a47a842f2a15005442f9522bb735695b75c37e7566b1c
-  data.tar.gz: 1575c4d703b71f0e8a63a3265c04fa5adfcb8601f519671eaf675d215f3b8bf7818ad0f42b8bf2b9ee487c051f1f2073b09040fa03fab21553c966d33b2621bb
+  metadata.gz: 12e1dfab360df93395240121cbc5442e31c717d7cb585b32984d00cb19f0202c5269a4d66a25d14c004513ee26875e7dbc738d499eea4c67e0017e179e3bafda
+  data.tar.gz: 806193bedb59a705cbcfe73b883a31b9b3284ecba2c47c6b110c7ceebcc40404bcbe71d74125c3536af4e8d4c388e210b6c4626e5b0602c15a81af0112e4125b

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

@@ -69,7 +69,9 @@ module Pubid::Iec
     end
 
     def to_s(with_edition_month_date: false, annotated: false)
-      self.class.get_renderer_class.new(renderer_data).render(with_edition_month_date: with_edition_month_date, annotated: annotated)
+      result = self.class.get_renderer_class.new(renderer_data).render(with_edition_month_date: with_edition_month_date, annotated: annotated)
+      result += " (all parts)" if all_parts
+      result
     end
 
     def to_yaml
@@ -111,7 +113,7 @@ module Pubid::Iec
 
       def transform(params)
         identifier_params = transform_hash(params)
-
+        normalize_urn_params!(identifier_params) if identifier_params[:publisher].to_s.match?(/\A[a-z]+\z/)
         if identifier_params[:interpretation_sheet]
           return Identifier.create(
             type: :ish,
@@ -125,6 +127,27 @@ module Pubid::Iec
         Identifier.create(**identifier_params)
       end
 
+      def normalize_urn_params!(params)
+        params[:publisher] = params[:publisher].to_s.upcase
+        params[:copublisher] = params[:copublisher].to_s.upcase if params[:copublisher]
+        params[:type] = params[:type].to_s.upcase if params[:type]
+        params[:number] = params[:number].to_s.upcase
+
+        # Map fuzzy URN stages to abbreviations that resolve correctly
+        if params[:stage]
+          stage_str = params[:stage].to_s
+          case stage_str
+          when "draft" then params[:stage] = "CD"
+          when "published" then params[:stage] = "60.60"
+          end
+        end
+
+        # Remove amendments/corrigendums parsed as bare strings from URN
+        # (full supplement round-trip support to be added later)
+        params.delete(:amendments) if params[:amendments].is_a?(String)
+        params.delete(:corrigendums) if params[:corrigendums].is_a?(String)
+      end
+
       def get_amendment_class
         Amendment
       end

data/lib/pubid/iec/parser.rb

@@ -1,7 +1,9 @@
 require "pubid-core"
+require_relative "parser_urn"
 
 module Pubid::Iec
   class Parser < Pubid::Core::Parser
+    include Pubid::Iec::ParserUrn
     rule(:organization) do
       str("IECEE") | str("IECEx") | str("IECQ") | str("IEC") | str("ISO") |
         str("IEEE") | str("CISPR") | str("ASTM")
@@ -106,6 +108,6 @@ module Pubid::Iec
         language.maybe)
     end
 
-    rule(:root) { identifier }
+    rule(:root) { urn_identifier | identifier }
   end
 end

data/lib/pubid/iec/parser_urn.rb

@@ -0,0 +1,110 @@
+module Pubid
+  module Iec
+    module ParserUrn
+      LANGUAGES = %w[en fr es ar ru zh ja de].freeze
+      VAP_CODES = %w[csv ser rlv cmv exv pac prv].freeze
+
+      def self.included(base) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        base.class_eval do # rubocop:disable Metrics/BlockLength
+          rule(:colon) { str(":") }
+
+          rule(:urn_organization) do
+            str("iecee") | str("iecex") | str("iecq") |
+              str("iec") | str("iso") | str("ieee") | str("cispr") | str("astm")
+          end
+
+          rule(:urn_publisher_copublisher) do
+            urn_organization.as(:publisher) >> (dash >> urn_organization.as(:copublisher)).repeat >> colon
+          end
+
+          rule(:urn_type) do
+            (array_to_str(
+              Identifier.config.types.map { |t| t.type[:short] }.flatten.compact.map(&:downcase),
+            ).as(:type) >> colon).maybe
+          end
+
+          rule(:urn_number) do
+            # Alpha-prefix numbers like ca:01 or plain alpha like syccomm
+            (match('[a-z]').repeat(1) >> (str(":") >> match('[a-z0-9]').repeat(1)).maybe |
+             # Numeric numbers, optionally followed by a letter (15k)
+             match('[0-9]').repeat(1) >> match('[a-z]').maybe).as(:number)
+          end
+
+          rule(:urn_part) do
+            # Accept both new format (colon-dash, e.g. ":-6") and legacy API
+            # format (dash only, e.g. "-6") for part numbers in URNs
+            (colon.maybe >> dash >> (match('[a-z0-9]') | dash).repeat(1).as(:part)).maybe
+          end
+
+          rule(:urn_conjuction_part) do
+            (str(",") >> digits.as(:conjuction_part)).repeat
+          end
+
+          rule(:urn_year) do
+            # Accept optional month suffix (e.g. "2008-03") for legacy API URNs
+            (year_digits.as(:year) >> (dash >> month_digits.as(:month)).maybe).maybe
+          end
+
+          rule(:urn_iteration) do
+            (str(".v") >> digits.as(:iteration)).maybe
+          end
+
+          rule(:urn_stage_digits) do
+            match('\d').repeat(1, 2) >> str(".") >> match('\d').repeat(2, 2)
+          end
+
+          rule(:urn_stage) do
+            str("stage-") >> (str("draft") | str("published") | urn_stage_digits).as(:stage) >>
+              urn_iteration
+          end
+
+          rule(:urn_vap) do
+            array_to_str(VAP_CODES).as(:vap) >>
+              (dash >> array_to_str(VAP_CODES).as(:vap)).repeat
+          end
+
+          rule(:urn_edition) do
+            (str("ed-") >> digits.as(:edition)).maybe
+          end
+
+          rule(:urn_amendment) do
+            colon >> str("amd").as(:amendments) >>
+              (colon >> (year_digits | digits).as(:number)).maybe >>
+              (colon >> str("v") >> digits.as(:iteration)).maybe
+          end
+
+          rule(:urn_corrigendum) do
+            colon >> str("cor").as(:corrigendums) >>
+              (colon >> (year_digits | digits).as(:number)).maybe >>
+              (colon >> str("v") >> digits.as(:iteration)).maybe
+          end
+
+          rule(:urn_supplements) do
+            (urn_amendment | urn_corrigendum).repeat
+          end
+
+          rule(:urn_fragment) do
+            (colon >> str("frag") >> colon >> match('[a-z0-9]').repeat(1).as(:fragment)).maybe
+          end
+
+          rule(:urn_language) do
+            (array_to_str(LANGUAGES) >> (dash >> array_to_str(LANGUAGES)).repeat).as(:language)
+          end
+
+          rule(:urn_identifier) do
+            str("urn:iec:std:") >> urn_publisher_copublisher >> urn_type >>
+              urn_number >> urn_part >> urn_conjuction_part >>
+              (colon >> urn_year >>
+                (colon >> (urn_stage | urn_vap).maybe >>
+                  (colon >> urn_edition >>
+                    urn_supplements >> urn_fragment >>
+                    (colon >> urn_language.maybe).maybe
+                  ).maybe
+                ).maybe
+              ).maybe
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pubid/iec/renderer/urn.rb

@@ -53,10 +53,38 @@ module Pubid::Iec::Renderer
     }.freeze
 
     def render_identifier(params)
-      "urn:iec:std:%{publisher}%{copublisher}%{type}:%{number}"\
-      "%{part}%{conjuction_part}%{year}%{stage}%{vap}"\
-      "%{urn_stage}%{corrigendum_stage}%{iteration}%{version}%{part_version}"\
-      "%{edition}%{amendments}%{corrigendums}%{fragment}" % params
+      result = "urn:iec:std:#{params[:publisher]}#{params[:copublisher]}" \
+               "#{params[:type]}:#{params[:number]}" \
+               "#{params[:part]}#{params[:conjuction_part]}"
+
+      # Positional fields — always colon-separated even when empty
+      result += ":#{strip_leading_colon(params[:year])}"
+
+      stage_value = [params[:stage], params[:vap], params[:urn_stage],
+                     params[:corrigendum_stage], params[:iteration],
+                     params[:version], params[:part_version]].map(&:to_s).join
+      result += ":#{strip_leading_colon(stage_value)}"
+
+      result += ":#{strip_leading_colon(params[:edition])}"
+
+      # Non-positional suffixes
+      result += params[:amendments].to_s
+      result += params[:corrigendums].to_s
+      result += params[:fragment].to_s
+
+      result
+    end
+
+    def render(with_date: true, with_language_code: :iso, annotated: false, **args)
+      base = render_base_identifier(**args.merge(
+        with_date: with_date, with_language_code: with_language_code, annotated: annotated,
+      ))
+      lang = strip_leading_colon(@prerendered_params[:language].to_s)
+      if @prerendered_params.key?(:all_parts)
+        "#{base}ser"
+      else
+        "#{base}:#{lang}"
+      end
     end
 
     def render_number(number, _opts, _params)
@@ -111,5 +139,12 @@ module Pubid::Iec::Renderer
       "-" + Array(copublisher).map { |c| c.to_s.downcase }.join("-")
     end
 
+    private
+
+    def strip_leading_colon(value)
+      s = value.to_s
+      s.start_with?(":") ? s[1..] : s
+    end
+
   end
 end

data/lib/pubid/iec/renderer/working_document_urn.rb

@@ -12,5 +12,11 @@ module Pubid::Iec::Renderer
     def render_stage(stage, _opts, _params)
       ":stage-#{stage.to_s.downcase}"
     end
+
+    def render(with_date: true, with_language_code: :iso, annotated: false, **args)
+      render_base_identifier(**args.merge(
+        with_date: with_date, with_language_code: with_language_code, annotated: annotated,
+      )) + @prerendered_params[:language].to_s
+    end
   end
 end

data/lib/pubid/iec/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iec
-    VERSION = "1.15.10".freeze
+    VERSION = "1.15.11".freeze
   end
 end

data/lib/pubid/iec.rb

@@ -11,6 +11,7 @@ require "pubid-core"
 require_relative "iec/errors"
 require_relative "iec/stage"
 require_relative "iec/typed_project_stage"
+require_relative "iec/parser_urn"
 require_relative "iec/parser"
 require_relative "iec/trf_parser"
 require_relative "iec/renderer/pubid"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iec
 version: !ruby/object:Gem::Version
-  version: 1.15.10
+  version: 1.15.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-26 00:00:00.000000000 Z
+date: 2026-04-01 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.10
+        version: 1.15.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.10
+        version: 1.15.11
 description: Library to generate, parse and manipulate IEC PubID.
 email:
 - open.source@ribose.com
@@ -75,6 +75,7 @@ files:
 - lib/pubid/iec/identifier/white_paper.rb
 - lib/pubid/iec/identifier/working_document.rb
 - lib/pubid/iec/parser.rb
+- lib/pubid/iec/parser_urn.rb
 - lib/pubid/iec/renderer/amendment.rb
 - lib/pubid/iec/renderer/corrigendum.rb
 - lib/pubid/iec/renderer/interpretation_sheet.rb