pubid-iec 1.15.2 → 1.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b77f83fe6b839f117353b6ec3f3026f99f773f839f5b56b1583c37b8207762
-  data.tar.gz: eaf3606ee424e5e7d6c69b536b37c8ed736da1bace78a21286ae5f554cd88384
+  metadata.gz: 6bd541f7c4f93e5532dfa5ab63c08e69b5af8793cdcec0b4b1956db70b85088b
+  data.tar.gz: 2bb7ee8b3ad42285c8a88a54a9a65885759cb2cb628eecaa340f72e8caf44914
 SHA512:
-  metadata.gz: e9fa4025f04ba91fc9c543f417642fead2c9239392a5a097873ca70d02b48cf78c44166c11b22d9ec5bdb92fbb15376810219887a96c185291a40ca1b0427bea
-  data.tar.gz: 89d3c5363ef867ac104f61a7d20a0f5d1b99c9387e2cd0de0efa9ae52d5aa1c3792ba5dc1c84f936b67e1fe4997cba0da8de4e356d6b224757547bc6aea73c23
+  metadata.gz: 53a26bb84c21b21510209f1a1cfecfa2d2c1f0c511f497284eb8f2a5aed3f1c8974d9a61ffed61e953763eb9f002b04c5a3f1589de96177b6dbf901c77c59f4f
+  data.tar.gz: c0d84474b0bcebb26df6d95b6ad943097b0f91cc326a1713c2214d666f18aadd80f59b93b17186502224f9ac67d775192e760db224703b72f9b05c3ec2d9e9a9

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

@@ -19,22 +19,22 @@ module Pubid::Iec
                    edition: nil, type: nil, month: nil, day: nil,
                    language: nil, stage: nil, sheet: nil, **args)
 
-      @vap = vap.to_s if vap
+      @vap = Array(vap).map(&:to_s) if vap
       @database = database if database
-      @fragment = fragment if fragment
+      @fragment = fragment.to_s if fragment
       @version = version if version
       @decision_sheet = decision_sheet if decision_sheet
-      @conjuction_part = conjuction_part if conjuction_part
+      @conjuction_part = Array(conjuction_part).map(&:to_s) if conjuction_part
       @part_version = part_version if part_version
       @trf_publisher = trf_publisher.to_s if trf_publisher
       @trf_series = trf_series if trf_series
       @trf_version = trf_version.to_s if trf_version
       @test_type = test_type if test_type
       @edition = edition.to_s if edition
-      @month = month if month
-      @day = day if day
-      @language = language if language
-      @sheet = sheet if sheet
+      @month = month.to_s if month
+      @day = day.to_s if day
+      @language = Array(language).map(&:to_s) if language
+      @sheet = sheet.transform_values(&:to_s) if sheet
 
       if stage
         @stage = self.class.has_project_stage?(stage) ? self.class.resolve_project_stage(stage) : resolve_stage(stage)
@@ -72,6 +72,10 @@ module Pubid::Iec
       self.class.get_renderer_class.new(renderer_data).render(with_edition_month_date: with_edition_month_date)
     end
 
+    def to_yaml
+      to_h(deep: true).to_yaml
+    end
+
     class << self
       def has_project_stage?(project_stage)
         self::PROJECT_STAGES.any? { |k, v| v[:abbr] == project_stage }

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

@@ -7,8 +7,10 @@ module Pubid::Iec
         { key: :cs, title: "Component Specification", short: "CS" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "CS")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "CS" if add_type
+        result
       end
     end
   end

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

@@ -7,8 +7,10 @@ module Pubid::Iec
         { key: :ca, title: "Conformity Assessment", short: "CA" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "CA")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "CA" if add_type
+        result
       end
     end
   end

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

@@ -20,8 +20,10 @@ module Pubid::Iec
         { key: :guide, title: "Guide", short: %w[Guide GUIDE] }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "Guide")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "Guide" if add_type
+        result
       end
     end
   end

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

@@ -7,8 +7,10 @@ module Pubid::Iec
         { key: :od, title: "Operational Document", short: "OD" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "OD")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "OD" if add_type
+        result
       end
     end
   end

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

