relaton-render 3.0.0.pre.alpha.4 → 3.0.0.pre.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee63b0602a2be7f4c00c3d0fee7795387cac5b695037ffec618271b380ce6098
-  data.tar.gz: 1bd28b75e32a979ba82cedc675851d61c26769010c62823a85180a5c8236a8a5
+  metadata.gz: 8cf356647bbf5280c9c9e4300c861917b428fc8d248db8a94b3c7b66916a0c01
+  data.tar.gz: 81bbe019e929ae84c4db8ca0808a10029c55dce0f61c94e072aa03c9d01127be
 SHA512:
-  metadata.gz: '070696e6d0f15855bb40365c0e5953f05a80ea0fc0b453b2c1b62da371d9bfa0459c9d7e593ba79add4227c4ecc97af247561cd78345d835a5262f9be30ee651'
-  data.tar.gz: 660e8b5815000dd129e2893f39584d64999eda4d863c704ba9a4ee1e8cda9d68bdefbdfb8675a2aea25309a649709d7fa24458e5682c27c5932344cbe5e8ceed
+  metadata.gz: 61831187b3aba40f2e3701e00b0af1d89e25f219dc735cbb1d36877a0431c0e548776b39d1b90ee8606dfdb4968962a58f61c82f83ba734b9ba4756bb02cd11e
+  data.tar.gz: 640b3659f2bd48a9b6cfb46c063f8d4ed7ecfe15fef2c7961c208875b56a9c7514a0641edcad9e3f335ba7fab91581044d832b737944c9a8c7a9cd134d77cb23

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

@@ -29,6 +29,14 @@ module Relaton
           value&.content.to_s
         end
 
+        # Localizable values scoped to the render language: the variants
+        # declared in that language, or all of them when none matches
+        def titles_in_lang(values)
+          titles = Array(values)
+          in_lang = titles.select { |t| Array(t.language).include?(@i18n.lang) }
+          in_lang.empty? ? titles : in_lang
+        end
+
         def contributors(role)
           Array(@model.contributor).select { |c| has_role?(c, role) }
         end

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

@@ -40,7 +40,8 @@ module Relaton
           def host_title_text
             return localized(relation&.description) if host.nil?
 
-            Array(host.title).map { |t| localized(t) }.join(" ").strip
+            titles_in_lang(host.title).map { |t| localized(t) }
+              .join(" ").strip
           end
 
           def host_title

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

@@ -36,7 +36,8 @@ module Relaton
           end
 
           def series_title
-            Array(series&.title).map { |t| localized(t) }.join(" ").strip
+            titles_in_lang(series&.title).map { |t| localized(t) }
+              .join(" ").strip
           end
 
           def number

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

@@ -33,10 +33,14 @@ module Relaton
               .include?(Kinds.kind_for(@model.type))
           end
 
+          # A typed main title wins; an untyped title is main by
+          # default, but yields to a typed one
           def main_title
-            t = Array(@model.title).find { |x| (x.type || "main") == "main" } ||
-              Array(@model.title).first
-            localized(t)
+            titles = Array(@model.title)
+            mains = titles.select { |x| x.type == "main" }
+            mains = titles.select { |x| x.type.nil? } if mains.empty?
+            mains = titles if mains.empty?
+            localized(titles_in_lang(mains).first)
           end
         end
       end

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

@@ -35,7 +35,18 @@ module Relaton
         def element_field(slot)
           element = Elements.build(slot, @model, style: @style, i18n: @i18n)
           text = element.render.to_s
-          Template::Field[element.present? && !text.empty?, text]
+          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
+
+        def item_kind
+          Kinds.kind_for(@model.type)
         end
 
         def name_fields

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

@@ -16,15 +16,19 @@ 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)
-            KINDS[type] = kind
+            OVERRIDES[type] = kind
             kind
           end
 
           def render(docidentifier)
             content = docidentifier.content.to_s
-            kind = KINDS[docidentifier.type]
+            kind = OVERRIDES[docidentifier.type] || KINDS[docidentifier.type]
             kind ? kind.call(content) : content
           end
         end

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

@@ -12,6 +12,7 @@ module Relaton
           attribute :series, :string
           attribute :title, :string
           attribute :home, :boolean
+          attribute :fallbacks, :hash, default: -> { {} }
 
           key_value do
             map "type", to: :type
@@ -19,6 +20,7 @@ module Relaton
             map "series", to: :series
             map "title", to: :title
             map "home", to: :home
+            map "fallbacks", to: :fallbacks
           end
         end
       end

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

@@ -52,6 +52,15 @@ module Relaton
           candidates.first&.template || templates.reference
         end
 
+        def type_template_for(type)
+          per_type.find { |t| t.type == type.to_s }
+        end
+
+        # The absent-slot replacement text declared for a type, when any
+        def fallback_for(type, slot)
+          type_template_for(type)&.fallbacks&.[](slot.to_s)
+        end
+
         def title_form_for(type)
           per_type.lazy.select { |t| t.type == type.to_s }
             .find { |t| t.title && !t.title.empty? }&.title

data/lib/relaton/render/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.4
+  version: 3.0.0.pre.alpha.5
 platform: ruby
 authors:
 - Ribose Inc.