ab_admin 0.7.0 → 0.8.0

data/config/locales/ru.yml

@@ -246,14 +246,6 @@ ru:
     updater_id: Обновил
     remember_me: Запомнить
     password: Пароль
-  attrs:
-    en: анг.
-    it: итал.
-    ru: рус.
-    uk: укр.
-    de: нем.
-    fr: фран.
-    es: исп.
   flash:
     admin:
       actions:

data/config/locales/uk.yml

@@ -246,14 +246,6 @@ uk:
     updater_id: "Обновил"
     remember_me: "Запомнить"
     password: "Пароль"
-  attrs:
-    en: "анг."
-    it: "итал."
-    ru: "рус."
-    uk: "укр."
-    de: "нем."
-    fr: "фран."
-    es: "исп."
   flash:
     admin:
       actions:

data/config/routes.rb

@@ -25,7 +25,8 @@ Rails.application.routes.draw do
     end
 
     resource :locators do
-      post :prepare, :reload, on: :collection
+      post :prepare, :reload, :import, on: :collection
+      get :export, on: :collection
     end
 
     resources :admin_comments

data/lib/ab_admin.rb

@@ -135,6 +135,8 @@ module AbAdmin
   mattr_accessor :site_name
   @@site_name = 'AbAdmin'
 
+  mattr_accessor :root_path
+
   mattr_accessor :body_css_class
 
   mattr_accessor :favicon_path
@@ -152,7 +154,7 @@ module AbAdmin
   @@translate_models = %w(User Asset Structure StaticPage Header AdminComment)
 
   mattr_accessor :assets
