pubid-core 1.8.2 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b29194f7ce41cd26b68b0a47d068c0b5745e86250a922e471c9c615048b52ee3
-  data.tar.gz: 9fa6099b292239068050ac35090d54b70b5500797d343f51a8c33778ad2259a6
+  metadata.gz: b39e42a4a1196d8f3510d93cec936eeef930c49119acf0c898c927fd2c14c12a
+  data.tar.gz: 22dbb10b9190cf3d3fb7c4e5ac0a4975f984483434c54572b94db3af8beb17e7
 SHA512:
-  metadata.gz: ff08b70ef0786f07120fd78d263b32a1c8b1147ca995445d95051d946c7ce80ca53390b669253e706c4cf8581fdaa52155d03c331559ea13d396bd83a5310731
-  data.tar.gz: f45e2fa4fb73cd3f1af6e66c0f13f13a055852a85d893eb23330a3f8c5a7dd45baa41cf3dbc4053c3faa45253e8146214c78ee73a293a91116163cba8eabf520
+  metadata.gz: 914b8dc3a40f13b95e607bc653e117a6eaecc532fc744dfdb3ef79ff6a01051aaa389db3e1181d107d8365b38704e8d5f3521eed355b14c4bddb5d4b40df5172
+  data.tar.gz: 9f5c42f3d069cf23d58bb5361b04296a76be68b2766995d5965c8238c56279fe5f51dd8d72f8aec1abddabc515a69ae753fdafd5b6d5bd665540f7d2aaab9730

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

@@ -74,47 +74,6 @@ module Pubid::Core
         self.class.get_renderer_class.new(get_params).render
       end
 
-      # @param typed_stage [String, Symbol] eg. "DTR" or :dtr
-      # @return [[Symbol, Stage]] typed stage and stage with assigned harmonized codes
-      def find_typed_stage(typed_stage)
-        if typed_stage.is_a?(Symbol)
-          return [typed_stage,
-                  Identifier.build_stage(
-                    harmonized_code: Identifier.build_harmonized_stage_code(self.class::TYPED_STAGES[typed_stage][:harmonized_stages])),
-          ]
-        end
-
-        typed_stage = self.class::TYPED_STAGES.find do |_, v|
-          if v[:abbr].is_a?(Hash)
-            v[:abbr].value?(typed_stage)
-          else
-            if v.key?(:legacy_abbr)
-              v[:legacy_abbr].include?(typed_stage) || v[:abbr] == typed_stage
-            else
-              v[:abbr] == typed_stage
-            end
-            #
-            # v[:abbr] == typed_stage
-          end
-        end
-
-        [typed_stage.first,
-         Identifier.build_stage(
-           harmonized_code: Identifier.build_harmonized_stage_code(typed_stage[1][:harmonized_stages]))]
-      end
-
-      # Resolve typed stage using stage harmonized stage code
-      # @param harmonized_code [HarmonizedStageCode]
-      # @return [Symbol, nil] typed stage or nil
-      def resolve_typed_stage(harmonized_code)
-        self.class::TYPED_STAGES.each do |k, v|
-          if (v[:harmonized_stages] & harmonized_code.stages) == harmonized_code.stages
-            return k
-          end
-        end
-        nil
-      end
-
       class << self
         # Parses given identifier
         # @param code_or_params [String, Hash] code or hash from parser
@@ -185,6 +144,10 @@ module Pubid::Core
           nil
         end
 
+        def get_identifier
+          Identifier
+        end
+
         def update_old_code(code)
           return code unless get_update_codes
 
@@ -216,6 +179,43 @@ module Pubid::Core
         def type_match?(parameters)
           parameters[:type] ? has_type?(parameters[:type]) : has_typed_stage?(parameters[:stage])
         end
+
+        # @param typed_stage [String, Symbol] eg. "DTR" or :dtr
+        # @return [[Symbol, Stage]] typed stage and stage with assigned harmonized codes
+        def find_typed_stage(typed_stage)
+          if typed_stage.is_a?(Symbol)
+            return [typed_stage,
+                    get_identifier.build_stage(
+                      harmonized_code: get_identifier.build_harmonized_stage_code(self::TYPED_STAGES[typed_stage][:harmonized_stages])),
+            ]
+          end
+
+          typed_stage = self::TYPED_STAGES.find do |_, v|
+            if v[:abbr].is_a?(Hash)
+              v[:abbr].value?(typed_stage)
+            elsif v.key?(:legacy_abbr)
+              v[:legacy_abbr].include?(typed_stage) || v[:abbr] == typed_stage
+            else
+              v[:abbr] == typed_stage
+            end
+          end
+
+          [typed_stage.first,
+           get_identifier.build_stage(
+             harmonized_code: get_identifier.build_harmonized_stage_code(typed_stage[1][:harmonized_stages]))]
+        end
+
+        # Resolve typed stage using stage harmonized stage code
+        # @param harmonized_code [HarmonizedStageCode]
+        # @return [Symbol, nil] typed stage or nil
+        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
+            end
+          end
+          nil
+        end
       end
     end
   end

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.8.2".freeze
+    VERSION = "1.8.4".freeze
   end
 end

data/lib/pubid-core.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-module Pubid::Core
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
+module Pubid
+  module Core
+    def self.configuration
+      @configuration ||= Configuration.new
+    end
 
-  def self.configure
-    yield(configuration)
+    def self.configure
+      yield(configuration)
+    end
   end
 end
 

metadata

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