pubid-iso 1.15.6 → 1.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca7db4a055506011106d0c2f2e8c54dd41f8c90751de4adcf0ea7aa4c33a479f
-  data.tar.gz: 4676fa7fb0d89f1289eb3fcc7a27bf167f8849867c72102e8113a69824fa2242
+  metadata.gz: 1893bea151d26da77c42fde6779f38a9bb07f4807115c567a52811ac4e9bb41a
+  data.tar.gz: 68d31036867e076d3f597c22774e95b62662ea01709c3944b22a78d3ed2e3cb5
 SHA512:
-  metadata.gz: 62db235eb6454044faf6f3feac5958b321bac80d1aba37a0edc6ef5899c3b41bd890e185ee1e47a5277a2c966f1a2762b6b1c40c18354562d123db6fb5fac509
-  data.tar.gz: 95eb033303f137db6935f668cd905cec8184779045b431e386e4547a074a7aaaaeaddb4eb2f83f3a4031efc1def94ccaa8833cfb2683346befdc4ae22843e51e
+  metadata.gz: 96ec944e72e01a6b9e53a429ad12fb89250801a6f49570da9d3b68facb03c51ebce36b9088eb6de9b86d4498c3ca14cff4c8819bbcd5c3ce2decf1393b0f090d
+  data.tar.gz: b6553af3511c3de43919bc6b871dd8996200f0620c2e9fb96e73f379d72227ec6d5cb2c8cbb12e165c92e5c4fbb281df1bd9620cf8e6b9b4256cb6c8c6b2d7ed

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

@@ -143,7 +143,8 @@ module Pubid::Iso
               month: supplement[:month],
               stage: supplement[:typed_stage], edition: supplement[:edition],
               iteration: supplement[:iteration], type: supplement[:type] || !supplement[:typed_stage] && :sup,
-              publisher: supplement[:publisher]&.to_s, base: Identifier.create(**base_params)
+              publisher: supplement[:publisher]&.to_s, base: Identifier.create(**base_params),
+              separator: ([" + ", ", "].include?(supplement[:separator]&.to_s) ? supplement[:separator].to_s : nil)
             )
           end
         end

data/lib/pubid/iso/identifier/supplement.rb

@@ -19,7 +19,10 @@ module Pubid::Iso
         },
       }.freeze
 
-      def initialize(publisher: nil, **opts)
+      attr_accessor :separator
+
+      def initialize(publisher: nil, separator: nil, **opts)
+        @separator = separator
         super(publisher: publisher, **opts)
       end
 

data/lib/pubid/iso/parser.rb

@@ -119,7 +119,7 @@ module Pubid::Iso
     end
 
     rule(:supplement) do
