pubid-iso 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d4eeb603e945da7dc88276eeec404e80e210dbb7256d0a1c6dbf0f5afe128e
-  data.tar.gz: d3be687ed15dad803823d873a9fb0189a96c97c45870c69a7a4887f165c60075
+  metadata.gz: 84d4109f05e973ee81d7d7ab5a949b93de233594e81be474156add05c0eb611f
+  data.tar.gz: fe8f286a88801ebc7c02f97c8de81ad66f94c9cadf1db457418b3c6e55d1078b
 SHA512:
-  metadata.gz: f99b0267a9322ceb93893b931a7ead3ac6e603cf95b8a75a75a192a8db6de3bab0c75fff137e7294b566a2d10960e8861dcddf9663d7b6a7473d0544f0e15683
-  data.tar.gz: 2067033963eeac42aac98bf5178f0cf19fefe21f5eb334e53e1e3fe41c6665b64b6e580c1f126d4f8936c6008e47c4d12b49cc793e5f305a8732525ade50604b
+  metadata.gz: e46b0939a516226943c49e097da4a9c9d1dabc175661a2c776a6c2a54d150d22bb79275cb983bbd72470fc480fa85c3c352b4e49d25db8a3fe7d66c2d2350e42
+  data.tar.gz: 89c434768a1d6e05558717a19ef1c5ebb4a01b738523acee23a4c457155f9b97447fc7ce7fe8b7b305a1d9ffa6cb766fa7b2f707f3b5c58716436be7690c34ae

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

@@ -4,7 +4,7 @@ require_relative "../renderer/urn-tc"
 
 module Pubid::Iso
   module Identifier
-    class Base < Pubid::Core::Identifier
+    class Base < Pubid::Core::Identifier::Base
       extend Forwardable
 
       attr_accessor :stage,
@@ -64,13 +64,13 @@ module Pubid::Iso
         end
 
         if stage
-          if stage.is_a?(Stage)
+          if stage.is_a?(Pubid::Core::Stage)
             @stage = stage
             @typed_stage = resolve_typed_stage(@stage.harmonized_code) unless @stage.abbr
           elsif self.class.has_typed_stage?(stage)
             @typed_stage, @stage = find_typed_stage(stage)
           else
-            @stage = Stage.parse(stage)
+            @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)
@@ -102,8 +102,8 @@ module Pubid::Iso
       def find_typed_stage(typed_stage)
         if typed_stage.is_a?(Symbol)
           return [typed_stage,
-           Stage.new(
-            harmonized_code: HarmonizedStageCode.new(self.class::TYPED_STAGES[typed_stage][:harmonized_stages])),
+                  Identifier.build_stage(
+                    harmonized_code: Identifier.build_harmonized_stage_code(self.class::TYPED_STAGES[typed_stage][:harmonized_stages])),
           ]
         end
 
@@ -122,7 +122,8 @@ module Pubid::Iso
         end
 
         [typed_stage.first,
-         Stage.new(harmonized_code: HarmonizedStageCode.new(typed_stage[1][:harmonized_stages]))]
+         Identifier.build_stage(
+           harmonized_code: Identifier.build_harmonized_stage_code(typed_stage[1][:harmonized_stages]))]
       end
 
       # Resolve typed stage using stage harmonized stage code
@@ -188,18 +189,6 @@ module Pubid::Iso
           Identifier.create(**identifier_params)
         end
 
-        def descendants
-          ObjectSpace.each_object(Class).select { |klass| klass < self }
-        end
-
-        # @param type [Symbol, String] eg. :tr, :ts, "TS"
-        # @return [Boolean] true if provided type matches with identifier's class type
-        def has_type?(type)
-          return type == self.type[:key] if type.is_a?(Symbol)
-
-          self.type.key?(:values) ? self.type[:values].include?(type) : type.to_s.downcase.to_sym == self.type[:key]
-        end
-
         # @param typed_stage [String, Symbol] typed stage, eg. "DTR" or :dtr
         # @return [Boolean] true when identifier has associated typed stage
         def has_typed_stage?(typed_stage)
@@ -241,6 +230,10 @@ module Pubid::Iso
         def get_update_codes
           UPDATE_CODES
         end
+
+        def type_match?(parameters)
+          parameters[:type] ? has_type?(parameters[:type]) : has_typed_stage?(parameters[:stage])
+        end
       end
 
       # Render URN identifier
@@ -337,7 +330,7 @@ module Pubid::Iso
         if self.class::TYPED_STAGES.key?(typed_stage)
           self.class::TYPED_STAGES[typed_stage][:abbr]
         else
-          "#{stage.abbr} #{type[:key].to_s.upcase}"
+          stage ? "#{stage.abbr} #{type[:key].to_s.upcase}" : type[:key].to_s.upcase
         end
       end
 
