pubid-iho 1.15.15 → 1.15.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506badb3e4667351b93e3fda4d100fb1a5dd5417a1ecea86089c59fd9e1b0094
-  data.tar.gz: e05b9e5659d947d92375ad55cc2afaec6948f2a2c6f1728f4c09b7c25dbf7088
+  metadata.gz: dba70173e8503455f343e9b8e5e3a968019f915a018ab3e0cc092fb790740570
+  data.tar.gz: c30012dd679b4c9c8ecfa4baffda8b81052f26285d8a170e78a9b726806713b6
 SHA512:
-  metadata.gz: 60f890917c141e8020e2bb26baa06bbd6122c5433d2bd1446c684bdefa26ac35089e70eac3582dd0271d5ae265efe60b7934d9826a9c17645013e99a39f73ee6
-  data.tar.gz: 0a0872043297042534cb6c3d97f5fc07f6dec23348c8b5046971e489d9f44425f8067ea9c0de0598adfb910f921d6880945626118c785922240398aaf64eef8e
+  metadata.gz: 8e390527143e07ce10e79e66b55baf2c771882516aac0b1ad69d4145ba6a2e4590245c2f439fca7fd13bd0b395bd84216d03164a490d6d38a28af5dfdabb6339
+  data.tar.gz: 26cb6f33f5f72274e43e9400638db171fa8e418e21181ca828216c9106cf7f2e05e69c937e6d29ee2f5bf0bf0cecdc445c5c172e848406b409b922f4346b5686

data/lib/pubid/iho/identifier/base.rb

@@ -1,17 +1,19 @@
 module Pubid::Iho
   module Identifier
     class Base < Pubid::Core::Identifier::Base
-      attr_accessor :version, :appendix
+      attr_accessor :version, :appendix, :annex, :supplement
 
       def self.type
         { key: :iho }
       end
 
-      def initialize(type:, publisher: "IHO", version: nil, part: nil, appendix: nil, **opts)
+      def initialize(type:, publisher: "IHO", version: nil, part: nil, appendix: nil, annex: nil, supplement: nil, **opts)
         super(**opts.merge(publisher: publisher))
         @part = part.to_s if part
         @version = version.to_s if version
         @appendix = appendix.to_s if appendix
+        @annex = annex.to_s if annex
+        @supplement = supplement.to_s if supplement
         if type
           unless Identifier.config.type_names.map { |_, v| v[:short] }.include?(type.to_s)
             raise Pubid::Core::Errors::WrongTypeError, "Type '#{type}' is not available"

data/lib/pubid/iho/parser.rb

@@ -13,7 +13,12 @@ module Pubid::Iho
     end
 
     rule(:appendix) do
-      space >> str("Ap.") >> space >> (digits | match("[A-Z]")).as(:appendix)
+      space >> (str("Appendix") | str("Ap.")) >> space >>
+        (
+          (match("[A-Z]") >> dash >> digits) |
+          digits |
+          match("[A-Z]")
+        ).as(:appendix)
     end
 
     rule(:part) do
@@ -24,13 +29,21 @@ module Pubid::Iho
         )
     end
 
+    rule(:annex) do
+      space >> str("Annex") >> space >> match("[A-Z]").as(:annex)
+    end
+
+    rule(:supplement) do
+      space >> str("Suppl") >> space >> digits.as(:supplement)
+    end
+
     rule(:version) do
       space >> (digits >> dot >> digits >> dot >> digits).as(:version)
     end
 
     rule(:identifier) do
       (str("IHO") >> space).maybe >> series >> dash >> number >>
-        appendix.maybe >> part.maybe >> version.maybe
+        appendix.maybe >> part.maybe >> annex.maybe >> supplement.maybe >> version.maybe
     end
 
     rule(:root) { identifier }

data/lib/pubid/iho/renderer/base.rb

@@ -1,7 +1,7 @@
 module Pubid::Iho::Renderer
   class Base < Pubid::Core::Renderer::Base
     def render_identifier(params)
-      "%{publisher} %{type}-%{number}%{appendix}%{part}%{version}" % params
+      "%{publisher} %{type}-%{number}%{appendix}%{part}%{annex}%{supplement}%{version}" % params
     end
 
     def render_part(part, _opts, _params)
@@ -12,6 +12,14 @@ module Pubid::Iho::Renderer
       " Ap. #{appendix}"
     end
 
+    def render_annex(annex, _opts, _params)
+      " Annex #{annex}"
+    end
+
+    def render_supplement(supplement, _opts, _params)
+      " Suppl #{supplement}"
+    end
+
     def render_version(version, _opts, _params)
       " #{version}"
     end

data/lib/pubid/iho/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iho
-    VERSION = "1.15.15".freeze
+    VERSION = "1.15.16".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iho
 version: !ruby/object:Gem::Version
-  version: 1.15.15
+  version: 1.15.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-28 00:00:00.000000000 Z
+date: 2026-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.15
+        version: 1.15.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.15
+        version: 1.15.16
 description: Library to generate, parse and manipulate IHO PubID.
 email:
 - open.source@ribose.com