pubid-core 1.8.5 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d899ad0149355f47d28e9cbb6d840b3678fe5f69147ffa7e659b557ad182e9e
-  data.tar.gz: 88493b5808fb4c51441b46b208ba8c32c5d13dedff1035b7ed19c80511869663
+  metadata.gz: 65c153405bb8ae343ef26b9943f013864d2db8fd2abfd27e14d2db1f83de4d0a
+  data.tar.gz: 1ebdf5cef55a9c09111f18245a9d6767ee8107d7039398e8aaa9ceb8f5e0e9d5
 SHA512:
-  metadata.gz: 7bfcbf3c67033e5c6b858459b9f2e74cc2e4d172377a10dbbf92d4498a568f1d8967c0b2044211e4e8fd42c8875d77c83acaac35fdb1a3e27df9beb853fdaa6d
-  data.tar.gz: 77253a629edfce98fbb5ae3505a80f7b6d4e2a51148ffb6cc9a9c9c0bbeff758aab615d27801069563f99d5a5f6c2c53cf3fa0f7ac3128c634796f27160f894d
+  metadata.gz: ff849c54be9d3e4b49a54c48fd58413b66fe0f2aae40f7735c62820fe064e08fdb77b9e197b21a3471dd14570b4875223dce065ae3e5333b614beb520c171bae
+  data.tar.gz: d649815ce64e1654b64681d1a183c6309759403738fff8d270ca01effe4a87d4a9e0e7e82f8468bbc7fe15c9717d2e0024e6268a16571eaba71620f0398ead6b

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

@@ -3,7 +3,7 @@ module Pubid::Core
     class Base
       attr_accessor :number, :publisher, :copublisher, :part,
                     :type, :year, :edition, :language, :amendments,
-                    :corrigendums, :stage
+                    :corrigendums, :stage, :typed_stage
 
       TYPED_STAGES = {}.freeze
 
@@ -53,7 +53,8 @@ module Pubid::Core
         @year = year.to_i if year
         @edition = edition.to_i if edition
         @language = language.to_s if language
-        @stage = stage if stage
+
+        @typed_stage, @stage = resolve_stage(stage) if stage
       end
 
       # @return [String] Rendered URN identifier
@@ -62,7 +63,16 @@ module Pubid::Core
       end
 
       def get_params
-        instance_variables.map { |var| [var.to_s.gsub("@", "").to_sym, instance_variable_get(var)] }.to_h
+        instance_variables.map do |var|
+          # XXX: temporary hack to prepare typed_stage for rendering
+          # probably need to convert typed_stage to class, now we store
+          # typed_stage as key to typed stage (Symbol)
+          if var.to_s == "@typed_stage" && @typed_stage
+            [:typed_stage, self.class::TYPED_STAGES[@typed_stage][:abbr]]
+          else
+            [var.to_s.gsub("@", "").to_sym, instance_variable_get(var)]
+          end
+        end.to_h
       end
 
       def ==(other)
@@ -74,6 +84,50 @@ module Pubid::Core
         self.class.get_renderer_class.new(get_params).render
       end
 
+      def typed_stage_abbrev
+        if self.class::TYPED_STAGES.key?(typed_stage)
+          return self.class::TYPED_STAGES[typed_stage][:abbr]
+        end
+
+        stage ? "#{stage.abbr} #{self.class.type[:key].to_s.upcase}" : self.class.type[:key].to_s.upcase
+      end
+
+      # Return typed stage name, eg. "Final Draft Technical Report" for "FDTR"
+      def typed_stage_name
+        if self.class::TYPED_STAGES.key?(typed_stage)
+          return self.class::TYPED_STAGES[typed_stage][:name]
+        end
+
+        stage ? "#{stage.name} #{self.class.type[:title]}" : self.class.type[:title]
+      end
+
+      # @param stage [Stage, Symbol, String] stage or typed stage, e.g. "PWI", "NP", "50.00", Stage.new(abbr: :WD), "DTR"
+      # @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 [self.class.resolve_typed_stage(stage.harmonized_code), stage]
+          # @typed_stage = resolve_typed_stage(@stage.harmonized_code) unless @stage.abbr
+        end
+
+        if self.class.has_typed_stage?(stage)
+          return self.class.find_typed_stage(stage)
+        end
+
+        parsed_stage = self.class.get_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) || parsed_stage.empty_abbr?(with_prf: true)
+          return [self.class.resolve_typed_stage(parsed_stage.harmonized_code), parsed_stage]
+        end
+
+        [nil, parsed_stage]
+
+        # from IEC
+        # @typed_stage = self.class::TYPED_STAGES[@typed_stage][:abbr] if @typed_stage
+      end
+
       class << self
         # Parses given identifier
         # @param code_or_params [String, Hash] code or hash from parser
@@ -94,7 +148,7 @@ module Pubid::Core
           params.inject({}) do |r, i|
             result = r
             i.each do |k, v|
-              result = result.merge(k => r.key?(k) ? [v, r[k]].flatten : v)
+              result = result.merge(k => r.key?(k) ? [r[k], v].flatten : v)
             end
             result
           end

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.8.5".freeze
+    VERSION = "1.8.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,7 +99,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 PubID.