slash_admin 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1972b380ac6782c7921b54ef60b515ebf3ccbc33499721d871c657f01a6b1060
-  data.tar.gz: ece587720d629fc7e1960b2ff5b4f6d4f6d4414fc0c041cad48b9f361a99008d
+  metadata.gz: 7f61951e5da77acff572ba11839d60c708cc440696971f3ca2eb483e55862ecc
+  data.tar.gz: fc105b1a368403c57f01190e863b34b5ad51e35a96c212623d3b695d712da148
 SHA512:
-  metadata.gz: bf2af28c8509da877de6786dad8890143a9d3697d6eae4c3732cc6f6d6644d32244851d3e46e34254455f6ea0fc625012e1014cfd9f1c9871f63400a2d25d808
-  data.tar.gz: cb011eaabf99b171edfb7b9761d72b266e73432861bfa4f71c8d26ae1ca39f801412bf68a0b8dff6cf0abca0a79befb3bb7a4d1ac5c17e6b5e8b6336a70a3c4e
+  metadata.gz: eaf607ee5214e9ec808afa71847f8ebfdce4249f06cbede5e0c276de9a3838dca3621cde3e1faead57d88e0950766e3f70fa92128a596bd70fce125fbe233f43
+  data.tar.gz: 8ee7c0e991a8eaf2bede39b04c397613847f6b84105afcb6229434f46b680f7f551004b570944ef7478c8fef26e0b558aa0f25e6109467f03608834657c6a91a

data/app/assets/javascripts/slash_admin/application.js

@@ -33,6 +33,7 @@ $(document).on("turbolinks:load", init);
 
 function init() {
   Turbolinks.clearCache();
+  $('[data-toggle="tooltip"]').tooltip();
 
   $('.page-sidebar a[href$="#"]').on("click", function(e) {
     e.preventDefault();

data/app/controllers/slash_admin/application_controller.rb

@@ -10,8 +10,8 @@ module SlashAdmin
 
     private
 
-      def set_locale
-        I18n.locale = http_accept_language.compatible_language_from(I18n.available_locales)
-      end
+    def set_locale
+      I18n.locale = http_accept_language.compatible_language_from(I18n.available_locales)
+    end
   end
 end

data/app/controllers/slash_admin/base_controller.rb

@@ -6,24 +6,25 @@ module SlashAdmin
     before_action :prepend_view_paths
     helper_method :current_admin, :boolean_to_string
 
-  protected
+    protected
 
-    def handle_default; end
+    def handle_default
+    end
 
     def handle_default_mode
       session[:compact] ||= false
     end
 
     def prepend_view_paths
-      prepend_view_path 'app/views/slash_admin'
+      prepend_view_path "app/views/slash_admin"
     end
 
-  private
+    private
 
     def authenticate_admin!
       return true if current_admin.present?
-      flash[:error] = t('slash_admin.sessions.login_required')
-      redirect_to login_url unless controller_name == 'sessions'
+      flash[:error] = t("slash_admin.sessions.login_required")
+      redirect_to login_url unless controller_name == "sessions"
     end
 
     def current_admin
@@ -31,11 +32,11 @@ module SlashAdmin
     end
 
     def to_boolean(str)
-      str == 'true'
+      str == "true"
     end
 
     def boolean_to_string(str)
-      str ? 'true' : 'false'
+      str ? "true" : "false"
     end
 
     def should_load_layout_data?

data/app/controllers/slash_admin/batch_actions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   class BatchActionsController < SlashAdmin::BaseController
     def delete

data/app/controllers/slash_admin/dashboard_controller.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   class DashboardController < SlashAdmin::BaseController
-    def home; end
+    def home
+    end
 
     def toggle
       session[:compact] = session[:compact].blank? ? true : nil

data/app/controllers/slash_admin/models_controller.rb

@@ -1,4 +1,4 @@
-require 'csv'
+require "csv"
 
 module SlashAdmin
   class ModelsController < SlashAdmin::BaseController
@@ -9,7 +9,7 @@ module SlashAdmin
     before_action :handle_default_params
     before_action :handle_assocations
 
-    helper_method :list_params, :export_params, :create_params, :update_params, :show_params, :nested_params, :should_add_translatable?, :translatable_params
+    helper_method :list_params, :export_params, :create_params, :update_params, :show_params, :nested_params, :should_add_translatable?, :translatable_params, :tooltips
 
     def index
       authorize! :index, @model_class
@@ -21,12 +21,12 @@ module SlashAdmin
 
       column = @model_class.arel_table[params[:order_field].to_sym]
       order = params[:order].downcase
-      if %w(asc desc).include?(order)
+      if %w[asc desc].include?(order)
         if @models_export.is_a? Array
-          if order == 'asc'
-            @models = @models_export.sort { |m1, m2| m1.send(params[:order_field]) <=> m2.send(params[:order_field]) }
+          @models = if order == "asc"
+            @models_export.sort { |m1, m2| m1.send(params[:order_field]) <=> m2.send(params[:order_field]) }
           else
-            @models = @models_export.sort { |m1, m2| m2.send(params[:order_field]) <=> m1.send(params[:order_field]) }
+            @models_export.sort { |m1, m2| m2.send(params[:order_field]) <=> m1.send(params[:order_field]) }
           end
           @models = Kaminari.paginate_array(@models).page(params[:page]).per(params[:per])
         else
@@ -36,8 +36,8 @@ module SlashAdmin
 
       @fields = if @use_export_params
         export_params
-        else
-          @model_class.column_names
+      else
+        @model_class.column_names
       end
 
       respond_to do |format|
@@ -53,8 +53,12 @@ module SlashAdmin
       @model = @model_class.new
     end
 
-    def before_validate_on_create; end
-    def after_save_on_create; end
+    def before_validate_on_create
+    end
+
+    def after_save_on_create
+    end
+
     def create
       authorize! :new, @model_class
       handle_has_one
@@ -69,19 +73,19 @@ module SlashAdmin
           after_save_on_create
           respond_to do |format|
             format.html do
-              flash[:success] = t('slash_admin.controller.create.success', model_name: @model_name)
-              redirect_to handle_redirect_after_submit and return
+              flash[:success] = t("slash_admin.controller.create.success", model_name: @model_name)
+              redirect_to(handle_redirect_after_submit) && return
             end
-            format.js { render json: { id: @model.id, name: helpers.show_object(@model) } and return }
+            format.js { render(json: {id: @model.id, name: helpers.show_object(@model)}) && return }
           end
         end
       else
-        flash[:error] = t('slash_admin.controller.create.error', model_name: @model_name)
+        flash[:error] = t("slash_admin.controller.create.error", model_name: @model_name)
       end
 
       respond_to do |format|
         format.html { render :new }
-        format.js { render json: { errors: @model.errors.full_messages } }
+        format.js { render json: {errors: @model.errors.full_messages} }
       end
     end
 
@@ -104,14 +108,14 @@ module SlashAdmin
       if @model.valid?
         if @model.save!
           after_save_on_update
-          flash[:success] = t('slash_admin.controller.update.success', model_name: @model_name)
+          flash[:success] = t("slash_admin.controller.update.success", model_name: @model_name)
           respond_to do |format|
-            format.html { redirect_to handle_redirect_after_submit and return }
+            format.html { redirect_to(handle_redirect_after_submit) && return }
             format.js
           end
         end
       else
-        flash[:error] = t('slash_admin.controller.update.error', model_name: @model_name)
+        flash[:error] = t("slash_admin.controller.update.error", model_name: @model_name)
       end
       render :edit
     end
@@ -128,20 +132,33 @@ module SlashAdmin
 
     def destroy
       @model_class.find(params[:id]).destroy!
-      flash[:success] = t('slash_admin.controller.delete.success', model_name: @model_name)
+      flash[:success] = t("slash_admin.controller.delete.success", model_name: @model_name)
       respond_to do |format|
         format.html { redirect_to main_app.polymorphic_url([:slash_admin, @model_class]) }
         format.js
       end
     end
 
-    def before_validate_on_update; end
-    def after_save_on_update; end
+    def before_validate_on_update
+    end
+
+    def after_save_on_update
+    end
+
+    # Add tooltip to th list view
+    # {
+    #   attr: 'Value',
+    #   title: 'The title of my model',
+    # }
+    #
+    def tooltips
+      {}
+    end
 
     def handle_has_one
       @has_one = {}
       Array.wrap(update_params + create_params).uniq.each do |p|
-        if helpers.guess_field_type(@model_class.new, p) == 'has_one' && !@model_class.nested_attributes_options.key?(p.to_sym)
+        if helpers.guess_field_type(@model_class.new, p) == "has_one" && !@model_class.nested_attributes_options.key?(p.to_sym)
           @has_one[p] = permit_params[p]
           permit_params.delete(p)
         end
@@ -168,7 +185,7 @@ module SlashAdmin
               @model.send("#{k}=", JSON.parse(permit_params[k]))
             rescue
               # Handle case when single string passed, we transform it into array to have a valid json
-              json = permit_params[k].split(',').to_json
+              json = permit_params[k].split(",").to_json
               @model.send("#{k}=", JSON.parse(json))
             end
           end
@@ -180,31 +197,31 @@ module SlashAdmin
 
     def nestable
       unless @is_nestable
-        flash[:error] = t('slash_admin.controller.nestable.error', model_name: @model_name)
-        redirect_to main_app.polymorphic_url([:slash_admin, @model_class]) and return
+        flash[:error] = t("slash_admin.controller.nestable.error", model_name: @model_name)
+        redirect_to(main_app.polymorphic_url([:slash_admin, @model_class])) && return
       end
 
       if request.post?
         if params[:nestable][:data].present?
           JSON.parse(params[:nestable][:data]).each_with_index do |p, i|
-            m = @model_class.find(p['id'])
+            m = @model_class.find(p["id"])
             m.position = i
             m.save!
           end
         end
 
-        flash[:success] = t('slash_admin.controller.nestable.success')
+        flash[:success] = t("slash_admin.controller.nestable.success")
 
-        redirect_to main_app.polymorphic_url(['slash_admin', @model_class]) and return if params.key?(:submit_redirect)
+        redirect_to(main_app.polymorphic_url(["slash_admin", @model_class])) && return if params.key?(:submit_redirect)
         redirect_to main_app.polymorphic_url([:nestable, :slash_admin, @model_class])
       end
     end
 
     def handle_filtered_search
-      if @model_class.respond_to? :translated_attribute_names
-        search = @model_class.with_translations(I18n.locale).all
+      search = if @model_class.respond_to? :translated_attribute_names
+        @model_class.with_translations(I18n.locale).all
       else
-        search = @model_class.all
+        @model_class.all
       end
 
       virtual_fields = []
@@ -215,17 +232,17 @@ module SlashAdmin
           if @model_class.respond_to?(:translated_attribute_names) && @model_class.translated_attribute_names.include?(attr.to_sym)
             attr = "#{@model_class.name.singularize.underscore}_translations.#{attr}"
           end
-          attr_prefixed = model.table_name + '.' + attr
+          attr_prefixed = model.table_name + "." + attr
           case attr_type
-          # TODO : Should be rewritten
-          when 'belongs_to'
+            # TODO : Should be rewritten
+          when "belongs_to"
             search = search.eager_load(attr.to_s)
-            search = search.where(attr.to_s + '_id IN (' + query.join(',') + ')')
-          # TODO : Should be rewritten
-          when 'has_one'
+            search = search.where(attr.to_s + "_id IN (" + query.join(",") + ")")
+            # TODO : Should be rewritten
+          when "has_one"
             search = search.eager_load(attr.to_s)
-            search = search.where(attr.to_s.pluralize + '.id IN (' + query.join(',') + ')')
-          when 'string', 'text'
+            search = search.where(attr.to_s.pluralize + ".id IN (" + query.join(",") + ")")
+          when "string", "text"
             query.strip! unless query.strip!.nil?
             attributes = @model_class.new.attributes.keys
             if !attributes.include?(attr.to_s) && @model_class.method_defined?(attr.to_s)
@@ -237,38 +254,38 @@ module SlashAdmin
                 search = search.where("lower(#{attr_prefixed}) LIKE lower(:query)", query: "%#{query}%")
               end
             end
-          when 'date', 'datetime'
+          when "date", "datetime"
             if query.is_a?(String)
               search = search.where("#{attr_prefixed} = :query", query: query)
             else
-              if query['from'].present? || query['to'].present?
-                if query['from'].to_date != query['to'].to_date
-                  if query['from'].present?
-                    search = search.where("#{attr_prefixed} >= :query", query: query['from'].to_date)
+              if query["from"].present? || query["to"].present?
+                if query["from"].to_date != query["to"].to_date
+                  if query["from"].present?
+                    search = search.where("#{attr_prefixed} >= :query", query: query["from"].to_date)
                   end
-                  if query['to'].present?
-                    search = search.where("#{attr_prefixed} <= :query", query: query['to'].to_date)
+                  if query["to"].present?
+                    search = search.where("#{attr_prefixed} <= :query", query: query["to"].to_date)
                   end
                 else
-                  search = search.where("#{attr_prefixed} = :query", query: query['from'].to_date)
+                  search = search.where("#{attr_prefixed} = :query", query: query["from"].to_date)
                 end
               end
             end
-          when 'decimal', 'number', 'integer'
+          when "decimal", "number", "integer"
             if query.instance_of?(ActionController::Parameters)
-              if query['from'].present? || query['to'].present?
-                search = search.where("#{attr_prefixed} >= :query", query: query['from']) if query['from'].present?
-                search = search.where("#{attr_prefixed} <= :query", query: query['to']) if query['to'].present?
+              if query["from"].present? || query["to"].present?
+                search = search.where("#{attr_prefixed} >= :query", query: query["from"]) if query["from"].present?
+                search = search.where("#{attr_prefixed} <= :query", query: query["to"]) if query["to"].present?
               end
             else
-              if attr_type == 'decimal' || attr_type == 'number'
+              if attr_type == "decimal" || attr_type == "number"
                 query = query.to_f
-              elsif attr_type == 'integer'
+              elsif attr_type == "integer"
                 query = query.to_i
               end
               search = search.where("#{attr_prefixed} = :query", query: query)
             end
-          when 'boolean'
+          when "boolean"
             search = search.where("#{attr_prefixed} = :query", query: to_boolean(query))
           else
             raise Exception.new("Unable to query for attribute_type : #{attr_type}")
@@ -293,7 +310,7 @@ module SlashAdmin
     end
 
     def update_params(options = {})
-      if (options.present?)
+      if options.present?
         create_params(options)
       else
         create_params
@@ -306,27 +323,31 @@ module SlashAdmin
         aut_params << m if model.respond_to? m
       end
 
-      raise Exception.new('You have to defined autocomplete_params in your admin model controller') if aut_params.blank?
+      raise Exception.new("You have to defined autocomplete_params in your admin model controller") if aut_params.blank?
       aut_params
     end
 
-  protected
+    protected
 
     def prepend_view_paths
-      prepend_view_path 'app/views/slash_admin'
-      prepend_view_path "app/views/slash_admin/models/#{@model_class.model_name.to_s.pluralize.underscore}" rescue nil
+      prepend_view_path "app/views/slash_admin"
+      begin
+        prepend_view_path "app/views/slash_admin/models/#{@model_class.model_name.to_s.pluralize.underscore}"
+      rescue
+        nil
+      end
     end
 
     def handle_redirect_after_submit
-      path =  main_app.edit_polymorphic_url(['slash_admin', @model])
-      path =  main_app.polymorphic_url(['slash_admin', @model_class]) if params.key?(:submit_redirect)
-      path =  main_app.new_polymorphic_url(['slash_admin', @model_class]) if params.key?(:submit_add)
+      path = main_app.edit_polymorphic_url(["slash_admin", @model])
+      path = main_app.polymorphic_url(["slash_admin", @model_class]) if params.key?(:submit_redirect)
+      path = main_app.new_polymorphic_url(["slash_admin", @model_class]) if params.key?(:submit_add)
 
       path
     end
 
     def permit_params
-      params[@model_class.name.split('::').last.underscore].permit!
+      params[@model_class.name.split("::").last.underscore].permit!
     end
 
     def handle_default
@@ -337,7 +358,7 @@ module SlashAdmin
       @per_values = [20, 30, 50, 100, 150]
       @use_export_params = false
       @order_field = :id
-      @order = 'DESC'
+      @order = "DESC"
     end
 
     def nestable_config
@@ -386,15 +407,13 @@ module SlashAdmin
 
     # By default we are looking in SlashAdmin:: namespace
     def model
-      begin
-        return controller_name.classify.constantize
-      rescue
-        return ('SlashAdmin::' + controller_name.classify).constantize
-      end
+      controller_name.classify.constantize
+    rescue
+      ("SlashAdmin::" + controller_name.classify).constantize
     end
 
     def create_params(options = {})
-      exclude_default_params(controller_name.classify.constantize.attribute_names).map { |attr| attr.gsub(/_id$/, '') }
+      exclude_default_params(controller_name.classify.constantize.attribute_names).map { |attr| attr.gsub(/_id$/, "") }
     end
 
     def translatable_params
@@ -402,13 +421,13 @@ module SlashAdmin
     end
 
     def show_params
-      @model_class.attribute_names.map { |attr| attr.gsub(/_id$/, '') }
+      @model_class.attribute_names.map { |attr| attr.gsub(/_id$/, "") }
     end
 
     def nested_params
       nested_params = []
       @model_class.nested_attributes_options.keys.each do |nested|
-        nested_params << { nested => exclude_default_params(nested.to_s.singularize.classify.constantize.attribute_names.map { |attr| attr.gsub(/_id$/, '') }) - [@model.model_name.param_key] }
+        nested_params << {nested => exclude_default_params(nested.to_s.singularize.classify.constantize.attribute_names.map { |attr| attr.gsub(/_id$/, "") }) - [@model.model_name.param_key]}
       end
 
       nested_params
@@ -416,16 +435,16 @@ module SlashAdmin
 
     # Exclude default params for edit and create
     def exclude_default_params(params)
-      params = params - %w(id created_at updated_at slug position)
+      params -= %w[id created_at updated_at slug position]
       if @model_class.try(:translated_attribute_names).present?
-        params = params - @model_class.translated_attribute_names.map(&:to_s)
+        params -= @model_class.translated_attribute_names.map(&:to_s)
       end
       params
     end
 
     def stream_file(filename, extension)
-      response.headers['Content-Type'] = 'application/octet-stream'
-      response.headers['Content-Disposition'] = "attachment; filename=#{filename}.#{extension}"
+      response.headers["Content-Type"] = "application/octet-stream"
+      response.headers["Content-Disposition"] = "attachment; filename=#{filename}.#{extension}"
 
       yield response.stream
     ensure
@@ -434,23 +453,25 @@ module SlashAdmin
 
     def stream_csv_report
       query = @models_export.limit(5000).to_sql
-      query_options = 'WITH CSV HEADER'
+      query_options = "WITH CSV HEADER"
 
-      stream_file("#{@model_class.model_name.plural.upcase}_#{Date.today}", 'csv') do |stream|
+      stream_file("#{@model_class.model_name.plural.upcase}_#{Date.today}", "csv") do |stream|
         stream_query_rows(query, query_options) do |row_from_db|
           stream.write row_from_db
         end
       end
     end
 
-  private
-    def list_params; end
+    private
+
+    def list_params
+    end
 
     def export_params
       list_params
     end
 
-    def stream_query_rows(sql_query, options = 'WITH CSV HEADER')
+    def stream_query_rows(sql_query, options = "WITH CSV HEADER")
       conn = ActiveRecord::Base.connection.raw_connection
       conn.copy_data "COPY (#{sql_query}) TO STDOUT #{options};" do
         while row = conn.get_copy_data

data/app/controllers/slash_admin/security/sessions_controller.rb

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   module Security
     class SessionsController < ActionController::Base
       protect_from_forgery with: :exception
 
-      layout 'slash_admin/admin_user'
+      layout "slash_admin/admin_user"
 
-      def new; end
+      def new
+      end
 
       def create
-        admin = Admin.where('username = :value OR lower(email) = lower(:value)', value: params[:admin][:login]).first
+        admin = Admin.where("username = :value OR lower(email) = lower(:value)", value: params[:admin][:login]).first
         if admin&.authenticate(params[:admin][:password])
           session[:admin_id] = admin.id
-          flash[:success] = 'Vous êtes à présent connecté.'
+          flash[:success] = "Vous êtes à présent connecté."
           redirect_to slash_admin.dashboard_path
         else
-          @error_messages = 'Merci de vérifier vos identifiants'
-          render :new and return
+          @error_messages = "Merci de vérifier vos identifiants"
+          render(:new) && return
         end
       end
 

data/app/controllers/slash_admin/selectize_controller.rb

@@ -8,10 +8,10 @@ module SlashAdmin
   class SelectizeController < SlashAdmin::BaseController
     def search
       model_class = model
-      if model_class.respond_to? :translated_attribute_names
-        results = model_class.with_translations(I18n.locale).all
+      results = if model_class.respond_to? :translated_attribute_names
+        model_class.with_translations(I18n.locale).all
       else
-        results = model_class.all
+        model_class.all
       end
 
       duplicate_for_orwhere = results
@@ -48,11 +48,9 @@ module SlashAdmin
         end
       end
 
-
-
       formatted_result = []
       results.each do |r|
-        formatted_result << { id: r.id, name: helpers.show_object(r) }
+        formatted_result << {id: r.id, name: helpers.show_object(r)}
       end
 
       render json: formatted_result

data/app/helpers/slash_admin/application_helper.rb

@@ -100,7 +100,7 @@ module SlashAdmin
     # Default available field_type handeled
     def orderable?(object, attr)
       field_type = guess_field_type(object, attr)
-      %w(boolean integer number decimal string text date datetime).include?(field_type)
+      %w[boolean integer number decimal string text date datetime].include?(field_type)
     end
 
     # By default all sortable fields are orderable
@@ -115,17 +115,17 @@ module SlashAdmin
     # Default label for object to string, title and name
     # can be an attribute, a string or the model_class
     def object_label(a)
-      if a.is_a? Hash
-        constantized_model = a.keys.first.to_s.singularize.classify.constantize
+      constantized_model = if a.is_a? Hash
+        a.keys.first.to_s.singularize.classify.constantize
       elsif a.is_a? ActiveRecord::Base
-        constantized_model = a
+        a
       else
-        constantized_model = a.to_s.singularize.classify.constantize
+        a.to_s.singularize.classify.constantize
       end
 
       constantized_model = constantized_model.new
 
-      method = 'to_s'
+      method = "to_s"
       object_label_methods.each do |m|
         method = m if constantized_model.respond_to?(m)
       end
@@ -134,7 +134,7 @@ module SlashAdmin
     end
 
     def show_object(a)
-      method = 'to_s'
+      method = "to_s"
 
       unless a.blank?
         object_label_methods.each do |m|
@@ -149,10 +149,10 @@ module SlashAdmin
     # object params can be a Model Class or a Model Instance
     # boolean integer number decimal string text date datetime has_many belongs_to
     def guess_field_type(object, attr)
-      if object.class === Class
-        object_class = object
+      object_class = if object.class === Class
+        object
       else
-        object_class = object.class
+        object.class
       end
 
       belongs_to_fields = object_class.reflect_on_all_associations(:belongs_to).map(&:name)
@@ -162,19 +162,19 @@ module SlashAdmin
       return if attr.is_a? Hash
 
       type = if object_class&.uploaders&.key?(attr.to_sym)
-        'image'
+        "image"
       elsif belongs_to_fields.include?(attr.to_sym)
-        'belongs_to'
+        "belongs_to"
       elsif has_many_fields.include?(attr.to_sym)
-        'has_many'
+        "has_many"
       elsif has_one_fields.include?(attr.to_sym)
-        'has_one'
+        "has_one"
       else
         object_class.type_for_attribute(attr.to_s).type.to_s
       end
 
       # Virtual field default string eg password
-      return 'string' if object_class.new.respond_to?(attr) && type.blank?
+      return "string" if object_class.new.respond_to?(attr) && type.blank?
 
       # Raise exception if no type fouded
       raise Exception.new("Unable to guess field_type for attribute: #{attr} in model: #{object_class}") if type.blank?
@@ -184,15 +184,14 @@ module SlashAdmin
     # From shoulda-matchers https://github.com/thoughtbot/shoulda-matchers/blob/da4e6ddd06de54016e7c2afd953120f0f6529c70/lib/shoulda/matchers/rails_shim.rb
     # @param model @model_class
     def serialized_attributes_for(model)
-      serialized_columns = model.columns.select do |column|
+      serialized_columns = model.columns.select { |column|
         model.type_for_attribute(column.name).is_a?(
           ::ActiveRecord::Type::Serialized,
-          )
-      end
+        )
+      }
 
-      serialized_columns.inject({}) do |hash, column|
+      serialized_columns.each_with_object({}) do |column, hash|
         hash[column.name.to_s] = model.type_for_attribute(column.name).coder
-        hash
       end
     end
 
@@ -205,7 +204,7 @@ module SlashAdmin
 
     def admin_custom_field(form, attribute)
       type = attribute[attribute.keys.first][:type].to_s
-      render partial: "slash_admin/custom_fields/#{type}", locals: { f: form, a: attribute }
+      render partial: "slash_admin/custom_fields/#{type}", locals: {f: form, a: attribute}
     end
 
     # Form helper for generic field
@@ -220,32 +219,32 @@ module SlashAdmin
         admin_custom_field(form, attribute)
       elsif belongs_to_fields.include?(attribute.to_sym)
         if form.object.class.nested_attributes_options.key?(attribute.to_sym)
-          render partial: 'slash_admin/fields/nested_belongs_to', locals: { f: form, a: attribute }
+          render partial: "slash_admin/fields/nested_belongs_to", locals: {f: form, a: attribute}
         else
-          render partial: 'slash_admin/fields/belongs_to', locals: { f: form, a: attribute }
+          render partial: "slash_admin/fields/belongs_to", locals: {f: form, a: attribute}
         end
       elsif has_many_fields.include?(attribute.to_sym)
         # if has nested_attributes_options for has_many field
         if form.object.class.nested_attributes_options.key?(attribute.to_sym)
-          render partial: 'slash_admin/fields/nested_has_many', locals: { f: form, a: attribute }
+          render partial: "slash_admin/fields/nested_has_many", locals: {f: form, a: attribute}
         else
-          render partial: 'slash_admin/fields/has_many', locals: { f: form, a: attribute }
+          render partial: "slash_admin/fields/has_many", locals: {f: form, a: attribute}
         end
       elsif has_one_fields.include?(attribute.to_sym)
         if form.object.class.nested_attributes_options.key?(attribute.to_sym)
-          render partial: 'slash_admin/fields/nested_has_one', locals: { f: form, a: attribute }
+          render partial: "slash_admin/fields/nested_has_one", locals: {f: form, a: attribute}
         else
-          render partial: 'slash_admin/fields/has_one', locals: { f: form, a: attribute }
+          render partial: "slash_admin/fields/has_one", locals: {f: form, a: attribute}
         end
       elsif form.object.class&.uploaders&.key?(attribute.to_sym)
-        render partial: 'slash_admin/fields/carrierwave', locals: { f: form, a: attribute }
+        render partial: "slash_admin/fields/carrierwave", locals: {f: form, a: attribute}
       else
         type = form.object.class.type_for_attribute(attribute.to_s).type.to_s
-        if type == 'date' || type == 'datetime'
-          render partial: 'slash_admin/fields/date', locals: { f: form, a: attribute }
+        if type == "date" || type == "datetime"
+          render partial: "slash_admin/fields/date", locals: {f: form, a: attribute}
         else
           raise Exception.new("Unable to guess field_type for attribute: #{attribute} in model: #{object_class}") if type.blank?
-          render partial: "slash_admin/fields/#{type}", locals: { f: form, a: attribute }
+          render partial: "slash_admin/fields/#{type}", locals: {f: form, a: attribute}
         end
       end
     end

data/app/helpers/slash_admin/menu_helper.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   module MenuHelper
     def menu_entries
       [
         {
-          title: 'Dashboard',
+          title: "Dashboard",
           path: slash_admin.dashboard_path,
-          icon: 'icon-home',
+          icon: "icon-home",
         },
       ]
     end

data/app/helpers/slash_admin/widgets_helper.rb

@@ -3,6 +3,6 @@
 module SlashAdmin::WidgetsHelper
   # number, title, icon, progress_label, percent, status
   def statistic_progress_tile(options = {})
-    render 'slash_admin/dashboard/widgets/statistic_progress_tile', options: options
+    render "slash_admin/dashboard/widgets/statistic_progress_tile", options: options
   end
 end

data/app/mailers/slash_admin/application_mailer.rb

@@ -1,6 +1,6 @@
 module SlashAdmin
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 end

data/app/models/slash_admin/admin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   class Admin < ApplicationRecord
     include CanCan::Ability
@@ -9,7 +10,7 @@ module SlashAdmin
 
     EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
     USERNAME_REGEX = /^[a-zA-Z0-9_\.]*$/
-    validates :username, presence: true, uniqueness: true, length: { in: 3..20 }
+    validates :username, presence: true, uniqueness: true, length: {in: 3..20}
     validates :email, presence: true, uniqueness: true
     validates_length_of :password, in: 6..20, on: :create
     validates_format_of :email, with: EMAIL_REGEX, multiline: true
@@ -28,15 +29,13 @@ module SlashAdmin
     end
 
     def handle_default_role
-      self.roles = 'superadmin' unless roles.present?
+      self.roles = "superadmin" unless roles.present?
     end
 
-    def login=(login)
-      @login = login
-    end
+    attr_writer :login
 
     def login
-      @login || self.username || self.email
+      @login || username || email
     end
 
     def identicon

data/app/models/slash_admin/admin_ability.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   class AdminAbility
     include CanCan::Ability

data/app/views/slash_admin/base/_data_list.html.erb

@@ -17,43 +17,52 @@
           <input type="checkbox" class="toggle-all"/>
         </th>
         <th
-        data-order-field="id"
-        <% if params[:order_field].to_s == 'id' %>
-        class="ordered <%= params[:order].downcase %>"
-        data-order="<%= params[:order] %>"
-        <% else %>
-        class="ordered"
-        <% end %>
-        >#
+          data-order-field="id"
+          <% if params[:order_field].to_s == 'id' %>
+          class="ordered <%= params[:order].downcase %>"
+          data-order="<%= params[:order] %>"
+          <% else %>
+          class="ordered"
+          <% end %>
+          >#
         </th>
         <% list_params.each do |attr| %>
           <% if attr.is_a?(Hash) %>
-            <th><%= @model_class.human_attribute_name(attr.keys.first) %></th>
+            <th>
+              <%= @model_class.human_attribute_name(attr.keys.first) %>
+              <% if tooltips.key? attr.keys.first %>
+                <a href="#" data-toggle="tooltip" data-placement="top" title="<%= tooltips[attr] %>"><i class="fas fa-question-circle"></i></a>
+              <% end %>
+            </th>
           <% else %>
             <th
-            <% if orderable?(@model_class, attr) %>
-            data-order-field="<%= attr %>"
-            <% if params[:order_field].to_s == attr.to_s %>
-            class="ordered <%= params[:order].downcase %>"
-            data-order="<%= params[:order] %>"
-            <% else %>
-            class="ordered"
-            <% end %>
-            <% end %>>
+              <% if orderable?(@model_class, attr) %>
+              data-order-field="<%= attr %>"
+              <% if params[:order_field].to_s == attr.to_s %>
+              class="ordered <%= params[:order].downcase %>"
+              data-order="<%= params[:order] %>"
+              <% else %>
+              class="ordered"
+              <% end %>
+              <% end %>>
               <%= @model_class.human_attribute_name(attr) %>
+              <% if tooltips.key? attr %>
+                <a href="#" data-toggle="tooltip" data-placement="top" title="<%= tooltips[attr] %>"><i class="fas fa-question-circle"></i></a>
+            <% end %>
             </th>
           <% end %>
         <% end %>
         <th class="text-center"><%= t('slash_admin.view.actions') %></th>
       </tr>
 
-        <%= render 'filters', model: @model_class %>
+      <%= render 'filters', model: @model_class %>
       </thead>
 
       <tbody>
       <% @models.each do |m| %>
         <tr>
-          <td class="fit"><input type="checkbox" name="<%= @model_name.pluralize.downcase %>[] %>" value="<%= m.id %>"></td>
+          <td class="fit"><input type="checkbox" name="<%= @model_name.pluralize.downcase %>[] %>" value="<%= m.id %>">
+          </td>
           <td class="fit"><%= m.id %></td>
           <% list_params.each do |attr| %>
             <% if attr.is_a?(Hash) %>
@@ -65,7 +74,7 @@
                     <em><%= t('slash_admin.view.no_image') %></em>
                   <% end %>
                 </td>
-                <% else %>
+              <% else %>
                 <td class="<%= attr.to_s.parameterize.underscore.downcase %>"><%= render attr.keys.first.to_s, model: m %></td>
               <% end %>
             <% else %>
@@ -88,7 +97,8 @@
                     <div class="modal-dialog" role="document">
                       <div class="modal-content">
                         <div class="modal-header">
-                          <h5 class="modal-title" id="exampleModalLabel"><%= t('slash_admin.view.associations') %> <strong>(<%= m.send(attr).length %>)</strong></h5>
+                          <h5 class="modal-title" id="exampleModalLabel"><%= t('slash_admin.view.associations') %>
+                            <strong>(<%= m.send(attr).length %>)</strong></h5>
                           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                           </button>
@@ -99,7 +109,7 @@
                           <% else %>
                             <% m.send(attr).each do |a| %>
                               <%= link_to(edit_polymorphic_url([:slash_admin, a]), class: 'link', target: '_blank') do %>
-                                <%= show_object(a) %><br />
+                                <%= show_object(a) %><br/>
                               <% end rescue show_object(a) %>
                             <% end %>
                           <% end %>
@@ -145,7 +155,7 @@
 <%= render 'slash_admin/shared/better_paginate' %>
 
 <script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
+  $(document).on('turbolinks:load', function () {
     $('.bootstrap-datepicker').datepicker({
       language: '<%= I18n.locale.to_s %>',
       format: "YYYY-MM-DD",
@@ -156,7 +166,7 @@
     });
 
     // handle Sort
-    $('.ordered').on('click', function() {
+    $('.ordered').on('click', function () {
       var field = $(this).data('order-field');
 
       if (field) {
@@ -170,13 +180,13 @@
 
         // change order field should reset pagination
         $('.admin-pagination input').val(1);
-        $('.admin-pagination option:first').prop('selected',true);
+        $('.admin-pagination option:first').prop('selected', true);
         handleFiltersAndLocation();
       }
     });
 
     function toggle_order(order_direction) {
-      return order_direction == 'DESC' ? 'ASC' : 'DESC';
+      return order_direction === 'DESC' ? 'ASC' : 'DESC';
     }
 
     function handle_form(field, order_direction) {
@@ -240,11 +250,11 @@
       }
     });
 
-    $('#reset-filters').on('click', function(e) {
+    $('#reset-filters').on('click', function (e) {
       e.preventDefault();
 
       $("input[name*='filters']").val('');
-      $("select[name*='filters'] option:first").prop('selected',true);
+      $("select[name*='filters'] option:first").prop('selected', true);
 
       $('#filters').trigger('submit');
     });
@@ -258,9 +268,9 @@
       var paginationParams = $('.admin-pagination').first().serialize();
       var orderParams = $('#order').serialize();
 
-      parameters = '';
-      $.each([filtersParams, paginationParams, orderParams], function(index, params) {
-        if (index != 0) {
+      var parameters = '';
+      $.each([filtersParams, paginationParams, orderParams], function (index, params) {
+        if (index !== 0) {
           parameters += '&' + params;
         } else {
           parameters += params;

data/config/initializers/validators.rb

@@ -1,6 +1,6 @@
 class JsonValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << (options[:message] || I18n.t('slash_admin.view.json_not_valid')) unless valid_json?(value) 
+    record.errors[attribute] << (options[:message] || I18n.t("slash_admin.view.json_not_valid")) unless valid_json?(value)
   end
 
   def valid_json?(string)

data/config/routes.rb

@@ -1,16 +1,16 @@
 SlashAdmin::Engine.routes.draw do
   scope :admin do
-    get '/' => 'dashboard#home', as: 'dashboard'
-    get 'login' => 'security/sessions#new'
-    post 'login', to: 'security/sessions#create'
-    get 'logout' => 'security/sessions#destroy'
-    get 'dashboard/toggle' => 'dashboard#toggle', as: 'toggle_dashboard'
+    get "/" => "dashboard#home", :as => "dashboard"
+    get "login" => "security/sessions#new"
+    post "login", to: "security/sessions#create"
+    get "logout" => "security/sessions#destroy"
+    get "dashboard/toggle" => "dashboard#toggle", :as => "toggle_dashboard"
 
-    get 'search' => 'selectize#search', as: 'remote_selectize'
+    get "search" => "selectize#search", :as => "remote_selectize"
 
     # Batch actions
 
     # DELETE
-    post 'batch_actions/delete/:model_class', to: 'batch_actions#delete', as: 'batch_delete'
+    post "batch_actions/delete/:model_class", to: "batch_actions#delete", as: "batch_delete"
   end
 end

data/db/migrate/20170512104248_create_slash_admin_admins.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
+
 class CreateSlashAdminAdmins < ActiveRecord::Migration[5.0]
   def change
     create_table :slash_admin_admins do |t|
       ## Database authenticatable
-      t.string :username,           null: false, default: ''
-      t.string :email,              null: false, default: ''
-      t.string :password_digest,    null: false, default: ''
+      t.string :username, null: false, default: ""
+      t.string :email, null: false, default: ""
+      t.string :password_digest, null: false, default: ""
       t.string :avatar
       t.string :roles
 
       ## Recoverable
-      t.string   :reset_password_token
+      t.string :reset_password_token
       t.datetime :reset_password_sent_at
 
       t.timestamps null: false

data/lib/batch_translation.rb

@@ -4,13 +4,13 @@ module ActionView
   module Helpers
     class FormBuilder
       def globalize_fields_for(locale, *args, &proc)
-        raise ArgumentError, 'Missing block' unless block_given?
+        raise ArgumentError, "Missing block" unless block_given?
         options = args.extract_options!
         @index = @index ? @index + 1 : 1
         object_name = "#{@object_name}[translations_attributes][#{@index}]"
         form_object = @object || @object_name.to_s.camelize.constantize.new
-        object = form_object.translations.select { |t| t.locale.to_s == locale.to_s }.first
-        @template.concat @template.hidden_field_tag("#{object_name}[id]", object ? object.id : '')
+        object = form_object.translations.find { |t| t.locale.to_s == locale.to_s }
+        @template.concat @template.hidden_field_tag("#{object_name}[id]", object ? object.id : "")
         @template.concat @template.hidden_field_tag("#{object_name}[locale]", locale)
         @template.fields_for(object_name, object, options, &proc)
       end

data/lib/generators/slash_admin/controllers/controllers_generator.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   module Generators
     class ControllersGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
       argument :model, required: true,
-                       desc: 'The model concerned'
+                       desc: "The model concerned"
 
       def create_controller
         @model_name = model.camelize
-        template 'controllers.erb',
-                 "app/controllers/slash_admin/models/#{model}_controller.rb"
+        template "controllers.erb",
+          "app/controllers/slash_admin/models/#{model}_controller.rb"
       end
     end
   end

data/lib/generators/slash_admin/install/install_generator.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
       def install
-        template 'install.erb',
-                 'app/helpers/slash_admin/menu_helper.rb'
+        template "install.erb",
+          "app/helpers/slash_admin/menu_helper.rb"
       end
     end
   end

data/lib/generators/slash_admin/override_admin/override_admin_generator.rb

@@ -3,11 +3,11 @@
 module SlashAdmin
   module Generators
     class OverrideAdminGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
       def override_admin
-        template 'admin.erb',
-                 'app/models/slash_admin/admin.rb'
+        template "admin.erb",
+          "app/models/slash_admin/admin.rb"
       end
     end
   end

data/lib/generators/slash_admin/override_session/override_session_generator.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   module Generators
     class OverrideSessionGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
       def override_session
-        template 'session.erb',
-                 'app/controllers/slash_admin/security/sessions_controller.rb'
+        template "session.erb",
+          "app/controllers/slash_admin/security/sessions_controller.rb"
       end
     end
   end

data/lib/generators/slash_admin/permissions/permissions_generator.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   module Generators
     class PermissionsGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
       def create_permissions
-        template 'permissions.erb',
-                 'app/models/slash_admin/admin_ability.rb'
+        template "permissions.erb",
+          "app/models/slash_admin/admin_ability.rb"
       end
     end
   end

data/lib/slash_admin/engine.rb

@@ -2,7 +2,7 @@ module SlashAdmin
   class Engine < ::Rails::Engine
     isolate_namespace SlashAdmin
     config.to_prepare do
-      Rails.application.config.assets.precompile += %w( slash_admin/* )
+      Rails.application.config.assets.precompile += %w[slash_admin/*]
     end
   end
 end

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = '1.0.1'
+  VERSION = "1.0.2"
 end

data/lib/slash_admin.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require 'slash_admin/engine'
-require 'cancancan'
-require 'kaminari'
-require 'groupdate'
-require 'ruby_identicon'
-require 'bcrypt'
-require 'chartkick'
-require 'chart-js-rails'
-require 'highcharts-rails'
-require 'selectize-rails'
-require 'js-routes'
-require 'i18n-js'
-require 'bootstrap'
-require 'cocoon'
-require 'datetime_picker_rails'
-require 'jquery-rails'
-require 'jquery-minicolors-rails'
-require 'momentjs-rails'
-require 'tether-rails'
-require 'sweetalert-rails'
-require 'http_accept_language'
-require 'batch_translation'
+require "slash_admin/engine"
+require "cancancan"
+require "kaminari"
+require "groupdate"
+require "ruby_identicon"
+require "bcrypt"
+require "chartkick"
+require "chart-js-rails"
+require "highcharts-rails"
+require "selectize-rails"
+require "js-routes"
+require "i18n-js"
+require "bootstrap"
+require "cocoon"
+require "datetime_picker_rails"
+require "jquery-rails"
+require "jquery-minicolors-rails"
+require "momentjs-rails"
+require "tether-rails"
+require "sweetalert-rails"
+require "http_accept_language"
+require "batch_translation"
 
 module SlashAdmin
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails