pubid-core 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fc24ad8424ccb4843c213b8642d558e4139671d9f7a302246f917510a20ad71
-  data.tar.gz: c8284af8dcb32ae4e13853ea8195e376769bbc745984f6639ee86780405f57d4
+  metadata.gz: 452665bfc83c23fed5563fb65e94b05e003491474be0572c10628838bf9bb8d4
+  data.tar.gz: 2c5282618c3bd1e04f26760791371205383191ab752878ac74ed32ac61ff6a2d
 SHA512:
-  metadata.gz: 6dafa25189561f26dd3e3908294d4649af1c891175eb6b546ca8e95c90aafb4dfbde8b1fa4271ca8bb540ce3824947a7d7e08c10945853530615204692990504
-  data.tar.gz: d7b4857f481c5aac96491c83b70367ebc50d3dd3e9d2ee4956d2c5b825f210657419e3778d23f3c8fccb975acd444c051c6aebb93eec392143bd35747218f831
+  metadata.gz: 57ec902835845daa759d264308e0456851e202a791d0f2dac62c6fb5253202741420f47c9c45f2a2a7398a691e3c17a61c6189ab01f177cbf2b46eb47be15d08
+  data.tar.gz: ae150bad555421587020450b38fba534f1b94429ad7506ff6b32c0a0a4717be367ead10d5b5266259dbd4f9dfdc7a407e87acba122d7bd4f5562e643685c8a88

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/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/supplement.rb

@@ -1,36 +1,36 @@
 module Pubid::Core
   class Supplement
     include Comparable
-    attr_accessor :version, :number
+    attr_accessor :number, :year
 
-    # Creates new supplement with provided version and optional number
-    # @param version [Integer]
+    # Creates new supplement with provided update number and optional year
     # @param number [Integer]
-    def initialize(version:, number: nil)
-      @version, @number = version&.to_i, number&.to_i
+    # @param year [Integer]
+    def initialize(number:, year: nil)
+      @number, @year = number&.to_i, year&.to_i
     end
 
     def <=>(other)
-      return 0 if number.nil? && other.number
+      return 0 if year.nil? && other.year
 
-      return number <=> other.number if version == other.version
+      return year <=> other.year if number == other.number
 
-      (version <=> other.version) || number <=> other.number
+      (number <=> other.number) || year <=> other.year
     end
 
     def render_pubid_number
-        if @number
-          "#{@version}:#{@number}"
+        if @year
+          "#{@number}:#{@year}"
         else
-          "#{@version}"
+          "#{@number}"
         end
     end
 
     def render_urn_number
-        if @number
-          ":#{@number}:v#{@version}"
+        if @year
+          ":#{@year}:v#{@number}"
         else
-          ":#{@version}:v1"
+          ":#{@number}:v1"
         end
     end
   end

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(number: amendment[:number], year: amendment[:year])
+          end
+        else
+          context[:amendments] =
+            [self.class.get_amendment_class.new(
+              number: context[:amendments][:number],
+              year: context[:amendments][:year])]
+
+        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(number: corrigendum[:number], year: corrigendum[:year])
+          end
+        else
+          context[:corrigendums] =
+            [self.class.get_corrigendum_class.new(
+              number: context[:corrigendums][:number],
+              year: context[:corrigendums][:year])]
+        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.2".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.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake