pubid-core 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b73ed4ff507dfe5cb2c7b506eaa392ef6fbf3af9b2ff0d500151a430d0a8d2c
-  data.tar.gz: 46108a14c2cbb1446085668ab46a8b60837e596a8a893f2f2731a2b247c6d7c2
+  metadata.gz: 448ee8d0c3ee2f141390d279b470709a69d479dd8203aab75202ec53f4b5d219
+  data.tar.gz: '0284a013694e73ddba1e96d3c560dbd27f15a69840f50cc33f19035adab3a373'
 SHA512:
-  metadata.gz: 93fcaaf9757fc059fe26cfd9506c5d42806e56e6f1abd1a86d2464abdfcb64cba933e777813d988e06abe997099504a5e8f632fe08784c926fea105916301643
-  data.tar.gz: d84b1ac6d760d5de765e87e041ad82a5dd7c76c762f69cb5a56074376981d7a0a13929162a462fd421144c1042042a51eae1c9cbb51433b7a4c9f377713d8ea5
+  metadata.gz: d7c8e1f74a0fb9fedb9388971edf1f2920917b1ea2d9d1fedab7cd7168412a9c085434f3da4ddf796d1921909db6589af4e1b4430a795227df65cf0dd2dc136b
+  data.tar.gz: 8c53cb46cf3fed1bcfbf1138063fbc728ad9c80b03b903a46acd211ce79fce6a086530280fbe6a63ef0d08671d468d6e9eaba489e9e22bfc0709f10da54fd776

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

@@ -1,8 +1,7 @@
 module Pubid::Core
   module Identifier
     class Base
-      attr_accessor :number, :publisher, :copublisher, :part,
-                    :type, :year, :edition, :language, :amendments,
+      attr_accessor :number, :publisher, :copublisher, :part, :year, :edition, :language, :amendments,
                     :corrigendums, :stage
 
       TYPED_STAGES = {}.freeze
@@ -21,7 +20,7 @@ module Pubid::Core
       # @param corrigendums [Array<Corrigendum>,Array<Hash>] document's corrigendums
       # @see Amendment
       # @see Corrigendum
