Merge pull request #63 from blocknotes/misc-improvements

Misc improvements

Author: blocknotes

lib/tiny_admin/plugins/simple_auth.rb

@@ -7,13 +7,13 @@ module Plugins
     module SimpleAuth
       class << self
         def configure(app, opts = {})
-          @@opts = opts || {} # rubocop:disable Style/ClassVars
-          @@opts[:password] ||= ENV.fetch("ADMIN_PASSWORD_HASH", nil) # NOTE: fallback value
+          opts ||= {}
+          password_hash = opts[:password] || ENV.fetch("ADMIN_PASSWORD_HASH", nil)
 
           Warden::Strategies.add(:secret) do
-            def authenticate!
+            define_method(:authenticate!) do
               secret = params["secret"] || ""
-              return fail(:invalid_credentials) if Digest::SHA512.hexdigest(secret) != @@opts[:password]
+              return fail(:invalid_credentials) if Digest::SHA512.hexdigest(secret) != password_hash
 
               success!(app: "TinyAdmin")
             end

lib/tiny_admin/router.rb

@@ -76,13 +76,13 @@ def setup_page_route(req, slug, page_data)
 
     def setup_resource_routes(req, slug, options:)
       req.on slug do
-        setup_collection_routes(req, slug, options: options)
-        setup_member_routes(req, slug, options: options)
+        repository = options[:repository].new(options[:model])
+        setup_collection_routes(req, slug, options: options, repository: repository)
+        setup_member_routes(req, slug, options: options, repository: repository)
       end
     end
 
-    def setup_collection_routes(req, slug, options:)
-      repository = options[:repository].new(options[:model])
+    def setup_collection_routes(req, slug, options:, repository:)
       action_options = options[:index] || {}
 
       # Custom actions
@@ -112,8 +112,7 @@ def setup_collection_routes(req, slug, options:)
       end
     end
 
-    def setup_member_routes(req, slug, options:)
-      repository = options[:repository].new(options[:model])
+    def setup_member_routes(req, slug, options:, repository:)
       action_options = (options[:show] || {}).merge(record_not_found_page: TinyAdmin.settings.record_not_found)
 
       req.on String do |reference|
@@ -149,10 +148,10 @@ def setup_member_routes(req, slug, options:)
 
     def setup_custom_actions(req, custom_actions = nil, options:, repository:, slug:, reference: nil)
       (custom_actions || []).each_with_object({}) do |custom_action, result|
-        action_slug, action = custom_action.first
-        action_class = to_class(action)
+        action_slug, action_config = custom_action.first
+        action_class, http_method = parse_action_config(action_config)
 
-        req.get action_slug.to_s do
+        req.public_send(http_method, action_slug.to_s) do
           authorize!(:custom_action, action_slug.to_s) do
             context = Context.new(
               actions: {},
@@ -171,6 +170,16 @@ def setup_custom_actions(req, custom_actions = nil, options:, repository:, slug:
       end
     end
 
+    def parse_action_config(config)
+      if config.is_a?(Hash)
+        action_class = to_class(config[:action] || config["action"])
+        http_method = (config[:method] || config["method"] || "get").to_sym
+        [action_class, http_method]
+      else
+        [to_class(config), :get]
+      end
+    end
+
     def authorization
       TinyAdmin.settings.authorization_class
     end

lib/tiny_admin/settings.rb

@@ -109,12 +109,18 @@ def convert_value(key, value)
         value.each_key do |key2|
           path = [key, key2]
           if (DEFAULTS[path].is_a?(Class) || DEFAULTS[path].is_a?(Module)) && self[key][key2].is_a?(String)
-            self[key][key2] = Object.const_get(self[key][key2])
+            self[key][key2] = resolve_class(self[key][key2], setting: "#{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])
+        self[key] = resolve_class(self[key], setting: key.to_s)
       end
     end
+
+    def resolve_class(class_name, setting:)
+      Object.const_get(class_name)
+    rescue NameError => e
+      raise NameError, "TinyAdmin: invalid class '#{class_name}' for setting '#{setting}' - #{e.message}"
+    end
   end
 end

lib/tiny_admin/store.rb

@@ -30,7 +30,7 @@ def prepare_sections(sections, logout:)
                end
         list << item if item
       end
-      navbar << logout if logout
+      @navbar << logout if logout
     end
 
     private

lib/tiny_admin/views/actions/index.rb

@@ -48,7 +48,8 @@ def view_template
                 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

lib/tiny_admin/views/actions/show.rb

@@ -35,7 +35,8 @@ def view_template
                 }
               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

lib/tiny_admin/views/attributes.rb

@@ -5,7 +5,12 @@ module Views
     module Attributes
       def update_attributes(attributes)
         attributes.each do |key, value|
-          send("#{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

lib/tiny_admin/views/components/field_value.rb

@@ -14,16 +14,17 @@ def initialize(field, value, record:)
 
         def view_template
           translated_value = field.translate_value(value)
+          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) {
-                render_value(field.apply_call_option(record) || translated_value)
+                render_value(display_value)
               }
             }
           else
             span(class: value_class) {
-              render_value(translated_value)
+              render_value(display_value)
             }
           end
         end

lib/tiny_admin/views/components/pagination.rb

@@ -18,8 +18,8 @@ def view_template
                     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)
@@ -39,7 +39,7 @@ 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 }
+              a(class: "page-link", href: href) { page.to_s }
             }
           end
           dots if with_dots

lib/tiny_admin/views/components/widgets.rb

@@ -4,8 +4,9 @@ module TinyAdmin
   module Views
     module Components
       class Widgets < BasicComponent
-        def initialize(widgets)
+        def initialize(widgets, context: {})
           @widgets = widgets
+          @context = context
         end
 
         def view_template
@@ -20,7 +21,7 @@ def view_template
                   div(class: "col") {
                     div(class: "card") {
                       div(class: "card-body") {
-                        render widget.new
+                        render build_widget(widget)
                       }
                     }
                   }
@@ -29,6 +30,20 @@ def view_template
             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