pubid-core 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452665bfc83c23fed5563fb65e94b05e003491474be0572c10628838bf9bb8d4
-  data.tar.gz: 2c5282618c3bd1e04f26760791371205383191ab752878ac74ed32ac61ff6a2d
+  metadata.gz: 7cc372a0160fd8c1a670be2957f3b3e0a98766dd89ed6f8782b1f52085bcbb8f
+  data.tar.gz: 9a0d58a218b982531fe206bd7505203428ec6f9d7dcbaa649f80267b09e44030
 SHA512:
-  metadata.gz: 57ec902835845daa759d264308e0456851e202a791d0f2dac62c6fb5253202741420f47c9c45f2a2a7398a691e3c17a61c6189ab01f177cbf2b46eb47be15d08
-  data.tar.gz: ae150bad555421587020450b38fba534f1b94429ad7506ff6b32c0a0a4717be367ead10d5b5266259dbd4f9dfdc7a407e87acba122d7bd4f5562e643685c8a88
+  metadata.gz: 04e0297f6ce7bea0cabc3e41c7718e1eee523f93e039fa42f4b08c7a34d4fcb7b3c979fbcdb2c0c7bd980b4523d2c6985198cf61f03bb1fad64765a51ad2ccd8
+  data.tar.gz: f0c98e3158ff918fe1f0df2e5ae3c2e7cff838e6cdf37cd078d1abdc1d147561b2453ffb6b5c749dbc7b019f1691f59d0b0b52356a61efcbb10533ce44319d64

data/lib/pubid/core/identifier.rb

@@ -14,16 +14,34 @@ module Pubid::Core
     # @param edition [Integer] document's edition, eg. "1"
     # @param language [String] document's translation language
     #   (available languages: "ru", "fr", "en", "ar")
-    # @param amendments [Array<Amendment>] document's amendments
-    # @param corrigendums [Array<Corrigendum>] document's corrigendums
+    # @param amendments [Array<Amendment>,Array<Hash>] document's amendments
+    # @param corrigendums [Array<Corrigendum>,Array<Hash>] document's corrigendums
     # @see Amendment
     # @see Corrigendum
     def initialize(publisher:, number:, copublisher: nil, part: nil, type: nil,
                    year: nil, edition: nil, language: nil, amendments: nil,
                    corrigendums: nil)
 
-      @amendments = amendments
-      @corrigendums = corrigendums
+      if amendments
+        @amendments = amendments.map do |amendment|
+          if amendment.is_a?(Hash)
+            self.class.get_transformer_class.new.apply(:amendments => [amendment])[:amendments].first
+          else
+            amendment
+          end
+        end
+      end
+
+      if corrigendums
+        @corrigendums = corrigendums.map do |corrigendum|
+          if corrigendum.is_a?(Hash)
+            self.class.get_transformer_class.new.apply(:corrigendums => [corrigendum])[:corrigendums].first
+          else
+            corrigendum
+          end
+        end
+      end
+
       @publisher = publisher.to_s
       @number = number
       @copublisher = copublisher if copublisher
@@ -56,33 +74,37 @@ module Pubid::Core
       def parse(code_or_params)
         params = code_or_params.is_a?(String) ?
                    get_parser_class.new.parse(update_old_code(code_or_params)) : code_or_params
-        transform(params)
+        transform(params.is_a?(Array) ? array_to_hash(params) : params)
       rescue Parslet::ParseFailed => failure
         raise Errors::ParseError, "#{failure.message}\ncause: #{failure.parse_failure_cause.ascii_tree}"
       end
 
+      # Converts array of hashes into single hash
+      # array like [{ publisher: "ISO" }, { number: 1 }] to hash { publisher: "ISO", number: 1 }
+      # @param params [Array<Hash>] input array of hashes, eg. [{ a: 1 }, { b: 2 }]
+      def array_to_hash(params)
+        params.inject({}) do |r, i|
+          result = r
+          i.each do |k, v|
+            result = result.merge(k => r.key?(k) ? [v, r[k]].flatten : v)
+          end
+          result
+        end
+      end
+
       # Transform parameters hash or array or hashes to identifier
       def transform(params)
-        # Parslet returns an array when match any copublisher
-        # otherwise it's hash
-        if params.is_a?(Array)
-          new(
-            **(
-              params.inject({}) do |r, i|
-                result = r
-                i.map {|k, v| get_transformer_class.new.apply(k => v).to_a.first }.each do |k, v|
-                  result = result.merge(k => r.key?(k) ? [v, r[k]].flatten : v)
-                end
-                result
-              end
-            )
-          )
-        else
-          new(**params.map do |k, v|
-            get_transformer_class.new.apply(k => v).to_a.first
-          end.to_h)
-        end
-        # merge values repeating keys into array (for copublishers)
+        # run transform through each element,
+        # like running transformer.apply(number: 1) and transformer.apply(year: 1999)
+        # instead of running transformer on whole hash, like running transformer.apply({ number: 1, year: 1999 })
+        # where rule for number or year only will be not applied
+        # transformation only applied to rules matching the whole hash
+
+        identifier_params = params.map do |k, v|
+                              get_transformer_class.new.apply(k => v).to_a.first
+                            end.to_h
+
+        new(**identifier_params)
       end
 
       def get_amendment_class

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.1.2".freeze
+    VERSION = "1.2.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake