pubid-core 1.8.6 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97aa518f45d87f5bff0afa474a3db2057a3071e655915c83db8aaf38c911fe88
-  data.tar.gz: f4ea4f74981a8624ed81a622a57634269d0efde5068f1d4385baf131670074ed
+  metadata.gz: c8fa90c212d201a964cf2744e9c8bcba06af62d10dfe195caa6af284189b82cd
+  data.tar.gz: 9d526bcae7afe9781b462aabd17fe3bbaafb1349e3b40c5f5fc6364468dce76d
 SHA512:
-  metadata.gz: a1ee5291d1973c694f48ba299040c9ac5b22f592d3904fc729444e7df4b1dca204af1ee29cd06dd047fa0bb3efad35c232091e85ca0da000fce69d3d5c8ad36e
-  data.tar.gz: 5525d84fb8ea848218849cbdaefba98e8bc9533be22edd41a5fef1f46c8b3ae1ffa3a060ad5b901327a4a00bcd87c486da239faea7cddee909748eb74d63aef7
+  metadata.gz: bd9862d64043e894cd11ab5a92f5e792377dc28d1986918799e809c06070504e16f1be6fcecac05da3f366e52e2266476ff4733664ba3427a03f87b5a4ba8c4d
+  data.tar.gz: b0962ace109243f800c6c17ceacde35cc50f345c952dd75b9af42045d03dbf961a72cb4d42b3585f4c1a98ecc7a035795614c45c7e83ca48bd18160c11f573d6

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,25 +53,80 @@ 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
       def urn
-        Renderer::Urn.new(get_params).render
+        Renderer::Urn.new(to_h).render
       end
 
-      def get_params
-        instance_variables.map { |var| [var.to_s.gsub("@", "").to_sym, instance_variable_get(var)] }.to_h
+      # @return [Hash] Identifier's parameters
+      def 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)
-        get_params == other.get_params
+        to_h == other.to_h
       end
 
       # Render identifier using default renderer
       def to_s
-        self.class.get_renderer_class.new(get_params).render
+        self.class.get_renderer_class.new(to_h).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

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

@@ -44,9 +44,9 @@ module Pubid::Core::Renderer
     def render_supplement(supplement_params, **args)
       base = if supplement_params[:base].type == :amd
                # render inner amendment (cor -> amd -> base)
-               render_supplement(supplement_params[:base].get_params, **args)
+               render_supplement(supplement_params[:base].to_h, **args)
              else
-               self.class.new(supplement_params[:base].get_params).render_base_identifier(
+               self.class.new(supplement_params[:base].to_h).render_base_identifier(
                  # always render year for identifiers with supplement
                  **args.merge({ with_date: true }),
                )

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.8.6".freeze
+    VERSION = "1.9.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-10-09 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.