tiny_admin 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb4a218cc1a4ff6acc940c402d74202582d2092b39f920e6551e5b395da752e
-  data.tar.gz: fb137625f9f5faa5b33dd5c7633a68eec7a4a2d2bb31db6f70758d6ed9ec3750
+  metadata.gz: 0dfe9b2fef29073201e228daf3a7d89003902f8d98108e58cb8245fdb9a533e3
+  data.tar.gz: 6634891a9bbc2585549a759cd061a25234b834ebdcc0b77fbbb9bd2297b0a626
 SHA512:
-  metadata.gz: fd7800ab65bd0e92ce5646210f08823d031fdd217f5230bc99207a0e00375b068ad2337805ddce196ca317fe6f0df60ad3e209fc885e31c765c68c125f83d900
-  data.tar.gz: f1df2bd938781a04c4af36c9653a7efffcc075cf72accd8f9fbaedbcc74286d860a1953bab159ec833c6a2cf5851a00633f555966b915fedec625af9ef2f85fa
+  metadata.gz: 78b49e3f8b7efe941e24734692db4e4baaa2159f58a10f49ce0563f8c4cfa5950f3e155184016faff12c415ff1a6632d4ee06cd61659a466d170d4b7954becf7
+  data.tar.gz: 16c4fe68dca49b84c4c8ca834c9e3c2ce2304f5a78dc378cfdde837462a96a4e00030e5098083d025ad9ab28060ea2aa581725434ffeec1582715e5fa725ff28

data/README.md

@@ -1,6 +1,6 @@
 # Tiny Admin
 
