ab_admin 0.9.0 → 0.10.0

data/lib/ab_admin/devise.rb

@@ -29,6 +29,13 @@ module AbAdmin
               super
             end
       end
+
+      protected
+
+      def sign_in_params
+        devise_parameter_sanitizer.permit(:sign_in, keys: [:otp_attempt]) if devise_mapping.try(:two_factor_authenticatable?)
+        devise_parameter_sanitizer.sanitize(:sign_in)
+      end
     end
 
     class PasswordsController < ::Devise::PasswordsController

data/lib/ab_admin/engine.rb

@@ -2,7 +2,7 @@ module AbAdmin
   class Engine < ::Rails::Engine
     engine_name 'ab_admin'
 
-    initializer 'ab_admin.assets_precompile', :group => :all do |app|
+    initializer 'ab_admin.assets_precompile', group: :all do |app|
       app.config.assets.precompile += AbAdmin.assets
     end
 

data/lib/ab_admin/hooks/ckeditor_lazy.rb

@@ -0,0 +1,13 @@
+begin
+  require 'ckeditor'
+
+  Ckeditor::Utils.module_eval do
+    class << self
+      def js_replace(dom_id, options = nil)
+        options.present? ? "lazyInitCkeditor('#{dom_id}', #{ActiveSupport::JSON.encode(options)});" : "lazyInitCkEditor('#{dom_id}');"
+      end
+    end
+  end
+rescue LoadError => e
+  raise unless e.message.include?('ckeditor')
+end

data/lib/ab_admin/menu/base_group.rb

@@ -2,7 +2,6 @@ module AbAdmin
   module Menu
     class BaseGroup
       include ::Rails.application.routes.url_helpers
-      include ::AbAdmin::Utils::EvalHelpers
 
       def link(title, path, options={})
         @menu_tree << Item.new(title, path, options)

data/lib/ab_admin/menu/group.rb

@@ -10,9 +10,7 @@ module AbAdmin
       end
 
       def render(template)
-        return if @options[:if] && !call_method_or_proc_on(template, @options[:if])
-        return if @options[:unless] && call_method_or_proc_on(template, @options[:unless])
-
+        return unless template.option_conditions_met?(@options)
         wrapper_class = "dropdown-wrap-#{@raw_title}" if @raw_title.is_a?(Symbol)
         <<-HTML.html_safe
       <li class="dropdown #{wrapper_class}">
@@ -26,7 +24,7 @@ module AbAdmin
 
       def title(template)
         return @title unless @options[:badge]
-        badge = call_method_or_proc_on(template, @options[:badge])
+        badge = @options[:badge].is_a?(Symbol) ? template.public_send(@options[:badge]) : template.instance_exec(&@options[:badge])
         return @title if !badge || badge == 0
         "#{@title}&nbsp;<span class='badge badge-#{@options[:badge_type] || 'important'}'>#{badge}</span>".html_safe
       end

data/lib/ab_admin/menu/item.rb

@@ -1,8 +1,6 @@
 module AbAdmin
   module Menu
     class Item
-      include ::AbAdmin::Utils::EvalHelpers
-
       def initialize(title, url, options)
         @title = title.is_a?(Symbol) ? I18n.t(title, scope: [:admin, :navigation]) : title
         @url = url
@@ -10,23 +8,21 @@ module AbAdmin
       end
 
       def render(template)
-        return if @options[:if] && !call_method_or_proc_on(template, @options[:if])
-        return if @options[:unless] && call_method_or_proc_on(template, @options[:unless])
+        return unless template.option_conditions_met?(@options)
 
-        item_url = @url.is_a?(String) ? @url : call_method_or_proc_on(template, @url)
+        item_url = @url.is_a?(String) ? @url : template.instance_exec(&@url)
         active = template.request.path.split('/')[2] == item_url.split('/')[2]
 
         <<-HTML.html_safe
-          <li class="#{'active' if active}">#{template.link_to title(template), item_url, @options.except(:if, :unless)}</li>
+          <li class="#{'active' if active}">#{template.link_to title(template), item_url, @options.except(:if, :unless, :badge)}</li>
         HTML
       end
 
       private
 
       def title(template)
-        ActiveSupport::Deprecation.warn('Menu item :badge_counter option is deprecated, use :badge instead') if @options[:badge_counter]
         return @title unless @options[:badge]
-        badge = call_method_or_proc_on(template, @options[:badge])
+        badge = @options[:badge].is_a?(Symbol) ? template.public_send(@options[:badge]) : template.instance_exec(&@options[:badge])
         return @title if !badge || badge == 0
         "#{@title}&nbsp;<span class='badge badge-#{@options[:badge_type] || 'important'}'>#{badge}</span>".html_safe
       end

data/lib/ab_admin/models/asset.rb

@@ -30,7 +30,7 @@ module AbAdmin
 
         def ext_list
           return unless uploaders[:data]
-          uploaders[:data].new.extension_whitelist
+          uploaders[:data].new.extension_allowlist
         end
 
         def clean!
@@ -76,14 +76,12 @@ module AbAdmin
         AbAdmin.image_types.include?(self.data_content_type)
       end
 
-      def base_filename
-        base = File.basename(data_file_name, '.*')
-        base == data_secure_token ? File.basename(original_name, '.*') : base
+      def human_filename
+        data.human_part
       end
 
-      def base_filename=(value)
-        return false if value.blank? || File.basename(data_file_name, '.*') == value
-        self.original_name = value + File.extname(data_file_name)
+      def human_filename=(value)
+        return if (human_filename.blank? && value.blank?) || human_filename == value
         rename!(value)
       end
 
@@ -116,14 +114,13 @@ module AbAdmin
 
       def rename!(name=nil)
         normalized_name = name ? data.normalize_filename(name) : rand(9999)
-        return false if normalized_name.blank?
-        data.rename_via_move "#{normalized_name}#{File.extname(data_file_name)}"
+        return if normalized_name.blank?
+        data.rename_via_move normalized_name
       end
 
       def refresh_assetable
         return unless assetable.try(:persisted?)
         assetable.touch
-        assetable.tire.update_index if assetable.respond_to?(:tire)
         true
       end
 

data/lib/ab_admin/models/locator.rb

@@ -127,7 +127,7 @@ module AbAdmin
             next if locale == I18n.default_locale
             clean_locale_hash = main_file.data.deep_clear_values
             path = File.join(main_file.dir, main_file.filename.sub(locale_replace_regexp, locale.to_s))
-            if File.exists?(path)
+            if File.exist?(path)
               file = self.class.prepare_data(path)
               self.class.save(path, {locale.to_s => clean_locale_hash.deep_add(file.data)})
             else

data/lib/ab_admin/models/settings.rb

@@ -38,7 +38,7 @@ module AbAdmin
         end
 
         def read_data
-          paths = base_paths.dup.push(editable_path).compact.find_all { |path| File.exists?(path) }
+          paths = base_paths.dup.push(editable_path).compact.find_all { |path| File.exist?(path) }
           hash = paths.map{|path| YAML.safe_load(File.read(path)) }.inject(&:deep_merge).deep_symbolize_keys
           SettingsStruct.new(hash)
         end
@@ -53,7 +53,7 @@ module AbAdmin
         end
 
         def editable_path
-          editable_paths.detect { |path| File.exists?(path) }
+          editable_paths.detect { |path| File.exist?(path) }
         end
       end
 

data/lib/ab_admin/models/structure.rb

@@ -15,12 +15,12 @@ module AbAdmin
         validates_numericality_of :structure_type_id, only_integer: true
 
         has_one :static_page, dependent: :destroy
-        has_many :visible_children, -> { where(is_visible: true) }, class_name: name, foreign_key: 'parent_id'
+        has_many :visible_children, -> { where(is_visible: true) }, class_name: name, foreign_key: :parent_id
 
         scope :visible, lambda { where(is_visible: true) }
-        scope :with_type, lambda { |structure_type| where(structure_type_id: structure_type.id) }
+        scope :with_type, lambda { |type| where(structure_type_id: (type.is_a?(Symbol) ? StructureType.public_send(type) : type.id)) }
         scope :with_depth, lambda { |level| where(depth: level.to_i) }
-        scope :with_position, lambda { |position_type| where(position_type_id: position_type.id).order('lft DESC') }
+        scope :with_position, lambda { |type| where(position_type_id: (type.is_a?(Symbol) ? StructureType.public_send(type) : type.id)).order(lft: :desc) }
       end
 
       def redirect?

data/lib/ab_admin/models/track.rb

@@ -44,9 +44,9 @@ module AbAdmin
           lookups << ['actions', key]
         end
         lookups.map!{|l| l.join('.').to_sym }
-        lookups << key
+        lookups << parts.last.humanize
 
-        I18n.t(lookups.shift, (parameters.merge(params) || {}).merge(scope: :admin, default: lookups))
+        I18n.t(lookups.shift, **(parameters.merge(params) || {}).merge(scope: :admin, default: lookups))
       end
 
       def trackable_changed_attrs
@@ -63,7 +63,19 @@ module AbAdmin
 
       def make_trackable
         self.name ||= trackable.han.first(250)
-        self.trackable_changes = trackable.saved_changes.except(:updated_at)
+        self.trackable_changes = format_trackable_changes(trackable.saved_changes.except(:updated_at))
+      end
+
+      def format_trackable_changes(value)
+        value.to_h.deep_transform_values do |v|
+          if v.is_a?(BigDecimal)
+            v.to_f
+          elsif v.is_a?(ActiveSupport::TimeWithZone)
+            v.to_s
+          else
+            v
+          end
+        end
       end
     end
   end

data/lib/ab_admin/utils/csv_document.rb

@@ -3,8 +3,6 @@ require 'csv'
 module AbAdmin
   module Utils
     class CsvDocument
-      include AbAdmin::Utils::EvalHelpers
-
       def initialize(source, options = {})
         @source = source
         @options = options
@@ -33,7 +31,10 @@ module AbAdmin
 
           I18n.with_locale options[:locale] do
             each_record do |item|
-              csv << column_data.map { |column| AbAdmin.pretty_data call_method_or_proc_on(item, column, context: context) }
+              csv << column_data.map do |column|
+                value = column.is_a?(Symbol) ? item.public_send(column) : context.instance_exec(item, &column)
+                AbAdmin.pretty_data value
+              end
             end
           end
         end
@@ -62,7 +63,6 @@ module AbAdmin
           @source.class
         end
       end
-
     end
   end
 end

data/lib/ab_admin/utils/eval_helpers.rb

@@ -83,22 +83,6 @@ module AbAdmin
             raise ArgumentError, 'Methods must be a symbol denoting the method to call, a block to be invoked, or a string to be evaluated'
           end
       end
-
-      def call_method_or_proc_on(obj, symbol_or_proc, options = {})
-        options.reverse_merge!(exec: true)
-        case symbol_or_proc
-          when String
-            symbol_or_proc
-          when Symbol
-            obj.public_send(symbol_or_proc.to_sym, *options[:attrs])
-          when Proc
-            if options[:context]
-              options[:context].instance_exec(obj, &symbol_or_proc)
-            else
-              options[:exec] ? obj.instance_exec(&symbol_or_proc) : symbol_or_proc.call(obj)
-            end
-        end
-      end
     end
   end
 end

data/lib/ab_admin/utils/logger.rb

@@ -8,11 +8,21 @@ module AbAdmin
           error("#{e.class} #{message}\n#{backtrace}\n\n")
         end
 
+        def puts(msg)
+          debug msg
+        end
+
         def reopen
           @logdev = LogDevice.new(@logdev.filename)
         end
       end
 
+      class BasicFormatter
+        def call(severity, time, _, msg)
+          "#{msg}\n"
+        end
+      end
+
       class Formatter
         FORMAT = "[%s] %5s %s\n".freeze
         DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%3N'.freeze
@@ -22,9 +32,9 @@ module AbAdmin
         end
       end
 
