pubid-iec 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187ed5786efa96deff3b174e420e35459b0f26c36858e2fb36d7817bb9a131e0
-  data.tar.gz: 050afef914f208fd2329dd6ab5ac6322133502f63ebfd87bcadcba9ac66766c6
+  metadata.gz: 521c15388c33bc8ce5118ea7e5d68a917882feeb638a452f2fa45006fc8fe04c
+  data.tar.gz: c18933a40936ece254eacc2f9882ce895c359bacc9cadf126abfaa9b154356f5
 SHA512:
-  metadata.gz: e891ac1a9977ff42f712a8a178d84f5d4855fa806ceb22b7eb2affddc1bf948fb45d446b59d1cd9903f5e5b6b7944e59a16fd757ff932f37fac8928ab8b49122
-  data.tar.gz: 361bd570bfc28dcf0d9a5496acd200af926329653e4364fb57697f10d11c641640595584c938952988d86b6879bf2a8259f3d10b1d2eb2e358579ff951d9e63d
+  metadata.gz: 138da54cbfd8cfae1776ad28487a4d30ca70150df77bbc8bbdaf555d6958dad7519c032b9241adc9a78cef5fee835e8cbbe88b1e34d841a003a46add8dd9812f
+  data.tar.gz: fea398c22600418dab178a50667961cc81b9b14e492976d797b34f931df45193eda531be158a74bb6e07a1aa62945b574fa7efd548fd4ff391284943b4e2d766

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

@@ -0,0 +1,22 @@
+require_relative "../renderer/amendment"
+require_relative "../renderer/urn_amendment"
+
+module Pubid::Iec
+  module Identifier
+    class Amendment < Supplement
+      def_delegators 'Pubid::Iec::Identifier::Amendment', :type
+
+      def self.type
+        { key: :amd, title: "Amendment" }
+      end
+
+      def self.get_renderer_class
+        Renderer::Amendment
+      end
+
+      def urn
+        Renderer::UrnAmendment.new(get_params).render
+      end
+    end
+  end
+end

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

@@ -1,25 +1,39 @@
+require "forwardable"
+
 module Pubid::Iec
   class Base < Pubid::Core::Identifier::Base
 
     attr_accessor :vap, :database, :fragment, :version, :decision_sheet,
                   :conjuction_part, :part_version, :trf_publisher,
-                  :trf_series, :trf_version, :test_type
+                  :trf_series, :trf_version, :test_type, :month, :day
+
+    extend Forwardable
 
     # @param stage [String] stage eg. "PWI", "PNW"
     def initialize(publisher: "IEC", stage: nil, vap: nil, database: nil,
                    fragment: nil, version: nil, decision_sheet: nil,
                    conjuction_part: nil, part_version: nil, trf_publisher: nil,
                    trf_series: nil, trf_version: nil, test_type: nil,
-                   edition: nil, type: nil, **args)
+                   edition: nil, type: nil, month: nil, day: nil,
+                   language: nil, **args)
       # @stage = stage.to_s if stage
       # @stage = Stage.parse(stage) if stage
 
       if stage
         if stage.is_a?(Stage)
           @stage = stage
+          @typed_stage = resolve_typed_stage(@stage.harmonized_code) unless @stage.abbr
+        elsif self.class.has_typed_stage?(stage)
+          @typed_stage, @stage = self.class.find_typed_stage(stage)
         else
           @stage = Identifier.parse_stage(stage)
+          # resolve typed stage when harmonized code provided as stage
+          # or stage abbreviation was not resolved
+          if /\A[\d.]+\z/.match?(stage) || @stage.empty_abbr?(with_prf: true)
+            @typed_stage = self.class.resolve_typed_stage(@stage.harmonized_code)
+          end
         end
+        @typed_stage = self.class::TYPED_STAGES[@typed_stage][:abbr] if @typed_stage
       end
 
       @vap = vap.to_s if vap
@@ -34,7 +48,9 @@ module Pubid::Iec
       @trf_version = trf_version.to_s if trf_version
       @test_type = test_type if test_type
       @edition = edition.to_s if edition
-      @type = Identifier.build_type(type) if type
+      @month = month if month
+      @day = day if day
+      @language = language if language
 
       super(**args.merge(publisher: publisher))
     end
@@ -43,7 +59,33 @@ module Pubid::Iec
       Renderer::Urn.new(get_params).render
     end
 
+    def to_s(with_edition_month_date: false)
+      self.class.get_renderer_class.new(get_params).render(with_edition_month_date: with_edition_month_date)
+    end
+
     class << self
+      def has_type?(type)
+        return type == self.type[:key] if type.is_a?(Symbol)
+
+        if self.type.key?(:short)
+          self.type[:short].is_a?(Array) ? self.type[:short].include?(type) : self.type[:short] == type
+        else
+          type.to_s.downcase.to_sym == self.type[:key]
+        end
+      end
+
+      def transform_hash(params)
+        params.map do |k, v|
+          get_transformer_class.new.apply(k => v.is_a?(Hash) ? transform_hash(v) : v)
+        end.inject({}, :merge)
+      end
+
+      def transform(params)
+        identifier_params = transform_hash(params)
+
+        Identifier.create(**identifier_params)
+      end
+
       def get_amendment_class
         Amendment
       end
@@ -67,6 +109,10 @@ module Pubid::Iec
       def get_update_codes
         UPDATE_CODES
       end
+
+      def get_identifier
+        Identifier
+      end
     end
 
     def database

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

@@ -0,0 +1,15 @@
+module Pubid::Iec
+  module Identifier
+    class ComponentSpecification < Base
+      def_delegators 'Pubid::Iec::Identifier::ComponentSpecification', :type
+
+      def self.type
+        { key: :cs, title: "Component Specification", short: "CS" }
+      end
+
+      def get_params
+        super.merge(type: "CS")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Pubid::Iec
+  module Identifier
+    class ConformityAssessment < Base
+      def_delegators 'Pubid::Iec::Identifier::ConformityAssessment', :type
+
+      def self.type
+        { key: :ca, title: "Conformity Assessment", short: "CA" }
+      end
+
+      def get_params
+        super.merge(type: "CA")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require_relative "../renderer/corrigendum"
+require_relative "../renderer/urn_corrigendum"
+
+module Pubid::Iec
+  module Identifier
+    class Corrigendum < Supplement
+      def_delegators 'Pubid::Iec::Identifier::Corrigendum', :type
+
+      def self.type
+        { key: :cor, title: "Corrigendum" }
+      end
+
+      def self.get_renderer_class
+        Renderer::Corrigendum
+      end
+
+      def urn
+        Renderer::UrnCorrigendum.new(get_params).render
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Pubid::Iec
+  module Identifier
+    class Guide < Base
+      def_delegators 'Pubid::Iec::Identifier::Guide', :type
+
+      def self.type
+        { key: :guide, title: "Guide", short: %w[Guide GUIDE] }
+      end
+
+      def get_params
+        super.merge(type: "Guide")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+module Pubid::Iec
+  module Identifier
+    class InternationalStandard < Base
+      def_delegators 'Pubid::Iec::Identifier::InternationalStandard', :type
+
+      TYPED_STAGES = {
+        afdis: {
+          abbr: "AFDIS",
+          name: "Approved for FDIS",
+          harmonized_stages: %w[40.99],
+        },
+        ccdv: {
+          abbr: "CCDV",
+          name: "Draft circulated as CDV",
+          harmonized_stages: %w[40.20],
+        },
+        cdvm: {
+          abbr: "CDVM",
+          name: "Rejected CDV to be discussed at a meeting",
+          harmonized_stages: %w[40.91],
+        },
+        cfdis: {
+          abbr: "CFDIS",
+          name: "Draft circulated as FDIS",
+          harmonized_stages: %w[50.20],
+        },
+        decfdis: {
+          abbr: "DECFDIS",
+          name: "FDIS at editing check",
+          harmonized_stages: %w[50.00],
+        },
+        ncdv: {
+          abbr: "NCDV",
+          name: "CDV rejected",
+          harmonized_stages: %w[40.91],
+        },
+        nfdis: {
+          abbr: "NFDIS",
+          name: "FDIS rejected",
+          harmonized_stages: %w[50.92],
+        },
+        prvc: {
+          abbr: "PRVC",
+          name: "Preparation of RVC",
+          harmonized_stages: %w[40.60],
+        },
+        prvd: {
+          abbr: "PRVD",
+          name: "Preparation of RVD",
+          harmonized_stages: %w[50.60],
+        },
+        rfdis: {
+          abbr: "RFDIS",
+          name: "FDIS received and registered",
+          harmonized_stages: %w[50.00],
+        },
+        tcdv: {
+          abbr: "TCDV",
+          name: "Translation of CDV",
+          harmonized_stages: %w[40.00],
+        },
+      }.freeze
+
+      def self.type
+        { key: :is, title: "International Standard", short: "IS" }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Pubid::Iec
+  module Identifier
+    class InterpretationSheet < Base
+      def_delegators 'Pubid::Iec::Identifier::InterpretationSheet', :type
+
+      TYPED_STAGES = {
+        cdish: {
+          abbr: "CDISH",
+          name: "Draft circulated as DISH",
+          harmonized_stages: %w[50.20],
+        },
+        decdish: {
+          abbr: "DECDISH",
+          name: "DISH at editing check",
+          harmonized_stages: %w[50.00],
+        },
+        prvdish: {
+          abbr: "PRVDISH",
+          name: "Preparation of RVDISH",
+          harmonized_stages: %w[50.60],
+        },
+        rdish: {
+          abbr: "RDISH",
+          name: "DISH received and registered",
+          harmonized_stages: %w[50.00],
+        },
+        tdish: {
+          abbr: "TDISH",
+          name: "Translation of DISH",
+          harmonized_stages: %w[50.00],
+        },
+      }.freeze
+
+      def self.type
+        { key: :ish, title: "InterpretationSheet", short: "ISH" }
+      end
+
+      def get_params
+        super.merge(type: "ISH")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Pubid::Iec
+  module Identifier
+    class OperationalDocument < Base
+      def_delegators 'Pubid::Iec::Identifier::OperationalDocument', :type
+
+      def self.type
+        { key: :od, title: "Operational Document", short: "OD" }
+      end
+
+      def get_params
+        super.merge(type: "OD")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Pubid::Iec
+  module Identifier
+    class PubliclyAvailableSpecification < Base
+      def_delegators 'Pubid::Iec::Identifier::PubliclyAvailableSpecification', :type
+
+      TYPED_STAGES = {
+        cdpas: {
+          abbr: "CDPAS",
+          name: "Draft circulated as DPAS",
+          harmonized_stages: %w[50.20],
+        },
+        PRVDPAS: {
+          abbr: "PRVDPAS",
+          name: "Preparation of RVDPAS",
+          harmonized_stages: %w[50.60],
+        }
+      }.freeze
+
+      def self.type
+        { key: :pas, title: "Publicly Available Specification", short: "PAS" }
+      end
+
+      def get_params
+        super.merge(type: "PAS")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module Pubid::Iec
+  module Identifier
+    class SocietalTechnologyTrendReport < Base
+      def_delegators 'Pubid::Iec::Identifier::SocietalTechnologyTrendReport', :type
+
+      def self.type
+        { key: :sttr, title: "Societal and Technology Trend Report", short: "Trend Report" }
+      end
+
+      def get_params
+        super.merge(type: "Trend Report")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Pubid::Iec
+  module Identifier
+    class Supplement < Base
+      def initialize(number:, year: nil)
+        @number = number ? number.to_i : 1
+        @year = year&.to_i
+      end
+
+      def <=>(other)
+        return 0 if year.nil? && other.year
+
+        return year <=> other.year if number == other.number
+
+        (number <=> other.number) || year <=> other.year
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Pubid::Iec
+  module Identifier
+    class SystemsReferenceDocument < Base
+      def_delegators 'Pubid::Iec::Identifier::SystemsReferenceDocument', :type
+
+      def self.type
+        { key: :srd, title: "Systems Reference Document", short: "SRD" }
+      end
+
+      def get_params
+        super.merge(type: "SRD")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Pubid::Iec
+  module Identifier
+    class TechnicalReport < Base
+      def_delegators 'Pubid::Iec::Identifier::TechnicalReport', :type
+
+      TYPED_STAGES = {
+        adtr: {
+          abbr: "ADTR",
+          name: "Approved for DTR",
+          harmonized_stages: %w[40.99],
+        },
+        cdtr: {
+          abbr: "CDTR",
+          name: "Draft circulated as DTR",
+          harmonized_stages: %w[50.20],
+        },
+        dtrm: {
+          abbr: "DTRM",
+          name: "Rejected DTR to be discussed at meeting",
+          harmonized_stages: %w[50.92],
+        },
+        ndtr: {
+          abbr: "NDTR",
+          name: "DTR rejected",
+          harmonized_stages: %w[50.92],
+        },
+        prvdtr: {
+          abbr: "PRVDTR",
+          name: "Preparation of RVDTR",
+          harmonized_stages: %w[50.60]
+        },
+        tdtr: {
+          abbr: "TDTR",
+          name: "Translation of DTR",
+          harmonized_stages: %w[50.00]
+        }
+      }.freeze
+
+      def self.type
+        { key: :tr, title: "Technical Report", short: "TR" }
+      end
+
+      def get_params
+        super.merge(type: "TR")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Pubid::Iec
+  module Identifier
+    class TechnicalSpecification < Base
+      TYPED_STAGES = {
+        adts: {
+          abbr: "ADTS",
+          name: "Approved for DTS",
+          harmonized_stages: %w[40.99],
+        },
+        cdts: {
+          abbr: "CDTS",
+          name: "Draft circulated as DTS",
+          harmonized_stages: %w[50.20],
+        },
+        dtsm: {
+          abbr: "DTSM",
+          name: "Rejected DTS to be discussed at meeting",
+          harmonized_stages: %w[50.92],
+        },
+        ndts: {
+          abbr: "NDTS",
+          name: "DTS rejected",
+          harmonized_stages: %w[50.92],
+        },
+        prvdts: {
+          abbr: "PRVDTS",
+          name: "Preparation of RVDTS",
+          harmonized_stages: %w[50.60],
+        },
+        tdts: {
+          abbr: "TDTS",
+          name: "Translation of DTS",
+          harmonized_stages: %w[50.00],
+        },
+      }.freeze
+
+      def_delegators 'Pubid::Iec::Identifier::TechnicalSpecification', :type
+
+      def self.type
+        { key: :ts, title: "Technical Specification", short: "TS" }
+      end
+
+      def get_params
+        super.merge(type: "TS")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Pubid::Iec
+  module Identifier
+    class TechnologyReport < Base
+      def_delegators 'Pubid::Iec::Identifier::TechnologyReport', :type
+
+      def self.type
+        { key: :tec, title: "Technology Report", short: "Technology Report" }
+      end
+
+      def get_params
+        super.merge(type: "Technology Report")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Pubid::Iec
+  module Identifier
+    class TestReportForm < Base
+
+      attr_accessor :version, :decision_sheet,
+                    :conjuction_part, :part_version, :trf_publisher,
+                    :trf_series, :trf_version, :test_type
+
+      def initialize(publisher: "IEC", decision_sheet: nil, trf_publisher: nil,
+                     trf_series: nil, trf_version: nil, test_type: nil,
+                     **args)
+        @decision_sheet = decision_sheet if decision_sheet
+        @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
+
+        super(**args.merge(publisher: publisher))
+      end
+
+      def self.type
+        { key: :trf, title: "Test Report Form", short: "TRF" }
+      end
+
+      def urn
+        Renderer::TrfUrn.new(get_params).render
+      end
+
+      class << self
+        def get_parser_class
+          TrfParser
+        end
+
+        def get_renderer_class
+          Renderer::TrfPubid
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Pubid::Iec
+  module Identifier
+    class WritePaper < Base
+      def_delegators 'Pubid::Iec::Identifier::WritePaper', :type
+
+      def self.type
+        { key: :wp, title: "Write Paper", short: "White Paper" }
+      end
+
+      def get_params
+        super.merge(type: "White Paper")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require "forwardable"
+
+module Pubid::Iec
+  module Identifier
+    class WorkingDocument < Pubid::Core::Identifier::Base
+      STAGES = %w[ACDV ACD ADTR ADTS AFDIS APUB BPUB CAN CDM CCDV CDISH CDVM
+                  CFDIS CDPAS CDTR CDTS DTRM DTSM DECDISH DECFDIS DECPUB
+                  DELPUB DEL NCDV NDTR NDTS NFDIS PCC PNW PPUB PRVC PRVDISH
+                  PRVDPAS PRVDTR PRVDTS PRVD PRVN PWI RDISH RFDIS RPUB TCDV TDISH
+                  TDTR TDTS TPUB WPUB AC CC CDV CD DA DV DC DISH DL DPAS DTR
+                  DTS FDIS INF MTG NP QP Q RM RQ RR RVC RVDISH RVDTR RVDTS RVD
+                  RVN RV R SBP].freeze
+
+      extend Forwardable
+
+      attr_accessor :technical_committee
+
+      def initialize(publisher: "IEC", technical_committee: nil, **args)
+        super(**args.merge(publisher: publisher))
+
+        @technical_committee = technical_committee
+      end
+
+      def urn
+        Renderer::WorkingDocumentUrn.new(get_params).render
+      end
+
+      class << self
+        def get_parser_class
+          WorkingDocumentParser
+        end
+
+        def get_renderer_class
+          Renderer::WorkingDocument
+        end
+      end
+    end
+  end
+end

data/lib/pubid/iec/parser.rb

@@ -4,7 +4,7 @@ module Pubid::Iec
   class Parser < Pubid::Core::Parser
     rule(:organization) do
       str("IECEE") | str("IECEx") | str("IECQ") | str("IEC") | str("ISO") |
-        str("IEEE") | str("CISPR")
+        str("IEEE") | str("CISPR") | str("ASTM")
     end
 
     rule(:stage) do
@@ -12,10 +12,7 @@ module Pubid::Iec
     end
 
     rule(:type) do
-      (str("IS") | str("TS") | str("TR") | str("PAS") | str("SRD") |
-        str("TEC") | str("STTR") | str("WP") | str("Guide") | str("GUIDE") | str("OD") |
-        str("CS") | str("CA")
-      ).as(:type)
+      array_to_str(Identifier.config.types.map { |type| type.type[:short] }.flatten.compact).as(:type)
     end
 
     rule(:part) do
@@ -33,7 +30,7 @@ module Pubid::Iec
 
     rule(:amendment) do
       ((str("/") | str("+") | space).maybe >>
-        str("AMD") >>
+        (str("AMD") | str("A")) >>
         digits.as(:number) >>
         (str(":") >> digits.as(:year)).maybe).as(:amendments)
     end
@@ -43,9 +40,9 @@ module Pubid::Iec
     end
 
     rule(:corrigendum) do
-      ((str("/") | space).maybe >>
+      ((str("/") | str(" + ") | space).maybe >>
         str("COR") >>
-        digits.as(:number) >>
+        digits.as(:number).maybe >>
         (str(":") >> digits.as(:year)).maybe).as(:corrigendums)
     end
 
@@ -55,8 +52,8 @@ module Pubid::Iec
 
     rule(:number) do
       (digits | str("SYMBOL") | str("SYCSMARTENERGY") | str("SyCLVDC") |
-        str("SYCLVDC") | str("SyCCOMM") | str("SyCAAL") | str("VIM")) >>
-        match("[A-Z]").maybe
+        str("SYCLVDC") | str("SyCCOMM") | str("SyCAAL") | str("VIM") | match("[A-Za-z0-9 ]").repeat) >>
+        ((str(":") >> match("[A-Z]").repeat(1)) | match("[A-Z]")).maybe
     end
 
     rule(:std_document_body) do
@@ -65,7 +62,8 @@ module Pubid::Iec
         edition.maybe >>
         part.maybe >>
         conjuction_part.maybe >>
-        (space? >> str(":") >> year).maybe >>
+        (space? >> str(":") >> year >> (str("-") >> month_digits.as(:month) >>
+          (str("-") >> day_digits.as(:day)).maybe).maybe).maybe >>
         ((amendment >> corrigendum.maybe) | corrigendum).repeat >>
         fragment.maybe
     end