-[![Gem Version](https://badge.fury.io/rb/tiny_admin.svg)](https://badge.fury.io/rb/tiny_admin) [![Linters](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml) [![Specs Rails 7.0](https://github.com/blocknotes/tiny_admin/actions/workflows/specs_rails_70.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/specs_rails_70.yml)
+[![Gem Version](https://badge.fury.io/rb/tiny_admin.svg)](https://badge.fury.io/rb/tiny_admin) [![Linters](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml) [![Specs](https://github.com/blocknotes/tiny_admin/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/specs.yml)
 
 A compact and composable dashboard component for Ruby.
 
@@ -16,10 +16,10 @@ Please ⭐ if you like it.
 
 ## Install
 
-- Add to your Gemfile: `gem 'tiny_admin', '~> 0.4'`
+- Add to your Gemfile: `gem 'tiny_admin', '~> 0.6'`
 - 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):
+- Configure the dashboard using `TinyAdmin.configure` and/or `TinyAdmin.configure_from_file` with a YAML config file (see [configuration](#configuration) below):
 
 ```rb
 TinyAdmin.configure do |settings|
@@ -35,32 +35,38 @@ end
 ### Authentication
 
 Plugins available:
-- _SimpleAuth_: session authentication based on Warden (`warden` gem must be included in the Gemfile) using a password hash provided via config or via environment variable (`ADMIN_PASSWORD_HASH`);
-- _NoAuth_: no authentication.
+
+- **SimpleAuth**: a session authentication based on Warden (`warden` gem must be included in the Gemfile) using a password hash provided via config or via environment variable (`ADMIN_PASSWORD_HASH`). _Disclaimer: this plugin is provided as example, if you need a secure authentication I suggest to create your own._
+
+- **NoAuth**: no authentication.
 
 ### Repository
 
 Plugin available:
-- _ActiveRecordRepository_: isolates the query layer to expose the resources in the admin interface.
+
+- **ActiveRecordRepository**: isolates the query layer to expose the resources in the admin interface.
 
 ### View pages
 
 Pages available:
-- _Root_: define how to present the content in the main page of the interface;
-- _PageNotFound_: define how to present pages not found;
-- _RecordNotFound_: define how to present record not found page;
-- _SimpleAuthLogin_: define how to present the login form for SimpleAuth plugin;
-- _Index_: define how to present a collection of items;
-- _Show_: define how to present the details of an item.
+
+- **Root**: define how to present the content in the main page of the interface;
+- **Content**: define how to present page with inline content;
+- **PageNotFound**: define how to present pages not found;
+- **RecordNotFound**: define how to present record not found page;
+- **SimpleAuthLogin**: define how to present the login form for SimpleAuth plugin;
+- **Index**: define how to present a collection of items;
+- **Show**: define how to present the details of an item.
 
 ### View components
 
 Components available:
-- _FiltersForm_: define how to present the filters form in the resource collection pages;
-- _Flash_: define how to present the flash messages;
-- _Head_: define how to present the Head tag;
-- _Navbar_: define how to present the navbar (the default one uses the Bootstrap structure);
-- _Pagination_: define how to present the pagination of a collection.
+
+- **FiltersForm**: define how to present the filters form in the resource collection pages;
+- **Flash**: define how to present the flash messages;
+- **Head**: define how to present the Head tag;
+- **Navbar**: define how to present the navbar (the default one uses the Bootstrap structure);
+- **Pagination**: define how to present the pagination of a collection.
 
 ## Configuration
 
@@ -70,9 +76,10 @@ See [extra](extra) folder for some usage examples.
 The following options are supported:
 
 `root` (Hash): define the root section of the admin, properties:
-  - `title` (String): root section's title;
-  - `page` (String): a view object to render;
-  - `redirect` (String): alternative to _page_ option - redirects to a specific slug;
+
+- `title` (String): root section's title;
+- `page` (String): a view object to render;
+- `redirect` (String): alternative to _page_ option - redirects to a specific slug;
 
 Example:
 
@@ -88,9 +95,21 @@ root:
 
 `record_not_found` (String): a view object to render when a missing record is requested.
 
+`style_links` (Array of hashes): list of styles files to include, properties:
+
+- `href` (String): URL for the style file;
+- `rel` (String): type of style file.
+
+`scripts` (Array of hashes): list of scripts to include, properties:
+
+- `src` (String): source URL for the script.
+
+`extra_styles` (String): inline CSS styles.
+
 `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")`).
+
+- `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")`).
 
 Example:
 
@@ -101,15 +120,32 @@ authentication:
 ```
 
 `sections` (Array of hashes): define the admin sections, properties:
-  - `slug` (String): section reference identifier;
-  - `name` (String): section's title;
-  - `type` (String): the type of section: `url`, `page` or `resource`;
-  - other properties depends on the section's type.
+
+- `slug` (String): section reference identifier;
+- `name` (String): section's title;
+- `type` (String): the type of section: `content`, `page`, `resource` or `url`;
+- other properties depends on the section's type.
+
+For _content_ sections:
+
+- `content` (String): the HTML content to present.
+
+Example:
+
+```yml
+slug: test-content
+name: Test content
+type: content
+content: >
+  <h1>Test content!</h1>
+  <p>Some test content</p>
+```
 
 For _url_ sections:
-  - `url` (String): the URL to load when clicking on the section's menu item;
-  - `options` (Hash): properties:
-    + `target` (String): link _target_ attributes (ex. `_blank`).
+
+- `url` (String): the URL to load when clicking on the section's menu item;
+- `options` (Hash): properties:
+  + `target` (String): link _target_ attributes (ex. `_blank`).
 
 Example:
 
@@ -123,7 +159,8 @@ options:
 ```
 
 For _page_ sections:
-  - `page` (String): a view object to render.
+
+- `page` (String): a view object to render.
 
 Example:
 
@@ -135,14 +172,15 @@ page: Admin::Stats
 ```
 
 For _resource_ sections:
-  - `model` (String): the class to use to fetch the data on an item of a collection;
-  - `repository` (String): the class to get the properties related to the model;
-  - `index` (Hash): collection's action options;
-  - `show` (Hash): detail's action options;
-  - `collection_actions` (Array of hashes): custom collection's actions;
-  - `member_actions` (Array of hashes): custom details's actions;
-  - `only` (Array of strings): list of supported actions (ex. `index`);
-  - `options` (Array of strings): resource options (ex. `hidden`).
+
+- `model` (String): the class to use to fetch the data on an item of a collection;
+- `repository` (String): the class to get the properties related to the model;
+- `index` (Hash): collection's action options (see below);
+- `show` (Hash): detail's action options (see below);
+- `collection_actions` (Array of hashes): custom collection's actions;
+- `member_actions` (Array of hashes): custom details's actions;
+- `only` (Array of strings): list of supported actions (ex. `index`);
+- `options` (Array of strings): resource options (ex. `hidden`).
 
 Example:
 
@@ -153,14 +191,72 @@ type: resource
 model: Post
 ```
 
-`style_links` (Array of hashes): list of styles files to include, properties:
-  - `href` (String): URL for the style file;
-  - `rel` (String): type of style file.
+#### Resource index options
 
-`scripts` (Array of hashes): list of scripts to include, properties:
-  - `src` (String): source URL for the script.
+The Index hash supports the following options:
 
-`extra_styles` (String): inline CSS styles.
+- `attributes` (Array): fields to expose in the resource list page;
+- `filters` (Array): filter the current listing;
+- `links` (Array): custom member actions to expose for each list's entry (defined in _member_actions_);
+- `pagination` (Integer): max pages size;
+- `sort` (Array): sort options to pass to the listing query.
+
+Example:
+
+```yml
+    index:
+      sort:
+        - id DESC
+      pagination: 10
+      attributes:
+        - id
+        - author: call, name
+        - position: round, 1
+        - field: author_id
+          header: The author
+          link_to: authors
+          call: author, name
+      filters:
+        - title
+        - field: state
+          type: select
+          values:
+            - published
+            - draft
+            - archived
+      links:
+        - show
+        - author_posts
+        - csv_export
+```
+
+#### Resource show options
+
+The Show hash supports the following options:
+
+- `attributes` (Array): fields to expose in the resource details page.
+
+Example:
+
+```yml
+    show:
+      attributes:
+        # Expose the id column
+        - id
+        # Expose the title column, calling `downcase` support method
+        - title: downcase
+        # Expose the category column, calling `upcase` support method
+        - category: upcase
+        # Expose the position column, calling `format` support method with argument %f
+        - position: format, %f
+        # Expose the position created_at, calling `strftime` support method with argument %Y%m%d %H:%M
+        - created_at: strftime, %Y%m%d %H:%M
+        # Expose the author_id column, with a custom header label, linked to authors section and calling author.name to get the value
+        - field: author_id
+          header: The author
+          link_to: authors
+          call: author, name
+```
 
 ### Sample
 

data/lib/tiny_admin/actions/index.rb

@@ -6,6 +6,7 @@ module TinyAdmin
       attr_reader :current_page,
                   :fields_options,
                   :filters_list,
+                  :links,
                   :pagination,
                   :pages,
                   :params,
@@ -13,18 +14,19 @@ module TinyAdmin
                   :repository,
                   :sort
 
-      def call(app:, context:, options:, actions:)
+      def call(app:, context:, options:)
         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_page(Views::Actions::Index) do |page|
-          setup_pagination(page, settings.components[:pagination], total_count: total_count)
+          setup_pagination(page, TinyAdmin.settings.components[:pagination], total_count: total_count)
           page.update_attributes(
-            actions: actions,
+            actions: context.actions,
             fields: fields,
             filters: filters,
+            links: links,
             prepare_record: ->(record) { repository.index_record_attrs(record, fields: fields_options) },
             records: records,
             title: repository.index_title
@@ -40,7 +42,8 @@ module TinyAdmin
         @repository = context.repository
         @filters_list = options[:filters]
         @pagination = options[:pagination] || 10
-        @sort = options[:sort] || ['id']
+        @sort = options[:sort]
+        @links = options[:links]
 
         @current_page = (params['p'] || 1).to_i
         @query_string = params_to_s(params.except('p'))
@@ -60,7 +63,7 @@ module TinyAdmin
         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)
+        page.pagination_component.update_attributes(current: current_page, pages: pages, query_string: query_string)
       end
     end
   end

data/lib/tiny_admin/actions/show.rb

@@ -3,18 +3,17 @@
 module TinyAdmin
   module Actions
     class Show < BasicAction
-      attr_reader :repository
-
-      def call(app:, context:, options:, actions:)
-        @repository = context.repository
+      def call(app:, context:, options:)
         fields_options = attribute_options(options[:attributes])
+        repository = context.repository
         record = repository.find(context.reference)
+        prepare_record = ->(record_data) { repository.show_record_attrs(record_data, fields: fields_options) }
 
         prepare_page(Views::Actions::Show) do |page|
           page.update_attributes(
-            actions: actions,
+            actions: context.actions,
             fields: repository.fields(options: fields_options),
-            prepare_record: ->(record_data) { repository.show_record_attrs(record_data, fields: fields_options) },
+            prepare_record: prepare_record,
             record: record,
             title: repository.show_title(record)
           )

data/lib/tiny_admin/authentication.rb

@@ -5,7 +5,7 @@ module TinyAdmin
     route do |r|
       r.get 'unauthenticated' do
         if current_user
-          r.redirect settings.root_path
+          r.redirect TinyAdmin.settings.root_path
         else
           render_login
         end
@@ -17,14 +17,14 @@ module TinyAdmin
 
       r.get 'logout' do
         logout_user
-        r.redirect settings.root_path
+        r.redirect TinyAdmin.settings.root_path
       end
     end
 
     private
 
     def render_login(notices: nil, warnings: nil, errors: nil)
-      page = prepare_page(settings.authentication[:login], options: %i[no_menu compact_layout])
+      page = prepare_page(TinyAdmin.settings.authentication[:login], options: %i[no_menu compact_layout])
       page.messages = {
         notices: notices || flash['notices'],
         warnings: warnings || flash['warnings'],

data/lib/tiny_admin/basic_app.rb

@@ -6,7 +6,7 @@ module TinyAdmin
 
     class << self
       def authentication_plugin
-        plugin = TinyAdmin::Settings.instance.authentication&.dig(:plugin)
+        plugin = TinyAdmin.settings.authentication&.dig(:plugin)
         plugin_class = plugin.is_a?(String) ? Object.const_get(plugin) : plugin
         plugin_class || TinyAdmin::Plugins::NoAuth
       end
@@ -17,8 +17,8 @@ module TinyAdmin
     plugin :render, engine: 'html'
     plugin :sessions, secret: SecureRandom.hex(64)
 
-    plugin authentication_plugin, TinyAdmin::Settings.instance.authentication
+    plugin authentication_plugin, TinyAdmin.settings.authentication
 
-    not_found { prepare_page(settings.page_not_found).call }
+    not_found { prepare_page(TinyAdmin.settings.page_not_found).call }
   end
 end

data/lib/tiny_admin/context.rb

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

data/lib/tiny_admin/field.rb

@@ -7,19 +7,20 @@ module TinyAdmin
     def initialize(name:, title:, type:, options: {})
       @type = type
       @name = name
-      @title = title || name
+      @title = title
       @options = options
     end
 
+    def apply_call_option(target)
+      messages = (options[:call] || '').split(',').map(&:strip)
+      messages.inject(target) { |result, msg| result&.send(msg) } if messages.any?
+    end
+
     class << self
       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
-        )
+        field_title = field_name.respond_to?(:humanize) ? field_name.humanize : field_name.tr('_', ' ').capitalize
+        new(name: field_name, title: title || field_title, type: type || :string, options: options || {})
       end
     end
   end

data/lib/tiny_admin/plugins/active_record_repository.rb

@@ -20,12 +20,12 @@ module TinyAdmin
       def fields(options: nil)
         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)
+          options.to_h do |name, field_options|
+            [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)
+          model.columns.to_h do |column|
+            [column.name, TinyAdmin::Field.create_field(name: column.name, type: column.type)]
           end
         end
       end
@@ -42,8 +42,12 @@ module TinyAdmin
         raise BaseRepository::RecordNotFound, e.message
       end
 
-      def list(page: 1, limit: 10, sort: ['id'], filters: nil)
-        query = model.all.order(sort)
+      def collection
+        model.all
+      end
+
+      def list(page: 1, limit: 10, sort: nil, filters: nil)
+        query = sort ? collection.order(sort) : collection
         query = apply_filters(query, filters) if filters
         page_offset = page.positive? ? (page - 1) * limit : 0
         records = query.offset(page_offset).limit(limit).to_a

data/lib/tiny_admin/plugins/base_repository.rb

@@ -18,7 +18,7 @@ module TinyAdmin
             converter = Object.const_get(field[:converter])
             converter.send(method, value, options: options || [])
           else
-            Settings.instance.helper_class.send(method, value, options: options || [])
+            TinyAdmin.settings.helper_class.send(method, value, options: options || [])
           end
         else
           value&.to_s

data/lib/tiny_admin/router.rb

@@ -2,10 +2,11 @@
 
 module TinyAdmin
   class Router < BasicApp
+    TinyAdmin.settings.load_settings
+
     route do |r|
-      context.settings = TinyAdmin::Settings.instance
-      context.settings.load_settings
       context.router = r
+      context.settings = TinyAdmin.settings
 
       r.on 'auth' do
         context.slug = nil
@@ -26,14 +27,14 @@ module TinyAdmin
 
       r.post '' do
         context.slug = nil
-        r.redirect settings.root_path
+        r.redirect TinyAdmin.settings.root_path
       end
 
-      context.settings.pages.each do |slug, data|
-        setup_page_route(r, slug, data)
+      context.pages.each do |slug, page_data|
+        setup_page_route(r, slug, page_data)
       end
 
-      context.settings.resources.each do |slug, options|
+      context.resources.each do |slug, options|
         setup_resource_routes(r, slug, options: options || {})
       end
 
@@ -51,19 +52,21 @@ module TinyAdmin
 
     def root_route(router)
       context.slug = nil
-      if settings.root[:redirect]
-        router.redirect route_for(settings.root[:redirect])
+      if TinyAdmin.settings.root[:redirect]
+        router.redirect route_for(TinyAdmin.settings.root[:redirect])
       else
-        page = settings.root[:page]
+        page = TinyAdmin.settings.root[:page]
         page_class = page.is_a?(String) ? Object.const_get(page) : page
         render_page prepare_page(page_class)
       end
     end
 
-    def setup_page_route(router, slug, page_class)
+    def setup_page_route(router, slug, page_data)
       router.get slug do
         context.slug = slug
-        render_page prepare_page(page_class)
+        page = prepare_page(page_data[:class])
+        page.update_attributes(content: page_data[:content]) if page_data[:content]
+        render_page page
       end
     end
 
@@ -88,19 +91,19 @@ module TinyAdmin
       )
 
       # Index
-      actions = options[:only]
-      if !actions || actions.include?(:index) || actions.include?('index')
+      if options[:only].include?(:index) || options[:only].include?('index')
         router.is do
+          context.actions = custom_actions
           context.request = request
           index_action = TinyAdmin::Actions::Index.new
-          render_page index_action.call(app: self, context: context, options: action_options, actions: custom_actions)
+          render_page index_action.call(app: self, context: context, options: action_options)
         end
       end
     end
 
     def setup_member_routes(router, options:)
       context.repository = options[:repository].new(options[:model])
-      action_options = (options[:show] || {}).merge(record_not_found_page: settings.record_not_found)
+      action_options = (options[:show] || {}).merge(record_not_found_page: TinyAdmin.settings.record_not_found)
 
       router.on String do |reference|
         context.reference = reference
@@ -114,12 +117,12 @@ module TinyAdmin
         )
 
         # Show
-        actions = options[:only]
-        if !actions || actions.include?(:show) || actions.include?('show')
+        if options[:only].include?(:show) || options[:only].include?('show')
           router.is do
+            context.actions = custom_actions
             context.request = request
             show_action = TinyAdmin::Actions::Show.new
-            render_page show_action.call(app: self, context: context, options: action_options, actions: custom_actions)
+            render_page show_action.call(app: self, context: context, options: action_options)
           end
         end
       end
@@ -132,6 +135,7 @@ module TinyAdmin
         action_class = action.is_a?(String) ? Object.const_get(action) : action
 
         router.get action_slug.to_s do
+          context.actions = {}
           context.request = request
           custom_action = action_class.new
           render_page custom_action.call(app: self, context: context, options: options)

data/lib/tiny_admin/settings.rb

@@ -12,6 +12,7 @@ module TinyAdmin
       %i[components head] => Views::Components::Head,
       %i[components navbar] => Views::Components::Navbar,
       %i[components pagination] => Views::Components::Pagination,
+      %i[content_page] => Views::Pages::Content,
       %i[helper_class] => Support,
       %i[page_not_found] => Views::Pages::PageNotFound,
       %i[record_not_found] => Views::Pages::RecordNotFound,
@@ -21,28 +22,40 @@ module TinyAdmin
       %i[root title] => 'TinyAdmin'
     }.freeze
 