@@ -28,8 +28,10 @@ module Pubid::Iec
         { key: :pas, title: "Publicly Available Specification", short: "PAS" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "PAS")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "PAS" if add_type
+        result
       end
     end
   end

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

@@ -8,8 +8,10 @@ module Pubid::Iec
         { key: :sttr, title: "Societal and Technology Trend Report", short: "Trend Report" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "Trend Report")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "Trend Report" if add_type
+        result
       end
     end
   end

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

@@ -6,6 +6,10 @@ module Pubid::Iec
         @year = year&.to_i
       end
 
+      def to_h(deep: true, add_type: true)
+        { number: number, year: year }.compact
+      end
+
       def <=>(other)
         return 0 if year.nil? && other.year
 

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

@@ -7,8 +7,10 @@ module Pubid::Iec
         { key: :srd, title: "Systems Reference Document", short: "SRD" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "SRD")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "SRD" if add_type
+        result
       end
     end
   end

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

@@ -48,8 +48,10 @@ module Pubid::Iec
         { key: :tr, title: "Technical Report", short: "TR" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "TR")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "TR" if add_type
+        result
       end
     end
   end

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

@@ -48,8 +48,10 @@ module Pubid::Iec
         { key: :ts, title: "Technical Specification", short: "TS" }
       end
 
-      def to_h(deep: true)
-        super.merge(type: "TS")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "TS" if add_type
+        result
       end
     end
   end

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

@@ -0,0 +1,17 @@
+module Pubid::Iec
+  module Identifier
+    class TechnologyAndMarketOutlookPaper < Base
+      def_delegators 'Pubid::Iec::Identifier::TechnologyAndMarketOutlookPaper', :type
+
+      def self.type
+        { key: :tmop, title: "Technology and Market Outlook Paper", short: "Technology and Market Outlook Paper" }
+      end
+
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "Technology and Market Outlook Paper" if add_type
+        result
+      end
+    end
+  end
+end

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

@@ -7,8 +7,10 @@ module Pubid::Iec
         { key: :tec, title: "Technology Report", short: "Technology Report" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "Technology Report")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "Technology Report" if add_type
+        result
       end
     end
   end

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

@@ -7,8 +7,10 @@ module Pubid::Iec
         { key: :wp, title: "Write Paper", short: "White Paper" }
       end
 
-      def to_h(deep: false)
-        super.merge(type: "White Paper")
+      def to_h(deep: true, add_type: true)
+        result = super(deep: deep, add_type: false)
+        result[:type] = "White Paper" if add_type
+        result
       end
     end
   end

data/lib/pubid/iec/parser.rb

@@ -17,7 +17,7 @@ module Pubid::Iec
 
     rule(:part) do
       (str("-") | str("/")) >> space? >>
-        (str("Amd") | str("Cor")).absent? >> (match['[\dA-Za-z]'] | str("-")).repeat(1).as(:part)
+        (str("Amd") | str("AMD") | str("Cor") | str("COR") | str("FRAG")).absent? >> (match['[\dA-Za-z]'] | str("-")).repeat(1).as(:part)
     end
 
     rule(:version) { digits >> (dot >> digits).maybe }
@@ -63,7 +63,7 @@ module Pubid::Iec
 
     rule(:number) do
       (digits | str("SYMBOL") | str("SYCSMARTENERGY") | str("SyCLVDC") |
-        str("SYCLVDC") | str("SyCCOMM") | str("SyCAAL") | str("VIM") | match("[A-Za-z0-9 ]").repeat) >>
+        str("SYCLVDC") | str("SyCCOMM") | str("SyCAAL") | str("VIM") | match("[A-Za-z0-9 \\-]").repeat) >>
         ((str(":") >> match("[A-Z]").repeat(1)) | match("[a-zA-Z]")).maybe
     end
 
@@ -74,14 +74,17 @@ module Pubid::Iec
         part.maybe >>
         conjuction_part.maybe >>
         (space? >> str(":") >> year >> (str("-") >> month_digits.as(:month) >>
-          (str("-") >> day_digits.as(:day)).maybe).maybe).maybe >> sheet.maybe >>
+          (str("-") >> day_digits.as(:day)).maybe).maybe).maybe >> str("-").maybe >> sheet.maybe >>
         ((amendment >> vap.maybe >> corrigendum.maybe) | corrigendum).repeat >>
         interpretation_sheet.maybe >> fragment.maybe
     end
 
