tiny_admin 0.10.1 → 0.11.0

data/lib/tiny_admin/views/actions/index.rb

@@ -15,22 +15,22 @@ module TinyAdmin
 
         def view_template
           super do
-            div(class: 'index') {
-              div(class: 'row') {
-                div(class: 'col-4') {
-                  h1(class: 'title') {
+            div(class: "index") {
+              div(class: "row") {
+                div(class: "col-4") {
+                  h1(class: "title") {
                     title
                   }
                 }
-                div(class: 'col-8') {
+                div(class: "col-8") {
                   actions_buttons
                 }
               }
 
-              div(class: 'row') {
-                div_class = filters&.any? ? 'col-9' : 'col-12'
+              div(class: "row") {
+                div_class = filters&.any? ? "col-9" : "col-12"
                 div(class: div_class) {
-                  table(class: 'table') {
+                  table(class: "table") {
                     table_header if fields.any?
 
                     table_body
@@ -40,7 +40,7 @@ module TinyAdmin
                 }
 
                 if filters&.any?
-                  div(class: 'col-3') {
+                  div(class: "col-3") {
                     filters_form = TinyAdmin::Views::Components::FiltersForm.new
                     filters_form.update_attributes(section_path: TinyAdmin.route_for(slug), filters: filters)
                     render filters_form
@@ -48,7 +48,8 @@ module TinyAdmin
                 end
               }
 
-              render TinyAdmin::Views::Components::Widgets.new(widgets)
+              context = { slug: slug, records: records, params: params }
+              render TinyAdmin::Views::Components::Widgets.new(widgets, context: context)
             }
           end
         end
@@ -75,20 +76,22 @@ module TinyAdmin
                 attributes = prepare_record.call(record)
                 attributes.each do |key, value|
                   field = fields[key]
+                  next unless field
+
                   td(class: "field-value-#{field.name} field-value-type-#{field.type}") {
                     render TinyAdmin.settings.components[:field_value].new(field, value, record: record)
                   }
                 end
 
-                td(class: 'actions p-1') {
-                  div(class: 'btn-group btn-group-sm') {
-                    link_class = 'btn btn-outline-secondary'
+                td(class: "actions p-1") {
+                  div(class: "btn-group btn-group-sm") {
+                    link_class = "btn btn-outline-secondary"
                     if links
                       links.each do |link|
                         whitespace
-                        if link == 'show'
+                        if link == "show"
                           a(href: TinyAdmin.route_for(slug, reference: record.id), class: link_class) {
-                            label_for('Show', options: ['actions.index.links.show'])
+                            label_for("Show", options: ["actions.index.links.show"])
                           }
                         else
                           a(href: TinyAdmin.route_for(slug, reference: record.id, action: link), class: link_class) {
@@ -99,7 +102,7 @@ module TinyAdmin
                       end
                     else
                       a(href: TinyAdmin.route_for(slug, reference: record.id), class: link_class) {
-                        label_for('Show', options: ['actions.index.links.show'])
+                        label_for("Show", options: ["actions.index.links.show"])
                       }
                     end
                   }
@@ -110,16 +113,9 @@ module TinyAdmin
         end
 
         def actions_buttons
-          ul(class: 'nav justify-content-end') {
-            (actions || {}).each do |action, action_class|
-              li(class: 'nav-item mx-1') {
-                href = TinyAdmin.route_for(slug, action: action)
-                a(href: href, class: 'nav-link btn btn-outline-secondary') {
-                  action_class.respond_to?(:title) ? action_class.title : action
-                }
-              }
-            end
-          }
+          buttons = TinyAdmin::Views::Components::ActionsButtons.new
+          buttons.update_attributes(actions: actions, slug: slug)
+          render buttons
         end
       end
     end

data/lib/tiny_admin/views/actions/show.rb

@@ -13,29 +13,30 @@ module TinyAdmin
 
         def view_template
           super do
-            div(class: 'show') {
-              div(class: 'row') {
-                div(class: 'col-4') {
-                  h1(class: 'title') { title }
+            div(class: "show") {
+              div(class: "row") {
+                div(class: "col-4") {
+                  h1(class: "title") { title }
                 }
-                div(class: 'col-8') {
+                div(class: "col-8") {
                   actions_buttons
                 }
               }
 
               prepare_record.call(record).each do |key, value|
                 field = fields[key]
+                next unless field
+
                 div(class: "field-#{field.name} row lh-lg") {
-                  if field
-                    div(class: 'field-header col-2') { field.options[:header] || field.title }
-                  end
-                  div(class: 'field-value col-10') {
+                  div(class: "field-header col-2") { field.options[:header] || field.title }
+                  div(class: "field-value col-10") {
                     render TinyAdmin.settings.components[:field_value].new(field, value, record: record)
                   }
                 }
               end
 
-              render TinyAdmin::Views::Components::Widgets.new(widgets)
+              context = { slug: slug, record: record, reference: reference, params: params }
+              render TinyAdmin::Views::Components::Widgets.new(widgets, context: context)
             }
           end
         end
@@ -43,16 +44,9 @@ module TinyAdmin
         private
 
         def actions_buttons
-          ul(class: 'nav justify-content-end') {
-            (actions || {}).each do |action, action_class|
-              li(class: 'nav-item mx-1') {
-                href = TinyAdmin.route_for(slug, reference: reference, action: action)
-                a(href: href, class: 'nav-link btn btn-outline-secondary') {
-                  action_class.respond_to?(:title) ? action_class.title : action
-                }
-              }
-            end
-          }
+          buttons = TinyAdmin::Views::Components::ActionsButtons.new
+          buttons.update_attributes(actions: actions, slug: slug, reference: reference)
+          render buttons
         end
       end
     end

data/lib/tiny_admin/views/attributes.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    module Attributes
+      def update_attributes(attributes)
+        attributes.each do |key, value|
+          setter = "#{key}="
+          unless respond_to?(setter)
+            raise ArgumentError, "#{self.class.name} does not support attribute '#{key}'"
+          end
+
+          send(setter, value)
+        end
+      end
+    end
+  end
+end

data/lib/tiny_admin/views/basic_layout.rb

@@ -3,6 +3,7 @@
 module TinyAdmin
   module Views
     class BasicLayout < Phlex::HTML
+      include Attributes
       include Utils
 
       attr_accessor :content, :params, :widgets
@@ -10,12 +11,6 @@ module TinyAdmin
       def label_for(value, options: [])
         TinyAdmin.settings.helper_class.label_for(value, options: options)
       end
-
-      def update_attributes(attributes)
-        attributes.each do |key, value|
-          send("#{key}=", value)
-        end
-      end
     end
   end
 end

data/lib/tiny_admin/views/components/actions_buttons.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    module Components
+      class ActionsButtons < BasicComponent
+        attr_accessor :actions, :slug, :reference
+
+        def view_template
+          ul(class: "nav justify-content-end") {
+            (actions || {}).each do |action, action_class|
+              li(class: "nav-item mx-1") {
+                href = TinyAdmin.route_for(slug, reference: reference, action: action)
+                a(href: href, class: "nav-link btn btn-outline-secondary") {
+                  action_class.respond_to?(:title) ? action_class.title : action
+                }
+              }
+            end
+          }
+        end
+      end
+    end
+  end
+end

data/lib/tiny_admin/views/components/basic_component.rb

@@ -4,11 +4,7 @@ module TinyAdmin
   module Views
     module Components
       class BasicComponent < Phlex::HTML
-        def update_attributes(attributes)
-          attributes.each do |key, value|
-            send("#{key}=", value)
-          end
-        end
+        include Attributes
       end
     end
   end

data/lib/tiny_admin/views/components/field_value.rb

@@ -14,19 +14,30 @@ module TinyAdmin
 
         def view_template
           translated_value = field.translate_value(value)
-          value_class = field.options[:options]&.include?('value_class') ? "value-#{value}" : nil
+          display_value = field.apply_call_option(record) || translated_value
+          value_class = field.options[:options]&.include?("value_class") ? "value-#{value}" : nil
           if field.options[:link_to]
             a(href: TinyAdmin.route_for(field.options[:link_to], reference: translated_value)) {
               span(class: value_class) {
-                field.apply_call_option(record) || translated_value
+                render_value(display_value)
               }
             }
           else
             span(class: value_class) {
-              translated_value
+              render_value(display_value)
             }
           end
         end
+
+        private
+
+        def render_value(val)
+          if val.is_a?(TinyAdmin::RawHtml)
+            unsafe_raw(val.to_s)
+          else
+            val
+          end
+        end
       end
     end
   end

data/lib/tiny_admin/views/components/filters_form.rb

@@ -7,49 +7,49 @@ module TinyAdmin
         attr_accessor :filters, :section_path
 
         def view_template
-          form(class: 'form_filters', method: 'get') {
+          form(class: "form_filters", method: "get") {
             filters.each do |field, filter|
               name = field.name
               filter_data = filter[:filter]
-              div(class: 'mb-3') {
-                label(for: "filter-#{name}", class: 'form-label') { field.title }
+              div(class: "mb-3") {
+                label(for: "filter-#{name}", class: "form-label") { field.title }
                 case filter_data[:type]&.to_sym || field.type
                 when :boolean
-                  select(class: 'form-select', id: "filter-#{name}", name: "q[#{name}]") {
-                    option(value: '') { '-' }
-                    option(value: '0', selected: filter[:value] == '0') {
-                      TinyAdmin.settings.helper_class.label_for('false', options: ['components.filters_form.boolean.false'])
+                  select(class: "form-select", id: "filter-#{name}", name: "q[#{name}]") {
+                    option(value: "") { "-" }
+                    option(value: "0", selected: filter[:value] == "0") {
+                      TinyAdmin.settings.helper_class.label_for("false", options: ["components.filters_form.boolean.false"])
                     }
-                    option(value: '1', selected: filter[:value] == '1') {
-                      TinyAdmin.settings.helper_class.label_for('true', options: ['components.filters_form.boolean.true'])
+                    option(value: "1", selected: filter[:value] == "1") {
+                      TinyAdmin.settings.helper_class.label_for("true", options: ["components.filters_form.boolean.true"])
                     }
                   }
                 when :date
-                  input(type: 'date', class: 'form-control', id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
+                  input(type: "date", class: "form-control", id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
                 when :datetime
-                  input(type: 'datetime-local', class: 'form-control', id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
+                  input(type: "datetime-local", class: "form-control", id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
                 when :integer
-                  input(type: 'number', class: 'form-control', id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
+                  input(type: "number", class: "form-control", id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
                 when :select
-                  select(class: 'form-select', id: "filter-#{name}", name: "q[#{name}]") {
-                    option(value: '') { '-' }
+                  select(class: "form-select", id: "filter-#{name}", name: "q[#{name}]") {
+                    option(value: "") { "-" }
                     filter_data[:values].each do |value|
                       option(selected: filter[:value] == value) { value }
                     end
                   }
                 else
-                  input(type: 'text', class: 'form-control', id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
+                  input(type: "text", class: "form-control", id: "filter-#{name}", name: "q[#{name}]", value: filter[:value])
                 end
               }
             end
 
-            div(class: 'mt-3') {
-              a(href: section_path, class: 'button_clear btn btn-secondary text-white') {
-                TinyAdmin.settings.helper_class.label_for('Clear', options: ['components.filters_form.buttons.clear'])
+            div(class: "mt-3") {
+              a(href: section_path, class: "button_clear btn btn-secondary text-white") {
+                TinyAdmin.settings.helper_class.label_for("Clear", options: ["components.filters_form.buttons.clear"])
               }
               whitespace
-              button(type: 'submit', class: 'button_filter btn btn-secondary') {
-                TinyAdmin.settings.helper_class.label_for('Filter', options: ['components.filters_form.buttons.submit'])
+              button(type: "submit", class: "button_filter btn btn-secondary") {
+                TinyAdmin.settings.helper_class.label_for("Filter", options: ["components.filters_form.buttons.submit"])
               }
             }
           }

data/lib/tiny_admin/views/components/flash.rb

@@ -12,10 +12,10 @@ module TinyAdmin
           warnings = messages[:warnings]
           errors = messages[:errors]
 
-          div(class: 'flash') {
-            div(class: 'notices alert alert-success', role: 'alert') { notices.join(', ') } if notices&.any?
-            div(class: 'notices alert alert-warning', role: 'alert') { warnings.join(', ') } if warnings&.any?
-            div(class: 'notices alert alert-danger', role: 'alert') { errors.join(', ') } if errors&.any?
+          div(class: "flash") {
+            div(class: "notices alert alert-success", role: "alert") { notices.join(", ") } if notices&.any?
+            div(class: "warnings alert alert-warning", role: "alert") { warnings.join(", ") } if warnings&.any?
+            div(class: "errors alert alert-danger", role: "alert") { errors.join(", ") } if errors&.any?
           }
         end
       end

data/lib/tiny_admin/views/components/head.rb

@@ -8,12 +8,12 @@ module TinyAdmin
 
         def view_template
           head {
-            meta charset: 'utf-8'
-            meta name: 'viewport', content: 'width=device-width, initial-scale=1'
+            meta charset: "utf-8"
+            meta name: "viewport", content: "width=device-width, initial-scale=1"
             title {
               page_title
             }
-            style_links.each do |style_link|
+            (style_links || []).each do |style_link|
               link(**style_link)
             end
             style { extra_styles } if extra_styles

data/lib/tiny_admin/views/components/navbar.rb

@@ -7,29 +7,29 @@ module TinyAdmin
         attr_accessor :current_slug, :items, :root_path, :root_title
 
         def view_template
-          nav(class: 'navbar navbar-expand-lg') {
-            div(class: 'container') {
-              a(class: 'navbar-brand', href: root_path) { root_title }
+          nav(class: "navbar navbar-expand-lg") {
+            div(class: "container") {
+              a(class: "navbar-brand", href: root_path) { root_title }
               button(
-                class: 'navbar-toggler',
-                type: 'button',
-                'data-bs-toggle' => 'collapse',
-                'data-bs-target' => '#navbarNav',
-                'aria-controls' => 'navbarNav',
-                'aria-expanded' => 'false',
-                'aria-label' => 'Toggle navigation'
+                class: "navbar-toggler",
+                type: "button",
+                "data-bs-toggle" => "collapse",
+                "data-bs-target" => "#navbarNav",
+                "aria-controls" => "navbarNav",
+                "aria-expanded" => "false",
+                "aria-label" => "Toggle navigation"
               ) {
-                span(class: 'navbar-toggler-icon')
+                span(class: "navbar-toggler-icon")
               }
-              div(class: 'collapse navbar-collapse', id: 'navbarNav') {
-                ul(class: 'navbar-nav') {
+              div(class: "collapse navbar-collapse", id: "navbarNav") {
+                ul(class: "navbar-nav") {
                   items.each do |item|
                     classes = %w[nav-link]
-                    classes << 'active' if item.slug == current_slug
-                    link_attributes = { class: classes.join(' '), href: item.path, 'aria-current' => 'page' }
+                    classes << "active" if item.slug == current_slug
+                    link_attributes = { class: classes.join(" "), href: item.path, "aria-current" => "page" }
                     link_attributes.merge!(item.options) if item.options
 
-                    li(class: 'nav-item') {
+                    li(class: "nav-item") {
                       a(**link_attributes) { item.name }
                     }
                   end

data/lib/tiny_admin/views/components/pagination.rb

@@ -7,28 +7,28 @@ module TinyAdmin
         attr_accessor :current, :pages, :query_string, :total_count
 
         def view_template
-          div(class: 'container') {
-            div(class: 'row') {
-              div(class: 'col total-count') {
+          div(class: "container") {
+            div(class: "row") {
+              div(class: "col total-count") {
                 "#{total_count} items"
               }
-              div(class: 'col col-6 text-center pagination-div') {
-                nav(class: 'd-inline-block', 'aria-label': 'Pagination') {
-                  ul(class: 'pagination') {
+              div(class: "col col-6 text-center pagination-div") {
+                nav(class: "d-inline-block", "aria-label": "Pagination") {
+                  ul(class: "pagination") {
                     if pages <= 10
                       pages_range(1..pages)
                     elsif current <= 4 || current >= pages - 3
-                      pages_range(1..(current <= 4 ? current + 2 : 4), with_dots: true)
-                      pages_range((current > pages - 4 ? current - 2 : pages - 2)..pages)
+                      pages_range(1..(current <= 4 ? (current + 2) : 4), with_dots: true)
+                      pages_range((current > pages - 4 ? (current - 2) : (pages - 2))..pages)
                     else
                       pages_range(1..1, with_dots: true)
-                      pages_range(current - 2..current + 2, with_dots: true)
+                      pages_range((current - 2)..(current + 2), with_dots: true)
                       pages_range(pages..pages)
                     end
                   }
                 }
               }
-              div(class: 'col')
+              div(class: "col")
             }
           }
         end
@@ -37,17 +37,17 @@ module TinyAdmin
 
         def pages_range(range, with_dots: false)
           range.each do |page|
-            li(class: page == current ? 'page-item active' : 'page-item') {
+            li(class: page == current ? "page-item active" : "page-item") {
               href = query_string.empty? ? "?p=#{page}" : "?#{query_string}&p=#{page}"
-              a(class: 'page-link', href: href) { page }
+              a(class: "page-link", href: href) { page.to_s }
             }
           end
           dots if with_dots
         end
 
         def dots
-          li(class: 'page-item disabled') {
-            a(class: 'page-link') { '...' }
+          li(class: "page-item disabled") {
+            a(class: "page-link") { "..." }
           }
         end
       end

data/lib/tiny_admin/views/components/widgets.rb

@@ -4,23 +4,24 @@ module TinyAdmin
   module Views
     module Components
       class Widgets < BasicComponent
-        def initialize(widgets)
+        def initialize(widgets, context: {})
           @widgets = widgets
+          @context = context
         end
 
         def view_template
           return if @widgets.nil? || @widgets.empty?
 
-          div(class: 'container widgets') {
+          div(class: "container widgets") {
             @widgets.each_slice(2).each do |row|
-              div(class: 'row') {
+              div(class: "row") {
                 row.each do |widget|
                   next unless widget < Phlex::HTML
 
-                  div(class: 'col') {
-                    div(class: 'card') {
-                      div(class: 'card-body') {
-                        render widget.new
+                  div(class: "col") {
+                    div(class: "card") {
+                      div(class: "card-body") {
+                        render build_widget(widget)
                       }
                     }
                   }
@@ -29,6 +30,20 @@ module TinyAdmin
             end
           }
         end
+
+        private
+
+        def build_widget(widget)
+          key_params = [:key, :keyreq]
+          if widget.instance_method(:initialize).arity != 0 ||
+             widget.instance_method(:initialize).parameters.any? { |type, _| key_params.include?(type) }
+            widget.new(context: @context)
+          else
+            widget.new
+          end
+        rescue ArgumentError
+          widget.new
+        end
       end
     end
   end

data/lib/tiny_admin/views/default_layout.rb

@@ -35,10 +35,10 @@ module TinyAdmin
       end
 
       def main_content
-        div(class: 'container main-content py-4') do
+        div(class: "container main-content py-4") do
           if options&.include?(:compact_layout)
-            div(class: 'row justify-content-center') {
-              div(class: 'col-6') {
+            div(class: "row justify-content-center") {
+              div(class: "col-6") {
                 yield
               }
             }
@@ -52,10 +52,10 @@ module TinyAdmin
         TinyAdmin.settings.style_links || [
           # Bootstrap CDN
           {
-            href: 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css',
-            rel: 'stylesheet',
-            integrity: 'sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65',
-            crossorigin: 'anonymous'
+            href: "https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css",
+            rel: "stylesheet",
+            integrity: "sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65",
+            crossorigin: "anonymous"
           }
         ]
       end

data/lib/tiny_admin/views/pages/content.rb

@@ -6,12 +6,12 @@ module TinyAdmin
       class Content < DefaultLayout
         def view_template
           super do
-            div(class: 'content') {
-              div(class: 'content-data') {
+            div(class: "content") {
+              div(class: "content-data") {
                 unsafe_raw(content)
               }
 
-              render TinyAdmin::Views::Components::Widgets.new(widgets)
+              render TinyAdmin::Views::Components::Widgets.new(widgets, context: { params: params })
             }
           end
         end

data/lib/tiny_admin/views/pages/error_page.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    module Pages
+      class ErrorPage < DefaultLayout
+        def view_template
+          super do
+            div(class: css_class) {
+              h1(class: "title") { title }
+            }
+          end
+        end
+
+        private
+
+        def css_class
+          self.class.name.split("::").last
+              .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+              .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+              .downcase
+        end
+      end
+    end
+  end
+end

data/lib/tiny_admin/views/pages/page_not_allowed.rb

@@ -3,17 +3,9 @@
 module TinyAdmin
   module Views
     module Pages
-      class PageNotAllowed < DefaultLayout
-        def view_template
-          super do
-            div(class: 'page_not_allowed') {
-              h1(class: 'title') { title }
-            }
-          end
-        end
-
+      class PageNotAllowed < ErrorPage
         def title
-          'Page not allowed'
+          "Page not allowed"
         end
       end
     end