pubid-iso 1.15.6 → 1.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca7db4a055506011106d0c2f2e8c54dd41f8c90751de4adcf0ea7aa4c33a479f
-  data.tar.gz: 4676fa7fb0d89f1289eb3fcc7a27bf167f8849867c72102e8113a69824fa2242
+  metadata.gz: 9f281981e42f4fe123fb11766a42a161efe7ea7ca67177217cb7b0e25abf605f
+  data.tar.gz: db7553520345a7860be01d909404dd208355f62bd6c3ea89debf80c259c7ca24
 SHA512:
-  metadata.gz: 62db235eb6454044faf6f3feac5958b321bac80d1aba37a0edc6ef5899c3b41bd890e185ee1e47a5277a2c966f1a2762b6b1c40c18354562d123db6fb5fac509
-  data.tar.gz: 95eb033303f137db6935f668cd905cec8184779045b431e386e4547a074a7aaaaeaddb4eb2f83f3a4031efc1def94ccaa8833cfb2683346befdc4ae22843e51e
+  metadata.gz: a892b598fb4be0cb9e2e59bff00f51a55138db6071db1e8d17a9bafc4acdef9afdb16cc48a8cc9be4fe2afa4f5293034e3b26ab4bdf994bc85915721ef8747ce
+  data.tar.gz: f434672ef4e38510f2d8af2c40104e859b7d9e9a2c885063c3555e2c3d4cf349fc89f6f1c7da42b915993c18e76f374212e20f1765a250b85a60a14fd5bf2e95

data/README.adoc

@@ -162,6 +162,30 @@ to see all available options.
 => "ISO 8601-1:2019/DAM 1"
 ----
 
+=== Annotated rendering
+
+Use `to_s(annotated: true)` to wrap each semantic component of the identifier in
+an HTML `<span>` tag with a CSS class, useful for styling in web applications.
+
+[source,ruby]
+----
+> pubid = Pubid::Iso::Identifier.parse("ISO 1234-1:2013")
+> pubid.to_s(annotated: true)
+=> '<span class="publisher">ISO</span> <span class="docnumber">1234</span>-<span class="part">1</span>:<span class="year">2013</span>'
+----
+
+With copublisher and document type:
+
+[source,ruby]
+----
+> pubid = Pubid::Iso::Identifier.parse("ISO/IEC TR 2131-1:2013")
+> pubid.to_s(annotated: true)
+=> '<span class="publisher">ISO/IEC</span> <span class="doctype">TR</span> <span class="docnumber">2131</span>-<span class="part">1</span>:<span class="year">2013</span>'
+----
+
+The `annotated:` option can be combined with other `to_s` options like `format:`,
+`lang:`, etc.
+
 === Using language specific rendering
 [source,ruby]
 ----

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
@@ -265,11 +266,12 @@ module Pubid::Iso
       #   :ref_undated -- reference undated: no language code + short form (DAM) + undated
       #   :ref_undated_long -- reference undated long: 1 letter language code + long form (DAmd) + undated
       # @return [String] pubid identifier
-      def to_s(lang: nil, with_edition: false, with_prf: false, format: :ref_dated_long)
+      def to_s(lang: nil, with_edition: false, with_prf: false, format: :ref_dated_long, annotated: false)
         options = resolve_format(format)
         options[:with_edition] = with_edition
         options[:with_prf] = with_prf
         options[:language] = lang
+        options[:annotated] = annotated
 
         self.class.get_renderer_class.new(to_h(deep: false)).render(**options) +
           render_joint_document(@joint_document) + render_all_parts

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/base.rb

@@ -32,10 +32,11 @@ module Pubid::Iso::Renderer
     # Render identifier
     # @param with_edition [Boolean] include edition in output
     # @see Pubid::Core::Renderer::Base for another options
-    def render(with_edition: true, with_language_code: :iso, with_date: true, **args)
+    def render(with_edition: true, with_language_code: :iso, with_date: true, annotated: false, **args)
       render_base_identifier(**args.merge({ with_date: with_date,
                                             with_language_code: with_language_code,
-                                            with_edition: with_edition })) +
+                                            with_edition: with_edition,
+                                            annotated: annotated })) +
         @prerendered_params[:language].to_s
     end
 
@@ -54,6 +55,10 @@ module Pubid::Iso::Renderer
     def render_identifier(params, opts)
       stage = params.key?(:stage) ? postrender_stage(params[:stage], opts, params) : ""
       type = render_type_prefix(params, opts)
+      if opts[:annotated]
+        stage = annotate_value(:stage, stage) if stage && !stage.to_s.empty?
+        type = annotate_value(:typed_stage, type) if type && !type.to_s.empty?
+      end
       "%<publisher>s#{stage}#{type} %<number>s%<part>s%<iteration>s%<year>s%" \
       "<amendments>s%<corrigendums>s%<addendum>s%<edition>s" % params
     end

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

@@ -7,14 +7,14 @@ module Pubid::Iso::Renderer
     # Render identifier
     # @param with_edition [Boolean] include edition in output
     # @see Pubid::Core::Renderer::Base for another options
-    def render(with_edition: true, with_language_code: :iso, with_date: true, **args) # rubocop:disable Metrics/MethodLength
-      @params[:base].to_s(lang: args[:language], with_edition: with_edition) +
+    def render(with_edition: true, with_language_code: :iso, with_date: true, annotated: false, **args) # rubocop:disable Metrics/MethodLength
+      @params[:base].to_s(lang: args[:language], with_edition: with_edition, annotated: annotated) +
         super(
           with_edition: with_edition, with_language_code: with_language_code, with_date: with_date,
-          base_type: @params[:base].type[:key],
+          annotated: annotated, 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.9".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.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-08 00:00:00.000000000 Z
+date: 2026-03-20 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.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.6
+        version: 1.15.9
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com