tiny_admin 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8eb3987f51f28c4f9a55c62fddfd521accf075aac9be4d0b4fab7e88145770
-  data.tar.gz: 98e2f4af557280ca167816fa325f824d5eda99cde96d35407d472ab1e37b370d
+  metadata.gz: 6eb4a218cc1a4ff6acc940c402d74202582d2092b39f920e6551e5b395da752e
+  data.tar.gz: fb137625f9f5faa5b33dd5c7633a68eec7a4a2d2bb31db6f70758d6ed9ec3750
 SHA512:
-  metadata.gz: 501e766d535a08b80597c7e5e9c5c40c075a74d1ddf347ad6d0858600c37fb945e39616a7d3b62d91a9486484a6a7d5edbd59fdfaca7e373fa099ecb8092edef
-  data.tar.gz: cfd95059d66a9f5d83b60086b5b59d01840fc654e929546778d02457605d6bca1b22cf3f587a92db93575464281ef0f1cd7993a2082bd234ef91c124e84b5ad7
+  metadata.gz: fd7800ab65bd0e92ce5646210f08823d031fdd217f5230bc99207a0e00375b068ad2337805ddce196ca317fe6f0df60ad3e209fc885e31c765c68c125f83d900
+  data.tar.gz: f1df2bd938781a04c4af36c9653a7efffcc075cf72accd8f9fbaedbcc74286d860a1953bab159ec833c6a2cf5851a00633f555966b915fedec625af9ef2f85fa

data/README.md

@@ -16,7 +16,7 @@ Please ⭐ if you like it.
 
 ## Install
 
-- Add to your Gemfile: `gem 'tiny_admin', '~> 0.2'`
+- Add to your Gemfile: `gem 'tiny_admin', '~> 0.4'`
 - Mount the app in a route (check some examples with: Hanami, Rails, Roda and standalone in [extra](extra))
   + in Rails, update _config/routes.rb_: `mount TinyAdmin::Router => '/admin'`
 - Configure the dashboard using `TinyAdmin.configure` and/or `TinyAdmin.configure_from_file` (see [configuration](#configuration) below):
@@ -82,6 +82,12 @@ root:
   redirect: posts
 ```
 
+`helper_class` (String): class or module with helper methods, used for attributes' formatters.
+
+`page_not_found` (String): a view object to render when a missing page is requested.
+
+`record_not_found` (String): a view object to render when a missing record is requested.
+
 `authentication` (Hash): define the authentication method, properties:
   - `plugin` (String): a plugin class to use (ex. `TinyAdmin::Plugins::SimpleAuth`);
   - `password` (String): a password hash used by _SimpleAuth_ plugin (generated with `Digest::SHA512.hexdigest("some password")`).
@@ -175,65 +181,64 @@ end
 ---
 authentication:
   plugin: TinyAdmin::Plugins::SimpleAuth
-  # password: 'f1891cea80fc05e433c943254c6bdabc159577a02a7395df...' <= SHA512
-page_not_found: Admin::PageNotFound
-record_not_found: Admin::RecordNotFound
+  # password: 'f1891cea80fc05e433c943254c6bdabc159577a02a7395dfebbfbc4f7661d4af56f2d372131a45936de40160007368a56ef216a30cb202c66d3145fd24380906'
 root:
-  title: 'Tiny Admin'
-  page: Admin::PageRoot
-  # redirect: posts
+  title: Test Admin
+  # page: RootPage
+helper_class: AdminHelper
+page_not_found: PageNotFound
+record_not_found: RecordNotFound
 sections:
   - slug: google
     name: Google.it
     type: url
     url: https://www.google.it
     options:
-      target: '_blank'
-  - slug: stats
-    name: Stats
+      target: _blank
+  - slug: sample
+    name: Sample page
     type: page
-    page: Admin::Stats
+    page: SamplePage
   - slug: authors
     name: Authors
     type: resource
     model: Author
-    repository: Admin::AuthorsRepo
     collection_actions:
-      - latests: Admin::LatestAuthorsAction
+      - sample_col: SampleCollectionAction
     member_actions:
-      - csv_export: Admin::CsvExportAuthorAction
-    # only:
-    #   - index
-    # options:
-    #   - hidden
+      - sample_mem: SampleMemberAction
   - slug: posts
     name: Posts
     type: resource
     model: Post
     index:
-      sort:
-        - author_id DESC
-      pagination: 15
+      pagination: 5
       attributes:
         - id
         - title
         - field: author_id
           link_to: authors
-        - state
+        - category: upcase
+        - state: downcase
         - published
-        - dt
+        - position: round, 1
+        - dt: to_date
         - field: created_at
-          converter: Admin::Utils
+          converter: AdminUtils
           method: datetime_formatter
+        - updated_at: strftime, %Y%m%d %H:%M
       filters:
         - title
-        - field: state
+        - author_id
+        - field: category
           type: select
           values:
-            - available
-            - unavailable
-            - arriving
+            - news
+            - sport
+            - tech
         - published
+        - dt
+        - created_at
     show:
       attributes:
         - id
@@ -243,7 +248,8 @@ sections:
           link_to: authors
         - category
         - published
-        - state
+        - position: format, %f
+        - dt
         - created_at
 style_links:
   - href: /bootstrap.min.css

data/lib/tiny_admin/actions/basic_action.rb

@@ -5,12 +5,21 @@ module TinyAdmin
     class BasicAction
       include Utils
 
-      attr_reader :params, :path, :repository
-
-      def initialize(repository, path:, params:)
-        @repository = repository
-        @path = path
-        @params = params
+      def attribute_options(options)
+        options&.each_with_object({}) do |field, result|
+          field_data =
+            if field.is_a?(Hash)
+              if field.one?
+                field, method = field.first
+                { field.to_s => { field: field.to_s, method: method } }
+              else
+                { field[:field] => field }
+              end
+            else
+              { field => { field: field } }
+            end
+          result.merge!(field_data)
+        end
       end
     end
   end

data/lib/tiny_admin/actions/index.rb

@@ -3,30 +3,41 @@
 module TinyAdmin
   module Actions
     class Index < BasicAction
-      attr_reader :current_page, :fields_options, :filters_list, :pagination, :query_string, :sort
+      attr_reader :current_page,
+                  :fields_options,
+                  :filters_list,
+                  :pagination,
+                  :pages,
+                  :params,
+                  :query_string,
+                  :repository,
+                  :sort
 
       def call(app:, context:, options:, actions:)
         evaluate_options(options)
         fields = repository.fields(options: fields_options)
         filters = prepare_filters(fields, filters_list)
         records, total_count = repository.list(page: current_page, limit: pagination, filters: filters, sort: sort)
-        prepare_record = ->(record) { repository.index_record_attrs(record, fields: fields_options) }
-        title = repository.index_title
-        pages = (total_count / pagination.to_f).ceil
-
-        prepare_page(Views::Actions::Index, context: context) do |page|
-          page.setup_pagination(current_page: current_page, pages: pages > 1 ? pages : false)
-          page.setup_records(records: records, fields: fields, prepare_record: prepare_record)
-          page.update_attributes(actions: actions, filters: filters, query_string: query_string, title: title)
+
+        prepare_page(Views::Actions::Index) do |page|
+          setup_pagination(page, settings.components[:pagination], total_count: total_count)
+          page.update_attributes(
+            actions: actions,
+            fields: fields,
+            filters: filters,
+            prepare_record: ->(record) { repository.index_record_attrs(record, fields: fields_options) },
+            records: records,
+            title: repository.index_title
+          )
         end
       end
 
       private
 
       def evaluate_options(options)
-        @fields_options = options[:attributes]&.each_with_object({}) do |field, result|
-          result.merge!(field.is_a?(Hash) ? { field[:field] => field } : { field => { field: field } })
-        end
+        @fields_options = attribute_options(options[:attributes])
+        @params = context.request.params
+        @repository = context.repository
         @filters_list = options[:filters]
         @pagination = options[:pagination] || 10
         @sort = options[:sort] || ['id']
@@ -39,10 +50,18 @@ module TinyAdmin
         filters = (filters_list || []).map { _1.is_a?(Hash) ? _1 : { field: _1 } }
         filters = filters.each_with_object({}) { |filter, result| result[filter[:field]] = filter }
         values = (params['q'] || {})
-        fields.each_with_object({}) do |field, result|
-          result[field] = { value: values[field.name], filter: filters[field.name] } if filters.key?(field.name)
+        fields.each_with_object({}) do |(name, field), result|
+          result[field] = { value: values[name], filter: filters[name] } if filters.key?(name)
         end
       end
+
+      def setup_pagination(page, pagination_component_class, total_count:)
+        @pages = (total_count / pagination.to_f).ceil
+        return if pages <= 1 || !pagination_component_class
+
+        page.pagination_component = pagination_component_class.new
+        page.pagination_component.update(current: current_page, pages: pages, query_string: query_string)
+      end
     end
   end
 end

data/lib/tiny_admin/actions/show.rb

@@ -3,17 +3,21 @@
 module TinyAdmin
   module Actions
     class Show < BasicAction
+      attr_reader :repository
+
       def call(app:, context:, options:, actions:)
-        fields_options = (options[:attributes] || []).each_with_object({}) do |field, result|
-          result.merge!(field.is_a?(Hash) ? { field[:field] => field } : { field => { field: field } })
-        end
+        @repository = context.repository
+        fields_options = attribute_options(options[:attributes])
         record = repository.find(context.reference)
-        prepare_record = ->(record_data) { repository.show_record_attrs(record_data, fields: fields_options) }
-        fields = repository.fields(options: fields_options)
 
-        prepare_page(Views::Actions::Show, context: context) do |page|
-          page.setup_record(record: record, fields: fields, prepare_record: prepare_record)
-          page.update_attributes(actions: actions, title: repository.show_title(record))
+        prepare_page(Views::Actions::Show) do |page|
+          page.update_attributes(
+            actions: actions,
+            fields: repository.fields(options: fields_options),
+            prepare_record: ->(record_data) { repository.show_record_attrs(record_data, fields: fields_options) },
+            record: record,
+            title: repository.show_title(record)
+          )
         end
       rescue Plugins::BaseRepository::RecordNotFound => _e
         prepare_page(options[:record_not_found_page] || Views::Pages::RecordNotFound)

data/lib/tiny_admin/context.rb

@@ -4,6 +4,6 @@ module TinyAdmin
   class Context
     include Singleton
 
-    attr_accessor :reference, :slug
+    attr_accessor :reference, :repository, :request, :router, :settings, :slug
   end
 end

data/lib/tiny_admin/field.rb

@@ -4,7 +4,7 @@ module TinyAdmin
   class Field
     attr_reader :name, :options, :title, :type
 
-    def initialize(type:, name:, title:, options: {})
+    def initialize(name:, title:, type:, options: {})
       @type = type
       @name = name
       @title = title || name
@@ -12,8 +12,14 @@ module TinyAdmin
     end
 
     class << self
-      def create_field(name:, title:, type: nil, options: {})
-        new(type: type, name: name, title: title, options: options)
+      def create_field(name:, title: nil, type: nil, options: {})
+        field_name = name.to_s
+        new(
+          name: field_name,
+          title: title || field_name.respond_to?(:humanize) ? field_name.humanize : field_name.tr('_', ' ').capitalize,
+          type: type || :string,
+          options: options
+        )
       end
     end
   end

data/lib/tiny_admin/plugins/active_record_repository.rb

@@ -4,17 +4,11 @@ module TinyAdmin
   module Plugins
     class ActiveRecordRepository < BaseRepository
       def index_record_attrs(record, fields: nil)
-        return record.attributes.transform_values(&:to_s) if !fields || fields.empty?
+        return record.attributes.transform_values(&:to_s) unless fields
 
-        record.attributes.slice(*fields.keys).each_with_object({}) do |(key, value), result|
-          field_data = fields[key]
-          result[key] =
-            if field_data[:converter] && field_data[:method]
-              converter = Object.const_get(field_data[:converter])
-              converter.send(field_data[:method], value)
-            else
-              value&.to_s
-            end
+        fields.to_h do |name, field|
+          value = record.send(name)
+          [name, translate_value(value, field)]
         end
       end
 
@@ -24,25 +18,19 @@ module TinyAdmin
       end
 
       def fields(options: nil)
-        opts = options || {}
-        columns = model.columns
-        if !opts.empty?
-          extra_fields = opts.keys - model.column_names
-          raise "Some requested fields are not available: #{extra_fields.join(', ')}" if extra_fields.any?
-
-          columns = opts.keys.map { |field| columns.find { _1.name == field } }
-        end
-        columns.map do |column|
-          name = column.name
-          type = opts.dig(column.name, :type) || column.type
-          TinyAdmin::Field.create_field(name: name, title: name.humanize, type: type, options: opts[name])
+        if options
+          types = model.columns.to_h { [_1.name, _1.type] }
+          options.each_with_object({}) do |(name, field_options), result|
+            result[name] = TinyAdmin::Field.create_field(name: name, type: types[name], options: field_options)
+          end
+        else
+          model.columns.each_with_object({}) do |column, result|
+            result[column.name] = TinyAdmin::Field.create_field(name: column.name, type: column.type)
+          end
         end
       end
 
-      def show_record_attrs(record, fields: nil)
-        attrs = !fields || fields.empty? ? record.attributes : record.attributes.slice(*fields.keys)
-        attrs.transform_values(&:to_s)
-      end
+      alias show_record_attrs index_record_attrs
 
       def show_title(record)
         "#{model} ##{record.id}"
@@ -54,10 +42,10 @@ module TinyAdmin
         raise BaseRepository::RecordNotFound, e.message
       end
 
-      def list(page: 1, limit: 10, filters: nil, sort: ['id'])
-        page_offset = page.positive? ? (page - 1) * limit : 0
+      def list(page: 1, limit: 10, sort: ['id'], filters: nil)
         query = model.all.order(sort)
         query = apply_filters(query, filters) if filters
+        page_offset = page.positive? ? (page - 1) * limit : 0
         records = query.offset(page_offset).limit(limit).to_a
         [records, query.count]
       end

data/lib/tiny_admin/plugins/base_repository.rb

@@ -10,6 +10,20 @@ module TinyAdmin
       def initialize(model)
         @model = model
       end
+
+      def translate_value(value, field)
+        if field[:method]
+          method, *options = field[:method].split(',').map(&:strip)
+          if field[:converter]
+            converter = Object.const_get(field[:converter])
+            converter.send(method, value, options: options || [])
+          else
+            Settings.instance.helper_class.send(method, value, options: options || [])
+          end
+        else
+          value&.to_s
+        end
+      end
     end
   end
 end

data/lib/tiny_admin/router.rb

@@ -2,9 +2,11 @@
 
 module TinyAdmin
   class Router < BasicApp
-    TinyAdmin::Settings.instance.load_settings
-
     route do |r|
+      context.settings = TinyAdmin::Settings.instance
+      context.settings.load_settings
+      context.router = r
+
       r.on 'auth' do
         context.slug = nil
         r.run Authentication
@@ -27,11 +29,11 @@ module TinyAdmin
         r.redirect settings.root_path
       end
 
-      TinyAdmin::Settings.instance.pages.each do |slug, data|
+      context.settings.pages.each do |slug, data|
         setup_page_route(r, slug, data)
       end
 
-      TinyAdmin::Settings.instance.resources.each do |slug, options|
+      context.settings.resources.each do |slug, options|
         setup_resource_routes(r, slug, options: options || {})
       end
 
@@ -54,14 +56,14 @@ module TinyAdmin
       else
         page = settings.root[:page]
         page_class = page.is_a?(String) ? Object.const_get(page) : page
-        render_page prepare_page(page_class, context: context)
+        render_page prepare_page(page_class)
       end
     end
 
     def setup_page_route(router, slug, page_class)
       router.get slug do
         context.slug = slug
-        render_page prepare_page(page_class, context: context)
+        render_page prepare_page(page_class)
       end
     end
 
@@ -74,14 +76,14 @@ module TinyAdmin
     end
 
     def setup_collection_routes(router, options:)
-      repository = options[:repository].new(options[:model])
+      context.repository = options[:repository].new(options[:model])
       action_options = options[:index] || {}
 
       # Custom actions
       custom_actions = setup_custom_actions(
         router,
         options[:collection_actions],
-        repository: repository,
+        repository: context.repository,
         options: action_options
       )
 
@@ -89,14 +91,15 @@ module TinyAdmin
       actions = options[:only]
       if !actions || actions.include?(:index) || actions.include?('index')
         router.is do
-          index_action = TinyAdmin::Actions::Index.new(repository, path: request.path, params: request.params)
+          context.request = request
+          index_action = TinyAdmin::Actions::Index.new
           render_page index_action.call(app: self, context: context, options: action_options, actions: custom_actions)
         end
       end
     end
 
     def setup_member_routes(router, options:)
-      repository = options[:repository].new(options[:model])
+      context.repository = options[:repository].new(options[:model])
       action_options = (options[:show] || {}).merge(record_not_found_page: settings.record_not_found)
 
       router.on String do |reference|
@@ -106,7 +109,7 @@ module TinyAdmin
         custom_actions = setup_custom_actions(
           router,
           options[:member_actions],
-          repository: repository,
+          repository: context.repository,
           options: action_options
         )
 
@@ -114,7 +117,8 @@ module TinyAdmin
         actions = options[:only]
         if !actions || actions.include?(:show) || actions.include?('show')
           router.is do
-            show_action = TinyAdmin::Actions::Show.new(repository, path: request.path, params: request.params)
+            context.request = request
+            show_action = TinyAdmin::Actions::Show.new
             render_page show_action.call(app: self, context: context, options: action_options, actions: custom_actions)
           end
         end
@@ -122,16 +126,18 @@ module TinyAdmin
     end
 
     def setup_custom_actions(router, custom_actions, repository:, options:)
-      (custom_actions || []).map do |custom_action|
+      context.repository = repository
+      (custom_actions || []).each_with_object({}) do |custom_action, result|
         action_slug, action = custom_action.first
         action_class = action.is_a?(String) ? Object.const_get(action) : action
 
         router.get action_slug.to_s do
-          custom_action = action_class.new(repository, path: request.path, params: request.params)
+          context.request = request
+          custom_action = action_class.new
           render_page custom_action.call(app: self, context: context, options: options)
         end
 
-        action_slug.to_s
+        result[action_slug.to_s] = action_class
       end
     end
   end

data/lib/tiny_admin/settings.rb

@@ -5,9 +5,26 @@ module TinyAdmin
     include Singleton
     include Utils
 
+    DEFAULTS = {
+      %i[authentication plugin] => Plugins::NoAuth,
+      %i[authentication login] => Views::Pages::SimpleAuthLogin,
+      %i[components flash] => Views::Components::Flash,
+      %i[components head] => Views::Components::Head,
+      %i[components navbar] => Views::Components::Navbar,
+      %i[components pagination] => Views::Components::Pagination,
+      %i[helper_class] => Support,
+      %i[page_not_found] => Views::Pages::PageNotFound,
+      %i[record_not_found] => Views::Pages::RecordNotFound,
+      %i[repository] => Plugins::ActiveRecordRepository,
+      %i[root_path] => '/admin',
+      %i[root page] => Views::Pages::Root,
+      %i[root title] => 'TinyAdmin'
+    }.freeze
+
     attr_accessor :authentication,
                   :components,
                   :extra_styles,
+                  :helper_class,
                   :navbar,
                   :page_not_found,
                   :record_not_found,
@@ -20,38 +37,33 @@ module TinyAdmin
 
     attr_reader :pages, :resources
 
-    def load_settings
-      @authentication ||= {}
-      @authentication[:plugin] ||= Plugins::NoAuth
-      @authentication[:login] ||= Views::Pages::SimpleAuthLogin
-      @authentication[:plugin] = Object.const_get(authentication[:plugin]) if authentication[:plugin].is_a?(String)
+    def [](key)
+      send(key)
+    end
+
+    def []=(key, value)
+      send("#{key}=", value)
+      convert_value(key, value)
+    end
 
-      @page_not_found ||= Views::Pages::PageNotFound
-      @page_not_found = Object.const_get(@page_not_found) if @page_not_found.is_a?(String)
-      @record_not_found ||= Views::Pages::RecordNotFound
-      @record_not_found = Object.const_get(@record_not_found) if @record_not_found.is_a?(String)
+    def load_settings
+      # default values
+      DEFAULTS.each do |(option, param), default|
+        if param
+          self[option] ||= {}
+          self[option][param] ||= default
+        else
+          self[option] ||= default
+        end
+      end
 
       @pages ||= {}
-      @repository ||= Plugins::ActiveRecordRepository
       @resources ||= {}
-      @root_path ||= '/admin'
-      @root_path = '/' if @root_path == ''
       @sections ||= []
-
-      @root ||= {}
-      @root[:title] ||= 'TinyAdmin'
-      @root[:page] ||= Views::Pages::Root
-
+      @root_path = '/' if @root_path == ''
       if @authentication[:plugin] == Plugins::SimpleAuth
         @authentication[:logout] ||= ['logout', "#{root_path}/auth/logout"]
       end
-
-      @components ||= {}
-      @components[:flash] ||= Views::Components::Flash
-      @components[:head] ||= Views::Components::Head
-      @components[:navbar] ||= Views::Components::Navbar
-      @components[:pagination] ||= Views::Components::Pagination
-
       @navbar = prepare_navbar(sections, logout: authentication[:logout])
     end
 
@@ -79,5 +91,20 @@ module TinyAdmin
       items['auth/logout'] = logout if logout
       items
     end
+
+    private
+
+    def convert_value(key, value)
+      if value.is_a?(Hash)
+        value.each_key do |key2|
+          path = [key, key2]
+          if DEFAULTS[path].is_a?(Class) || DEFAULTS[path].is_a?(Module)
+            self[key][key2] = Object.const_get(self[key][key2])
+          end
+        end
+      elsif value.is_a?(String) && (DEFAULTS[[key]].is_a?(Class) || DEFAULTS[[key]].is_a?(Module))
+        self[key] = Object.const_get(self[key])
+      end
+    end
   end
 end

data/lib/tiny_admin/support.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  class Support
+    class << self
+      def call(value, options: [])
+        value && options&.any? ? options.inject(value) { |result, message| result&.send(message) } : value
+      end
+
+      def downcase(value, options: [])
+        value&.downcase
+      end
+
+      def format(value, options: [])
+        value && options&.any? ? Kernel.format(options.first, value) : value
+      end
+
+      def round(value, options: [])
+        value&.round(options&.first&.to_i || 2)
+      end
+
+      def strftime(value, options: [])
+        value ? value.strftime(options&.first || '%Y-%m-%d %H:%M') : ''
+      end
+
+      def to_date(value, options: [])
+        value ? value.to_date.to_s : value
+      end
+
+      def upcase(value, options: [])
+        value&.upcase
+      end
+    end
+  end
+end

data/lib/tiny_admin/utils.rb

@@ -13,17 +13,26 @@ module TinyAdmin
       list.join('&')
     end
 
-    def prepare_page(page_class, context: nil, options: nil)
+    def prepare_page(page_class, options: nil)
       page_class.new.tap do |page|
-        page.context = context
         page.options = options
+        page.head_component = settings.components[:head]&.new
+        page.flash_component = settings.components[:flash]&.new
+        page.navbar_component = settings.components[:navbar]&.new(
+          current_slug: context&.slug,
+          root_path: settings.root_path,
+          root_title: settings.root[:title],
+          items: options&.include?(:no_menu) ? [] : settings.navbar
+        )
+
         yield(page) if block_given?
       end
     end
 
-    def route_for(section, reference: nil, action: nil)
+    def route_for(section, reference: nil, action: nil, query: nil)
       root_path = settings.root_path == '/' ? nil : settings.root_path
       route = [root_path, section, reference, action].compact.join("/")
+      route << "?#{query}" if query
       route[0] == '/' ? route : route.prepend('/')
     end
 

data/lib/tiny_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TinyAdmin
-  VERSION = '0.2.1'
+  VERSION = '0.4.0'
 end

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

@@ -4,23 +4,9 @@ module TinyAdmin
   module Views
     module Actions
       class Index < DefaultLayout
-        attr_reader :current_page, :fields, :pages, :prepare_record, :records
-        attr_accessor :actions, :filters, :query_string
-
-        def setup_pagination(current_page:, pages:)
-          @current_page = current_page
-          @pages = pages
-        end
-
-        def setup_records(records:, fields:, prepare_record:)
-          @records = records
-          @fields = fields.each_with_object({}) { |field, result| result[field.name] = field }
-          @prepare_record = prepare_record
-        end
+        attr_accessor :actions, :fields, :filters, :pagination_component, :prepare_record, :records
 
         def template
-          @filters ||= {}
-
           super do
             div(class: 'index') {
               div(class: 'row') {
@@ -28,19 +14,12 @@ module TinyAdmin
                   h1(class: 'title') { title }
                 }
                 div(class: 'col-8') {
-                  ul(class: 'nav justify-content-end') {
-                    (actions || []).each do |action|
-                      li(class: 'nav-item') {
-                        href = route_for(context.slug, action: action)
-                        a(href: href, class: 'nav-link btn btn-outline-secondary') { action }
-                      }
-                    end
-                  }
+                  actions_buttons
                 }
               }
 
               div(class: 'row') {
-                div_class = filters.any? ? 'col-9' : 'col-12'
+                div_class = filters&.any? ? 'col-9' : 'col-12'
                 div(class: div_class) {
                   table(class: 'table') {
                     table_header if fields.any?
@@ -49,7 +28,7 @@ module TinyAdmin
                   }
                 }
 
-                if filters.any?
+                if filters&.any?
                   div(class: 'col-3') {
                     filters_form_attrs = { section_path: route_for(context.slug), filters: filters }
                     render TinyAdmin::Views::Components::FiltersForm.new(**filters_form_attrs)
@@ -57,9 +36,7 @@ module TinyAdmin
                 end
               }
 
-              if pages
-                render components[:pagination].new(current: current_page, pages: pages, query_string: query_string)
-              end
+              render pagination_component if pagination_component
             }
           end
         end
@@ -70,7 +47,9 @@ module TinyAdmin
           thead {
             tr {
               fields.each_value do |field|
-                td(class: "field-header-#{field.name} field-header-type-#{field.type}") { field.title }
+                td(class: "field-header-#{field.name} field-header-type-#{field.type}") {
+                  field.options[:header] || field.title
+                }
               end
               td { whitespace }
             }
@@ -86,8 +65,9 @@ module TinyAdmin
                   field = fields[key]
                   td(class: "field-value-#{field.name} field-value-type-#{field.type}") {
                     if field.options && field.options[:link_to]
-                      reference = record.send(field.options[:field])
-                      a(href: route_for(field.options[:link_to], reference: reference)) { value }
+                      messages = (field.options[:call] || '').split(',').map(&:strip)
+                      label = messages.any? ? messages.inject(record) { |result, msg| result&.send(msg) } : value
+                      a(href: route_for(field.options[:link_to], reference: value)) { label }
                     else
                       value
                     end
@@ -100,6 +80,18 @@ module TinyAdmin
             end
           }
         end
+
+        def actions_buttons
+          ul(class: 'nav justify-content-end') {
+            (actions || {}).each do |action, action_class|
+              li(class: 'nav-item mx-1') {
+                href = route_for(context.slug, action: action)
+                title = action_class.respond_to?(:title) ? action_class.title : action
+                a(href: href, class: 'nav-link btn btn-outline-secondary') { title }
+              }
+            end
+          }
+        end
       end
     end
   end

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

@@ -4,14 +4,7 @@ module TinyAdmin
   module Views
     module Actions
       class Show < DefaultLayout
-        attr_reader :fields, :prepare_record, :record
-        attr_accessor :actions
-
-        def setup_record(record:, fields:, prepare_record:)
-          @record = record
-          @fields = fields
-          @prepare_record = prepare_record
-        end
+        attr_accessor :actions, :fields, :prepare_record, :record
 
         def template
           super do
@@ -21,27 +14,21 @@ module TinyAdmin
                   h1(class: 'title') { title }
                 }
                 div(class: 'col-8') {
-                  ul(class: 'nav justify-content-end') {
-                    (actions || []).each do |action|
-                      li(class: 'nav-item') {
-                        href = route_for(context.slug, reference: context.reference, action: action)
-                        a(href: href, class: 'nav-link btn btn-outline-secondary') { action }
-                      }
-                    end
-                  }
+                  actions_buttons
                 }
               }
 
-              prepare_record.call(record).each_with_index do |(_key, value), index|
-                field = fields[index]
+              prepare_record.call(record).each do |key, value|
+                field = fields[key]
                 div(class: "field-#{field.name} row lh-lg") {
                   if field
-                    div(class: 'field-header col-2') { field.title }
+                    div(class: 'field-header col-2') { field.options[:header] || field.title }
                   end
                   div(class: 'field-value col-10') {
                     if field.options && field.options[:link_to]
-                      reference = record.send(field.options[:field])
-                      a(href: route_for(field.options[:link_to], reference: reference)) { value }
+                      messages = (field.options[:call] || '').split(',').map(&:strip)
+                      label = messages.any? ? messages.inject(record) { |result, msg| result&.send(msg) } : value
+                      a(href: route_for(field.options[:link_to], reference: value)) { label }
                     else
                       value
                     end
@@ -51,6 +38,20 @@ module TinyAdmin
             }
           end
         end
+
+        private
+
+        def actions_buttons
+          ul(class: 'nav justify-content-end') {
+            (actions || {}).each do |action, action_class|
+              li(class: 'nav-item mx-1') {
+                href = route_for(context.slug, reference: context.reference, action: action)
+                title = action_class.respond_to?(:title) ? action_class.title : action
+                a(href: href, class: 'nav-link btn btn-outline-secondary') { title }
+              }
+            end
+          }
+        end
       end
     end
   end

data/lib/tiny_admin/views/basic_layout.rb

@@ -5,10 +5,6 @@ module TinyAdmin
     class BasicLayout < Phlex::HTML
       include Utils
 
-      def components
-        settings.components
-      end
-
       def update_attributes(attributes)
         attributes.each do |key, value|
           send("#{key}=", value)

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

@@ -6,14 +6,6 @@ module TinyAdmin
       class Flash < Phlex::HTML
         attr_reader :errors, :notices, :warnings
 
-        def initialize(messages:)
-          return unless messages
-
-          @notices = messages[:notices]
-          @warnings = messages[:warnings]
-          @errors = messages[:errors]
-        end
-
         def template
           div(class: 'flash') {
             div(class: 'notices alert alert-success', role: 'alert') { notices.join(', ') } if notices&.any?
@@ -21,6 +13,14 @@ module TinyAdmin
             div(class: 'notices alert alert-danger', role: 'alert') { errors.join(', ') } if errors&.any?
           }
         end
+
+        def update(messages:)
+          return unless messages
+
+          @notices = messages[:notices]
+          @warnings = messages[:warnings]
+          @errors = messages[:errors]
+        end
       end
     end
   end

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

@@ -6,12 +6,6 @@ module TinyAdmin
       class Head < Phlex::HTML
         attr_reader :extra_styles, :page_title, :style_links
 
-        def initialize(page_title, style_links: [], extra_styles: nil)
-          @page_title = page_title
-          @style_links = style_links
-          @extra_styles = extra_styles
-        end
-
         def template
           head {
             meta charset: 'utf-8'
@@ -25,6 +19,12 @@ module TinyAdmin
             style { extra_styles } if extra_styles
           }
         end
+
+        def update(page_title, style_links: [], extra_styles: nil)
+          @page_title = page_title
+          @style_links = style_links
+          @extra_styles = extra_styles
+        end
       end
     end
   end

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

@@ -6,27 +6,48 @@ module TinyAdmin
       class Pagination < Phlex::HTML
         attr_reader :current, :pages, :query_string
 
-        def initialize(current:, pages:, query_string:)
-          @current = current
-          @pages = pages
-          @query_string = query_string
-        end
-
         def template
           div(class: 'pagination-div') {
             nav('aria-label' => 'Pagination') {
               ul(class: 'pagination justify-content-center') {
-                1.upto(pages) do |i|
-                  li_class = (i == current ? 'page-item active' : 'page-item')
-                  li(class: li_class) {
-                    href = query_string.empty? ? "?p=#{i}" : "?#{query_string}&p=#{i}"
-                    a(class: 'page-link', href: href) { i }
-                  }
+                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)
+                else
+                  pages_range(1..1, with_dots: true)
+                  pages_range(current - 2..current + 2, with_dots: true)
+                  pages_range(pages..pages)
                 end
               }
             }
           }
         end
+
+        def update(current:, pages:, query_string:)
+          @current = current
+          @pages = pages
+          @query_string = query_string
+        end
+
+        private
+
+        def pages_range(range, with_dots: false)
+          range.each do |page|
+            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 }
+            }
+          end
+          dots if with_dots
+        end
+
+        def dots
+          li(class: 'page-item disabled') {
+            a(class: 'page-link') { '...' }
+          }
+        end
       end
     end
   end

data/lib/tiny_admin/views/default_layout.rb

@@ -3,24 +3,22 @@
 module TinyAdmin
   module Views
     class DefaultLayout < BasicLayout
-      attr_accessor :context, :messages, :options, :title
+      attr_accessor :flash_component, :head_component, :messages, :navbar_component, :options, :title
 
       def template(&block)
+        flash_component&.update(messages: messages)
+        head_component&.update(title, style_links: style_links, extra_styles: settings.extra_styles)
+
         doctype
         html {
-          render components[:head].new(title, style_links: style_links, extra_styles: settings.extra_styles)
+          render head_component if head_component
 
           body(class: body_class) {
-            navbar_attrs = {
-              current_slug: context&.slug,
-              root_path: settings.root_path,
-              root_title: settings.root[:title],
-              items: navbar_items
-            }
-            render components[:navbar].new(**navbar_attrs)
+            render navbar_component if navbar_component
 
             main_content {
-              render components[:flash].new(messages: messages || {})
+              render flash_component if flash_component
+
               yield_content(&block)
             }
 
@@ -35,10 +33,6 @@ module TinyAdmin
         "module-#{self.class.to_s.split('::').last.downcase}"
       end
 
-      def navbar_items
-        options&.include?(:no_menu) ? [] : settings.navbar
-      end
-
       def main_content
         div(class: 'container main-content py-4') do
           if options&.include?(:compact_layout)

data/lib/tiny_admin.rb

@@ -18,7 +18,7 @@ module TinyAdmin
   def configure_from_file(file)
     config = YAML.load_file(file, symbolize_names: true)
     config.each do |key, value|
-      TinyAdmin::Settings.instance.send("#{key}=", value)
+      TinyAdmin::Settings.instance[key] = value
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -88,6 +88,7 @@ files:
 - lib/tiny_admin/plugins/simple_auth.rb
 - lib/tiny_admin/router.rb
 - lib/tiny_admin/settings.rb
+- lib/tiny_admin/support.rb
 - lib/tiny_admin/utils.rb
 - lib/tiny_admin/version.rb
 - lib/tiny_admin/views/actions/index.rb