-      def initialize(publisher:, number:, copublisher: nil, part: nil, type: nil,
+      def initialize(publisher:, number:, copublisher: nil, part: nil,
                      year: nil, edition: nil, language: nil, amendments: nil,
                      corrigendums: nil, stage: nil)
 
@@ -49,7 +48,6 @@ module Pubid::Core
         @number = number
         @copublisher = copublisher if copublisher
         @part = part.to_s if part
-        @type = type.to_s if type
         @year = year.to_i if year
         @edition = edition.to_i if edition
         @language = language.to_s if language
@@ -64,7 +62,7 @@ module Pubid::Core
 
       # @return [Hash] Identifier's parameters
       def to_h(deep: true)
-        instance_variables.map do |var|
+        result = instance_variables.map do |var|
           value = instance_variable_get(var)
 
           [var.to_s.gsub("@", "").to_sym,
@@ -77,6 +75,12 @@ module Pubid::Core
            end
           ]
         end.to_h
+
+        if respond_to?(:type)
+          result[:type] = self.type[:key]
+        end
+
+        result
       end
 
       def ==(other)
@@ -102,8 +106,8 @@ module Pubid::Core
 
       # Return typed stage name, eg. "Final Draft Technical Report" for "FDTR"
       def typed_stage_name
-        if self.class::TYPED_STAGES.key?(stage&.typed_stage)
-          return self.class::TYPED_STAGES[stage.typed_stage][:name]
+        if stage.is_a?(TypedStage) && self.class::TYPED_STAGES.key?(stage.abbr)
+          return self.class::TYPED_STAGES[stage.abbr][:name]
         end
 
         stage ? "#{stage.name} #{self.class.type[:title]}" : self.class.type[:title]
@@ -113,15 +117,9 @@ module Pubid::Core
       # @return [[nil, Stage], [Symbol, Stage]] typed stage and stage values
       def resolve_stage(stage)
         if stage.is_a?(Stage)
-          # return [nil, stage] if stage.abbr
-          # return stage if stage.abbr
+          return self.class.resolve_typed_stage(stage.harmonized_code) || stage unless stage.abbr
 
-          # return [self.class.resolve_typed_stage(stage.harmonized_code), stage]
-          unless stage.abbr
-            stage.typed_stage = self.class.resolve_typed_stage(stage.harmonized_code)
-          end
           return stage
-          # @typed_stage = resolve_typed_stage(@stage.harmonized_code) unless @stage.abbr
         end
 
         if self.class.has_typed_stage?(stage)
@@ -132,7 +130,7 @@ module Pubid::Core
         # resolve typed stage when harmonized code provided as stage
         # or stage abbreviation was not resolved
         if /\A[\d.]+\z/.match?(stage) || parsed_stage.empty_abbr?(with_prf: true)
-          parsed_stage.typed_stage = self.class.resolve_typed_stage(parsed_stage.harmonized_code)
+          return self.class.resolve_typed_stage(parsed_stage.harmonized_code) || parsed_stage
         end
 
         parsed_stage
@@ -280,7 +278,7 @@ module Pubid::Core
         def resolve_typed_stage(harmonized_code)
           self::TYPED_STAGES.each do |k, v|
             if (v[:harmonized_stages] & harmonized_code.stages) == harmonized_code.stages
-              return k
+              return get_identifier.build_typed_stage(abbr: k, harmonized_code: harmonized_code)
             end
           end
           nil

data/lib/pubid/core/identifier.rb

@@ -12,10 +12,10 @@ module Pubid::Core
     # @param typed_stage_or_stage [String] typed stage or stage
     # @return identifier's class
     def resolve_identifier(parameters = {})
-      return @config.default_type.new(**parameters) if parameters[:type].nil? && parameters[:stage].nil?
+      return @config.default_type.new(**parameters.dup.tap { |h| h.delete(:type) }) if parameters[:type].nil? && parameters[:stage].nil?
 
       @config.types.each do |identifier_type|
-        return identifier_type.new(**parameters) if identifier_type.type_match?(parameters)
+        return identifier_type.new(**parameters.dup.tap { |h| h.delete(:type) }) if identifier_type.type_match?(parameters)
       end
 
       # When stage is not typed stage and type is not defined

data/lib/pubid/core/stage.rb

@@ -1,14 +1,13 @@
 module Pubid::Core
   class Stage
-    attr_accessor :config, :abbr, :harmonized_code, :typed_stage
+    attr_accessor :config, :abbr, :harmonized_code
 
     # @param abbr [String, Symbol] abbreviation eg. :PWI, :WD
     # @param harmonized_code [String, Float, HarmonizedStageCode]
     # @param config [Configuration]
-    def initialize(config:, abbr: nil, harmonized_code: nil, typed_stage: nil)
+    def initialize(config:, abbr: nil, harmonized_code: nil)
       @config = config
       @abbr = abbr&.to_s
-      @typed_stage = typed_stage
 
       if harmonized_code
         @harmonized_code = if harmonized_code.is_a?(HarmonizedStageCode)

data/lib/pubid/core/typed_stage.rb

@@ -5,7 +5,7 @@ module Pubid::Core
     # @param config [Configuration]
     # @param abbr [Symbol] typed stage symbol, e.g. :dtr
     # @param harmonized_code [String, Float, HarmonizedStageCode]
-    def initialize(config:, abbr:, harmonized_code: nil)
+    def initialize(config:, abbr: nil, harmonized_code: nil)
       @config = config
       @abbr = abbr
 
@@ -15,14 +15,26 @@ module Pubid::Core
                            else
                              HarmonizedStageCode.new(harmonized_code, config: config)
                            end
-        # @abbr ||= lookup_abbr(@harmonized_code.stages)
+        @abbr ||= lookup_abbr(@harmonized_code.stages)
       end
 
-      raise Errors::TypedStageInvalidError, "#{abbr} is not valid typed stage" unless config.typed_stages.key?(abbr)
+      if abbr && !config.typed_stages.key?(abbr)
+        raise Errors::TypedStageInvalidError, "#{abbr} is not valid typed stage"
+      end
 
       @harmonized_code ||= HarmonizedStageCode.new(abbr, config: config)
     end
 
+    def lookup_abbr(lookup_code)
+      lookup_code = lookup_code.first if lookup_code.is_a?(Array) && lookup_code.count == 1
+
+      config.typed_stages.each do |abbr, stage|
+        return abbr if stage[:harmonized_stages].include?(lookup_code)
+      end
+
+      nil
+    end
+
     # Compares one stage with another
     # should return false if
     def ==(other)

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.11.0".freeze
+    VERSION = "1.12.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2023-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake