pubid-core 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e9bf3dd3d9bc2b650200a864109ae197ab92914d1badcbf211d414b9b72d535
-  data.tar.gz: 65ceef880cc4e59dfa4cd059cd2b57090cfee8400cf26717f6bd480d3a29b7db
+  metadata.gz: 2a3c1e99b3327c14f2364992238d1d6a4040809dca85a6640254e2669784a449
+  data.tar.gz: ca910a6333a2e5e9dc1c907577bee5c3e0c34bc6a891e07b310f4be39e9ecc59
 SHA512:
-  metadata.gz: 57670502ba1de60b88d0befb0933f990c37b3dd23544a5bd4889d2da0aea6086ea1d87032e9c547c2c5a9430037c3325d77149ebe36edf3a66c349ec3d734274
-  data.tar.gz: 1c9917b90d532faf17a601fea62ea18fe204098052b349b189067287877f29ba66dd2e244389b4b906d8772d33eced7aa2f204f61082a81aede616168e11b038
+  metadata.gz: b148eeaf72cd34a292d1da244e33a4c4f7eb1549cca374e9c7da7aadc6a09de262c992de578725ebb5ecaad4c1fa625365dbfda519119ccec82c39da224d71f7
+  data.tar.gz: 9fb7676fbd6e7ffbf1bce920a626d70a260c24e83d59569447595c4e28157e879969b6700423d9199564e915d7929ca5c93a507e2703d79c192f0cc21d6f91cf

data/lib/pubid/core/identifier.rb

@@ -74,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/renderer/base.rb

@@ -13,6 +13,22 @@ module Pubid::Core::Renderer
       @params = params
     end
 
+    # Prerender parameters and store in @prerendered_params
+    # @param opts [Hash] options for render method, eg. { with_language_code: :single, with_date: true }
+    # @return [Renderer::Base] self
+    def prerender(**opts)
+      @prerendered_params = prerender_params(@params, opts)
+      @prerendered_params.default = ""
+      self
+    end
+
+    def render_base_identifier(**args)
+      prerender(**args)
+
+      render_identifier(@prerendered_params)
+    end
+
+
     def prerender_params(params, opts)
       params.map do |key, value|
         next unless value
@@ -24,16 +40,44 @@ module Pubid::Core::Renderer
       end.compact.to_h
     end
 
+    # Renders amendment and corrigendum when applied through identifier type
+    def render_supplement(supplement_params, **args)
+      if supplement_params[:base].type == :amd
+        # render inner amendment (cor -> amd -> base)
+        render_supplement(supplement_params[:base].get_params, **args)
+      else
+        self.class.new(supplement_params[:base].get_params).render_base_identifier(
+          # always render year for identifiers with supplement
+          **args.merge({ with_date: true }),
+        )
+      end +
+        case supplement_params[:type].type
+        when :amd
+          render_amendments(
+            [Pubid::Iso::Amendment.new(**supplement_params.slice(:number, :year, :stage, :edition, :iteration))],
+            args,
+            nil,
+          )
+        when :cor
+          render_corrigendums(
+            [Pubid::Iso::Corrigendum.new(**supplement_params.slice(:number, :year, :stage, :edition, :iteration))],
+            args,
+            nil,
+          )
+          # copy parameters from Identifier only supported by Corrigendum
+        end +
+        (supplement_params[:base].language ? render_language(supplement_params[:base].language, args, nil) : "")
+    end
+
     # Render identifier
     # @param with_date [Boolean] include year in output
     # @param with_language_code [:iso,:single] render document language as 2-letter ISO 639-1 language code or single code
-    def render(with_date: true, with_language_code: :iso)
-      params = prerender_params(@params,
-                                { with_date: with_date, with_language_code: with_language_code })
-      # render empty string when the key is not exist
-      params.default = ""
-
-      render_identifier(params)
+    def render(with_date: true, with_language_code: :iso, **args)
+      if %i(amd cor).include? @params[:type]&.type
+        render_supplement(@params, **args.merge({ with_date: with_date, with_language_code: with_language_code}))
+      else
+        render_base_identifier(**args.merge({ with_date: with_date, with_language_code: with_language_code})) + @prerendered_params[:language].to_s
+      end
     end
 
     def render_base(params, prefix = "")

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.2.0".freeze
+    VERSION = "1.2.2".freeze
   end
 end

metadata

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