pubid-iec 0.2.2 → 0.2.5

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,19 +30,25 @@ 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
 
+    rule(:interpretation_sheet) do
+      (str("/") >> str("ISH") >>
+        digits.as(:number) >>
+        (str(":") >> digits.as(:year)).maybe).as(:interpretation_sheet)
+    end
+
     rule(:fragment) do
       (str("/") >> str("FRAG") >> match('[\dA-Z]').repeat(1).as(:fragment)).maybe
     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,19 +58,20 @@ 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
-      (type >> space).maybe >>
-        number.as(:number) >>
+      ((str("/") | space) >> type).maybe >>
+        space >> number.as(:number) >>
         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
+        interpretation_sheet.maybe >> fragment.maybe
     end
 
     rule(:vap) do
@@ -79,12 +83,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("/")) >>
+      (originator.maybe >> (space.maybe >> stage.as(:stage)).maybe >>
         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/interpretation_sheet.rb

@@ -0,0 +1,17 @@
+module Pubid::Iec::Renderer
+  class InterpretationSheet < Pubid
+    def render_identifier(params)
+      type_prefix = params[:typed_stage].nil? || params[:typed_stage].empty? ? "ISH" : ""
+
+      "%{base}/%{typed_stage}#{type_prefix}%{number}%{year}" % params
+    end
+
+    def render_typed_stage(typed_stage, _opts, _params)
+      typed_stage
+    end
+
+    def render_year(year, _opts, _params)
+      ":#{year}"
+    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.5".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,57 @@ 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/renderer/interpretation_sheet"
 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.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-08-06 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,47 @@ 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/interpretation_sheet.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 +141,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