@@ -79,12 +77,19 @@ module Pubid::Iec
       space >> str("DB").as(:database)
     end
 
+    rule(:language) do
+      str("(") >> (
+        (match["a-z"].repeat(1).as(:language) >> str("-").maybe).repeat(1)
+      ) >> str(")")
+    end
+
     rule(:identifier) do
       (originator.maybe >> (space.maybe >> stage.as(:stage)).maybe >> (space | str("/")) >>
         std_document_body >>
         vap.maybe >> database.maybe >>
         edition.maybe >>
-        (str(":") >> year).maybe)
+        (str(":") >> year).maybe >>
+        language.maybe)
     end
 
     rule(:root) { identifier }

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

@@ -0,0 +1,7 @@
+module Pubid::Iec::Renderer
+  class Amendment < Pubid
+    def render_identifier(params)
+      "AMD%{number}%{year}" % params
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Pubid::Iec::Renderer
+  class Corrigendum < Pubid
+    def render_identifier(params)
+      "COR%{number}%{year}" % params
+    end
+  end
+end

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

@@ -1,12 +1,17 @@
 module Pubid::Iec::Renderer
   class Pubid < Pubid::Core::Renderer::Base
     def render_identifier(params)
-      "%{publisher}%{type}%{stage} %{number}%{part}%{conjuction_part}"\
+      "%{publisher}%{type}%{typed_stage}%{stage} %{number}%{part}%{conjuction_part}"\
       "%{part_version}%{version}%{iteration}"\
-      "%{year}%{amendments}%{corrigendums}%{fragment}%{vap}%{edition}%{language}%{database}" % params
+      "%{year}%{month}%{day}%{amendments}%{corrigendums}%{fragment}%{vap}%{edition}%{database}" % params
+    end
+    def render_typed_stage(typed_stage, _opts, _params)
+      " #{typed_stage}"
     end
 
     def render_type(type, _opts, _params)
+      return if params[:typed_stage]
+
       " #{type}"
     end
 
@@ -14,7 +19,9 @@ module Pubid::Iec::Renderer
       " #{vap}"
     end
 
-    def render_stage(stage, _opts, _params)
+    def render_stage(stage, _opts, params)
+      return if params[:typed_stage]
+
       " #{stage}"
     end
 
@@ -30,12 +37,12 @@ module Pubid::Iec::Renderer
       params[:vap] == "CSV" && "+" || "/"
     end
 
-    def render_amendments(amendments, _opts, params)
-      supplement_prefix(params) + super
+    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) + super
+    def render_corrigendums(corrigendums, _opts, _params)
+      supplement_prefix(params) + corrigendums.sort.map(&:to_s).join("+")
     end
 
     def render_version(version, _opts, params)
@@ -63,5 +70,21 @@ module Pubid::Iec::Renderer
         "#{conjunction_symbol}#{conjuction_parts}"
       end
     end