+    rule(:vap_code) do
+      str("CSV") | str("SER") | str("RLV") | str("CMV") | str("EXV") | str("PAC") | str("PRV")
+    end
+
     rule(:vap) do
-      space >> (str("CSV") | str("SER") | str("RLV") | str("CMV") | str("EXV") |
-        str("PAC") | str("PRV")).as(:vap)
+      space >> vap_code.as(:vap) >> (str("-") >> vap_code.as(:vap)).repeat
     end
 
     rule(:database) do
@@ -97,7 +100,7 @@ module Pubid::Iec
     rule(:identifier) do
       (originator.maybe >> (space.maybe >> stage.as(:stage)).maybe >>
         std_document_body >>
-        vap.maybe >> database.maybe >>
+        vap.maybe >> corrigendum.maybe >> database.maybe >>
         edition.maybe >>
         (str(":") >> year).maybe >>
         language.maybe)

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

@@ -1,14 +1,26 @@
 module Pubid::Iec::Renderer
   class Pubid < Pubid::Core::Renderer::Base
     def render_identifier(params)
-      "%{publisher}%{type}%{typed_stage}%{stage} %{number}%{part}%{conjuction_part}"\
-      "%{part_version}%{version}%{iteration}"\
-      "%{year}%{month}%{day}%{sheet}%{amendments}%{corrigendums}%{fragment}%{vap}%{edition}%{database}" % params
+      # VAP (CSV, CMV, RLV, EXV) always comes before corrigendums
+      # e.g., "IEC 60529:1989+AMD1:1999 CSV/COR2:2007"
+      format_string = "%{publisher}%{copublisher}%{type}%{typed_stage}%{stage} %{number}%{part}%{conjuction_part}"\
+        "%{part_version}%{version}%{iteration}"\
+        "%{year}%{month}%{day}%{sheet}%{amendments}%{vap}%{corrigendums}"\
+        "%{fragment}%{edition}%{database}"
+      format_string % params
     end
     def render_typed_stage(typed_stage, _opts, _params)
       " #{typed_stage}"
     end
 
+    def render_publisher(publisher, _opts, _params)
+      publisher
+    end
+
+    def render_copublisher(copublisher, _opts, _params)
+      "/" + Array(copublisher).join("/")
+    end
+
     def render_type(type, _opts, params)
       return if params[:stage].is_a?(::Pubid::Core::TypedStage)
 
@@ -16,7 +28,7 @@ module Pubid::Iec::Renderer
     end
 
     def render_vap(vap, _opts, _params)
-      " #{vap}"
+      " #{vap.join('-')}"
     end
 
     def render_stage(stage, _opts, params)
@@ -29,8 +41,9 @@ module Pubid::Iec::Renderer
       "/FRAG#{fragment}"
     end
 
-    def render_sheet(sheet, _opts, _params)
-      "/#{sheet[:number]}" + (sheet[:year] ? ":#{sheet[:year]}" : "")
+    def render_sheet(sheet, _opts, params)
+      prefix = params[:part] ? "" : "-"
+      "#{prefix}/#{sheet[:number]}" + (sheet[:year] ? ":#{sheet[:year]}" : "")
     end
 
     def render_database(database, _opts, _params)
@@ -38,15 +51,15 @@ module Pubid::Iec::Renderer
     end
 
     def supplement_prefix(params)
-      params[:vap] == "CSV" && "+" || "/"
+      params[:vap]&.include?("CSV") ? "+" : "/"
     end
 
-    def render_amendments(amendments, _opts, _params)
+    def render_amendments(amendments, _opts, params)
       supplement_prefix(params) + amendments.sort.map(&:to_s).join("+")
     end
 
     def render_corrigendums(corrigendums, _opts, _params)
-      supplement_prefix(params) + corrigendums.sort.map(&:to_s).join("+")
+      "/" + corrigendums.sort.map(&:to_s).join("+")
     end
 
     def render_version(version, _opts, params)
@@ -57,8 +70,8 @@ module Pubid::Iec::Renderer
       " ED#{edition}" unless params[:version]
     end
 
-    def render_conjuction_part(conjuction_parts, _opts, _params)
-      conjunction_symbol = case _params[:publisher]
+    def render_conjuction_part(conjuction_parts, _opts, params)
+      conjunction_symbol = case params[:publisher]
       when "IECEE"
         # IECEE TRFs use '&' as parts separator (IECEE OD-2020)
         "&"

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

@@ -64,7 +64,7 @@ module Pubid::Iec::Renderer
     end
 
     def render_vap(vap, _opts, _params)
-      ":#{vap.downcase}"
+      ":#{vap.map(&:downcase).join('-')}"
     end
 
     def render_fragment(fragment, _opts, _params)
@@ -107,5 +107,9 @@ module Pubid::Iec::Renderer
       ":" + (language.is_a?(Array) ? language.join("-") : language)
     end
 
+    def render_copublisher(copublisher, _opts, _params)
+      "-" + Array(copublisher).map { |c| c.to_s.downcase }.join("-")
+    end
+
   end
 end

data/lib/pubid/iec/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iec
-    VERSION = "1.15.2".freeze
+    VERSION = "1.15.4".freeze
   end
 end

data/lib/pubid/iec.rb

@@ -37,6 +37,7 @@ require_relative "iec/identifier/amendment"
 require_relative "iec/identifier/corrigendum"
 require_relative "iec/identifier/white_paper"
 require_relative "iec/identifier/technology_report"
+require_relative "iec/identifier/technology_and_market_outlook_paper"
 require_relative "iec/identifier/societal_technology_trend_report"
 require_relative "iec/identifier/interpretation_sheet"
 require_relative "iec/working_document_parser"
@@ -62,6 +63,7 @@ config.types = [Pubid::Iec::Identifier::InternationalStandard,
                 Pubid::Iec::Identifier::TestReportForm,
                 Pubid::Iec::Identifier::WritePaper,
                 Pubid::Iec::Identifier::TechnologyReport,
+                Pubid::Iec::Identifier::TechnologyAndMarketOutlookPaper,
                 Pubid::Iec::Identifier::SocietalTechnologyTrendReport,
                 Pubid::Iec::Identifier::InterpretationSheet]
 

data/update_codes.yaml

@@ -60,4 +60,8 @@ IECEE TRF 60601-1-2CEMC:2011: IECEE TRF 60601-1-2C_EMC:2011
 "CISPR 14-2:2015/AMD1/FRAG3:": CISPR 14-2:2015/AMD1/FRAG3 ED2
 "IEC 60309-3:1994/FRAG1:": IEC 60309-3:1994/FRAG1 ED1
 "CISPR 14-1:2016/AMD1/FRAG5:": CISPR 14-1:2016/AMD1/FRAG5 ED5
-"IEC 60285-/1:1989": IEC 60285-1:1989
+"IEC 61360-C00168:": IEC 61360-C00168
+"IEC 61360-C00169:": IEC 61360-C00169
+"IEC 61360-C00172:": IEC 61360-C00172
+"IEC 61360-C00174:": IEC 61360-C00174
+"IEC 61360-C00178:": IEC 61360-C00178

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iec
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.15.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-27 00:00:00.000000000 Z
+date: 2026-02-06 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.2
+        version: 1.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.2
+        version: 1.15.4
 description: Library to generate, parse and manipulate IEC PubID.
 email:
 - open.source@ribose.com
@@ -69,6 +69,7 @@ files:
 - lib/pubid/iec/identifier/systems_reference_document.rb
 - lib/pubid/iec/identifier/technical_report.rb
 - lib/pubid/iec/identifier/technical_specification.rb
+- lib/pubid/iec/identifier/technology_and_market_outlook_paper.rb
 - lib/pubid/iec/identifier/technology_report.rb
 - lib/pubid/iec/identifier/test_report_form.rb
 - lib/pubid/iec/identifier/white_paper.rb