-      def self.for_file(filename)
+      def self.for_file(filename, formatter: nil)
         logger = ExtendedLogger.new(Rails.root.join('log', filename))
-        logger.formatter = Formatter.new
+        logger.formatter = formatter || Formatter.new
         logger
       end
     end

data/lib/ab_admin/utils/mysql.rb

@@ -14,14 +14,13 @@ module AbAdmin
 
         # remove duplicate records by columns
         def remove_duplicates(*cols, deleted_id_order: '<')
-          conds = cols.map { |col| "#{table_name}.#{col} IS NOT NULL AND #{table_name}.#{col} = t.#{col}" }.join(' AND ')
+          condition_sql = cols.map { |col| "#{table_name}.#{col} IS NOT NULL AND #{table_name}.#{col} = t.#{col}" }.join(' AND ')
           query = <<-SQL
-            DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id #{deleted_id_order} t.id AND #{conds}
+            DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id #{deleted_id_order} t.id AND #{condition_sql}
           SQL
           connection.execute(query)
         end
 
-
         # Disables key updates for model table
         def disable_keys
           connection.execute("ALTER TABLE #{quoted_table_name} DISABLE KEYS")

data/lib/ab_admin/utils/xls_document.rb

@@ -12,8 +12,6 @@ module AbAdmin
     end
 
     class XlsDocument
-      include AbAdmin::Utils::EvalHelpers
-
       def initialize(source, options = {})
         @source = source
         @options = options
@@ -58,7 +56,7 @@ module AbAdmin
             row = index + 1
 
             column_data.each_with_index do |column, num|
-              value = call_method_or_proc_on(item, column, context: context)
+              value = column.is_a?(Symbol) ? item.public_send(column) : context.instance_exec(item, &column)
 
               case value
                 when Date

data/lib/ab_admin/utils.rb

@@ -1,10 +1,5 @@
 module AbAdmin
   module Utils
-    autoload :CSVBuilder, 'ab_admin/utils/csv_builder'
-    autoload :EvalHelpers, 'ab_admin/utils/eval_helpers'
-    autoload :Logger, 'ab_admin/utils/logger'
-    autoload :Mysql, 'ab_admin/utils/mysql'
-
     def all_models
       Kernel.suppress_warnings do
         Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').reject { |path| path =~ /concerns|shared/ }.each { |file| require file }

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -5,9 +5,12 @@ module AbAdmin
         record = Array(object).last
         record.fallbacks_for_empty_translations = false if record.respond_to?(:fallbacks_for_empty_translations)
         options = args.extract_options!
+        options[:wrapper] = :bootstrap
         options[:remote] = true if request.xhr?
         options[:html] ||= {}
-        options[:html][:class] ||= 'form-horizontal'
+        options[:html][:class] = Array(options[:html][:class])
+        options[:html][:class] << 'form-horizontal' if options[:html][:class].empty?
+        options[:html][:class] << 'save-error' if Array(object).last.errors.of_kind?(:base, :changed)
         options[:builder] ||= ::AbAdmin::Views::FormBuilder
         options[:html]['data-id'] = record.id
         if controller_name == 'manager' && resource_class == Array(object).last.class
@@ -77,7 +80,7 @@ module AbAdmin
             value: opts[:value] || item[attr],
             title: opts[:title] || item[attr]
         }
-        link_to html_title, '#', class: "editable #{opts[:class]}", data: data.update(opts[:data] || {})
+        link_to html_title, '#', class: "editable #{opts[:class]}", placeholder: opts[:placeholder], data: data.update(opts[:data] || {})
       end
 
       def options_for_ckeditor(options = {})
@@ -122,8 +125,9 @@ module AbAdmin
         %(<span class="badge #{css}">#{text}</span>).html_safe
       end
 
-      def icon(name, white=false)
-        "<i class='icon-#{name} #{'icon-white' if white}'></i> ".html_safe
+      def icon(name, white=false, title: nil)
+        title_html = %( title="#{h(title)}") if title
+        "<i class='icon-#{name}#{' icon-white' if white}#{' tool' if title}'#{title_html}></i> ".html_safe
       end
 
       def locale_flag(code)
@@ -132,12 +136,16 @@ module AbAdmin
 
       def admin_pretty_data(object)
         case object
-          when String, Integer, BigDecimal, Float
+          when Integer, BigDecimal, Float
             object
+          when String
+            object.html_safe? ? object : object.no_html.gsub("\n", '<br/>').html_safe
           when TrueClass, FalseClass
             color_bool(object)
-          when Date, DateTime, Time, ActiveSupport::TimeWithZone
-            I18n.l(object, format: :long)
+          when Date
+            I18n.l(object, format: AbAdmin.date_format)
+          when DateTime, Time, ActiveSupport::TimeWithZone
+            I18n.l(object, format: AbAdmin.datetime_format)
           when NilClass
             ''
           when ActiveRecord::Base
@@ -178,6 +186,11 @@ module AbAdmin
         content_tag(:div, html, options)
       end
 
+      def copy_btn(text, btn_text: nil, tooltip: false)
+        return if text.blank?
+        content_tag(:div, "#{icon('share')} #{btn_text}".html_safe, 'data-clipboard-text' => text, class: ['btn', 'btn-mini', 'js-copy', ('tool' if tooltip)], title: (text.no_html if tooltip))
+      end
+
       def ha(attr)
         resource_class.han(attr)
       end
@@ -186,15 +199,19 @@ module AbAdmin
         AbAdmin.site_name.is_a?(String) ? AbAdmin.site_name : AbAdmin.site_name.call
       end
 
-      def call_method_or_proc_on(obj, symbol_or_proc, options = {})
-        exec = options[:exec].nil? ? true : options[:exec]
-        case symbol_or_proc
-          when String
-            symbol_or_proc
-          when Symbol
-            obj.send(symbol_or_proc.to_sym)
-          when Proc
-            exec ? instance_exec(obj, &symbol_or_proc) : symbol_or_proc.call(obj)
+      def option_conditions_met?(options, object=nil)
+        return true unless options
+        condition = options[:if] || options[:unless]
+        return true unless condition
+        options[:if] ? method_or_proc_on(condition, object) : !method_or_proc_on(condition, object)
+      end
+
+      def method_or_proc_on(symbol_or_proc, object=nil)
+        return unless symbol_or_proc
+        if symbol_or_proc.is_a?(Symbol)
+          (object || self).public_send(symbol_or_proc)
+        else
+          object ? instance_exec(object, &symbol_or_proc) : instance_exec(&symbol_or_proc)
         end
       end
     end

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -63,7 +63,7 @@ module AbAdmin
       end
 
       def collection_params
-        params.slice(:index_view, *button_scopes.map(&:first)).permit!.to_h.symbolize_keys
+        params.slice(:index_view, :view_options, *button_scopes.map(&:name)).permit!.to_h.symbolize_keys
       end
 
       def short_action_link(action, item)
@@ -80,9 +80,7 @@ module AbAdmin
                               class: 'btn btn-info', title: t('admin.actions.show.link')
           when :preview
             preview_path = preview_resource_path(item)
-            if preview_path
-              link_to icon('eye-open', true), preview_path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank'
-            end
+            link_to(icon('eye-open', true), preview_path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank') if preview_path
           when :history
             item_link_to_can? :history, item, icon('book', true), history_resource_path(item),
                               class: 'btn btn-info', title: t('admin.actions.history.link')
@@ -111,9 +109,8 @@ module AbAdmin
           when :show
             link_to_can? :show, t('admin.actions.show.link'), resource_path, class: 'btn btn-info'
           when :preview
-            if path = preview_resource_path(resource)
-              link_to t('admin.actions.preview.link'), path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank'
-            end
+            preview_path = preview_resource_path(resource)
+            link_to(t('admin.actions.preview.link'), preview_path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank') if preview_path
           when :history
             link_to_can? :history, t('admin.actions.history.link'), history_resource_path, class: 'btn btn-info'
           when AbAdmin::Config::ActionItem
@@ -129,8 +126,14 @@ module AbAdmin
         end
       end
 
+      def preview_resource_path(item)
+        return unless controller_name == 'manager' && manager.preview_path && option_conditions_met?(manager.preview_path[:options], item)
+        manager.preview_path[:value].is_a?(Symbol) ? public_send(manager.preview_path[:value], item) : instance_exec(item, &manager.preview_path[:value])
+      end
+
       def link_to_can?(act, *args, &block)
-        item_link_to_can?(act, get_subject, *args, &block)
+        subject = params[:id] ? resource : resource_class
+        item_link_to_can?(act, subject, *args, &block)
       end
 
       def item_link_to_can?(act, item, *args, &block)
@@ -207,7 +210,7 @@ module AbAdmin
       def batch_action_item(item)
         if settings[:batch]
           content_tag :td do
-            check_box_tag 'by_ids[]', item.id, false, id: "batch_action_item_#{item.id}", class: 'batch_check'
+            check_box_tag 'q[id_in][]', item.id, false, id: "batch_action_item_#{item.id}", class: 'batch_check'
           end
         end
       end

data/lib/ab_admin/views/inputs/ckeditor_input.rb

@@ -3,11 +3,7 @@ module AbAdmin
     module Inputs
       class CkeditorInput < ::SimpleForm::Inputs::Base
         def input(wrapper_options=nil)
-          unless @builder.template.instance_variable_get(:@ckeditor_loaded)
-            @builder.template.concat @builder.template.javascript_include_tag(Ckeditor.cdn_url)
-            @builder.template.instance_variable_set(:@ckeditor_loaded, true)
-          end
-          input_html_options.reverse_merge!({width: 800, height: 200})
+          input_html_options.reverse_merge!({width: 800, height: 200, data: {cdn_url: Ckeditor.cdn_url}})
           @builder.cktext_area(attribute_name, input_html_options)
         end
       end

data/lib/ab_admin/views/manager_helpers.rb

@@ -17,6 +17,10 @@ module AbAdmin
         manager.chart ||= ::AbAdmin::Config::Chart.default_for_model(resource_class)
       end
 
+      def stats_builder
+        manager.stats ||= ::AbAdmin::Config::Stats.default_for_model(resource_class)
+      end
+
       def map_builder
         manager.map ||= ::AbAdmin::Config::Map.default_for_model(resource_class)
       end
@@ -39,7 +43,7 @@ module AbAdmin
         elsif field.options[:image]
           item_image_link(item, assoc: field.name)
         else
-          admin_pretty_data call_method_or_proc_on(item, field.data)
+          admin_pretty_data method_or_proc_on(field.data, item)
         end
       end
 
@@ -54,10 +58,12 @@ module AbAdmin
       end
 
       INDEX_VIEW_ICONS = {table: 'list', tree: 'move', grid: 'th', chart: 'signal', map: 'map-marker', stats: 'eye-open'}
+      INDEX_VIEW_SYMBOLS = {pie_chart: '◔'}
       def index_view_link(index_view)
-        options = {class: "btn tool tool-bottom #{('active' if settings[:current_index_view] == index_view)}", title: t("admin.index_view.#{index_view}", default: index_view.to_s)}
+        options = {class: ['btn', 'tool', 'tool-bottom', ('active' if settings[:current_index_view] == index_view)], title: t("admin.index_view.#{index_view}", default: index_view.to_s)}
         url = url_for({index_view: index_view, q: params[:q]}.reject_blank)
-        title = INDEX_VIEW_ICONS[index_view.to_sym] ? icon(INDEX_VIEW_ICONS[index_view.to_sym]) : index_view
+        title = INDEX_VIEW_ICONS[index_view.to_sym] ? icon(INDEX_VIEW_ICONS[index_view.to_sym]) : (INDEX_VIEW_SYMBOLS[index_view.to_sym] || index_view.to_s)
+        options[:class] << 'btn-symbol' if INDEX_VIEW_SYMBOLS[index_view.to_sym]
         link_to title, url, options
       end
     end