-    attr_accessor :authentication,
-                  :components,
-                  :extra_styles,
-                  :helper_class,
-                  :navbar,
-                  :page_not_found,
-                  :record_not_found,
-                  :repository,
-                  :root,
-                  :root_path,
-                  :sections,
-                  :scripts,
-                  :style_links
-
-    attr_reader :pages, :resources
-
-    def [](key)
-      send(key)
+    OPTIONS = %i[
+      authentication
+      components
+      content_page
+      extra_styles
+      helper_class
+      page_not_found
+      record_not_found
+      repository
+      root
+      root_path
+      sections
+      scripts
+      style_links
+    ].freeze
+
+    OPTIONS.each do |option|
+      define_method(option) do
+        self[option]
+      end
+
+      define_method("#{option}=") do |value|
+        self[option] = value
+      end
+    end
+
+    def [](*path)
+      key, option = fetch_setting(path)
+      option[key]
     end
 
-    def []=(key, value)
-      send("#{key}=", value)
+    def []=(*path, value)
+      key, option = fetch_setting(path)
+      option[key] = value
       convert_value(key, value)
     end
 
@@ -57,43 +70,29 @@ module TinyAdmin
         end
       end
 
-      @pages ||= {}
-      @resources ||= {}
-      @sections ||= []
-      @root_path = '/' if @root_path == ''
-      if @authentication[:plugin] == Plugins::SimpleAuth
-        @authentication[:logout] ||= ['logout', "#{root_path}/auth/logout"]
+      context.pages ||= {}
+      context.resources ||= {}
+      self.sections ||= []
+      self.root_path = '/' if root_path == ''
+
+      if authentication[:plugin] <= Plugins::SimpleAuth
+        authentication[:logout] ||= { name: 'logout', path: "#{root_path}/auth/logout" }
       end
-      @navbar = prepare_navbar(sections, logout: authentication[:logout])
+      context.navbar = prepare_navbar(sections, logout: authentication[:logout])
     end
 
-    def prepare_navbar(sections, logout:)
-      items = sections.each_with_object({}) do |section, list|
-        slug = section[:slug]
-        case section[:type]&.to_sym
-        when :url
-          list[slug] = [section[:name], section[:url], section[:options]]
-        when :page
-          page = section[:page]
-          pages[slug] = page.is_a?(String) ? Object.const_get(page) : page
-          list[slug] = [section[:name], route_for(slug)]
-        when :resource
-          repository = section[:repository] || settings.repository
-          resources[slug] = {
-            model: section[:model].is_a?(String) ? Object.const_get(section[:model]) : section[:model],
-            repository: repository.is_a?(String) ? Object.const_get(repository) : repository
-          }
-          resources[slug].merge! section.slice(:resource, :only, :index, :show, :collection_actions, :member_actions)
-          hidden = section[:options] && (section[:options].include?(:hidden) || section[:options].include?('hidden'))
-          list[slug] = [section[:name], route_for(slug)] unless hidden
-        end
-      end
-      items['auth/logout'] = logout if logout
-      items
+    def reset!
+      @options = {}
     end
 
     private
 
