pubid-core 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f9bff0cb4e318de8dab3eb5c8155cb5fe3c560cc24d0616cb38f71a9a83d1c
-  data.tar.gz: 306cc2e013df2f7d236ef62b45fdaccc0038d8e220827898e817a8b2d47dc19e
+  metadata.gz: 151e935e74a5977ef8728449d2e4f8a06175e38669a4394cfb561e330cacd051
+  data.tar.gz: 5b70b9ca2ab35c264426478f6d747b70a9c67f4872f921006e77a5b20b039450
 SHA512:
-  metadata.gz: a8845cff2602c572ccf3a8bc081aa8f326dcaa0384c06353dd1ca842ae94405acc821b12b3fdb9c7eb14c70da61c9abcee2297d01a94a56125e8298411cf9f72
-  data.tar.gz: 78a9452536f524523c470d09973490bb6d2f7c634c531e05dc4150a92ef21bffedb3b0a3bb65c1a32afae17c4c3eee63dd5c0fc055549d80bf7cf9bbd491edeb
+  metadata.gz: 910b4449b492a78156b73a25f18fed85df8915b079e4ce09f3d7d5780aeb33e536a5347e289fb9ea69f8b4d7be5db719612deaf8e409e4199768524d0242c80a
+  data.tar.gz: 663243db6546332315f0688879a57b3155e39c5f4c72941bb3a32201f262ca9254ae0045df8fba8bf0ecd705ded64d2ec1c277f78b0523a702632e0be0114c7e

data/lib/pubid/core/identifier.rb

@@ -21,25 +21,9 @@ module Pubid::Core
     def initialize(publisher:, number:, copublisher: nil, part: nil, type: nil,
                    year: nil, edition: nil, language: nil, amendments: nil,
                    corrigendums: nil)
-      if amendments
-        @amendments = if amendments.is_a?(Array)
-                        amendments.map do |amendment|
-                          self.class.get_amendment_class.new(**amendment)
-                        end
-                      else
-                        [self.class.get_amendment_class.new(**amendments)]
-                      end
-      end
-      if corrigendums
-        @corrigendums = if corrigendums.is_a?(Array)
-                          corrigendums.map do |corrigendum|
-                            self.class.get_corrigendum_class.new(**corrigendum)
-                          end
-                        else
-                          [self.class.get_corrigendum_class.new(**corrigendums)]
-                        end
-      end
 
+      @amendments = amendments
+      @corrigendums = corrigendums
       @publisher = publisher.to_s
       @number = number
       @copublisher = copublisher if copublisher
@@ -72,6 +56,13 @@ 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)
+      rescue Parslet::ParseFailed => failure
+        raise Errors::ParseError, "#{failure.message}\ncause: #{failure.parse_failure_cause.ascii_tree}"
+      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)
@@ -80,7 +71,7 @@ module Pubid::Core
               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]] : v)
+                  result = result.merge(k => r.key?(k) ? [v, r[k]].flatten : v)
                 end
                 result
               end
@@ -92,9 +83,6 @@ module Pubid::Core
           end.to_h)
         end
         # merge values repeating keys into array (for copublishers)
-
-      rescue Parslet::ParseFailed => failure
-        raise Errors::ParseError, "#{failure.message}\ncause: #{failure.parse_failure_cause.ascii_tree}"
       end
 
       def get_amendment_class
@@ -113,10 +101,15 @@ module Pubid::Core
         Transformer
       end
 
+      # @return [Hash, nil] replacement patterns
+      def get_update_codes
+        nil
+      end
+
       def update_old_code(code)
-        return code unless defined?(UPDATE_CODES)
+        return code unless get_update_codes
 
-        UPDATE_CODES.each do |from, to|
+        get_update_codes.each do |from, to|
           code = code.gsub(from.match?(/^\/.*\/$/) ? Regexp.new(from[1..-2]) : /^#{Regexp.escape(from)}$/, to)
         end
         code

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

@@ -24,7 +24,9 @@ module Pubid::Core::Renderer
       end.compact.to_h
     end
 
-    # render from hash keys
+    # 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 })

data/lib/pubid/core/transformer.rb

@@ -1,4 +1,46 @@
 module Pubid::Core
   class Transformer < Parslet::Transform
+    class << self
+      def get_amendment_class
+        Amendment
+      end
+
+      def get_corrigendum_class
+        Corrigendum
+      end
+    end
+
+    def initialize
+      super
+
+      rule(amendments: subtree(:amendments)) do |context|
+        if context[:amendments].is_a?(Array)
+          context[:amendments] = context[:amendments].map do |amendment|
+            self.class.get_amendment_class.new(version: amendment[:version], number: amendment[:number])
+          end
+        else
+          context[:amendments] =
+            [self.class.get_amendment_class.new(
+              version: context[:amendments][:version],
+              number: context[:amendments][:number])]
+
+        end
+        context
+      end
+
+      rule(corrigendums: subtree(:corrigendums)) do |context|
+        if context[:corrigendums].is_a?(Array)
+          context[:corrigendums] = context[:corrigendums].map do |corrigendum|
+            self.class.get_corrigendum_class.new(version: corrigendum[:version], number: corrigendum[:number])
+          end
+        else
+          context[:corrigendums] =
+            [self.class.get_corrigendum_class.new(
+              version: context[:corrigendums][:version],
+              number: context[:corrigendums][:number])]
+        end
+        context
+      end
+    end
   end
 end

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.0.0".freeze
+    VERSION = "1.1.1".freeze
   end
 end

metadata

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