pubid-iso 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b09b867ebc673153defa32f6987a1f6337895789069e76388d8791cb9c8f2545
-  data.tar.gz: caa42c15191fca2b22905524f8ffa8765e137b4fb8fa96b693eec8626e3d46f2
+  metadata.gz: eb49fb09056ae2a808d1fef9f8c1bd107285095fdf3496fad1a2bc9b929d3555
+  data.tar.gz: dfe7c869035871233c2d318bc2eb3b9baa98208cc29ac7e59ac538402850a91a
 SHA512:
-  metadata.gz: 251a4b42ce806cc3a55dc31923b07ea8c2202bacd563041d1fd4dd6bc8a4de0572fd8ff219b9f39bc58fba4e6edc713a33a86041b961d849567ac7cdbf7128bb
-  data.tar.gz: 45493ee2cc7deaade4a97ba422d87c9c76b0d9db9745ce1573a903be5669591897d9606a3cdd5dff03638d71aeb4c2ea94ed6ed59e92e6200741fceb28e35550
+  metadata.gz: af2a0127f4cebfa368c26b6e55b651c70dce70d25af68d9d6af8e0e1f56487ec7a73dbadc0abb423d6bb4da26d013754ae7b65e38d897ab8cd79a4c0250fa3f4
+  data.tar.gz: 0afe6817acab2cf6f32164669038e1ab96cbd34763921191f43d8e96606bac0355f000c825b01799ff70aeca8bb1f8539d4a7a5f5b057c4259dec23bc25f07b2

data/lib/pubid/iso/parser.rb

@@ -71,20 +71,18 @@ module Pubid::Iso
       ((str("/") >> stage.as(:stage)).maybe >>
       (str("/") | space).maybe >>
         (str("Amd") | str("AMD") | str("AM")) >>
-        str(".").maybe >>
-        space.maybe >>
+        (space | str(".")).repeat(1).maybe >>
         digits.as(:version) >>
-        (str(":") >> digits.as(:number)).maybe).as(:amendments)
+        ((str(":") | str("-")) >> digits.as(:number)).maybe).as(:amendments)
     end
 
     rule(:corrigendum) do
       ((str("/") >> stage.as(:stage)).maybe >>
       (str("/") | space).maybe >>
         (str("Cor") | str("COR")) >>
-        str(".").maybe >>
-        space.maybe >>
+        (space | str(".")).repeat(1).maybe >>
         digits.as(:version) >>
-        (str(":") >> digits.as(:number)).maybe).as(:corrigendums)
+        ((str(":") | str("-")) >> digits.as(:number)).maybe).as(:corrigendums)
     end
 
     rule(:language) do
@@ -133,7 +131,7 @@ module Pubid::Iso
         # for identifiers like ISO 5537/IDF 26
         (str("|") >> (str("IDF") >> space >> digits).as(:joint_document)).maybe >>
         part.maybe >> iteration.maybe >>
-        (space? >> str(":") >> year).maybe >>
+        (space? >> (str(":") | str("-")) >> year).maybe >>
         # stage before amendment
         (
           # stage before corrigendum

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.1.9".freeze
+    VERSION = "0.1.10".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Ribose Inc.