+    def fetch_setting(path)
+      @options ||= {}
+      *parts, last = path.map(&:to_sym)
+      [last, parts.inject(@options) { |result, part| result[part] ||= {} }]
+    end
+
     def convert_value(key, value)
       if value.is_a?(Hash)
         value.each_key do |key2|
@@ -106,5 +105,59 @@ module TinyAdmin
         self[key] = Object.const_get(self[key])
       end
     end
+
+    def prepare_navbar(sections, logout:)
+      items = sections.each_with_object({}) do |section, list|
+        unless section.is_a?(Hash)
+          section_class = section.is_a?(String) ? Object.const_get(section) : section
+          next unless section_class.respond_to?(:to_h)
+
+          section = section_class.to_h
+        end
+
+        slug = section[:slug].to_s
+        case section[:type]&.to_sym
+        when :content
+          list[slug] = add_content_section(slug, section)
+        when :page
+          list[slug] = add_page_section(slug, section)
+        when :resource
+          list[slug] = add_resource_section(slug, section)
+        when :url
+          list[slug] = add_url_section(slug, section)
+        end
+      end
+      items['auth/logout'] = logout if logout
+      items
+    end
+
+    def add_content_section(slug, section)
+      context.pages[slug] = { class: content_page, content: section[:content] }
+      { name: section[:name], path: route_for(slug), class: content_page }
+    end
+
+    def add_page_section(slug, section)
+      page = section[:page]
+      page_class = page.is_a?(String) ? Object.const_get(page) : page
+      context.pages[slug] = { class: page_class }
+      { name: section[:name], path: route_for(slug), class: page_class }
+    end
+
+    def add_resource_section(slug, section)
+      repo = section[:repository] || repository
+      context.resources[slug] = {
+        model: section[:model].is_a?(String) ? Object.const_get(section[:model]) : section[:model],
+        repository: repo.is_a?(String) ? Object.const_get(repo) : repo
+      }
+      resource_options = section.slice(:resource, :only, :index, :show, :collection_actions, :member_actions)
+      resource_options[:only] ||= %i[index show]
+      context.resources[slug].merge!(resource_options)
+      hidden = section[:options] && (section[:options].include?(:hidden) || section[:options].include?('hidden'))
+      { name: section[:name], path: route_for(slug) } unless hidden
+    end
+
+    def add_url_section(_slug, section)
+      section.slice(:name, :options).tap { _1[:path] = section[:url] }
+    end
   end
 end

data/lib/tiny_admin/support.rb

@@ -4,7 +4,7 @@ module TinyAdmin
   class Support
     class << self
       def call(value, options: [])
-        value && options&.any? ? options.inject(value) { |result, message| result&.send(message) } : value
+        options.inject(value) { |result, message| result&.send(message) } if value && options&.any?
       end
 
       def downcase(value, options: [])
@@ -12,7 +12,7 @@ module TinyAdmin
       end
 
       def format(value, options: [])
-        value && options&.any? ? Kernel.format(options.first, value) : value
+        Kernel.format(options.first, value) if value && options&.any?
       end
 
       def round(value, options: [])
@@ -20,11 +20,11 @@ module TinyAdmin
       end
 
       def strftime(value, options: [])
-        value ? value.strftime(options&.first || '%Y-%m-%d %H:%M') : ''
+        value&.strftime(options&.first || '%Y-%m-%d %H:%M')
       end
 
       def to_date(value, options: [])
-        value ? value.to_date.to_s : value
+        value.to_date.to_s if value
       end
 
       def upcase(value, options: [])

data/lib/tiny_admin/utils.rb

@@ -5,7 +5,8 @@ module TinyAdmin
     def params_to_s(params)
       list = params.each_with_object([]) do |(param, value), result|
         if value.is_a?(Hash)
-          result.concat(value.map { |k, v| "#{param}[#{k}]=#{v}" })
+          values = value.map { |key, val| "#{param}[#{key}]=#{val}" }
+          result.concat(values)
         else
           result.push(["#{param}=#{value}"])
         end
@@ -16,32 +17,34 @@ module TinyAdmin
     def prepare_page(page_class, options: nil)
       page_class.new.tap do |page|
         page.options = options
-        page.head_component = settings.components[:head]&.new
-        page.flash_component = settings.components[:flash]&.new
-        page.navbar_component = settings.components[:navbar]&.new(
+        page.head_component = TinyAdmin.settings.components[:head]&.new
+        page.flash_component = TinyAdmin.settings.components[:flash]&.new
+        page.navbar_component = TinyAdmin.settings.components[:navbar]&.new
+        page.navbar_component&.update_attributes(
           current_slug: context&.slug,
-          root_path: settings.root_path,
-          root_title: settings.root[:title],
-          items: options&.include?(:no_menu) ? [] : settings.navbar
+          root_path: TinyAdmin.settings.root_path,
+          root_title: TinyAdmin.settings.root[:title],
+          items: options&.include?(:no_menu) ? [] : context&.navbar
         )
-
         yield(page) if block_given?
       end
     end
 
     def route_for(section, reference: nil, action: nil, query: nil)
-      root_path = settings.root_path == '/' ? nil : settings.root_path
+      root_path = TinyAdmin.settings.root_path == '/' ? nil : TinyAdmin.settings.root_path
       route = [root_path, section, reference, action].compact.join("/")
       route << "?#{query}" if query
       route[0] == '/' ? route : route.prepend('/')
     end
 
-    def context
-      TinyAdmin::Context.instance
+    def to_label(string)
+      return '' unless string
+
+      string.respond_to?(:humanize) ? string.humanize : string.tr('_', ' ').capitalize
     end
 
-    def settings
-      TinyAdmin::Settings.instance
+    def context
+      TinyAdmin::Context.instance
     end
   end
 end

data/lib/tiny_admin/version.rb

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

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

@@ -4,7 +4,7 @@ module TinyAdmin
   module Views
     module Actions
       class Index < DefaultLayout
-        attr_accessor :actions, :fields, :filters, :pagination_component, :prepare_record, :records
+        attr_accessor :actions, :fields, :filters, :links, :pagination_component, :prepare_record, :records
 
         def template
           super do
@@ -30,8 +30,9 @@ module TinyAdmin
 
                 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)
+                    filters_form = TinyAdmin::Views::Components::FiltersForm.new
+                    filters_form.update_attributes(section_path: route_for(context.slug), filters: filters)
+                    render filters_form
                   }
                 end
               }
@@ -65,16 +66,33 @@ module TinyAdmin
                   field = fields[key]
                   td(class: "field-value-#{field.name} field-value-type-#{field.type}") {
                     if field.options && field.options[:link_to]
-                      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 }
+                      a(href: route_for(field.options[:link_to], reference: value)) {
+                        field.apply_call_option(record) || value
+                      }
                     else
                       value
                     end
                   }
                 end
-                td(class: 'actions') {
-                  a(href: route_for(context.slug, reference: record.id)) { 'show' }
+
+                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'
+                          a(href: route_for(context.slug, reference: record.id), class: link_class) { 'show' }
+                        else
+                          a(href: route_for(context.slug, reference: record.id, action: link), class: link_class) {
+                            to_label(link)
+                          }
+                        end
+                      end
+                    else
+                      a(href: route_for(context.slug, reference: record.id), class: link_class) { 'show' }
+                    end
+                  }
                 }
               }
             end
@@ -86,8 +104,9 @@ module TinyAdmin
             (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 }
+                a(href: href, class: 'nav-link btn btn-outline-secondary') {
+                  action_class.respond_to?(:title) ? action_class.title : action
+                }
               }
             end
           }

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

@@ -25,10 +25,10 @@ module TinyAdmin
                     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]
-                      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 }
+                    if field.options[:link_to]
+                      a(href: route_for(field.options[:link_to], reference: value)) {
+                        field.apply_call_option(record) || value
+                      }
                     else
                       value
                     end
@@ -46,8 +46,9 @@ module TinyAdmin
             (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 }
+                a(href: href, class: 'nav-link btn btn-outline-secondary') {
+                  action_class.respond_to?(:title) ? action_class.title : action
+                }
               }
             end
           }

data/lib/tiny_admin/views/basic_layout.rb

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

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    module Components
+      class BasicComponent < Phlex::HTML
+        def update_attributes(attributes)
+          attributes.each do |key, value|
+            send("#{key}=", value)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,8 @@
 module TinyAdmin
   module Views
     module Components
-      class FiltersForm < Phlex::HTML
-        attr_reader :filters, :section_path
-
-        def initialize(section_path:, filters:)
-          @section_path = section_path
-          @filters = filters
-        end
+      class FiltersForm < BasicComponent
+        attr_accessor :filters, :section_path
 
         def template
           form(class: 'form_filters', method: 'get') {

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

@@ -3,24 +3,21 @@
 module TinyAdmin
   module Views
     module Components
-      class Flash < Phlex::HTML
-        attr_reader :errors, :notices, :warnings
+      class Flash < BasicComponent
+        attr_accessor :messages
 
         def template
+          @messages ||= {}
+          notices = messages[:notices]
+          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?
           }
         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

