uchi 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c91f06accc01dce5031d673f7c0a78c71174fadf6d079dc288b68d815b4a9c
-  data.tar.gz: 76542812dc454f122bb54ed3a86b0857860ff5ff633cf3a9a3f120ea28bf782c
+  metadata.gz: 89d20ec9aa3f6dad006bcf717d489b69fd889d6f8ad37ac484b9a146b52ef843
+  data.tar.gz: f6e3c52325eff6be90d814a2158083cf3f2f521f689539c9a23bf30d20246ab4
 SHA512:
-  metadata.gz: ec71b43f8744a50005922ba80cd6224ce88cd8c90e4bbf70eb33d9017e327f184bb032f9a1609b3e1c48430b2345cc96a42644eee4cbb63a30577ee530995724
-  data.tar.gz: c8e26d886f9153251caf74d123883d529c3247b8252048be18706e65174688223db6f03c0ca7f027f95bab9df278446c951664c55a57727cab212f549b96c9df
+  metadata.gz: cf626c8ce1d6a0d5e22ca6df5f190c5def32b4e02d81510429b281cfa54ab79f95fe57745cdce76c4fb54487ce66547521778be78b319cedbcb283de17b5c121
+  data.tar.gz: e913266e035d095b1e5c801ba6da2867d9dad9dec026bc8e1cc379d49b9bc6693517416b76ac3393798f09468a9090688ecfb7cb2ab7ffe59eb2fe2a55cffc97

data/app/components/uchi/field/belongs_to/show.html.erb

@@ -1,3 +1,5 @@
-<%= render(Flowbite::Link.new(
-  href: associated_repository.routes.path_for(:show, id: associated_record.id)
-).with_content(associated_record.to_s)) %>
+<% if associated_record %>
+  <%= render(Flowbite::Link.new(
+    href: associated_repository.routes.path_for(:show, id: associated_record.id)
+  ).with_content(associated_record.to_s)) %>
+<% end %>

data/app/components/uchi/field/belongs_to.rb

@@ -25,11 +25,18 @@ module Uchi
 
         def collection_for_select
           repository = associated_repository
-          collection.map do |item|
+          items = []
+          items << ["", nil] if optional?
+          items + collection.map do |item|
             [repository.title(item), item.id]
           end
         end
 
+        # Returns true if the association is optional.
+        def optional?
+          reflection.options[:optional] == true
+        end
+
         def options
           options = {
             attribute: attribute_name,

data/app/components/uchi/ui/page_header/page_header.html.erb

@@ -5,9 +5,9 @@
     <% end %>
   </div>
 
-  <div class="items-center justify-between space-x-6 space-y-3 md:flex md:px-0">
+  <div class="items-start justify-between space-x-6 md:flex md:px-0">
     <div>
-      <h1 class="mb-1 text-3xl font-semibold tracking-tight text-gray-900 dark:text-white group"><%= title %></h1>
+      <h1 class="text-3xl font-semibold tracking-tight text-gray-900 dark:text-white group"><%= title %></h1>
       <% if description.present? %>
         <div class="text-lg text-gray-500 lg:mb-0 dark:text-gray-400 lg:max-w-2xl"><%= description %></div>
       <% end %>

data/app/views/layouts/uchi/application.html.erb

@@ -13,10 +13,10 @@
     <div class="md:flex">
       <nav class="w-64 h-full px-3 py-4 overflow-y-auto shrink-0 bg-gray-50 dark:bg-gray-800" aria-label="Main">
         <ul class="space-y-2 font-medium">
-          <% Uchi::Repository.all.map { |repository| repository.new }.sort_by { |repository| repository.translate.plural_name.downcase }.each do |repository| %>
+          <% Uchi::Repository.all.map { |repository| repository.new }.sort_by { |repository| repository.translate.navigation_label.downcase }.each do |repository| %>
             <li>
               <%= link_to(repository.routes.path_for(:index), :class => "flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group") do %>
-                <span class="ms-3"><%= repository.translate.plural_name.titlecase %></span>
+                <span class="ms-3"><%= repository.translate.navigation_label %></span>
               <% end %>
             </li>
           <% end %>

data/app/views/uchi/repository/edit.html.erb

@@ -1,12 +1,12 @@
-<%- content_for(:page_title) { @repository.translate.title(:edit, record: @record) } %>
+<%- content_for(:page_title) { @repository.translate.title_for_edit(@record) } %>
 
 <%= render(
   Uchi::Ui::PageHeader.new(
     description: @repository.translate.description(:edit),
-    title: @repository.translate.title(:edit, record: @record),
+    title: @repository.translate.title_for_edit(@record),
   )) do |header| %>
   <% header.with_breadcrumb(items: [
-    {href: @repository.routes.root_path, label: Rails.application.name.titlecase },
+    {href: @repository.routes.root_path, label: @repository.translate.breadcrumb_label_for_root },
     {href: @repository.routes.path_for(:index), label: @repository.translate.breadcrumb_label(:index) },
     {href: @repository.routes.path_for(:show, id: @record.id), label: @repository.translate.breadcrumb_label(:show, record: @record) },
     {href: @repository.routes.path_for(:edit, id: @record.id), label: @repository.translate.breadcrumb_label(:edit, record: @record) }

data/app/views/uchi/repository/index.html.erb

@@ -1,15 +1,15 @@
-<%- content_for(:page_title) { @repository.translate.title(:index) } %>
+<%- content_for(:page_title) { @repository.translate.title_for_index } %>
 
 <%= render(
   Uchi::Ui::PageHeader.new(
     description: @repository.translate.description(:index),
-    title: @repository.translate.title(:index),
+    title: @repository.translate.title_for_index,
   )) do |header| %>
   <% header.with_action do %>
     <%= link_to(@repository.translate.link_to_new, @repository.routes.path_for(:new), class: Flowbite::Button.classes) %>
   <% end %>
   <% header.with_breadcrumb(items: [
-    {href: @repository.routes.root_path, label: Rails.application.name.titlecase },
+    {href: @repository.routes.root_path, label: @repository.translate.breadcrumb_label_for_root },
     {href: @repository.routes.path_for(:index), label: @repository.translate.breadcrumb_label(:index) }
   ]) %>
 <% end %>

data/app/views/uchi/repository/new.html.erb

@@ -1,12 +1,12 @@
-<%- content_for(:page_title) { @repository.translate.title(:new) } %>
+<%- content_for(:page_title) { @repository.translate.title_for_new } %>
 
 <%= render(
   Uchi::Ui::PageHeader.new(
     description: @repository.translate.description(:new),
-    title: @repository.translate.title(:new),
+    title: @repository.translate.title_for_new,
   )) do |header| %>
   <% header.with_breadcrumb(items: [
-    {href: @repository.routes.root_path, label: Rails.application.name.titlecase },
+    {href: @repository.routes.root_path, label: @repository.translate.breadcrumb_label_for_root },
     {href: @repository.routes.path_for(:index), label: @repository.translate.breadcrumb_label(:index) },
     {href: @repository.routes.path_for(:new), label: @repository.translate.breadcrumb_label(:new) }
   ]) %>

data/app/views/uchi/repository/show.html.erb

@@ -1,9 +1,9 @@
-<%- content_for(:page_title) { @repository.translate.title(:show, record: @record) } %>
+<%- content_for(:page_title) { @repository.translate.title_for_show(@record) } %>
 
 <%= render(
   Uchi::Ui::PageHeader.new(
     description: @repository.translate.description(:show, record: @record),
-    title: @repository.translate.title(:show, record: @record),
+    title: @repository.translate.title_for_show(@record),
   )
 ) do |header| %>
   <% header.with_action do %>
@@ -23,7 +23,7 @@
   <% end %>
 
   <% header.with_breadcrumb(items: [
-      {href: @repository.routes.root_path, label: Rails.application.name.titlecase },
+      {href: @repository.routes.root_path, label: @repository.translate.breadcrumb_label_for_root },
       {href: @repository.routes.path_for(:index), label: @repository.translate.breadcrumb_label(:index) },
       {href: @repository.routes.path_for(:show, id: @record.id), label: @repository.translate.breadcrumb_label(:show, record: @record) }
     ]) %>

data/lib/uchi/repository/translate.rb

@@ -39,11 +39,23 @@ module Uchi
           translate(i18n_scope("breadcrumb.index.label"), default: nil),
           translate(i18n_scope("index.title"), default: nil),
           plural_name,
-          translate("common.index"),
+          translate("common.index", default: nil),
           "Index"
         )
       end
 
+      # Returns the label for the root breadcrumb item. Defaults to the
+      # application name.
+      #
+      # To customize this provide a translation for the key:
+      # `uchi.breadcrumb.root.label`
+      def breadcrumb_label_for_root
+        first_present_value(
+          translate("breadcrumb.root.label", default: nil),
+          Rails.application.name.titlecase
+        )
+      end
+
       # Returns a description for the given page, or nil if none is found.
       # This description is intended to provide additional context for the page
       # being shown.
@@ -126,30 +138,53 @@ module Uchi
       end
 
       def link_to_destroy(record)
-        translate(
-          "link_to_destroy",
-          default: "Delete",
-          model: singular_name,
-          record: repository.title(record),
-          scope: i18n_scope("button")
+        first_present_value(
+          translate(
+            "link_to_destroy",
+            default: nil,
+            model: singular_name,
+            record: repository.title(record),
+            scope: i18n_scope("button")
+          ),
+          translate(
+            "common.destroy",
+            default: nil,
+            model: singular_name,
+            record: repository.title(record)
+          ),
+          "Delete"
         )
       end
 
       def link_to_edit(record)
-        translate(
-          "link_to_edit",
-          default: "Edit",
-          model: singular_name,
-          record: repository.title(record),
-          scope: i18n_scope("button")
+        first_present_value(
+          translate(
+            "link_to_edit",
+            default: nil,
+            model: singular_name,
+            record: repository.title(record),
+            scope: i18n_scope("button")
+          ),
+          translate(
+            "common.edit",
+            default: nil,
+            model: singular_name,
+            record: repository.title(record)
+          ),
+          "Edit"
         )
       end
 
       # Returns the text for the "new" action link.
+      #
+      # Returns the first of the following translations that is present:
+      # 1. Translation from "uchi.repository.[name].button.link_to_new"
+      # 2. Translation from "uchi.common.new" with interpolation key %{model}
+      # 3. Default string "New %{model}"
       def link_to_new
         translate(
           "link_to_new",
-          default: "New %{model}", # rubocop:disable Style/FormatStringToken
+          default: translate("common.new", default: "New %{model}"),
           model: singular_name,
           scope: i18n_scope("button")
         )
@@ -159,6 +194,21 @@ module Uchi
         translate("loading", default: "Loading...", scope: "uchi.repository.common")
       end
 
+      # Returns the label for the navigation link to this repository's index
+      # page.
+      #
+      # Returns the first of the following that is present:
+      # 1. Translation from "uchi.repository.[name].navigation.label"
+      # 2. Translation from "uchi.repository.[name].index.title"
+      # 3. plural name of the model
+      def navigation_label
+        first_present_value(
+          translate(i18n_scope("navigation.label"), default: nil),
+          translate(i18n_scope("index.title"), default: nil),
+          plural_name
+        )
+      end
+
       # Returns the localized, human-readable plural name of the model this
       # repository manages.
       def plural_name
@@ -222,16 +272,50 @@ module Uchi
         )
       end
 
-      # Returns the title for the given page.
-      def title(page, record: nil)
-        return repository.title(record) if record && page == :show
+      def title_for_edit(record)
+        first_present_value(
+          translate(
+            "title",
+            default: nil,
+            model: singular_name,
+            record: repository.title(record),
+            scope: i18n_scope(:edit)
+          ),
+          link_to_edit(record)
+        )
+      end
 
+      def title_for_index
         translate(
           "title",
           default: plural_name,
           model: singular_name,
-          record: record,
-          scope: i18n_scope(page)
+          scope: i18n_scope(:index)
+        )
+      end
+
+      def title_for_show(record)
+        return repository.title(record) if record
+
+        translate(
+          "title",
+          default: plural_name,
+          model: singular_name,
+          scope: i18n_scope(:show)
+        )
+      end
+
+      # Returns the title for the "new" page.
+      #
+      # Returns the first of the following translations that is present:
+      # 1. Translation from "uchi.repository.[name].new.title"
+      # 2. Translation from "uchi.repository.[name].button.link_to_new"
+      # 3. Translation from "uchi.common.new" with interpolation key %{model}
+      # 4. Default string "New %{model}"
+      def title_for_new
+        first_present_value(
+          translate(i18n_scope("new.title"), default: nil),
+          link_to_new
         )
       end
 

data/lib/uchi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uchi
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uchi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jakob Skjerning