-      ((str("/") | space).maybe >>
+      ((str(" + ") | str(", ") | str("/") | space).as(:separator).maybe >>
         (((stage.as(:typed_stage) >> space).maybe >> supplements.as(:type)) |
           staged_supplement.as(:typed_stage)) >>
         (space | str(".")).repeat(1).maybe >>

data/lib/pubid/iso/renderer/supplement.rb

@@ -14,7 +14,7 @@ module Pubid::Iso::Renderer
           base_type: @params[:base].type[:key],
           **args
         ) +
-        if @params[:base].language
+        if !@params[:language] && @params[:base].language
           render_language(@params[:base].language,
                           { with_language_code: with_language_code }, nil).to_s
         else
@@ -28,18 +28,26 @@ module Pubid::Iso::Renderer
       stage = params[:stage]
 
       if params[:stage].instance_of?(Pubid::Core::Stage) && !params[:stage].to_s(with_prf: opts[:with_prf]).empty?
-        type_prefix = " #{type_prefix}"
-        stage = params[:stage].to_s(with_prf: opts[:with_prf])
+        stage_str = params[:stage].to_s(with_prf: opts[:with_prf])
+        if stage_str == "IS"
+          stage = ""
+        else
+          type_prefix = " #{type_prefix}"
+          stage = stage_str
+        end
       end
 
+      sep = params[:separator]
+      sep = "/" if sep.nil? || sep.empty?
+
       if instance_of?(Supplement)
         if opts[:base_type] == :dir
           "%<stage>s%<publisher>s SUP%<number>s%<part>s%<iteration>s%<year>s%<month>s%<edition>s" % params
         else
-          "/#{stage}#{type_prefix}%<number>s%<part>s%<iteration>s%<year>s%<edition>s" % params
+          "#{sep}#{stage}#{type_prefix}%<number>s%<part>s%<iteration>s%<year>s%<edition>s" % params
         end
       else
-        "/#{stage}#{type_prefix}%<number>s%<part>s%<iteration>s%<year>s%<edition>s" % params
+        "#{sep}#{stage}#{type_prefix}%<number>s%<part>s%<iteration>s%<year>s%<edition>s" % params
       end
     end
 

data/lib/pubid/iso/transformer.rb

@@ -10,8 +10,14 @@ module Pubid::Iso
       context[:root]
     end
 
-    rule(edition: "Ed") do
-      { edition: "1" }
+    rule(edition: subtree(:edition)) do |context|
+      if context[:edition].to_s == "Ed"
+        { edition: "1" }
+      elsif context[:edition].is_a?(Hash)
+        { edition: context[:edition].transform_values(&:to_s) }
+      else
+        context
+      end
     end
 
     rule(stage: subtree(:stage)) do |context|
@@ -26,15 +32,20 @@ module Pubid::Iso
         context[:supplements] =
           context[:supplements].map do |supplement|
             if supplement[:typed_stage]
-              supplement.merge(
-                case supplement[:typed_stage]
-                when "PDAM" then { typed_stage: "CD", type: "Amd" }
-                when "pDCOR" then { typed_stage: "CD", type: "Cor" }
-                # when "DAD" then { typed_stage: "WD", type: "Amd" }
-                when "draft" then convert_urn_sup_draft_type supplement[:type]
-                else convert_urn_sup_stage_code(supplement)
-                end,
-              )
+              if supplement[:typed_stage] == "published"
+                supplement[:typed_stage] = "IS"
+                supplement.merge(convert_urn_sup_stage_code(supplement))
+              else
+                supplement.merge(
+                  case supplement[:typed_stage]
+                  when "PDAM" then { typed_stage: "CD", type: "Amd" }
+                  when "pDCOR" then { typed_stage: "CD", type: "Cor" }
+                  # when "DAD" then { typed_stage: "WD", type: "Amd" }
+                  when "draft" then convert_urn_sup_draft_type supplement[:type]
+                  else convert_urn_sup_stage_code(supplement)
+                  end,
+                )
+              end
             else
               case supplement[:type]
               when "Addendum" then supplement.merge({ type: "Add" })
@@ -141,8 +152,12 @@ module Pubid::Iso
 
     def self.convert_urn_sup_stage_code(sup)
       stage_type = convert_urn_sup_type(sup[:type])
-      abbr = convert_stage_code(sup[:typed_stage])
-      stage_type[:typed_stage] = abbr if abbr
+      if /\A[\d.]+\z/.match?(sup[:typed_stage].to_s)
+        stage_type[:typed_stage] = sup[:typed_stage].to_s
+      else
+        abbr = convert_stage_code(sup[:typed_stage])
+        stage_type[:typed_stage] = abbr if abbr
+      end
       stage_type
     end
 

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "1.15.6".freeze
+    VERSION = "1.15.8".freeze
   end
 end

data/update_codes.yaml

@@ -1,2 +1,4 @@
 ISO/R 657/IV: ISO/R 657-4:1969
 ISO/IEC/IEEE 8802-22.2:2015/Amd.2:2017(E): ISO/IEC/IEEE 8802-22:2015/Amd.2:2017(E)
+ISO/TR 17716.2: ISO/TR 17716
+ISO/TR 17716.2(E): ISO/TR 17716(E)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 1.15.6
+  version: 1.15.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-08 00:00:00.000000000 Z
+date: 2026-03-19 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.6
+        version: 1.15.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.6
+        version: 1.15.8
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com