+
+    def render_month(month, opts, _params)
+      "-#{month}" if opts[:with_edition_month_date]
+    end
+
+    def render_day(day, opts, _params)
+      "-#{day}" if opts[:with_edition_month_date]
+    end
+
+    def render_language(language, opts, _params)
+      if language.is_a?(Array)
+        "(#{language.map(&:to_s).sort.join('-')})"
+      else
+        "(#{language})"
+      end
+    end
   end
 end

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

@@ -56,7 +56,7 @@ module Pubid::Iec::Renderer
       "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}%{language}" % params
+      "%{edition}%{amendments}%{corrigendums}%{fragment}" % params
     end
 
     def render_number(number, _opts, _params)
@@ -92,7 +92,20 @@ module Pubid::Iec::Renderer
     end
 
     def render_type(type, _, _)
-      ":#{type.type.to_s}"
+      ":#{type.downcase}"
     end
+
+    def render_amendments(amendments, _opts, _params)
+      amendments&.map(&:urn)&.join || ""
+    end
+
+    def render_corrigendums(corrigendums, _opts, _params)
+      corrigendums&.map(&:urn)&.join || ""
+    end
+
+    def render_language(language, _opts, _params)
+      ":" + (language.is_a?(Array) ? language.join("-") : language)
+    end
+
   end
 end

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

@@ -0,0 +1,10 @@
+require_relative "urn_supplement"
+
+module Pubid::Iec::Renderer
+  class UrnAmendment < UrnSupplement
+    def render_identifier(params)
+      ":amd%{year}%{number}" % params
+    end
+
+  end
+end

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

@@ -0,0 +1,9 @@
+require_relative "urn_supplement"
+
+module Pubid::Iec::Renderer
+  class UrnCorrigendum < UrnSupplement
+    def render_identifier(params)
+      ":cor%{year}%{number}" % params
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Pubid::Iec::Renderer
+  class UrnSupplement < ::Pubid::Core::Renderer::Urn
+    def render_number(number, _opts, params)
+      if params[:year]
+        ":v#{number}"
+      else
+        ":#{number}:v1"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Pubid::Iec::Renderer
+  class WorkingDocument < Pubid
+    def render_identifier(params)
+      "%{technical_committee}/%{number}%{stage}" % params
+    end
+
+    def render_stage(stage, _opts, _params)
+      "/#{stage}"
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Pubid::Iec::Renderer
+  class WorkingDocumentUrn < Urn
+
+    def render_identifier(params)
+      "urn:iec:working-document:%{technical_committee}:%{number}%{stage}" % params
+    end
+
+    def render_technical_committee(technical_committee, _opts, _params)
+      technical_committee.to_s.gsub("/", "-").downcase
+    end
+
+    def render_stage(stage, _opts, _params)
+      ":stage-#{stage.to_s.downcase}"
+    end
+  end
+end

data/lib/pubid/iec/transformer.rb

@@ -10,11 +10,11 @@ module Pubid::Iec
 
     class << self
       def get_amendment_class
-        Amendment
+        Identifier::Amendment
       end
 
       def get_corrigendum_class
-        Corrigendum
+        Identifier::Corrigendum
       end
     end
   end

data/lib/pubid/iec/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iec
-    VERSION = "0.2.2".freeze
+    VERSION = "0.2.4".freeze
   end
 end

data/lib/pubid/iec/working_document.rb

@@ -0,0 +1,11 @@
+module Pubid::Iec
+  module WorkingDocument
+    class << self
+      include Pubid::Core::Identifier
+
+      def parse(*args)
+        Identifier::WorkingDocument.parse(*args)
+      end
+    end
+  end
+end

data/lib/pubid/iec/working_document_parser.rb

@@ -0,0 +1,24 @@
+require "pubid-core"
+
+module Pubid::Iec
+  class WorkingDocumentParser < Pubid::Core::Parser
+    rule(:stage) do
+      array_to_str(Identifier::WorkingDocument::STAGES).as(:stage)
+    end
+
+    rule(:technical_committee) do
+      ((str("CIS/") >> match("[A-Z]")) |
+      (match("[A-Za-z0-9-]").repeat(1))).as(:technical_committee)
+    end
+
+    rule(:number) do
+      (digits >> match("[A-Z]").maybe >> str("(F)").maybe).as(:number)
+    end
+
+    rule(:identifier) do
+      technical_committee >> str("/") >> number >> (str("/") >> stage).maybe
+    end
+
+    rule(:root) { identifier }
+  end
+end

data/lib/pubid/iec.rb

@@ -10,68 +10,56 @@ end
 require "pubid-core"
 require_relative "iec/errors"
 require_relative "iec/stage"
-# require_relative "iec/type"
 require_relative "iec/parser"
 require_relative "iec/trf_parser"
-require_relative "iec/amendment"
-require_relative "iec/corrigendum"
 require_relative "iec/renderer/pubid"
 require_relative "iec/renderer/trf_pubid"
 require_relative "iec/renderer/urn"
 require_relative "iec/renderer/trf_urn"
+require_relative "iec/renderer/working_document"
+require_relative "iec/renderer/working_document_urn"
 require_relative "iec/transformer"
 require_relative "iec/identifier/base"
+require_relative "iec/identifier/international_standard"
+require_relative "iec/identifier/technical_report"
+require_relative "iec/identifier/technical_specification"
+require_relative "iec/identifier/publicly_available_specification"
+require_relative "iec/identifier/guide"
+require_relative "iec/identifier/operational_document"
+require_relative "iec/identifier/component_specification"
+require_relative "iec/identifier/systems_reference_document"
+require_relative "iec/identifier/conformity_assessment"
+require_relative "iec/identifier/test_report_form"
+require_relative "iec/identifier/supplement"
+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/societal_technology_trend_report"
+require_relative "iec/identifier/interpretation_sheet"
+require_relative "iec/working_document_parser"
+require_relative "iec/identifier/working_document"
 require_relative "iec/trf_identifier"
 require_relative "iec/identifier"
+require_relative "iec/working_document"
 
 config = Pubid::Core::Configuration.new
 config.stages = YAML.load_file(File.join(File.dirname(__FILE__), "../../stages.yaml"))
 config.stage_class = Pubid::Iec::Stage
-config.type_names = { is: {
-                        long: "International Standard",
-                        short: "IS",
-                      },
-                      ts: {
-                        long: "Technical Specification",
-                        short: "TS",
-                      },
-                      tr: {
-                        long: "Technical Report",
-                        short: "TR",
-                      },
-                      pas: {
-                        long: "Publicly Available Specification",
-                        short: "PAS",
-                      },
-                      srd: {
-                        short: "SRD",
-                      },
-                      tec: {
-                        short: "TEC",
-                      },
-                      sttr: {
-                        short: "STTR",
-                      },
-                      wp: {
-                        short: "WP",
-                      },
-                      guide: {
-                        long: "Guide",
-                        short: "Guide",
-                      },
-                      od: {
-                        short: "OD",
-                      },
-                      cs: {
-                        short: "CS",
-                      },
-                      ca: {
-                        short: "CA",
-                      },
-                      trf: {
-                        long: "Test Report Form",
-                        short: "TRF",
-                      }
+config.default_type = Pubid::Iec::Identifier::InternationalStandard
+config.types = [Pubid::Iec::Identifier::InternationalStandard,
+                Pubid::Iec::Identifier::TechnicalReport,
+                Pubid::Iec::Identifier::TechnicalSpecification,
+                Pubid::Iec::Identifier::PubliclyAvailableSpecification,
+                Pubid::Iec::Identifier::Guide,
+                Pubid::Iec::Identifier::OperationalDocument,
+                Pubid::Iec::Identifier::ComponentSpecification,
+                Pubid::Iec::Identifier::SystemsReferenceDocument,
+                Pubid::Iec::Identifier::ConformityAssessment,
+                Pubid::Iec::Identifier::TestReportForm,
+                Pubid::Iec::Identifier::WritePaper,
+                Pubid::Iec::Identifier::TechnologyReport,
+                Pubid::Iec::Identifier::SocietalTechnologyTrendReport,
+                Pubid::Iec::Identifier::InterpretationSheet]
 
-                    }.freeze
 Pubid::Iec::Identifier.set_config(config)

data/stages.yaml

@@ -1,52 +1,23 @@
 abbreviations:
   ACD: "20.99"
   ACDV: "30.99"
-  ADTR: "40.99"
-  ADTS: "40.99"
-  AFDIS: "40.99"
   APUB: "50.99"
   BPUB: "60.00"
   CAN: "30.98"
-  CCDV: "40.20"
   CD: "30.20"
-  CDISH: "50.20"
   CDM: "30.60"
-  CDPAS: "50.20"
-  CDTR: "50.20"
-  CDTS: "50.20"
-  CDVM: "40.91"
-  CFDIS: "50.20"
-  DECDISH: "50.00"
-  DECFDIS: "50.00"
   DECPUB: "60.00"
   DEL: "10.98"
   DELPUB: "99.60"
-  DTRM: "50.92"
-  DTSM: "50.92"
   MERGED: "30.97"
-  NCDV: "40.91"
-  NDTR: "50.92"
-  NDTS: "50.92"
-  NFDIS: "50.92"
   PCC: "30.60"
   PNW: "10.20"
   PPUB: "60.60"
-  PRVC: "40.60"
-  PRVD: "50.60"
-  PRVDISH: "50.60"
-  PRVDPAS: "50.60"
-  PRVDTR: "50.60"
-  PRVDTS: "50.60"
   PRVN: "10.60"
   PWI: "00.00"
