pubid-iec 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092ecdd26535d1bf9d3b7c8aa11d9117ab2e0836d6a8659169f36979cdafcd54'
-  data.tar.gz: 228f27369cfdb0130cfcacfebb8befa3c902becb3f5f701e27f5f0b893669a09
+  metadata.gz: ff5ab2749359998a8854c4dd8ffef000a461f286395b5ccc97e38330289a9e25
+  data.tar.gz: 05b2a25efdfb97ee0b62f88e50bcce131e5915a65d8f8a5e96a49066a1712d27
 SHA512:
-  metadata.gz: b7f2b20b4e841616c650403f940521c7d13ad42065479331987f7af91b19d4f80502f168ba1c4f537ff4174aa5ff5178d0f07170547765eee694015edd4c2853
-  data.tar.gz: cdbd7d923574793ade27a1523c4ff4c59dd14af8a8b50b04b9dc9f16086e537fb2314a27e24de89f23afc750eab3446cb4055abba77995845a0d838ff7bab1cf
+  metadata.gz: b77a15ec2d63febaf43f64ec246ce1f1caf53221a62b7d37b804c2255449be09e9765bfccca29b5a16d788faede50e9eb8894296f1d55e5bd4d89bbc6e36e79d
+  data.tar.gz: a78b98628dae0e756076c4f142deadea479dd206b0d61081a723f943e8687d4ec649fa7ecac6a77429770d9f273cadea4794815908cbceea042774e324c8acb0

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

@@ -0,0 +1,76 @@
+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
+
+    # @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)
+      # @stage = stage.to_s if stage
+      # @stage = Stage.parse(stage) if stage
+
+      if stage
+        if stage.is_a?(Stage)
+          @stage = stage
+        else
+          @stage = Identifier.parse_stage(stage)
+        end
+      end
+
+      @vap = vap.to_s if vap
+      @database = database if database
+      @fragment = fragment if fragment
+      @version = version if version
+      @decision_sheet = decision_sheet if decision_sheet
+      @conjuction_part = conjuction_part 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
+      @type = Identifier.build_type(type) if type
+
+      super(**args.merge(publisher: publisher))
+    end
+
+    def urn
+      Renderer::Urn.new(get_params).render
+    end
+
+    class << self
+      def get_amendment_class
+        Amendment
+      end
+
+      def get_corrigendum_class
+        Corrigendum
+      end
+
+      def get_parser_class
+        Parser
+      end
+
+      def get_renderer_class
+        Renderer::Pubid
+      end
+
+      def get_transformer_class
+        Transformer
+      end
+
+      def get_update_codes
+        UPDATE_CODES
+      end
+    end
+
+    def database
+      @database || false
+    end
+  end
+end

data/lib/pubid/iec/identifier.rb

@@ -1,67 +1,11 @@
 module Pubid::Iec
-  class Identifier < Pubid::Core::Identifier
-
-    attr_accessor :vap, :database, :fragment, :version, :decision_sheet,
-                  :conjuction_part, :part_version, :trf_publisher,
-                  :trf_series, :trf_version, :test_type
-
-    # @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)
-      # @stage = stage.to_s if stage
-      @stage = Stage.parse(stage) if stage
-      @vap = vap.to_s if vap
-      @database = database if database
-      @fragment = fragment if fragment
-      @version = version if version
-      @decision_sheet = decision_sheet if decision_sheet
-      @conjuction_part = conjuction_part 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
-      @type = Type.parse(type) if type
-
-      super(**args.merge(publisher: publisher))
-    end
-
-    def urn
-      Renderer::Urn.new(get_params).render
-    end
-
+  module Identifier
     class << self
-      def get_amendment_class
-        Amendment
-      end
-
-      def get_corrigendum_class
-        Corrigendum
-      end
-
-      def get_parser_class
-        Parser
-      end
-
-      def get_renderer_class
-        Renderer::Pubid
-      end
+      include Pubid::Core::Identifier
 
-      def get_transformer_class
-        Transformer
+      def parse(*args)
+        Base.parse(*args)
       end
-
-      def get_update_codes
-        UPDATE_CODES
-      end
-    end
-
-    def database
-      @database || false
     end
   end
 end

data/lib/pubid/iec/stage.rb

@@ -1,84 +1,15 @@
 module Pubid::Iec
-  class Stage
-    STAGES = { 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"
-    }.freeze
-
-    attr_accessor :stage
-
-    def initialize(stage)
-      raise Errors::StageInvalidError, "#{stage} is not valid stage" unless STAGES.key?(stage.to_sym)
-
-      @stage = stage
-    end
+  class Stage < Pubid::Core::Stage
 
     def to_s(format = :short)
-      return "" if nil?
+      return "" if empty_abbr?
 
       case format
       when :short
-        @stage
+        abbr
       else
-        STAGES[@stage.to_sym]
+        @harmonized_code.to_s
       end
     end
-
-    def nil?
-      @stage.nil?
-    end
-
-    def self.parse(stage)
-      raise Errors::StageInvalidError unless stage.is_a?(Symbol) || stage.is_a?(String) || stage.is_a?(Parslet::Slice)
-
-      Stage.new(stage.to_s)
-    end
   end
 end

data/lib/pubid/iec/trf_identifier.rb

@@ -1,5 +1,5 @@
 module Pubid::Iec
-  class TrfIdentifier < Identifier
+  class TrfIdentifier < Base
 
     attr_accessor :version, :decision_sheet,
                   :conjuction_part, :part_version, :trf_publisher,

data/lib/pubid/iec/type.rb

@@ -1,72 +1,22 @@
 module Pubid::Iec
-  class Type
-    attr_accessor :type
+  class Type < Pubid::Core::Type
 
-    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",
-      }
+    # # 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
 
-    }.freeze
-
-    # 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 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]

data/lib/pubid/iec/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iec
-    VERSION = "0.1.1".freeze
+    VERSION = "0.2.1".freeze
   end
 end

data/lib/pubid/iec.rb

@@ -7,9 +7,10 @@ module Pubid
   end
 end
 
+require "pubid-core"
 require_relative "iec/errors"
 require_relative "iec/stage"
-require_relative "iec/type"
+# require_relative "iec/type"
 require_relative "iec/parser"
 require_relative "iec/trf_parser"
 require_relative "iec/amendment"
@@ -19,5 +20,58 @@ require_relative "iec/renderer/trf_pubid"
 require_relative "iec/renderer/urn"
 require_relative "iec/renderer/trf_urn"
 require_relative "iec/transformer"
-require_relative "iec/identifier"
+require_relative "iec/identifier/base"
 require_relative "iec/trf_identifier"
+require_relative "iec/identifier"
+
+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",
+                      }
+
+                    }.freeze
+Pubid::Iec::Identifier.set_config(config)

data/stages.yaml

@@ -0,0 +1,99 @@
+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"
+
+codes_description:
+  "00.00": Proposal for new project received
+  "00.20": Proposal for new project under review
+  "00.60": Close of review
+  "00.98": Proposal for new project abandoned
+  "00.99": Approval to ballot proposal for new project
+  "10.00": Proposal for new project registered
+  "10.20": New project ballot initiated
+  "10.60": Close of voting
+  "10.92": Proposal returned to submitter for further definition
+  "10.98": New project rejected
+  "10.99": New project approved
+  "20.00": New project registered in TC/SC work programme
+  "20.20": Working draft (WD) study initiated
+  "20.60": Close of comment period
+  "20.98": Project deleted
+  "20.99": WD approved for registration as CD
+  "30.00": Committee draft (CD) registered
+  "30.20": CD study/ballot initiated
+  "30.60": Close of voting/ comment period
+  "30.92": CD referred back to Working Group
+  "30.98": Project deleted
+  "30.99": CD approved for registration as DIS
+  "40.00": DIS registered
+  "40.20": "DIS ballot initiated: 12 weeks"
+  "40.60": Close of voting
+  "40.93": "Full report circulated: decision for new DIS ballot"
+  "40.98": Project deleted
+  "40.92": "Full report circulated: DIS referred back to TC or SC"
+  "40.99": "Full report circulated: DIS approved for registration as FDIS"
+  "50.00": Final text received or FDIS registered for formal approval
+  "50.20": "Proof sent to secretariat or FDIS ballot initiated: 8 weeks"
+  "50.60": Close of voting. Proof returned by secretariat
+  "50.92": FDIS or proof referred back to TC or SC
+  "50.98": Project deleted
+  "50.99": FDIS or proof approved for publication
+  "60.00": International Standard under publication
+  "60.60": International Standard published
+  "90.20": International Standard under systematic review
+  "90.60": Close of review
+  "90.92": International Standard to be revised
+  "90.93": International Standard confirmed
+  "90.99": Withdrawal of International Standard proposed by TC or SC
+  "95.20": Withdrawal ballot initiated
+  "95.60": Close of voting
+  "95.92": Decision not to withdraw International Standard
+  "95.99": Withdrawal of International Standard

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
 description: Library to generate, parse and manipulate IEC PubID.
 email:
 - open.source@ribose.com
@@ -83,6 +83,7 @@ files:
 - lib/pubid/iec/corrigendum.rb
 - lib/pubid/iec/errors.rb
 - lib/pubid/iec/identifier.rb
+- lib/pubid/iec/identifier/base.rb
 - lib/pubid/iec/parser.rb
 - lib/pubid/iec/renderer/pubid.rb
 - lib/pubid/iec/renderer/trf_pubid.rb
@@ -94,6 +95,7 @@ files:
 - lib/pubid/iec/trf_parser.rb
 - lib/pubid/iec/type.rb
 - lib/pubid/iec/version.rb
+- stages.yaml
 - update_codes.yaml
 homepage: https://github.com/metanorma/pubid-iec
 licenses: