relaton-render 3.0.0.pre.alpha.9 → 3.0.0.pre.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b2cc7ff33eb9f42dda9093ce14cfe39a2495d4499d93150e50783da711e8087
-  data.tar.gz: 8be8a9bea072cd0e69307b5ea8fe3674429e302dd8751f1f399b81a5a154c08f
+  metadata.gz: c0b28a1996c4db280d4b0f1f976c91c2dc99926b60839df65e76407df0a491f2
+  data.tar.gz: 675de3d7b9821c9838a63730bff1d49f39e6595213d2b9476c6875ed5b76f024
 SHA512:
-  metadata.gz: 1101c3d3781e1c51f78728e74a5ea7c3897e2d52407d896057952d6eb0461f7f6dab1344ef7141e0d37bf77348cc203019420e6e4ea9753986746e2261ef344b
-  data.tar.gz: 4be1e8b804b46e08494db403d5bb9100760415af858dc0a96e2d0db30f82cd00d8d53cdd8447a06d434847d6316389b6b3346e7307a5f5630717105b6a3dab06
+  metadata.gz: 8a6d75a746549935b322e7437692938d3a126692de6e074053f1768b97b7a4da3c6ce33e8fb5b182f89f92b388c5bcb54bda1d18a38e429c533e72f0cc03b92b
+  data.tar.gz: 0cbb4c77dc482860c76834d3dff1f418ab8726dfd84477e5787d06c9b11df4dff139e22019cf2d6b525d980ae6d907207075d315143afc8f472d2828df634116

data/lib/relaton/render/general.rb

@@ -74,6 +74,11 @@ module Relaton
       # falling back to the reference rendering (the 1.x short-cite)
       FIRST_DELIM = "<span class='fmt-first-biblio-delim'/>"
 
+      # A creator list alone (flavors' document-history name forms)
+      def creator_names(item)
+        @renderer.render_creators(to_model(item))
+      end
+
       # render_all feeds the bibliography list: a reference not ending
       # in the biblio terminator takes one (the 1.x render1 behaviour;
       # single-item render stays verbatim)
@@ -142,6 +147,12 @@ module Relaton
       EXCLUDED_ID_TYPES = %w(METANORMA METANORMA-ORDINAL AUTHOR-DATE TITLE
                              URN ISO-REFERENCE ISSN ISBN DOI).freeze
 
+      # Flavors extend the authoritative-identifier exclusions by
+      # overriding this reader on their facade subclass
+      def excluded_id_types
+        EXCLUDED_ID_TYPES
+      end
+
       def facade_docids(doc)
         node = doc
         unless node.respond_to?(:xpath)
@@ -160,7 +171,7 @@ module Relaton
           ->(_x) { true },
         ].each do |p|
           out = ids.select do |x|
-            p.call(x) && !EXCLUDED_ID_TYPES.include?(facade_id_type(x))
+            p.call(x) && !excluded_id_types.include?(facade_id_type(x))
           end
           out.empty? or break
         end

data/lib/relaton/render/iso690/element.rb

@@ -77,7 +77,7 @@ module Relaton
           parts = Array(person.name&.forename).map do |f|
             content = localized(f)
             next content unless content.empty?
-            next "#{f.initial}." if f.initial.to_s.length == 1
+            next initial(f.initial) if f.initial.to_s.length == 1
 
             ""
           end.reject(&:empty?)

data/lib/relaton/render/iso690/elements/creator.rb

@@ -93,14 +93,23 @@ module Relaton
             end
           end
 
-          # The declared creator fallback (e.g. the publisher's
-          # abbreviation for standards with no personal creators)
+          # The declared creator fallback for items with no personal
+          # creators: the publisher's abbreviation or full name
           def fallback_name
-            return "" unless name_form.creator_fallback == "publisher_abbrev"
-
-            contributors("publisher").map do |c|
-              localized(c.organization&.abbreviation)
-            end.reject(&:empty?).first.to_s
+            orgs = contributors("publisher")
+            name = case name_form.creator_fallback
+                   when "publisher_abbrev"
+                     orgs.map do |c|
+                       localized(c.organization&.abbreviation)
+                     end
+                   when "publisher_name"
+                     orgs.map do |c|
+                       localized(Array(c.organization&.name).first)
+                     end
+                   else
+                     []
+                   end
+            name.reject(&:empty?).first.to_s
           end
 
           def names

data/lib/relaton/render/iso690/elements/identifier.rb

@@ -15,9 +15,18 @@ module Relaton
 
 
           def render
-            d = identifiers.first or return ""
+            return "" if identifiers.empty?
 
-            IdentifierKinds.render(d)
+            ids = @style.templates.identifier_mode == "first" ?
+              [identifiers.first] : identifiers
+            ids.map { |d| render_id(d) }
+              .join(@i18n.punct_fetch("identifier_join", ". "))
+          end
+
+          # A flavor's identifier kinds subclass this element and
+          # override here
+          def render_id(docidentifier)
+            IdentifierKinds.render(docidentifier)
           end
 
           private

data/lib/relaton/render/iso690/elements/location.rb

@@ -12,13 +12,20 @@ module Relaton
           end
 
           def render
+            text = uri
             form = uri_form
+            # an access location cites its own label ("At: Library"); a
+            # uri carries the availability label
+            if @from_accesslocation
+              return "#{@i18n.label('at_url')} #{text}".strip
+            end
+
             text = if form && !form.empty?
                      ::Relaton::Render::Iso690::Template.new(form).evaluate(
-                       "uri" => Template::Field[!uri.empty?, uri],
+                       "uri" => Template::Field[!text.empty?, text],
                      )
                    else
-                     uri
+                     text
                    end
 
             label = @short ? "" : "#{@i18n.label('available_from')} "
@@ -44,6 +51,7 @@ module Relaton
             from_accesslocation =
               Array(@model.accesslocation).map(&:to_s).reject(&:empty?)
             unless from_accesslocation.empty?
+              @from_accesslocation = true
               return from_accesslocation.first.to_s
             end
 

data/lib/relaton/render/iso690/elements/pub_date.rb

@@ -13,13 +13,10 @@ module Relaton
             !render.nil?
           end
 
+          # The bare date; the style's dateForm wraps it in the
+          # dategroup slot (Fields#dategroup_field)
           def render
-            text = range || year&.to_s
-            return text if (form = @style.templates.date_form).empty?
-
-            ::Relaton::Render::Iso690::Template.new(form).evaluate(
-              "date" => Template::Field[!text.to_s.empty?, text.to_s],
-            )
+            range || year&.to_s
           end
 
           private
@@ -27,7 +24,9 @@ module Relaton
           def publication_date
             Array(@model.date).find(&:published) ||
               Array(@model.date).find { |d| d.type.nil? } ||
-              Array(@model.date).find { |d| d.type == "created" }
+              Array(@model.date).find { |d| d.type == "created" } ||
+              Array(@model.date).find { |d| d.type == "issued" } ||
+              Array(@model.date).find { |d| d.type == "circulated" }
           end
 
           def publication_date_value
@@ -39,7 +38,9 @@ module Relaton
             d = publication_date or return nil
             dash = @i18n.label("date_range")
             if d.from && d.to
-              "#{d.from.to_date.year}#{dash}#{d.to.to_date.year}"
+              fy = d.from.to_date.year
+              ty = d.to.to_date.year
+              fy == ty ? fy.to_s : "#{fy}#{dash}#{ty}"
             elsif d.from
               "#{d.from.to_date.year}#{dash}"
             end

data/lib/relaton/render/iso690/elements/updated.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Relaton
+  module Render
+    module Iso690
+      module Elements
+        # The item's updated date, nested in the creator date group
+        # ("(2018 (updated November 2018))")
+        class Updated < Element
+          def present?
+            !render.empty?
+          end
+
+          def render
+            d = Array(@model.date).find { |x| x.type == "updated" } or
+              return ""
+            value = d.at || d.from || d.to or return ""
+
+            date = value.to_date
+            " (#{label('updated')} #{month(date.month)} #{date.year})"
+          rescue ArgumentError, TypeError
+            ""
+          end
+
+          private
+
+          def label(key)
+            @i18n.label(key)
+          end
+
+          def month(num)
+            @i18n.label("month_#{num}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/iso690/elements.rb

@@ -22,6 +22,7 @@ module Relaton
         autoload :Stddoc, "relaton/render/iso690/elements/stddoc"
         autoload :Status, "relaton/render/iso690/elements/status"
         autoload :Citeid, "relaton/render/iso690/elements/citeid"
+        autoload :Updated, "relaton/render/iso690/elements/updated"
 
         CLASSES = {
           creator: Creator,
@@ -41,11 +42,22 @@ module Relaton
           stddoc: Stddoc,
           status: Status,
           citeid: Citeid,
+          updated: Updated,
         }.freeze
 
-        def self.build(name, model, style:, i18n:, short: false)
-          CLASSES.fetch(name).new(model, style: style, i18n: i18n,
-                                  short: short)
+        class << self
+          # Flavors extend the vocabulary through the renderer's
+          # element map: a flavor slot resolves before the built-ins,
+          # scoped to that renderer alone (never process-wide)
+          def resolve(name, elements = {})
+            elements[name.to_sym] || CLASSES.fetch(name, nil)
+          end
+        end
+
+        def self.build(name, model, style:, i18n:, short: false,
+                       elements: {})
+          klass = resolve(name, elements) or return nil
+          klass.new(model, style: style, i18n: i18n, short: short)
         end
       end
     end

data/lib/relaton/render/iso690/fields.rb

@@ -11,40 +11,89 @@ module Relaton
         ELEMENT_SLOTS = %i[
           creator title edition medium series production
           date numeration component_part identifier location size
-          extent access stddoc status citeid
+          extent access stddoc status citeid updated
         ].freeze
 
         def initialize(model, style:, i18n:, disambiguator: nil,
-                       short: false)
+                       short: false, elements: {})
           @model = model
           @style = style
           @i18n = i18n
           @disambiguator = disambiguator.to_s
           @short = short
+          @elements = elements
         end
 
         def to_h
           table = {}
-          ELEMENT_SLOTS.each do |slot|
+          slots.each do |slot|
             key = slot.to_s.delete("_").downcase
             table[key] = element_field(slot)
           end
+          table["dategroup"] = dategroup_field
+          unless table["dategroup"].present?
+            table["dategroup"] = fallback_field(:dategroup)
+          end
           table.merge(name_fields)
         end
 
+        def fallback_field(slot)
+          fallback = @style.fallback_for(item_kind, slot)
+          fallback ? Template::Field[true, fallback] :
+            Template::Field[false, ""]
+        end
+
         private
 
+        # The date with the updated date nested ("(2018 (updated
+        # November 2018))"); the bare date slot stays untouched
+        def dategroup_field
+          date = raw_field(:date)
+          updated = raw_field(:updated)
+          return Template::Field[false, ""] if !date.present? &&
+            !updated.present?
+
+          inner = updated.present? ? updated.text : date.text
+          inner = "#{date.text}#{updated.text}" if date.present? &&
+            updated.present?
+          Template::Field[true, "(#{inner})"]
+        end
+
+        private
+
+        def slots
+          ELEMENT_SLOTS | @elements.keys
+        end
+
+        # The element's own render, before any absent-slot fallback:
+        # the creator-date group cites real dates only
+        def raw_field(slot)
+          element_field = build_field(slot)
+          return element_field if element_field.present?
+
+          Template::Field[false, ""]
+        end
+
         def element_field(slot)
+          field = build_field(slot)
+          return field if field.present?
+
+          fallback = @style.fallback_for(item_kind, slot)
+          return Template::Field[true, fallback] if fallback
+
+          Template::Field[false, ""]
+        end
+
+        def build_field(slot)
           element = Elements.build(slot, @model, style: @style,
-                                   i18n: @i18n, short: @short)
+                                   i18n: @i18n, short: @short,
+                                   elements: @elements) or
+            return Template::Field[false, ""]
           text = element.render.to_s
           if element.present? && !text.empty?
             return Template::Field[true, text]
           end
 
-          fallback = @style.fallback_for(item_kind, slot)
-          return Template::Field[true, fallback] if fallback
-
           Template::Field[false, ""]
         end
 
@@ -53,7 +102,8 @@ module Relaton
         end
 
         def name_fields
-          creator = Elements.build(:creator, @model, style: @style, i18n: @i18n)
+          creator = Elements.build(:creator, @model, style: @style,
+                                   i18n: @i18n, elements: @elements)
           {
             "surname" => Template::Field[creator.present?, creator.in_text],
             "givennames" => Template::Field[!creator.principal_given.empty?,

data/lib/relaton/render/iso690/i18n/en.yml

@@ -26,6 +26,7 @@ labels:
   series_no: "no."
   report_no: "Report no."
   available_from: "Available from:"
+  at_url: "At:"
   in: "In:"
   and: "and"
   oxford_comma: ","

data/lib/relaton/render/iso690/identifier_kinds.rb

@@ -16,19 +16,10 @@ module Relaton
           "MRN" => ->(content) { content },
         }.freeze
 
-        # Flavor-registered kinds, consulted before the built-ins; the
-        # registry is process-wide by design
-        OVERRIDES = {}
-
         class << self
-          def register(type, kind)
-            OVERRIDES[type] = kind
-            kind
-          end
-
           def render(docidentifier)
             content = docidentifier.content.to_s
-            kind = OVERRIDES[docidentifier.type] || KINDS[docidentifier.type]
+            kind = KINDS[docidentifier.type]
             kind ? kind.call(content) : content
           end
         end

data/lib/relaton/render/iso690/renderer.rb

@@ -23,7 +23,8 @@ module Relaton
         end
 
         def initialize(style: DEFAULT_STYLE, lang: "en", script: "Latn",
-                       labels: {})
+                       labels: {}, elements: {})
+          @elements = elements
           @style = Style.load(style)
           @i18n = I18n.load(lang)
           @i18n.overlay_hash!(labels) unless labels.empty?