@@ -3,8 +3,8 @@
 module TinyAdmin
   module Views
     module Components
-      class Head < Phlex::HTML
-        attr_reader :extra_styles, :page_title, :style_links
+      class Head < BasicComponent
+        attr_accessor :extra_styles, :page_title, :style_links
 
         def template
           head {
@@ -19,12 +19,6 @@ 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/navbar.rb

@@ -3,33 +3,34 @@
 module TinyAdmin
   module Views
     module Components
-      class Navbar < Phlex::HTML
-        attr_reader :current_slug, :items, :root_path, :root_title
-
-        def initialize(root_path:, root_title:, items: [], current_slug: nil)
-          @root_path = root_path
-          @root_title = root_title
-          @items = items || []
-          @current_slug = current_slug
-        end
+      class Navbar < BasicComponent
+        attr_accessor :current_slug, :items, :root_path, :root_title
 
         def template
           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') {
+              button(
+                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')
               }
               div(class: 'collapse navbar-collapse', id: 'navbarNav') {
                 ul(class: 'navbar-nav') {
-                  items.each do |slug, (name, path, options)|
+                  items.each do |slug, item|
                     classes = %w[nav-link]
                     classes << 'active' if slug == current_slug
-                    link_attributes = { class: classes.join(' '), href: path, 'aria-current' => 'page' }
-                    link_attributes.merge!(options) if options
+                    link_attributes = { class: classes.join(' '), href: item[:path], 'aria-current' => 'page' }
+                    link_attributes.merge!(item[:options]) if item[:options]
 
                     li(class: 'nav-item') {
-                      a(**link_attributes) { name }
+                      a(**link_attributes) { item[:name] }
                     }
                   end
                 }

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

@@ -3,8 +3,8 @@
 module TinyAdmin
   module Views
     module Components
-      class Pagination < Phlex::HTML
-        attr_reader :current, :pages, :query_string
+      class Pagination < BasicComponent
+        attr_accessor :current, :pages, :query_string
 
         def template
           div(class: 'pagination-div') {
@@ -25,12 +25,6 @@ module TinyAdmin
           }
         end
 
-        def update(current:, pages:, query_string:)
-          @current = current
-          @pages = pages
-          @query_string = query_string
-        end
-
         private
 
         def pages_range(range, with_dots: false)

data/lib/tiny_admin/views/default_layout.rb

@@ -6,8 +6,9 @@ module TinyAdmin
       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)
+        extra_styles = TinyAdmin.settings.extra_styles
+        flash_component&.messages = messages
+        head_component&.update_attributes(page_title: title, style_links: style_links, extra_styles: extra_styles)
 
         doctype
         html {
@@ -48,7 +49,7 @@ module TinyAdmin
       end
 
       def style_links
-        settings.style_links || [
+        TinyAdmin.settings.style_links || [
           # Bootstrap CDN
           {
             href: 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css',
@@ -60,7 +61,7 @@ module TinyAdmin
       end
 
       def render_scripts
-        (settings.scripts || []).each do |script_attrs|
+        (TinyAdmin.settings.scripts || []).each do |script_attrs|
           script(**script_attrs)
         end
       end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    module Pages
+      class Content < DefaultLayout
+        def template
+          super do
+            div(class: 'content') {
+              unsafe_raw(content)
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tiny_admin.rb

@@ -12,15 +12,20 @@ loader.setup
 
 module TinyAdmin
   def configure(&block)
-    block&.call(TinyAdmin::Settings.instance) || TinyAdmin::Settings.instance
+    block&.call(settings) || settings
   end
 
   def configure_from_file(file)
+    settings.reset!
     config = YAML.load_file(file, symbolize_names: true)
     config.each do |key, value|
-      TinyAdmin::Settings.instance[key] = value
+      settings[key] = value
     end
   end
 
-  module_function :configure, :configure_from_file
+  def settings
+    TinyAdmin::Settings.instance
+  end
+
+  module_function :configure, :configure_from_file, :settings
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_admin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -94,12 +94,14 @@ files:
 - lib/tiny_admin/views/actions/index.rb
 - lib/tiny_admin/views/actions/show.rb
 - lib/tiny_admin/views/basic_layout.rb
+- lib/tiny_admin/views/components/basic_component.rb
 - lib/tiny_admin/views/components/filters_form.rb
 - lib/tiny_admin/views/components/flash.rb
 - lib/tiny_admin/views/components/head.rb
 - lib/tiny_admin/views/components/navbar.rb
 - lib/tiny_admin/views/components/pagination.rb
 - lib/tiny_admin/views/default_layout.rb
+- lib/tiny_admin/views/pages/content.rb
 - lib/tiny_admin/views/pages/page_not_found.rb
 - lib/tiny_admin/views/pages/record_not_found.rb
 - lib/tiny_admin/views/pages/root.rb