@@ -346,7 +339,7 @@ module Pubid::Iso
         if self.class::TYPED_STAGES.key?(typed_stage)
           self.class::TYPED_STAGES[typed_stage][:name]
         else
-          "#{stage.name} #{type[:title]}"
+          stage ? "#{stage.name} #{type[:title]}" : type[:title]
         end
       end
 

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

@@ -33,7 +33,7 @@ module Pubid::Iso
         if self.class::TYPED_STAGES.key?(typed_stage)
           super
         else
-          stage.abbr
+          stage&.abbr
         end
       end
 

data/lib/pubid/iso/identifier.rb

@@ -1,46 +1,12 @@
 module Pubid::Iso
   module Identifier
     class << self
-      # Resolve identifier's class and create new identifier
-      # @see Pubid::Identifier::Base.initialize for available options
-      def create(**opts)
-        resolve_identifier(
-          opts[:type],
-          opts[:stage],
-          opts.reject { |k, _v| [:type, :stage].include?(k) })
-      end
-
-      # @param typed_stage_or_stage [String] typed stage or stage
-      # @return identifier's class
-      def resolve_identifier(type, typed_stage_or_stage, parameters = {})
-        return Identifier::InternationalStandard.new(**parameters) if type.nil? && typed_stage_or_stage.nil?
-
-        Base.descendants.each do |identifier_type|
-          if type
-            return identifier_type.new(stage: typed_stage_or_stage, **parameters) if identifier_type.has_type?(type)
-
-            next
-          elsif identifier_type.has_typed_stage?(typed_stage_or_stage)
-            return identifier_type.new(stage: typed_stage_or_stage, **parameters)
-          end
-        end
-
-        # When stage is not typed stage and type is not defined
-        if type.nil? && (typed_stage_or_stage.is_a?(Stage) || Stage.has_stage?(typed_stage_or_stage))
-          return Identifier::InternationalStandard.new(stage: typed_stage_or_stage, **parameters)
-        end
-
-        raise Errors::TypeStageParseError, "cannot parse typed stage or stage '#{typed_stage_or_stage}'" if type.nil?
-
-        raise Errors::ParseTypeError, "cannot parse type #{type}"
-      end
+      include Pubid::Core::Identifier
 
-      # @see Pubid::Identifier::Base.parse
       def parse(*args)
         Base.parse(*args)
       end
 
-      # Parse identifier from title
       def parse_from_title(title)
         title.split.reverse.inject(title) do |acc, part|
           return Base.parse(acc)

data/lib/pubid/iso/parser.rb

@@ -20,7 +20,7 @@ module Pubid::Iso
 
     DIR_SUPPLEMENTS = %w[Supplement SUP].freeze
 
-    TYPED_STAGES = Pubid::Iso::Identifier::Base.descendants.map do |type|
+    TYPED_STAGES = Identifier.config.types.map do |type|
       type::TYPED_STAGES.map do |_, v|
         v.key?(:legacy_abbr) ? (v[:legacy_abbr] + [v[:abbr]]) : v[:abbr]
       end
@@ -74,7 +74,7 @@ module Pubid::Iso
     end
 
     rule(:roman_numerals) do
-      array_to_str(%w[I V X L C D M]).repeat(1).as(:roman_numerals)
+      str("CD").absent? >> array_to_str(%w[I V X L C D M]).repeat(1).as(:roman_numerals)
     end
 
     rule(:year_digits) { (str("19") | str("20")) >> match('\d').repeat(2, 2) >> digits.absent? }

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.4.1".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/lib/pubid/iso.rb

@@ -9,13 +9,8 @@ module Pubid
   end
 end
 
-STAGES_CONFIG = YAML.load_file(File.join(File.dirname(__FILE__), "../../stages.yaml"))
-
 require "pubid-core"
 require_relative "iso/errors"
-require_relative "iso/stage"
-require_relative "iso/type"
-require_relative "iso/harmonized_stage_code"
 require_relative "iso/transformer"
 require_relative "iso/identifier"
 require_relative "iso/identifier/base"
@@ -33,4 +28,67 @@ require_relative "iso/identifier/guide"
 require_relative "iso/identifier/recommendation"
 require_relative "iso/identifier/technology_trends_assessments"
 require_relative "iso/identifier/international_workshop_agreement"