-  @@assets = %w(ab_admin/devise.css bootstrap.js ab_admin/loading.gif ab_admin/clear.png)
+  @@assets = %w(ab_admin/devise.css bootstrap.js ab_admin/loading.gif ab_admin/clear.png ab_admin/clear.png admin/flags/*.png)
 
   mattr_accessor :test_settings
   @@test_settings = {}
@@ -174,6 +176,9 @@ module AbAdmin
 
   mattr_accessor :base_url
 
+  mattr_accessor :default_resource_settings
+  @@default_resource_settings = {index_view: 'table', search: true, batch: true, hotkeys: true, list_dblclick: true}
+
   mattr_accessor :default_per_page
   @@default_per_page = 50
 

data/lib/ab_admin/abstract_resource.rb

@@ -6,7 +6,7 @@ module AbAdmin
       ACTIONS = [:index, :show, :new, :edit, :create, :update, :destroy, :preview, :batch, :rebuild, :custom_action, :history]
     end
 
-    attr_accessor :model, :table, :search, :export, :form, :modal_form, :show, :preview_path, :actions, :custom_settings,
+    attr_accessor :model, :table, :search, :export, :form, :chart, :modal_form, :show, :preview_path, :actions, :custom_settings,
                   :batch_action_list, :action_items, :disabled_action_items, :resource_action_items, :tree_node_renderer,
                   :parent_resources, :custom_actions, :permitted_params, :scopes
 

data/lib/ab_admin/carrierwave/base_uploader.rb

@@ -47,7 +47,7 @@ module AbAdmin
       end
 
       def human_full_filename(for_file=filename)
-        ext = File.extname(for_file).downcase
+        ext = File.extname(for_file)
         human_filename_part = for_file.chomp(ext)
         tech_filename_part = "#{base_filename_part}#{ext}"
         human_filename_part == secure_token ? tech_filename_part : "#{human_filename_part}_#{tech_filename_part}"

data/lib/ab_admin/concerns/utilities.rb

@@ -32,8 +32,8 @@ module AbAdmin
           #ActiveRecord::Base.descendants.find_all { |model| model.descends_from_active_record? }
         end
 
-        def han(attr)
-          human_attribute_name(attr)
+        def han(attr, locale: nil)
+          locale ? "#{human_attribute_name(attr)} (#{locale})" : human_attribute_name(attr)
         end
 
         def quote_column(col_name)

data/lib/ab_admin/config/base.rb

@@ -3,8 +3,7 @@ module AbAdmin
     class BaseBuilder
       attr_reader :options, :fields
       attr_accessor :partial
-      class_attribute :field_defaults, :partial_name, instance_writer: false
-      self.field_defaults = {}
+      class_attribute :partial_name, instance_writer: false
 
       def initialize(options={}, &block)
         @fields = []
@@ -14,7 +13,7 @@ module AbAdmin
       end
 
       def field(name, options={}, &block)
-        @fields << Field.new(name, options.reverse_merge!(field_defaults), &block)
+        @fields << Field.new(name, options, &block)
       end
 
       def self.default_for_model(model, options={})
@@ -30,7 +29,6 @@ module AbAdmin
     end
 
     class Table < BaseBuilder
-      self.field_defaults = {sortable: true}
       self.partial_name = 'table'
     end
 
@@ -38,6 +36,10 @@ module AbAdmin
       self.partial_name = 'search_form'
     end
 
+    class Chart < BaseBuilder
+      self.partial_name = 'chart'
+    end
+
     class Export < BaseBuilder
       def render_options
         {column_names: fields.map(&:name), column_data: fields.map(&:data),
@@ -164,11 +166,11 @@ module AbAdmin
       def initialize(name, options={}, &block)
         @name = name
         @options = options
+        @options[:badge] = {} if @options[:badge] && !@options[:badge].is_a?(Hash)
         @data = block
       end
 
       def apply(relation, params)
-        return relation unless params[name].present?
         data.is_a?(Proc) ? data.call(relation, params) : relation.public_send(name)
       end
     end

data/lib/ab_admin/core_ext/hash.rb

@@ -103,10 +103,15 @@ class Hash
     new_hash
   end
 
-  def no_blank
+  def reject_blank
     reject { |_, v| v.blank? }
   end
 
+  def no_blank
+    ActiveSupport::Deprecation.warn('`no_blank` is deprecated, use `reject_blank` instead')
+    reject_blank
+  end
+
   def try_keys(*try_keys)
     try_keys.each do |k|
       return self[k] if self.has_key?(k)
@@ -122,4 +127,17 @@ class Hash
     }
   end unless Hash.method_defined?(:deep_stringify_keys)
 
+  def flatten_hash!(k = [])
+    inject({}) do |h, v|
+      new_k = k + [v[0]]
+      h.merge!(v[-1].is_a?(Hash) ? v[-1].flatten_hash!(new_k) : {new_k => v[-1]})
+    end
+  end
+
+  def flatten_hash(k = [])
+    dup.inject({}) do |h, v|
+      new_k = k + [v[0]]
+      h.merge!(v[-1].is_a?(Hash) ? v[-1].dup.flatten_hash(new_k) : {new_k => v[-1]})
+    end
+  end
 end

data/lib/ab_admin/core_ext/other.rb

@@ -4,16 +4,6 @@ class NilClass
   end
 end
 
-class Time
-  def formatted_datetime
-    I18n.l(self, format: '%d.%m.%Y %H:%M')
-  end
-
-  def formatted_date
-    I18n.l(self, format: '%d.%m.%Y')
-  end
-end
-
 class TrueClass
   def to_i
     1
@@ -37,41 +27,3 @@ class Date
     self.to_date == ::Date.tomorrow
   end
 end
-
-#module ActiveSupport
-#  class OrderedHash < ::Hash
-#    def to_yaml(opts = {})
-#      YAML::quick_emit(self, opts) do |out|
-#        out.map(nil, to_yaml_style) do |map|
-#          each do |k, v|
-#            map.add(k, v)
-#          end
-#        end
-#      end
-#    end
-#  end
-#end
-
-#class Numeric
-#  # round a given number to the nearest step
-#  def round_by(increment)
-#    (self /increment).round * increment
-#  end
-#end
-#
-#class Float
-#  def ceil_to(i=4)
-#    #(self * 10**i).ceil.to_f / 10**i
-#    (self * (10.0 ** i)).round(10).ceil * (10.0 ** (-i))
-#  end
-#
-#  def floor_to(i=4)
-#    (self * 10**i).floor.to_f / 10**i
-#  end
-#
-#  def round_to
-#    return (self+0.5).floor if self > 0.0
-#    return (self-0.5).ceil if self < 0.0
-#    0
-#  end
-#end

data/lib/ab_admin/hooks/will_paginate_id_prefetch.rb

@@ -40,7 +40,7 @@ module WillPaginate
         rel.total_entries = total.to_i unless total.blank?
 
         if large
-          ids = rel.except(:includes).pluck("#{quoted_table_name}.id")
+          ids = rel.except(:includes).pluck(Arel.sql("#{quoted_table_name}.id"))
           new_rel = rel.except(:limit, :offset, :where).where(id: ids)
           new_rel.paginate_limit = rel.limit_value.to_i
           new_rel.paginate_offset = rel.offset_value.to_i

data/lib/ab_admin/i18n_tools/model_translator.rb

@@ -5,7 +5,8 @@ module AbAdmin
       IGNORE_COLUMNS = %w(id reset_password_sent_at remember_created_at current_sign_in_at confirmation_token
                       reset_password_token password_salt failed_attempts)
 
-      def initialize
+      def initialize(options: {})
+        @options = options
         @locales = Globalize.available_locales
         @models = AbAdmin.translate_models.map{|m| m.constantize }
         @models_i18n_hash = {}
@@ -33,10 +34,9 @@ module AbAdmin
                 model.reflect_on_all_associations.map(&:name).map(&:to_s).reject { |a| a =~ /^translation/ }.each do |assoc|
                   o[assoc] = ha(model, assoc, locale)
                 end
-                if model.new.respond_to?("#{attr}_#{locale.to_s}".to_sym)
+                if @options[:locale_attributes] && model.new.respond_to?("#{attr}_#{locale.to_s}".to_sym)
                   @locales.each do |locale_1|
-                    attr_suffix = I18n.t(locale_1, scope: [:attrs], default: locale_1.to_s.humanize)
-                    o["#{attr}_#{locale_1.to_s}"] = "#{ha(model, attr, locale)} (#{attr_suffix})"
+                    o["#{attr}_#{locale_1.to_s}"] = "#{ha(model, attr, locale)} (#{locale_1.to_s})"
                   end
                 end
               end.sort.to_h

data/lib/ab_admin/models/asset.rb

@@ -52,10 +52,6 @@ module AbAdmin
         data.versions[thumb_size] ? url(thumb_size) : url
       end
 
-      def format_created_at
-        I18n.l(created_at, format: '%d.%m.%Y %H:%M')
-      end
-
       def human_name
         original_name.presence || data_file_name
       end

data/lib/ab_admin/models/locator.rb

@@ -1,3 +1,5 @@
+require 'csv'
+
 module AbAdmin
   module Models
     module Locator
@@ -23,13 +25,44 @@ module AbAdmin
         def prepare_data(path)
           data = YAML.load_file(path)
           locale = data.keys.first
-          OpenStruct.new({locale: locale.to_sym, data: data[locale], flat_data: flat_hash(data[locale]),
+          OpenStruct.new({locale: locale.to_sym, data: data[locale], flat_data: data[locale].flatten_hash,
                           filename: File.basename(path), path: path, dir: File.dirname(path)})
         end
 
-        def flat_hash(hash, k = [])
-          return {k => hash} unless hash.is_a?(Hash)
-          hash.inject({}) { |h, v| h.merge! flat_hash(v[-1], k + [v[0]]) }
+        def export_csv(*keys, locales: nil)
+          return if keys.blank?
+          locales ||= I18n.available_locales
+          I18n.backend.available_locales # Force load translations
+          filter_keys = keys.map {|k| k.include?('*') ? Regexp.new("\\A#{k.gsub('.', '\.').gsub('*', '.*')}\\z") : k}
+          data = filter_keys.each_with_object(Hash.new { |h, k| h[k] = [] }) do |key, res|
+            locales.each_with_index do |l, i|
+              translations[l].find_all{|k, _| key.is_a?(Regexp) ? k =~ key : k == key }.each{|k, v| res[k][i] = v}
+            end
+          end
+          for_csv = [['DO NOT EDIT THIS COLUMN!', *locales]] + data.map{|k, v| [k, *v] }
+          for_csv.map(&:to_csv).join
+        end
+
+        def import_csv(csv, locales: nil)
+          return if csv.blank?
+          locales ||= I18n.available_locales
+          csv_data = CSV.parse(csv)
+          csv_data.shift.each_with_index do |l, i|
+            next if i.zero? || !locales.include?(l.to_sym)
+            path = Rails.root.join('config', 'locales', "#{l}.yml")
+            raise "Missing file #{path}" unless File.file?(path)
+            data = YAML.load_file(path)
+            csv_data.each do |d|
+              key_parts = [l.to_s] + d[0].split('.')
+              raise "Invalid key #{d[0]}" unless data.dig(*key_parts)
+              data.store_multi(d[i], *key_parts)
+            end
+            save path, data
+          end
+        end
+
+        def translations
+          @translations ||= I18n.backend.send(:translations).slice(*I18n.available_locales).transform_values{|v| v.flatten_hash.transform_keys{|k| k.join('.') } }
         end
       end
 

data/lib/ab_admin/models/user.rb

@@ -32,8 +32,8 @@ module AbAdmin
       end
 
       def activate!
-        confirm unless confirmed?
-        unlock_access! if access_locked?
+        confirm if respond_to?(:confirm) && !confirmed?
+        unlock_access! if respond_to?(:unlock_access!) && access_locked?
       end
 
       def active?

data/lib/ab_admin/utils.rb

@@ -9,7 +9,7 @@ module AbAdmin
       Kernel.suppress_warnings do
         Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').reject { |path| path =~ /concerns|shared/ }.each { |file| require file }
       end
-      ActiveRecord::Base.direct_descendants
+      [ActiveRecord::Base, ApplicationRecord].flat_map{|sc| sc.subclasses.find_all { |model| model.connection.table_exists?(model.table_name) } }
     end
 
     def load_files!(base_path = 'lib/utils')

data/lib/ab_admin/utils/eval_helpers.rb

@@ -90,11 +90,7 @@ module AbAdmin
           when Symbol, String
             obj.send(symbol_or_proc.to_sym, *options[:attrs])
           when Proc
-            if exec
-              obj.instance_exec(&symbol_or_proc)
-            else
-              symbol_or_proc.call(obj)
-            end
+            exec ? obj.instance_exec(&symbol_or_proc) : symbol_or_proc.call(obj)
         end
       end
 

data/lib/ab_admin/utils/logger.rb

@@ -4,7 +4,7 @@ module AbAdmin
       class ExtendedLogger < ::Logger
         def exception(e, options={})
           message = "#{e.message} #{"DATA:#{options[:data].inspect}" if options && options[:data]}"
-          backtrace = e.backtrace.map { |l| "#{' ' * 2}#{l}" }.join("\n")
+          backtrace = e.backtrace.map { |l| "#{' ' * 2}#{l}" }.join("\n") if e.backtrace
           error("#{e.class} #{message}\n#{backtrace}\n\n")
         end
 
@@ -13,9 +13,18 @@ module AbAdmin
         end
       end
 
+      class Formatter
+        FORMAT = "[%s] %5s %s\n".freeze
+        DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%3N'.freeze
+
+        def call(severity, time, _, msg)
+          FORMAT % [time.strftime(DATETIME_FORMAT), severity, msg]
+        end
+      end
+
       def self.for_file(filename)
         logger = ExtendedLogger.new(Rails.root.join('log', filename))
-        logger.formatter = ::Logger::Formatter.new
+        logger.formatter = Formatter.new
         logger
       end
     end

data/lib/ab_admin/utils/mysql.rb

@@ -13,10 +13,10 @@ module AbAdmin
         end
 
         # remove duplicate records by columns
-        def remove_duplicates(*cols)
+        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 ')
           query = <<-SQL
-            DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id < 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 #{conds}
           SQL
           connection.execute(query)
         end

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -21,34 +21,52 @@ module AbAdmin
         end
       end
 
+      def editable_bool(item, attr)
+        url = "/admin/#{item.class.model_name.plural}/#{item.id}"
+        content_tag :div, class: 'auto-submit-checkbox-wrap' do
+          check_box_tag("#{item.class.model_name.singular}[#{attr}]", '1', item.send(attr), class: 'js-auto-submit-checkbox', data: {url: url})
+        end
+      end
+
       def admin_editable(item, attr, options=nil)
         options = {} unless options.is_a?(Hash)
-        options[:type] ||= 'select' if options[:source]
-        
-        case attr.to_s
-          when /_at$/
-            options[:type] ||= 'date'
-          when /^is_/
-            options[:type] ||= 'select'
-            options[:source] ||= {1 => 'yes', 0 => 'no'}
-            options[:value] ||= item[attr] ? 1 : 0
-            options[:title] ||= item[attr] ? 'yes' : 'no'
-          when /description|body|content/
-            options[:type] ||= 'textarea'
+        title = options[:title] || item[attr]
+        html_title = admin_pretty_data(title).to_s.html_safe
+        return html_title unless can?(:update, item)
+        options[:source] = options[:collection].is_a?(Hash) ? options[:collection] : options[:collection].map{|r| [r.id, AbAdmin.display_name(r)] }.to_h if options[:collection]
+
+        unless options[:type]
+          if options[:source]
+            options[:type] = 'select'
           else
-            options[:type] ||= 'text'
+            case attr.to_s
+              when /_at$/
+                options[:type] ||= 'date'
+                options[:title] ||= html_title
+              when /^is_/
+                options[:type] ||= 'select'
+                options[:source] ||= {1 => 'yes', 0 => 'no'}
+                options[:value] ||= item[attr] ? 1 : 0
+                options[:title] ||= item[attr] ? 'yes' : 'no'
+              when /description|body|content/
+                options[:type] ||= 'textarea'
+              else
+                options[:type] ||= 'text'
+            end
+          end
         end
 
         data = {
             type: options[:type],
             source: options[:source].try(:to_json),
             model: options[:model] || item.class.model_name.singular,
+            accept: options[:accept],
             url: options[:url] || "/admin/#{item.class.model_name.plural}/#{item.id}",
             name: attr,
             value: options[:value] || item[attr],
             title: options[:title] || item[attr]
         }
-        link_to admin_pretty_data(data[:title]).html_safe, '#', class: "editable #{options[:class]}", data: data.update(options[:data] || {})
+        link_to html_title, '#', class: "editable #{options[:class]}", data: data.update(options[:data] || {})
       end
 
       def options_for_ckeditor(options = {})
@@ -86,8 +104,11 @@ module AbAdmin
         render 'admin/admin_comments/comments'
       end
 
-      def color_bool(val, success_class='badge-success')
-        %(<span class="badge #{success_class if val}">#{val ? '+' : '-'}</span>).html_safe
+      def color_bool(val, options={})
+        options.reverse_merge!(true_css: 'badge-success', false_css: nil, nil_css: nil)
+        css = options["#{val.inspect}_css".to_sym]
+        text = val.nil? ? '?' : (val ? '+' : '-')
+        %(<span class="badge #{css}">#{text}</span>).html_safe
       end
 
       def icon(name, white=false)
@@ -156,11 +177,7 @@ module AbAdmin
           when Symbol, String
             obj.send(symbol_or_proc.to_sym)
           when Proc
-            if exec
-              instance_exec(obj, &symbol_or_proc)
-            else
-              symbol_or_proc.call(obj)
-            end
+            exec ? instance_exec(obj, &symbol_or_proc) : symbol_or_proc.call(obj)
         end
       end