pubid 2.0.0.pre.alpha.56 → 2.0.0.pre.alpha.58

data/lib/pubid/ieee/builder.rb

@@ -1151,6 +1151,13 @@ module Pubid
           return Identifiers::Standard.new(**printed_attrs.compact)
         end
 
+        # The designation route ("IEEE P24748-4/D=FDIS") has no
+        # publishers group and no parsed publisher slot; IEEE is the
+        # sole publisher of the D= designator face, and the elections
+        # below read the builder-local slots.
+        attributes[:publisher] ||= "IEEE"
+        attributes[:copublisher] ||= []
+
         # The re-parse of the pubid#203 designator render ("IEEE
         # P15026.2/D=FDIS-201008") captures the stage and the verbatim
         # date token (":2020", "-201008") with no publisher slot; the
@@ -1182,9 +1189,12 @@ module Pubid
           if parsed[:iso_stage_iteration]
             stage_abbr += extract_value(parsed[:iso_stage_iteration])
           end
+          # The designation route ("IEEE P24748-4/D=FDIS") carries no
+          # publishers group, so the builder-local copublisher is nil on
+          # it — the empty test must admit nil as none.
           bare_ieee_project = parsed[:project_marker] &&
                               attributes[:publisher] == "IEEE" &&
-                              attributes[:copublisher] == []
+                              (attributes[:copublisher] || []).empty?
           if bare_ieee_project && parsed[:draft_stage_year].nil?
             # pubid#203: a bare-IEEE project row carrying an ISO stage is
             # an IEEE draft of joint ISO/IEC work ("IEEE FDIS P15026.2,
@@ -1517,9 +1527,13 @@ module Pubid
           if pub_data[:copublishers]
             copubs = pub_data[:copublishers]
             copubs = [copubs] unless copubs.is_a?(Array)
+            # A capture may carry its own separators ("/IEC/ISO" — a
+            # joint token glued to the leading slash); the copublisher
+            # collection renders join("/"), so entries hold bare orgs.
             attributes[:copublisher] = copubs.filter_map do |cp|
               extract_value(cp[:copublisher])
-            end
+            end.flat_map { |c| c.to_s.sub(%r{\A/}, "").split("/") }
+                   .reject(&:empty?)
           end
         elsif parsed[:publisher]
           attributes[:publisher] = extract_value(parsed[:publisher])
@@ -2008,7 +2022,14 @@ module Pubid
             end
           end
         else
-          version = extract_value(draft_data)
+          # A degraded wire leaf carries the whole draft clause verbatim
+          # ("/D2.1.1" — the three-segment designator the engine cannot
+          # structure): Draft.parse is the inverse of Draft#to_s, so it
+          # strips the prefix instead of double-appending it.
+          draft = Components::Draft.parse(extract_value(draft_data).to_s)
+          attributes[:draft_obj] = draft
+          attributes[:draft] = draft.to_s
+          return
         end
 
         # A stage-token draft's month rides the D= designator zero-padded

data/lib/pubid/ieee/components/draft.rb

@@ -169,7 +169,12 @@ day: nil, iso_stage: nil, iso_iteration: nil)
         end
 
         def to_s
-          result = "/D#{version}"
+          # A version that already opens with a designator word ("ED4",
+          # the IEC edition-draft ordinal; an ISO/IEC stage token such
+          # as "FDIS_March") renders verbatim — prepending D
+          # concatenates a hallucinated token ("DED4", "DFDIS") that no
+          # face spells. Every other version keeps the D designator.
+          result = version&.match?(/\A(ED\d|(FDIS|FCD|CDV|DIS|CD|WD|PWI|NP))/) ? "/#{version}" : "/D#{version}"
           result += "=#{iso_stage}" if iso_stage
           result += ".#{iso_iteration}" if iso_stage && iso_iteration
           result += if revision.to_s.start_with?(".")

data/lib/pubid/ieee/identifiers/base.rb

@@ -120,13 +120,13 @@ module Pubid
         # Handle draft as component object
         if args[:draft_obj]
           self.draft_obj = args[:draft_obj]
-          self.draft = args[:draft_obj].to_s
+          self.draft = args[:draft_obj].to_s.sub(%r{\A/}, "")
         elsif args[:draft].is_a?(String)
           self.draft_obj = Components::Draft.parse(args[:draft])
-          self.draft = draft_obj.to_s
+          self.draft = draft_obj.to_s.sub(%r{\A/}, "")
         elsif args[:draft]
           self.draft_obj = args[:draft]
-          self.draft = args[:draft].to_s
+          self.draft = args[:draft].to_s.sub(%r{\A/}, "")
         end
 
         # Set other attributes.
@@ -150,9 +150,11 @@ module Pubid
             public_send(setter, value)
           end
         end
+
       end
 
-      # Override accessors to return component objects.
+            # Override accessors to return component objects.
+
       def code
         code_obj
       end
@@ -231,7 +233,23 @@ module Pubid
       # no expansion (Draft.parse accepts the slashless form).
       def self.from_hash(data, options = {})
         data = Compaction.expand(Compaction.deep_dup(data)) if data.is_a?(::Hash)
-        super
+        identifier = super
+        # == compares the raw ivars: a rebuild whose lazy readers have not
+        # run carries @code_obj/@draft_obj nil while a parse has them set,
+        # so the objects compare unequal although their serialized hashes
+        # agree (pubid#596). Materialize the runtime components eagerly.
+        identifier.materialize_runtime_components
+        identifier
+      end
+
+      # Rebuild the runtime components from the wire strings. Safe on every
+      # construction path: the readers' ||= no-ops when already set, and the
+      # CodeNumber rebuild covers the split-column rows that carry no code
+      # string.
+      def materialize_runtime_components
+        code_obj
+        draft_obj
+        self
       end
 
       # Register the identifier classes the automatic `Identifiers::*` scan

data/lib/pubid/renderers/supplement_renderer.rb

@@ -13,14 +13,18 @@ module Pubid
           annotated: context.annotated,
         )
 
-        stage_str = annotate(@id.typed_stage.render(context:),
+        # A nil typed_stage means "no stage" (metanorma-iso's draft-biblio
+        # flow assigns nil through the public setter); render the supplement
+        # without the stage segment instead of crashing on nil.render.
+        stage_str = @id.typed_stage &&
+                    annotate(@id.typed_stage.render(context:),
                              typed_stage_css(@id.typed_stage),
                              annotated: context.annotated)
-        parts << "#{base_str}/#{stage_str}"
+        parts << (stage_str ? "#{base_str}/#{stage_str}" : "#{base_str}/")
 
         num_port = render_number_portion(context)
         if num_port && !num_port.empty? && !num_port.start_with?(":")
-          parts << (stage_str.end_with?(".") ? "" : " ")
+          parts << (stage_str&.end_with?(".") ? "" : " ")
         end
         parts << num_port
 

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.0.pre.alpha.56"
+  VERSION = "2.0.0.pre.alpha.58"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.56
+  version: 2.0.0.pre.alpha.58
 platform: ruby
 authors:
 - Ribose Inc.