+
+config = Pubid::Core::Configuration.new
+config.stages = YAML.load_file(File.join(File.dirname(__FILE__), "../../stages.yaml"))
+config.default_type = Pubid::Iso::Identifier::InternationalStandard
+config.type_class = Pubid::Core::Type
+config.types = [Pubid::Iso::Identifier::InternationalStandard,
+                Pubid::Iso::Identifier::InternationalStandardizedProfile,
+                Pubid::Iso::Identifier::InternationalWorkshopAgreement,
+                Pubid::Iso::Identifier::Amendment,
+                Pubid::Iso::Identifier::Corrigendum,
+                Pubid::Iso::Identifier::PubliclyAvailableSpecification,
+                Pubid::Iso::Identifier::Recommendation,
+                Pubid::Iso::Identifier::Directives,
+                Pubid::Iso::Identifier::Supplement,
+                Pubid::Iso::Identifier::TechnicalCommittee,
+                Pubid::Iso::Identifier::TechnicalReport,
+                Pubid::Iso::Identifier::TechnicalSpecification,
+                Pubid::Iso::Identifier::TechnologyTrendsAssessments,
+                Pubid::Iso::Identifier::Guide]
+config.type_names = { tr: {
+                        long: "Technical Report",
+                        short: "TR",
+                      },
+                      ts: {
+                        long: "Technical Specification",
+                        short: "TS",
+                      },
+                      is: {
+                        long: "International Standard",
+                        short: "IS",
+                      },
+                      pas: {
+                        long: "Publicly Available Specification",
+                        short: "PAS",
+                      },
+                      isp: {
+                        long: "International Standardized Profiles",
+                        short: "ISP",
+                      },
+                      guide: {
+                        long: "Guide",
+                        short: "Guide",
+                      },
+                      dir: {
+                        long: "Directives",
+                        short: "DIR",
+                      },
+                      dpas: {
+                        long: "Publicly Available Specification Draft",
+                        short: "DPAS",
+                      },
+                      cor: {
+                        short: "Cor",
+                      },
+                      amd: {
+                        short: "Amd",
+                      },
+                      r: {
+                        long: "Recommendation",
+                        short: "R",
+                      } }.freeze
+Pubid::Iso::Identifier.set_config(config)
+
 require_relative "iso/parser"

data/update_codes.yaml

@@ -1 +1,2 @@
 ISO/R 657/IV: ISO/R 657-4:1969
+ISO/IEC/IEEE 8802-22.2:2015/Amd.2:2017(E): ISO/IEC/IEEE 8802-22:2015/Amd.2:2017(E)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.0
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com
@@ -122,7 +122,6 @@ files:
 - lib/pubid-iso.rb
 - lib/pubid/iso.rb
 - lib/pubid/iso/errors.rb
-- lib/pubid/iso/harmonized_stage_code.rb
 - lib/pubid/iso/identifier.rb
 - lib/pubid/iso/identifier/amendment.rb
 - lib/pubid/iso/identifier/base.rb
@@ -161,9 +160,7 @@ files:
 - lib/pubid/iso/renderer/urn-supplement.rb
 - lib/pubid/iso/renderer/urn-tc.rb
 - lib/pubid/iso/renderer/urn.rb
-- lib/pubid/iso/stage.rb
 - lib/pubid/iso/transformer.rb
-- lib/pubid/iso/type.rb
 - lib/pubid/iso/version.rb
 - stages.yaml
 - update_codes.yaml

data/lib/pubid/iso/harmonized_stage_code.rb

@@ -1,5 +0,0 @@
-module Pubid::Iso
-  class HarmonizedStageCode < Pubid::Core::HarmonizedStageCode
-
-  end
-end

data/lib/pubid/iso/stage.rb

@@ -1,5 +0,0 @@
-module Pubid::Iso
-  class Stage < Pubid::Core::Stage
-
-  end
-end

data/lib/pubid/iso/type.rb

@@ -1,85 +0,0 @@
-module Pubid::Iso
-  class Type
-    attr_accessor :type
-
-    TYPE_NAMES = {
-      tr: {
-        long: "Technical Report",
-        short: "TR",
-      },
-      ts: {
-        long: "Technical Specification",
-        short: "TS",
-      },
-      is: {
-        long: "International Standard",
-        short: "IS",
-      },
-      pas: {
-        long: "Publicly Available Specification",
-        short: "PAS",
-      },
-      isp: {
-        long: "International Standardized Profiles",
-        short: "ISP",
-      },
-      guide: {
-        long: "Guide",
-        short: "Guide",
-      },
-      dir: {
-        long: "Directives",
-        short: "DIR",
-      },
-      dpas: {
-        long: "Publicly Available Specification Draft",
-        short: "DPAS",
-      },
-      cor: {
-        short: "Cor",
-      },
-      amd: {
-        short: "Amd",
-      },
-      r: {
-        long: "Recommendation",
-        short: "R",
-      },
-    }.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] == type_string
-      end
-      raise Errors::ParseTypeError, "Cannot parse '#{type_string}' type"
-    end
-
-    def to_s(format = :short)
-      TYPE_NAMES[type][format]
-    end
-
-    def ==(other)
-      return type == other if other.is_a?(Symbol)
-
-      return false if other.nil?
-
-      type == other.type
-    end
-
-    def self.has_type?(type)
-      TYPE_NAMES.any? do |_, v|
-        v[:short] == type
-      end
-    end
-  end
-end