pubid-core 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fc24ad8424ccb4843c213b8642d558e4139671d9f7a302246f917510a20ad71
-  data.tar.gz: c8284af8dcb32ae4e13853ea8195e376769bbc745984f6639ee86780405f57d4
+  metadata.gz: f2ec998c6f62ddf6387a254425f4989052de90cd44f60577c384f1371314e874
+  data.tar.gz: f9aa149ce454d7d8c674fe12c6c7dc9246ff06c6197c63686abaacd6babe15a6
 SHA512:
-  metadata.gz: 6dafa25189561f26dd3e3908294d4649af1c891175eb6b546ca8e95c90aafb4dfbde8b1fa4271ca8bb540ce3824947a7d7e08c10945853530615204692990504
-  data.tar.gz: d7b4857f481c5aac96491c83b70367ebc50d3dd3e9d2ee4956d2c5b825f210657419e3778d23f3c8fccb975acd444c051c6aebb93eec392143bd35747218f831
+  metadata.gz: 502cca40f231aa67f96041c61cb82868a67a1db3b521d8a2e1f7431d3013dfe48d77e698139407c1640f23931d76766c92eeee36033f6f0de1424bd57f669ccc
+  data.tar.gz: 63ba052753612c1c239a5fc6bd71a3952f35dd6dd82715899fa02855479bb55039c71e6b2b7d5d13ab2d02abea638089ab96bc4eacf4c64a6bdfa9c5a27797ca

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

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.1".freeze
+    VERSION = "1.1.0".freeze
   end
 end

metadata

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