@@ -37,7 +38,8 @@ module Relaton
           kind = Kinds.kind_for(model.type)
           template = @style.template_for(kind, home: home_docid?(model))
           out = Template.new(template).evaluate(
-            Fields.new(model, style: @style, i18n: @i18n).to_h,
+            Fields.new(model, style: @style, i18n: @i18n,
+                       elements: @elements).to_h,
           )
           raise ::Relaton::Render::Unrenderable,
                 "no renderable elements" if out.strip.empty?
@@ -52,13 +54,20 @@ module Relaton
           Array(model.docidentifier).any? { |d| types.include?(d.type) }
         end
 
+        # A creator list alone (flavors' document-history name forms)
+        def render_creators(model)
+          Elements.build(:creator, model, style: @style, i18n: @i18n,
+                         short: true, elements: @elements).render
+        end
+
         # The short cite: the reference with the first-biblio marker
         def render_short(model, delim)
           kind = Kinds.kind_for(model.type)
           template = @style.type_template_for(kind)&.short ||
             @style.template_for(kind, home: home_docid?(model))
           Template.new(template).evaluate_short(
-            Fields.new(model, style: @style, i18n: @i18n, short: true).to_h,
+            Fields.new(model, style: @style, i18n: @i18n, short: true,
+                       elements: @elements).to_h,
             delim,
           )
         rescue ::Relaton::Render::Unrenderable
@@ -69,7 +78,8 @@ module Relaton
         def citation(model, disambiguator: nil)
           Template.new(@style.templates.citation).evaluate(
             Fields.new(model, style: @style, i18n: @i18n,
-                       disambiguator: disambiguator).to_h,
+                       disambiguator: disambiguator,
+                       elements: @elements).to_h,
           )
         end
       end

data/lib/relaton/render/iso690/style/template_map.rb

@@ -18,6 +18,9 @@ module Relaton
           attribute :creators, :string, default: ""
           attribute :uri_short, :string, default: ""
           attribute :date_form, :string, default: ""
+          # "first": cite only the first identifier (1.x
+          # authoritative_identifier|first styles)
+          attribute :identifier_mode, :string, default: "all"
 
           key_value do
             map "titleOpen", to: :title_open
@@ -30,6 +33,7 @@ module Relaton
           map "creators", to: :creators
           map "uriShort", to: :uri_short
           map "dateForm", to: :date_form
+          map "identifierMode", to: :identifier_mode
           end
         end
       end

data/lib/relaton/render/iso690/template.rb

@@ -87,8 +87,14 @@ module Relaton
         def terminate(body)
           # 1.x punctuation cleanup: an element ending in a colon
           # carries its own separator (the following sentence period
-          # collapses), and spaces collapse before a comma
+          # collapses); a sentence period followed by a spaced comma
+          # or another period collapses into one (", 2013" over
+          # ". , 2013"; "n.d.." into "n.d.") — an initials period
+          # before a comma ("P.,") stands; spaces collapse before a
+          # comma
           body = body.gsub(/:\s*\.\s*/, ": ")
+          body = body.gsub(/\.\s+,/, ",")
+          body = body.gsub(/\.\s*\./, ".")
           body = body.gsub(/ +/, " ").gsub(" ,", ",")
           return body if @terminator.strip.empty?
           return body if body.rstrip.end_with?(@terminator.strip)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "3.0.0.pre.alpha.9".freeze
+    VERSION = "3.0.0.pre.alpha.11".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.9
+  version: 3.0.0.pre.alpha.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-05 00:00:00.000000000 Z
+date: 2026-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -137,6 +137,7 @@ files:
 - lib/relaton/render/iso690/elements/status.rb
 - lib/relaton/render/iso690/elements/stddoc.rb
 - lib/relaton/render/iso690/elements/title.rb
+- lib/relaton/render/iso690/elements/updated.rb
 - lib/relaton/render/iso690/fields.rb
 - lib/relaton/render/iso690/i18n.rb
 - lib/relaton/render/iso690/i18n/en.yml