-  RDISH: "50.00"
-  RFDIS: "50.00"
   RPUB: "60.00"
   SPLIT: "30.96"
   TCDV: "40.00"
-  TDISH: "50.00"
-  TDTR: "50.00"
-  TDTS: "50.00"
   TPUB: "60.00"
   WPUB: "95.99"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iec
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.6
 description: Library to generate, parse and manipulate IEC PubID.
 email:
 - open.source@ribose.com
@@ -79,22 +79,46 @@ files:
 - README.adoc
 - lib/pubid-iec.rb
 - lib/pubid/iec.rb
-- lib/pubid/iec/amendment.rb
-- lib/pubid/iec/corrigendum.rb
 - lib/pubid/iec/errors.rb
 - lib/pubid/iec/identifier.rb
+- lib/pubid/iec/identifier/amendment.rb
 - lib/pubid/iec/identifier/base.rb
+- lib/pubid/iec/identifier/component_specification.rb
+- lib/pubid/iec/identifier/conformity_assessment.rb
+- lib/pubid/iec/identifier/corrigendum.rb
+- lib/pubid/iec/identifier/guide.rb
+- lib/pubid/iec/identifier/international_standard.rb
+- lib/pubid/iec/identifier/interpretation_sheet.rb
+- lib/pubid/iec/identifier/operational_document.rb
+- lib/pubid/iec/identifier/publicly_available_specification.rb
+- lib/pubid/iec/identifier/societal_technology_trend_report.rb
+- lib/pubid/iec/identifier/supplement.rb
+- 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_report.rb
+- lib/pubid/iec/identifier/test_report_form.rb
+- lib/pubid/iec/identifier/white_paper.rb
+- lib/pubid/iec/identifier/working_document.rb
 - lib/pubid/iec/parser.rb
+- lib/pubid/iec/renderer/amendment.rb
+- lib/pubid/iec/renderer/corrigendum.rb
 - lib/pubid/iec/renderer/pubid.rb
 - lib/pubid/iec/renderer/trf_pubid.rb
 - lib/pubid/iec/renderer/trf_urn.rb
 - lib/pubid/iec/renderer/urn.rb
+- lib/pubid/iec/renderer/urn_amendment.rb
+- lib/pubid/iec/renderer/urn_corrigendum.rb
+- lib/pubid/iec/renderer/urn_supplement.rb
+- lib/pubid/iec/renderer/working_document.rb
+- lib/pubid/iec/renderer/working_document_urn.rb
 - lib/pubid/iec/stage.rb
 - lib/pubid/iec/transformer.rb
 - lib/pubid/iec/trf_identifier.rb
 - lib/pubid/iec/trf_parser.rb
-- lib/pubid/iec/type.rb
 - lib/pubid/iec/version.rb
+- lib/pubid/iec/working_document.rb
+- lib/pubid/iec/working_document_parser.rb
 - stages.yaml
 - update_codes.yaml
 homepage: https://github.com/metanorma/pubid-iec
@@ -116,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Library to generate, parse and manipulate IEC PubID.

data/lib/pubid/iec/amendment.rb

@@ -1,11 +0,0 @@
-module Pubid::Iec
-  class Amendment < Pubid::Core::Supplement
-    def render_pubid
-      "AMD#{render_pubid_number}"
-    end
-
-    def render_urn
-      ":amd#{render_urn_number}"
-    end
-  end
-end

data/lib/pubid/iec/corrigendum.rb

@@ -1,11 +0,0 @@
-module Pubid::Iec
-  class Corrigendum < Pubid::Core::Supplement
-    def render_pubid
-      "COR#{render_pubid_number}"
-    end
-
-    def render_urn
-      ":cor#{render_urn_number}"
-    end
-  end
-end

data/lib/pubid/iec/type.rb

@@ -1,25 +0,0 @@
-module Pubid::Iec
-  class Type < Pubid::Core::Type
-
-    # # Create new type
-    # # @param type [Symbol]
-    # def initialize(type = :is)
-    #   type = type.to_s.downcase.to_sym unless type.is_a?(Symbol)
-    #
-    #   raise Errors::WrongTypeError, "#{type} type is not available" unless TYPE_NAMES.key?(type)
-    #
-    #   @type = type
-    # end
-
-    # def self.parse(type_string)
-    #   TYPE_NAMES.each do |type, values|
-    #     return new(type) if values[:short].upcase == type_string.to_s.upcase
-    #   end
-    #   raise Errors::ParseTypeError, "Cannot parse '#{type_string}' type"
-    # end
-
-    def to_s(format = :short)
-      TYPE_NAMES[type][format]
-    end
-  end
-end