pubid-core 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8752ce15b475a7cf21261ea7d1cac28e181052b6a888487a93f89c679bc3a317
-  data.tar.gz: 85f903a2d68b26497c832a41255a571ba76b55f56c754f277ca1b6a27ccde9ca
+  metadata.gz: 448ee8d0c3ee2f141390d279b470709a69d479dd8203aab75202ec53f4b5d219
+  data.tar.gz: '0284a013694e73ddba1e96d3c560dbd27f15a69840f50cc33f19035adab3a373'
 SHA512:
-  metadata.gz: 87c242c84385cbdceb1e711ea16ebf96b844d591e900e75923fe1812ffff1a7ab5383ca8442e22a562a2d89b0cd910364a145c0044ce71ab8380c956dab7eba2
-  data.tar.gz: aa97a199ccaec9ddda10615c339308d64240d28f2bebf32075f50b17d34776b1f0d25d87f278498d6f4d79cb07291a5a1250c11d81446184c163d5a7637998b7
+  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)

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/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.12.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.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-24 00:00:00.000000000 Z
+date: 2023-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake