pubid-iso 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5970af41e67f70e22e928d11ac1eabd71d42ca1855f5d3d6254dea8f98844aab
-  data.tar.gz: fface01211f338c08b5ab853be7a48573400e4ca8c290bca9f52e9f6d9361c89
+  metadata.gz: e97d39eae4c4c0962361910084b0ba9ed9613a01761214d2f4a0750e0c71fe39
+  data.tar.gz: 0b41fc99349db1c5c5672e690305561e01dac3503d7c226b049bada4fcf857b7
 SHA512:
-  metadata.gz: 7b4431cc30c76062a19fc1531ad3e2b57ec2b31b0fc9604672ad9a6a3a5908fc756c256f5552d94b0165b36f5032df084250b68fe7c884435339e6628ec365ba
-  data.tar.gz: b0d2a810b02ceff7044fe35a88a81e3ef2c5feb0a39a8592655136d4b9f0bd6d3ab01e3fb325a743843e057cc816930bfeb09f6cb0d0b45c586b6a8f127bee9d
+  metadata.gz: 7859c8ac83fc94369f1fab9fc6d4c7529cc49d35a5a09c2fa34dda3b95b2d21d1cd5917e277e6c63bbf96ec174496494ca328f8fff0d995e59ae160423d0ba01
+  data.tar.gz: 7a104ec181c49142996ef2133648a9145a2c0a0d01a05348abddf362285327d915e59d0b283913113b03bd343ee44f5f5de5265ba111ad21ed2da25bffee2ef8

data/lib/pubid/iso/identifier.rb

@@ -40,10 +40,10 @@ module Pubid::Iso
         raise Errors::SupplementWithoutYearError, "Cannot apply supplement to document without edition year"
       end
       if stage
-        if stage.abbr == "IS" && iteration
+        @stage = (stage.is_a?(Symbol) || stage.is_a?(String)) ? Stage.new(abbr: stage) : stage
+        if @stage.abbr == "IS" && iteration
           raise Errors::IsStageIterationError, "IS stage document cannot have iteration"
         end
-        @stage = stage
       end
       @iteration = iteration.to_i if iteration
       @supplement = supplement if supplement

data/lib/pubid/iso/parser.rb

@@ -63,7 +63,7 @@ module Pubid::Iso
         (space | str(".")).repeat(1).maybe >>
         digits.as(:number) >>
         (str(".") >> digits.as(:iteration)).maybe >>
-        ((str(":") | str("-")) >> digits.as(:year)).maybe).as(:amendments)
+        ((str(":") | str("-")) >> digits.as(:year)).maybe).repeat(1).as(:amendments)
     end
 
     rule(:corrigendum) do
@@ -73,7 +73,7 @@ module Pubid::Iso
         (space | str(".")).repeat(1).maybe >>
         digits.as(:number) >>
         (str(".") >> digits.as(:iteration)).maybe >>
-        ((str(":") | str("-")) >> digits.as(:year)).maybe).as(:corrigendums)
+        ((str(":") | str("-")) >> digits.as(:year)).maybe).repeat(1).as(:corrigendums)
     end
 
     rule(:language) do

data/lib/pubid/iso/supplement.rb

@@ -9,7 +9,7 @@ module Pubid::Iso
     # @see Pubid::Core::Supplement for other options
     def initialize(stage: nil, publisher: nil, edition: nil, iteration: nil, **args)
       super(**args)
-      @stage = stage
+      @stage = (stage.is_a?(Symbol) || stage.is_a?(String)) ? Stage.new(abbr: stage) : stage
       @publisher = publisher.to_s
       @edition = edition&.to_i
       @iteration = iteration&.to_i

data/lib/pubid/iso/transformer.rb

@@ -10,23 +10,25 @@ module Pubid::Iso
 
     rule(amendments: subtree(:amendments)) do |context|
       context[:amendments] =
-        [Amendment.new(
-          number: context[:amendments][:number],
-          year: context[:amendments][:year],
-          stage: context[:amendments][:stage] && convert_stage(context[:amendments][:stage]),
-          iteration: context[:amendments][:iteration])]
-
+        context[:amendments].map do |amendment|
+          Amendment.new(
+            number: amendment[:number],
+            year: amendment[:year],
+            stage: amendment[:stage] && convert_stage(amendment[:stage]),
+            iteration: amendment[:iteration])
+        end
       context
     end
 
     rule(corrigendums: subtree(:corrigendums)) do |context|
       context[:corrigendums] =
-        [Corrigendum.new(
-          number: context[:corrigendums][:number],
-          year: context[:corrigendums][:year],
-          stage: context[:corrigendums][:stage] && convert_stage(context[:corrigendums][:stage]),
-          iteration: context[:corrigendums][:iteration])]
-
+        context[:corrigendums].map do |corrigendum|
+          Corrigendum.new(
+            number: corrigendum[:number],
+            year: corrigendum[:year],
+            stage: corrigendum[:stage] && convert_stage(corrigendum[:stage]),
+            iteration: corrigendum[:iteration])
+        end
       context
     end
 

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.1.11".freeze
+    VERSION = "0.1.12".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com