pubid-core 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 151e935e74a5977ef8728449d2e4f8a06175e38669a4394cfb561e330cacd051
-  data.tar.gz: 5b70b9ca2ab35c264426478f6d747b70a9c67f4872f921006e77a5b20b039450
+  metadata.gz: 1e9bf3dd3d9bc2b650200a864109ae197ab92914d1badcbf211d414b9b72d535
+  data.tar.gz: 65ceef880cc4e59dfa4cd059cd2b57090cfee8400cf26717f6bd480d3a29b7db
 SHA512:
-  metadata.gz: 910b4449b492a78156b73a25f18fed85df8915b079e4ce09f3d7d5780aeb33e536a5347e289fb9ea69f8b4d7be5db719612deaf8e409e4199768524d0242c80a
-  data.tar.gz: 663243db6546332315f0688879a57b3155e39c5f4c72941bb3a32201f262ca9254ae0045df8fba8bf0ecd705ded64d2ec1c277f78b0523a702632e0be0114c7e
+  metadata.gz: 57670502ba1de60b88d0befb0933f990c37b3dd23544a5bd4889d2da0aea6086ea1d87032e9c547c2c5a9430037c3325d77149ebe36edf3a66c349ec3d734274
+  data.tar.gz: 1c9917b90d532faf17a601fea62ea18fe204098052b349b189067287877f29ba66dd2e244389b4b906d8772d33eced7aa2f204f61082a81aede616168e11b038

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

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

@@ -16,13 +16,13 @@ module Pubid::Core
       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])
+            self.class.get_amendment_class.new(number: amendment[:number], year: amendment[:year])
           end
         else
           context[:amendments] =
             [self.class.get_amendment_class.new(
-              version: context[:amendments][:version],
-              number: context[:amendments][:number])]
+              number: context[:amendments][:number],
+              year: context[:amendments][:year])]
 
         end
         context
@@ -31,13 +31,13 @@ module Pubid::Core
       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])
+            self.class.get_corrigendum_class.new(number: corrigendum[:number], year: corrigendum[:year])
           end
         else
           context[:corrigendums] =
             [self.class.get_corrigendum_class.new(
-              version: context[:corrigendums][:version],
-              number: context[:corrigendums][:number])]
+              number: context[:corrigendums][:number],
+              year: context[:corrigendums][:year])]
         end
         context
       end

data/lib/pubid/core/version.rb

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

metadata

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