pubid-core 1.12.2 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2be43aad6f69c9b201bf69b722d6e305aef555bf32926004d8652d25dc3988
-  data.tar.gz: 7f101b011e471f1c386ecfdf5fab54e830c76884e52d314bd94809d3d2a38748
+  metadata.gz: 2905a611f0bd23030009f14b8f3c9cbe7e24efbf3fdb9c2536fb895526a60706
+  data.tar.gz: 12380f2b1a7a2875909ac7c82e78eea20901fbe6c602819dc3054d85d31e754e
 SHA512:
-  metadata.gz: 4c0263f2f4bab74aa39177da1187bf7138997ff7545ec2ade31edc0e29e50c066fe290dde176bbad9acb694b5e0dcf172e61fba4bf6dd7c15f9dd98af14e914f
-  data.tar.gz: d91a015f964644d7ca16d67d1dc50fa80d29300ffb45abdda64a49601db216b63139fb6c08087b21b81b744fef28cc0e71fb85e422f29afae098f4aab4d6d795
+  metadata.gz: f5d25ff122a185577e2066ac58146f3b0e00059a41137100aafc6c57e412b5706dcf3b0fc1c4d86e53b413edc3933d2e0e50051b91a3d4ec7864e73116cd9316
+  data.tar.gz: 909377bfbd364f597ac87b7bb2e95111c453942e51d533ddb147d040298d59035d7c4fd227e5bc402d1b214e6384358ae1a1760104a96d7d9a0844bba30d24ec

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

@@ -45,7 +45,7 @@ module Pubid::Core
         end
 
         @publisher = publisher.to_s
-        @number = number
+        @number = number&.to_s
         @copublisher = copublisher if copublisher
         @part = part.to_s if part
         @year = year.to_i if year
@@ -61,7 +61,7 @@ module Pubid::Core
       end
 
       # @return [Hash] Identifier's parameters
-      def to_h(deep: true)
+      def to_h(deep: true, add_type: true)
         result = instance_variables.map do |var|
           value = instance_variable_get(var)
 
@@ -76,8 +76,8 @@ module Pubid::Core
           ]
         end.to_h
 
-        if respond_to?(:type)
-          result[:type] = self.type[:short]
+        if add_type && respond_to?(:type) && type[:short]
+          result[:type] = type[:short]
         end
 
         result
@@ -92,8 +92,22 @@ module Pubid::Core
         self.class.get_renderer_class.new(to_h(deep: false)).render
       end
 
-      def exclude(*attrs)
-        self.class.new(**to_h.reject { |k| attrs.include?(k) })
+      def exclude(*args)
+        nested_exclusions, top_level_exclusions = args.partition { |arg| arg.is_a?(Hash) }
+
+        nested_exclusions = nested_exclusions.reduce({}, :merge)
+
+        excluded_hash = to_h(add_type: false)
+          .reject { |k, v| top_level_exclusions.include?(k) }
+          .each_with_object({}) do |(k, v), memo|
+            memo[k] = if v.is_a?(Hash) && nested_exclusions.key?(k)
+                        v.reject { |key, _| nested_exclusions[k].include?(key) }
+                      else
+                        v
+                      end
+          end
+
+        self.class.new(**excluded_hash)
       end
 
       def typed_stage_abbrev

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.12.2".freeze
+    VERSION = "1.12.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake