ab_admin 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e8d999fb88464fad70ad946040526c58aa3e514
-  data.tar.gz: f8f9cdc1adeea88a740ebc3fb5266cf7a24b639b
+SHA256:
+  metadata.gz: 43ed57227cecaa2f87430c9c4d91b091a481d63a7c114f11815475d035d7c0fa
+  data.tar.gz: 3c468bae1894700743f5c78d9c833c57ece9638179174294e6a1ba90dd2cae54
 SHA512:
-  metadata.gz: 6228321150b29065d1e7059ad3e0b9af0bf2ff4290f70f213a9594d4c3f5187b2b8318749cd8670f001c9a1f718c429b579fc67cfe38fdc32f745d686bc99d28
-  data.tar.gz: d19c4790fca2cd080baf4520b4c8b08ab543fdad6959db138ef986b48bdd36d460ab5f1af6809e84ad3893ab1d20ddc1a98162ffc6a26ac2a86e1d3dcae34da8
+  metadata.gz: f172fa06ba23701ba8d0849267642bbe51485951aed25d1f686a342b7b770d5983b0387886cc544c83269e653d026e31cae9fb3b2eacd40c2c5e402b2c032b3d
+  data.tar.gz: c90de19869723ace5d640bfc0b426cbfa7982f1555312dee5b990cf8a523bb09d4468c7fb1fd3297d5181987a892897638e8411690a06474539de0bb42e687fc

data/app/assets/javascripts/ab_admin/core/init.js.coffee

@@ -50,7 +50,6 @@ $ ->
 
   initFancySelect()
   initNestedFields()
-  initNestedFields()
   inputSetToggle()
   inputBtnClose()
   initEditableBool()

data/app/assets/javascripts/ab_admin/core/ui_utils.js.coffee

@@ -82,3 +82,11 @@ window.initEditableBool = ->
       success: ->
         $wrap.addClass('success')
         $el.attr('disabled', null)
+
+window.initNestedFields = (opts={}) ->
+  $(document).on 'nested:fieldAdded', 'form.simple_form', (e) =>
+    window.locale_tabs?.initHandlers() unless opts.skip_tabs
+    window.initFancySelect() unless opts.skip_fancy
+    window.initPickers() unless opts.skip_pickers
+    window.initEditor() unless opts.skip_editor
+    opts.callback.call(e) if opts.callback

data/app/assets/javascripts/ab_admin/main.js

@@ -27,7 +27,6 @@
 //= require ab_admin/components/admin_assets
 //= require ab_admin/components/gmaps
 //= require ab_admin/components/in_place_edit
-//= require ab_admin/components/init_nested_filelds
 //= require ab_admin/components/hotkeys
 //= require ab_admin/inputs/datetime_input
 

data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.scss

@@ -42,7 +42,7 @@ img {
 }
 
 .well-small {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 
 .dropdown .caret {

data/app/assets/stylesheets/ab_admin/components/_form.scss

@@ -55,9 +55,9 @@ input[type="color"],
   .form-actions {
     position: fixed;
     bottom: -20px;
-    left: 0px;
+    left: 0;
     border-radius: 10px;
-    padding: 10px;
+    padding: 5px;
     z-index: 4;
     .btn {
       margin-right: 5px;
@@ -178,6 +178,21 @@ textarea.text {
   margin-left: 10px;
 }
 
+.select2-container-multi .select2-choices {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  border-radius: 4px;
+  background-image: none;
+}
+.select2-container-multi .select2-choices .select2-search-choice {
+  margin: 3px;
+}
+.select2-container-multi .select2-choices .select2-search-field input {
+  padding: 3px;
+}
+
 .label.control-label.label-reset {
   display: block;
 }
@@ -191,7 +206,13 @@ textarea.text {
   padding: 2px 4px 2px 6px;
   border-radius: 5px;
   input.js-auto-submit-checkbox[type='checkbox'] {
+    width: auto;
     margin: 0;
+    line-height: normal;
+    vertical-align: text-bottom;
+  }
+  label {
+    margin-bottom: 0;
   }
   &.success {
     background-color: #dff0d8;

data/app/assets/stylesheets/ab_admin/components/_table_view.scss

@@ -124,6 +124,7 @@ table.index_table {
     }
   }
 
+  tr.test-hover > td > .actions_panel-wrap_outer > .actions_panel-wrap_inner,
   tr:hover > td > .actions_panel-wrap_outer > .actions_panel-wrap_inner {
     display: block;
   }

data/app/controllers/admin/assets_controller.rb

@@ -35,7 +35,7 @@ class Admin::AssetsController < ApplicationController
 
   def batch_update
     Asset.update(params[:data].keys, params[:data].values)
-    head :ok
+    @assets = Asset.find(params[:data].keys)
   end
 
   def rotate

data/app/controllers/admin/locators_controller.rb

@@ -6,15 +6,13 @@ class ::Admin::LocatorsController < ::Admin::BaseController
 
   def export
     authorize! :export, resource_class
-    locales = I18n.available_locales & params[:locales].split(',').map(&:to_sym) if params[:locales].present?
-    keys = Locator.export_csv(*params[:keys].to_s.split(','), locales: locales)
+    keys = Locator.export_csv(*params[:keys].to_s.split(','), locales: params[:locales], files: params[:files])
     send_data(keys, filename: "locales_#{Time.now.strftime('%Y_%m_%d')}.csv", type: Mime[:csv], disposition: 'attachment')
   end
 
   def import
     if params[:csv_file].present?
-      locales = I18n.available_locales & params[:locales].split(',').map(&:to_sym) if params[:locales].present?
-      Locator.import_csv(params[:csv_file].read, locales: locales)
+      Locator.import_csv(params[:csv_file].read, locales: params[:locales])
       flash[:notice] = 'File imported'
     else
       flash[:error] = 'Missing or invalid csv file'

data/app/controllers/admin/manager_controller.rb

@@ -142,8 +142,9 @@ class ::Admin::ManagerController < ::Admin::BaseController
 
   def preview_resource_path(item)
     return unless manager.preview_path
+    return if manager.preview_path[:options][:if] && !call_method_or_proc_on(item, manager.preview_path[:options][:if])
     I18n.with_locale I18n.default_locale do
-      manager.preview_path.is_a?(Proc) ? instance_exec(item, &manager.preview_path) : send(manager.preview_path, item)
+      manager.preview_path[:value].is_a?(Proc) ? instance_exec(item, &manager.preview_path[:value]) : send(manager.preview_path[:value], item)
     end
   end
 

data/app/controllers/admin/settings_controller.rb

@@ -4,7 +4,7 @@ class ::Admin::SettingsController < ::Admin::BaseController
   defaults resource_class: Settings
 
   def update
-    Settings.instance.save(params.require(:settings).permit!.to_h)
+    Settings.update(params.require(:settings).permit!.to_h)
     Settings.reload_checker.expire
     redirect_back fallback_location: admin_root_url
   end
@@ -21,7 +21,7 @@ class ::Admin::SettingsController < ::Admin::BaseController
   end
 
   def collection
-    @settings ||= Settings.instance.editable
+    @collection ||= Settings.editable_data
   end
 
   def collection_path

data/app/views/admin/assets/batch_update.js.erb

@@ -0,0 +1,4 @@
+<% @assets.each do |asset| %>
+  uploader = $('#asset_<%= asset.id %>').closest('.fileupload').data('assets');
+  $('#asset_<%= asset.id %>').replaceWith(uploader.assetHtml(<%== asset.to_json(root: false) %>));
+<% end %>

data/app/views/admin/base/new.js.erb

@@ -8,7 +8,7 @@
     html = %[<tr id="#{form_wrap_id}" class="warning list_edit"><td>#{render('form')}</td></tr>].html_safe
   %>
   $('#<%= form_wrap_id %>').remove();
-  $('#list tbody').prepend('<%= j html %>');
+  $('#list tbody:first').prepend('<%= j html %>');
   $('#<%= form_wrap_id %> td:first').attr('colspan', $('#list tr:first th').length);
   $('#<%= form_wrap_id %> form').trigger('admin:form_init');
 <% end %>

data/app/views/admin/fileupload/_asset_templates.html.slim

@@ -6,7 +6,7 @@ script#image_template type='text/x-handlebars-template'
     .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
     .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
     a.fileupload-file.fancybox href='{{url}}' rel='fancybox'
-      img src='{{thumb_url}}' title='{{filename}}'
+      img src='{{thumb_url}}' title='{{name}}' alt="{{alt}}"
 
 
 script#file_template type='text/x-handlebars-template'

data/app/views/admin/fileupload/_image.html.slim

@@ -5,4 +5,5 @@
   .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
   .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
   a.fileupload-file.fancybox href=image.url rel='fancybox'
-    img src=image.thumb_url title=image.filename
+    - I18n.with_locale(image.assetable.try(:locale)) do
+      img src=image.thumb_url title=image.name alt=image.alt

data/app/views/admin/locators/show.html.slim

@@ -15,20 +15,17 @@ table.table.table-striped.table-bordered style='width: 1050px;'
 hr
 
 = form_tag export_admin_locators_path, method: :get do
-  input.input-xxlarge> type='text' name='keys' placeholder='Keys comma separated'
-  br
-  input.input-medium.fancy_select> type='text' name='locales' placeholder='Locales, all by default' data-tags=I18n.available_locales.to_json
-  br
-  br
+  p= select_tag :files, options_for_select(@files.map{|path| File.basename(path) }), multiple: true, class: 'fancy_select input-xxlarge', placeholder: 'Filenames comma separated, all by default'
+  p
+    input.input-xxlarge> type='text' name='keys' placeholder='Keys comma separated, use `*` for matching'
+    .help-block EXAMPLES: "hello,bye", "hello*,*bye*"
+  p= select_tag :locales, options_for_select(I18n.available_locales), multiple: true, class: 'fancy_select input-xxlarge', placeholder: 'Locales, all by default'
   button.btn Export CSV
 
 hr
 
 = form_tag import_admin_locators_path, method: :post, multipart: true do
   = file_field_tag :csv_file
-  br
-  input.input-medium.fancy_select> type='text' name='locales' placeholder='Locales, all by default' data-tags=I18n.available_locales.to_json
-  br
-  br
+  p= select_tag :locales, options_for_select(I18n.available_locales), multiple: true, class: 'fancy_select input-xxlarge', placeholder: 'Locales, all by default'
   button.btn Import CSV
 

data/app/views/admin/manager/_table.html.slim

@@ -9,16 +9,13 @@
         th.actions_panel
         - table_builder.fields.each do |field|
           th class=('hide_cell' if field.options[:hidden])
-            - if field.options[:sortable].is_a?(FalseClass)
-              = field.name.is_a?(Symbol) ? ha(field.name) : field.name
-            - elsif field.options[:sortable].is_a?(TrueClass)
-              = list_sort_link field.name
-            - elsif field.options[:sortable].is_a?(Hash)
-              = list_sort_link field.name, field.options[:sortable]
-            - elsif resource_class.column_names.include?(field.name.to_s)
-              = list_sort_link field.name
+            - field_title = field.options[:title] || (field.name.is_a?(Symbol) ? ha(field.name) : field.name)
+            - if field.options[:sortable].is_a?(Hash)
+              = list_sort_link field.name, field.options[:sortable].merge(title: field_title)
+            - elsif field.options[:sortable].is_a?(TrueClass) || (!field.options[:sortable].is_a?(FalseClass) && resource_class.column_names.include?(field.name.to_s))
+              = list_sort_link field.name, title: field_title
             - else
-              = field.name.is_a?(Symbol) ? ha(field.name) : field.name
+              = field_title
     tbody
       - is_edit_link = manager.actions.include?(:edit)
       - collection.each do |item|
@@ -27,7 +24,7 @@
           td= id_link(item, edit: is_edit_link)
           = item_index_actions_panel(item)
           - table_builder.fields.each do |field|
-            td class=(field.options[:css_class] if field.options[:css_class])
+            td class=(field.options[:cell_class] if field.options[:cell_class])
               - field_content = table_item_field(item, field)
               - if field.options[:copy_button]
                 - field_id = dom_id(item, field.name)

data/app/views/admin/shared/_content_actions.html.slim

@@ -21,7 +21,7 @@
         - param_name = opts[:as] || name
         - active = params[param_name]
         a.btn href=url_for(param_name => (active ? nil : 1)) class=('active' if active)
-          = t "admin.scopes.#{name}", default: name.to_s.titleize
+          = opts[:title] || t("admin.scopes.#{name}", default: name.to_s.titleize)
           - if opts[:badge]
             - scope = opts[:block] ? opts[:block].call(controller, resource_class) : resource_class.send(name)
             - scope_count = scope.send(*[opts[:badge][:value_type] || :count, opts[:badge][:column]].compact)

data/app/views/admin/shared/_main_menu.html.slim

@@ -4,7 +4,7 @@ nav.navbar-inner
       span.icon-bar
       span.icon-bar
       span.icon-bar
-    a.brand href=(AbAdmin.root_path || root_path) target='_blank' = AbAdmin.site_name
+    a.brand href=(AbAdmin.root_path || root_path) target='_blank' = admin_site_name
     .nav-collapse.collapse
       = AdminMenu.render(self)
 

data/app/views/layouts/admin/_footer.html.slim

@@ -1,10 +1,10 @@
-- if AbAdmin.footer
-  footer
-    ' Powered by
-    a href='https://github.com/leschenko/ab_admin' target='_blank' = "AbAdmin #{AbAdmin::VERSION}"
-    .muted.footer-notes= AbAdmin.footer_notes
-
 = cache [I18n.locale, 'admin', 'footer'] do
+  - if AbAdmin.footer
+    footer
+      ' Powered by
+      a href='https://github.com/leschenko/ab_admin' target='_blank' = "AbAdmin #{AbAdmin::VERSION}"
+      .muted.footer-notes= AbAdmin.footer_notes
+
   = render 'admin/fileupload/asset_templates'
   = render 'admin/shared/columns_hider'
 

data/app/views/layouts/admin/devise.html.slim

@@ -3,10 +3,9 @@ html id="controller_#{controller_name}"
   head
     meta charset='utf-8'
     meta name='viewport' content='width=device-width, initial-scale=1.0'
-    title= @page_title || AbAdmin.site_name
+    meta name="robots" content="noindex,nofollow"
+    title= @page_title || admin_site_name
     = stylesheet_link_tag 'ab_admin/devise', media: 'all'
-    script src='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'
-    = javascript_include_tag 'bootstrap'
     = csrf_meta_tags
   body.container
     = render('admin/shared/flash', flash: flash) if flash

data/config/locales/en.yml

@@ -13,7 +13,7 @@ en:
         zero: History
     attributes:
       user:
-        password_confirmation: ''
+        password_confirmation: 'Password confirmation'
   admin:
     actions:
       activate:
@@ -116,11 +116,11 @@ en:
       save_and_edit_prev: Save and prev.
       details: More
       base: Base
-      keywords: ''
+      keywords: 'keywords'
     gender:
       female: Female
       male: Male
-      undefined: ''
+      undefined: 'undefined'
     geo_autocomplete: Enter the address
     group:
       kind:
@@ -242,8 +242,8 @@ en:
     updated_at: Updated at
     user: User
     user_id: User
-    updater: ''
-    updater_id: ''
+    updater: 'Updater'
+    updater_id: 'Updater'
     remember_me: Remember
     password: Password
   flash:

data/lib/ab_admin/abstract_resource.rb

@@ -55,8 +55,8 @@ module AbAdmin
         instance.show = ::AbAdmin::Config::Show.new(options, &block)
       end
 
-      def preview_path(value=nil, &block)
-        instance.preview_path = block_given? ? block : value
+      def preview_path(value=nil, options={}, &block)
+        instance.preview_path = {value: block_given? ? block : value, options: options}
       end
 
       def permitted_params(*values, &block)

data/lib/ab_admin/carrierwave/base_uploader.rb

@@ -35,11 +35,9 @@ module AbAdmin
       end
 
       def base_filename_part
-        if version_name
-          version_name.to_s.start_with?('retina_') ? "#{version_name.to_s.sub(/^retina_/, '')}@2x" : version_name.to_s
-        else
-          secure_token
-        end
+        return if version_name == :default
+        return secure_token unless version_name
+        version_name.to_s.start_with?('retina_') ? "#{version_name.to_s.sub(/^retina_/, '')}@2x" : version_name.to_s
       end
 
       def full_filename(for_file=filename)
@@ -48,9 +46,10 @@ module AbAdmin
 
       def human_full_filename(for_file=filename)
         ext = File.extname(for_file)
+        system_part = base_filename_part
         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}"
+        return "#{system_part || version_name}#{ext}" if human_filename_part == secure_token
+        system_part ? "#{human_filename_part}_#{system_part}#{ext}" : "#{human_filename_part}#{ext}"
       end
 
       def full_original_filename

data/lib/ab_admin/concerns/admin_addition.rb

@@ -4,7 +4,7 @@ module AbAdmin
       extend ActiveSupport::Concern
 
       included do
-        scope(:admin, -> { all }) unless respond_to?(:admin)
+        scope(:admin, proc { all }) unless respond_to?(:admin)
         scope(:base, -> { all }) unless respond_to?(:base)
         scope :by_ids, lambda { |ids| where("#{quoted_table_name}.id IN (?)", AbAdmin.val_to_array(ids).push(0)) } unless respond_to?(:by_ids)
 

data/lib/ab_admin/concerns/headerable.rb

@@ -22,6 +22,10 @@ module AbAdmin
       def default_header
         header || build_header
       end
+
+      def default_persistent_header
+        header || create_header
+      end
     end
   end
 end

data/lib/ab_admin/config/base.rb

@@ -18,10 +18,9 @@ module AbAdmin
 
       def self.default_for_model(model, options={})
         new.tap do |builder|
-          builder.field(:id) unless options[:skip].try(:include?, :id)
           model.column_names.each do |column|
             column_name = column.to_sym
-            next if options[:skip].try(:include?, column_name)
+            next if column_name == :id || options[:skip].try(:include?, column_name)
             builder.field(column_name)
           end
         end
@@ -52,7 +51,7 @@ module AbAdmin
       self.partial_name = 'form'
 
       def group(name=nil, options={}, &block)
-        options[:title] = name || :base
+        options[:title] = name
         @fields << FieldGroup.new(options, &block)
       end
 

data/lib/ab_admin/i18n_tools/google_translate.rb

@@ -9,7 +9,7 @@ module AbAdmin
         return text if from == to
         base = 'https://www.googleapis.com/language/translate/v2'
         params = {
-            key: configatron.else.retrieve(:google_api_key, ENV['GOOGLE_API_KEY']),
+            key: ENV['GOOGLE_API_KEY'] || Settings.data.else.try!(:google_api_key),
             format: 'html',
             source: from,
             target: to,

data/lib/ab_admin/models/admin_comment.rb

@@ -17,7 +17,7 @@ module AbAdmin
         after_create :increment_counter_cache
         before_destroy :decrement_counter_cache
 
-        scope :admin, lambda { includes(:user, :attachment_files) }
+        scope :admin, proc { includes(:user, :attachment_files) }
         
         fileuploads :attachment_files
       end

data/lib/ab_admin/models/asset.rb

@@ -58,13 +58,14 @@ module AbAdmin
 
       def as_json(options = nil)
         options = {
-            only: [:id, :guid, :assetable_id, :assetable_type, :user_id, :data_file_size, :data_content_type, :is_main,
-                   :original_name, :cached_alt, :cached_title],
             root: 'asset',
+            only: [:id, :guid, :assetable_id, :assetable_type, :user_id, :data_file_size, :data_content_type, :is_main, :original_name],
             methods: [:filename, :url, :thumb_url, :width, :height]
         }.merge(options || {})
 
-        super
+        res = super
+        I18n.with_locale(assetable.try(:locale)) { (res[options[:root]] || res).update('name' => name, 'alt' => alt) }
+        res
       end
 
       def has_dimensions?

data/lib/ab_admin/models/locator.rb

@@ -3,6 +3,7 @@ require 'csv'
 module AbAdmin
   module Models
     module Locator
+      YAML_LINE_WIDTH = 200
       extend ActiveSupport::Concern
 
       included do
@@ -19,7 +20,7 @@ module AbAdmin
 
         def save(path, data)
           data.deep_transform_values! { |v| AbAdmin.normalize_html(v) }
-          File.write path, data.deep_stringify_keys.to_yaml.sub(/\A---\s+/, '').gsub(/:\s+$/, ':').gsub(/^(\s+)(yes|no):/, '\1"\2":')
+          File.write path, data.deep_stringify_keys.to_yaml(line_width: YAML_LINE_WIDTH).sub(/\A---\s+/, '').gsub(/:\s+$/, ':').gsub(/^(\s+)(yes|no):/, '\1"\2":')
         end
 
         def prepare_data(path)
@@ -29,14 +30,16 @@ module AbAdmin
                           filename: File.basename(path), path: path, dir: File.dirname(path)})
         end
 
-        def export_csv(*keys, locales: nil)
+        def export_csv(*keys, locales: nil, files: nil)
           return if keys.blank?
-          locales ||= I18n.available_locales
+          sources = files.present? ? translations_for_files(files) : translations
+          locales = locales.present? ? (I18n.available_locales & locales.map(&:to_sym)) : (sources.keys || 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}
+              next unless sources[l]
+              sources[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] }
@@ -45,7 +48,7 @@ module AbAdmin
 
         def import_csv(csv, locales: nil)
           return if csv.blank?
-          locales ||= I18n.available_locales
+          locales = locales.present? ? (I18n.available_locales & locales.map(&:to_sym)) : 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)
@@ -64,6 +67,16 @@ module AbAdmin
         def translations
           @translations ||= I18n.backend.send(:translations).slice(*I18n.available_locales).transform_values{|v| v.flatten_hash.transform_keys{|k| k.join('.') } }
         end
+
+        def translations_for_files(files)
+          data = {}
+          files.each do |file|
+            path = Rails.root.join('config', 'locales', file)
+            puts path
+            data.deep_merge!(YAML.load_file(path))
+          end
+          data.symbolize_keys.slice(*I18n.available_locales).transform_values{|v| v.flatten_hash.transform_keys{|k| k.join('.') } }
+        end
       end
 
       def initialize

data/lib/ab_admin/models/settings.rb

@@ -6,7 +6,7 @@ module AbAdmin
       included do
         extend ActiveModel::Naming
         extend ActiveRecord::Translation
-        class_attribute :base_class, :base_dir, :base_paths, :editable_paths
+        class_attribute :data_cache, :base_class, :base_dir, :base_paths, :editable_paths
         self.base_class = self
         self.base_dir = Rails.root.join('config', 'settings')
         self.base_paths = [
@@ -17,63 +17,58 @@ module AbAdmin
             File.join(base_dir, "#{Rails.env}.local.yml"),
             File.join(base_dir, 'settings.local.yml')
         ]
+
+        class << self
+          delegate :get, :dig, to: :data, allow_nil: true
+        end
       end
 
       module ClassMethods
         def load_config
-          configatron.configure_from_hash instance.all
-          configatron
+          ActiveSupport::Deprecation.warn('`Settings.load_config` is deprecated, use `Settings.data` instead')
+          data
         end
-      end
 
-      def initialize
-        @data = {}
-        @paths = find_paths
-      end
+        def data
+          self.data_cache ||= read_data
+        end
 
-      def editable
-        return {} unless  editable_path
-        YAML.load_file(editable_path) rescue {}
-      end
+        def reload_data
+          self.data_cache = read_data
+        end
 
-      def save(raw_config)
-        config = {}
-        raw_config.each do |root_key, root_value|
-          if root_value.is_a?(Hash)
-            config[root_key] ||= {}
-            root_value.each do |key, value|
-              config[root_key][key] = typecast_value(value)
-            end
-          else
-            config[root_key] = typecast_value(root_value)
-          end
+        def read_data
+          paths = base_paths.dup.push(editable_path).compact.find_all { |path| File.exists?(path) }
+          hash = paths.map{|path| YAML.safe_load(File.read(path)) }.inject(&:deep_merge).deep_symbolize_keys
+          SettingsStruct.new(hash)
         end
-        return unless editable_path
-        File.open(editable_path, 'w') { |file| file.write config.to_yaml } and self.class.load_config
-      end
 
-      def all
-        @paths.each do |path|
-          @data.deep_merge!(YAML.load_file(path))
+        def editable_data
+          YAML.safe_load(File.read(editable_path))
         end
-        @data
-      end
 
-      private
+        def update(raw_config)
+          config = YAML.safe_load(YAML.dump(raw_config.to_hash.deep_stringify_keys.deep_transform_values!{|v| YAML.safe_load(v) }))
+          File.write(editable_path, config.to_yaml)
+        end
 
-      def editable_path
-        @editable_path ||= editable_paths.detect { |path| File.exists?(path) }
+        def editable_path
+          editable_paths.detect { |path| File.exists?(path) }
+        end
       end
 
-      def find_paths
-        base_paths.dup.unshift(editable_path).compact.find_all { |path| File.exists?(path) }
-      end
+      class SettingsStruct < OpenStruct
+        def initialize(hash=nil)
+          @table = {}
+          return unless hash
+          hash.symbolize_keys.each do |k, v|
+            k = k.to_sym
+            @table[k] = v.is_a?(Hash) ? SettingsStruct.new(v.symbolize_keys) : v
+          end
+        end
 
-      def typecast_value(value)
-        if %w(true false).include?(value) || value.to_s.is_number?
-          YAML::load(value)
-        else
-          value
+        def get(key)
+          dig *key.split('.').map(&:to_sym)
         end
       end
     end

data/lib/ab_admin/models/user.rb

@@ -8,7 +8,7 @@ module AbAdmin
 
         scope :managers, -> { where(user_role_id: [::UserRoleType.admin.id, ::UserRoleType.moderator.id]) }
         scope :active, -> { where(locked_at: nil) }
-        scope :admin, -> { includes(:avatar) }
+        scope :admin, proc { includes(:avatar) }
 
         after_initialize :init
         before_validation :generate_login
@@ -28,7 +28,7 @@ module AbAdmin
       end
 
       def suspend!
-        update_attribute(:locked_at, Time.now.utc)
+        lock_access!
       end
 
       def activate!

data/lib/ab_admin/utils.rb

@@ -65,8 +65,7 @@ module AbAdmin
     # html like: '<!-- html comment --><script>script content</script><div>div content</div><p>p content</p>'
     # normalized to: "<p>div content</p><p>p content</p>"
     def normalize_html(raw_html, options = {}, &block)
-      @@sanitizer ||= Sanitizer.new(options)
-      @@sanitizer.normalize_html(raw_html, options[:sanitize] || {}, &block)
+      Sanitizer.new(options).normalize_html(raw_html, options[:sanitize] || {}, &block)
     end
 
     def url_helpers

data/lib/ab_admin/utils/eval_helpers.rb

@@ -87,13 +87,15 @@ module AbAdmin
       def call_method_or_proc_on(obj, symbol_or_proc, options = {})
         exec = options[:exec].nil? ? true : options[:exec]
         case symbol_or_proc
-          when Symbol, String
-            obj.send(symbol_or_proc.to_sym, *options[:attrs])
+          when String
+            ActiveSupport::Deprecation.warn('`call_method_or_proc_on` don\'t accept method name as String, use Symbol instead') if symbol_or_proc =~ /\A\w+\z/
+            symbol_or_proc
+          when Symbol
+            obj.public_send(symbol_or_proc.to_sym, *options[:attrs])
           when Proc
             exec ? obj.instance_exec(&symbol_or_proc) : symbol_or_proc.call(obj)
         end
       end
-
     end
   end
 end

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -21,52 +21,64 @@ module AbAdmin
         end
       end
 
-      def editable_bool(item, attr)
+      def editable_bool(item, attr, label: nil)
         url = "/admin/#{item.class.model_name.plural}/#{item.id}.json"
-        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
+        html = check_box_tag("#{item.class.model_name.singular}[#{attr}]", '1', item.send(attr), class: 'js-auto-submit-checkbox', data: {url: url})
+        html = content_tag(:label, "#{label} #{html}".html_safe) if label
+        content_tag :div, html, class: 'auto-submit-checkbox-wrap white-space-nowrap'
       end
 
-      def admin_editable(item, attr, options=nil)
-        options = {} unless options.is_a?(Hash)
-        title = options[:title] || item[attr]
+      def admin_editable(item, attr, opts=nil)
+        opts = {} unless opts.is_a?(Hash)
+        if opts[:title]
+          title = opts[:title]
+        else
+          assoc_name = attr.to_s.remove('_id')
+          title = item.class.reflect_on_association(assoc_name) ? AbAdmin.display_name(item.send(assoc_name)) : item[attr]
+        end
         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'
+        if opts[:collection]
+          if opts[:collection].is_a?(Hash)
+            opts[:source] = opts[:collection]
+          elsif opts[:collection].is_a?(Array)
+            opts[:source] = opts[:collection].first.respond_to?(:id) ? opts[:collection].map {|r| [r.id, AbAdmin.display_name(r)]}.to_h : opts[:collection].map {|v| [v, v]}.to_h
+          end
+        end
+
+        unless opts[:type]
+          if opts[:source]
+            opts[:type] = 'select'
           else
             case attr.to_s
               when /_at$/
-                options[:type] ||= 'date'
-                options[:title] ||= html_title
+                opts[:type] ||= 'date'
+                opts[: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'
+                opts[:type] ||= 'select'
+                opts[:source] ||= {1 => 'yes', 0 => 'no'}
+                opts[:value] ||= item[attr] ? 1 : 0
+                opts[:title] ||= item[attr] ? 'yes' : 'no'
               when /description|body|content/
-                options[:type] ||= 'textarea'
+                opts[:type] ||= 'textarea'
               else
-                options[:type] ||= 'text'
+                opts[: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}",
+            type: opts[:type],
+            source: opts[:source].try(:to_json),
+            model: opts[:model] || item.class.model_name.singular,
+            accept: opts[:accept],
+            url: opts[:url] || "/admin/#{item.class.model_name.plural}/#{item.id}",
             name: attr,
-            value: options[:value] || item[attr],
-            title: options[:title] || item[attr]
+            value: opts[:value] || item[attr],
+            title: opts[:title] || item[attr]
         }
-        link_to html_title, '#', class: "editable #{options[:class]}", data: data.update(options[:data] || {})
+        link_to html_title, '#', class: "editable #{opts[:class]}", data: data.update(opts[:data] || {})
       end
 
       def options_for_ckeditor(options = {})
@@ -162,7 +174,7 @@ module AbAdmin
       # input_set 'title', legend_class: 'do_sort', label_class: 'label-info' do
       def input_set(title, options={}, &block)
         options.reverse_merge!(class: "inputs well well-small clearfix #{options.delete(:legend_class) || 'do_sort'}", id: options.delete(:legend_id))
-        html = content_tag(:label, title, class: "input_set label #{options.delete(:label_class)}")
+        html = title ? content_tag(:label, title, class: "input_set label #{options.delete(:label_class)}") : ''.html_safe
         html.concat(capture(&block)) if block_given?
         content_tag(:div, html, options)
       end
@@ -171,16 +183,22 @@ module AbAdmin
         resource_class.han(attr)
       end
 
+      def admin_site_name
+        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 Symbol, String
+          when String
+            ActiveSupport::Deprecation.warn('`call_method_or_proc_on` don\'t accept method name as String, use Symbol instead') if symbol_or_proc =~ /\A\w+\z/
+            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)
         end
       end
-
     end
   end
 end

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -20,20 +20,19 @@ module AbAdmin
         if adapter && adapter.klass == resource_class
           sort_link(adapter, attribute, options)
         else
-          attribute.is_a?(Symbol) ? ha(attribute) : attribute
+          options[:title] || (attribute.is_a?(Symbol) ? ha(attribute) : attribute)
         end
       end
 
-      def sort_link(search, attribute, *args)
-        name = attribute.is_a?(Symbol) ? ha(attribute) : attribute
-        return name unless search
-
-        options = args.first.is_a?(Hash) ? args.shift.dup : {}
+      def sort_link(adapter, attribute, options={})
+        name = options[:title] || (attribute.is_a?(Symbol) ? ha(attribute) : attribute)
+        return name unless adapter
         search_params = (params[:q] || {}).to_h.with_indifferent_access
         attr_name = (options.delete(:column) || attribute).to_s
         default_order = options.delete :default_order
 
-        if existing_sort = search.sorts.detect { |s| s.name == attr_name }
+        existing_sort = adapter.sorts.detect { |s| s.name == attr_name }
+        if existing_sort
           prev_attr, prev_dir = existing_sort.name, existing_sort.dir
           current_dir = prev_attr == attr_name ? prev_dir : nil
         else

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

@@ -21,8 +21,8 @@ module AbAdmin
           @options[:container_class] = container_class
         end
 
-        def input(wrapper_options=nil)
-          title = options[:title] || object.class.han(attribute_name)
+        def input(*)
+          title = options[:title] || object.class.han(attribute_name) if options[:title] || !options.key?(:title)
           template.capture do
             if @options[:unwrapped]
               render_input

data/lib/generators/ab_admin/install/templates/config/ab_admin.rb.erb

@@ -1,7 +1,5 @@
 require 'ab_admin/hooks'
 
-Settings.load_config
-
 I18n.available_locales = Globalize.available_locales = [:ru, :en]
 
 AbAdmin.setup do |config|

data/lib/generators/ab_admin/install/templates/models/settings.rb

@@ -1,12 +1,8 @@
-require 'configatron'
-
 class Settings
   include Singleton
   include AbAdmin::Models::Settings
   include ::AbAdmin::Concerns::Reloadable
 
-  has_reload_check('settings_reload_key', Rails.logger) { Settings.load_config }
-
-  attr_accessor :paths, :data
+  has_reload_check('settings_reload_key', Rails.logger) { Settings.reload_data }
 
 end

data/lib/generators/ab_admin/model/templates/resource.erb

@@ -18,11 +18,9 @@ class AbAdmin<%= model.name %> < AbAdmin::AbstractResource
 <% end -%>
 
   form do
-    group :base do
 <% index_attrs.without('id', 'created_at', 'updated_at', 'lat', 'lon', 'zoom', 'lft', 'rgt', 'depth').without(*translated_columns).each do |attr| -%>
-      field :<%= attr %>
+    field :<%= attr %>
 <% end -%>
-    end
 <% unless translated_columns.empty? -%>
     locale_tabs do
 <% translated_columns.each do |attr| -%>

data/lib/generators/template.rb

@@ -19,8 +19,6 @@ gem 'globalize', github: 'globalize/globalize'
 
 gem 'carrierwave'
 gem 'mini_magick'
-# 3.0 is broken -  creates new `configatron` instance in every namespace
-gem 'configatron', '~> 2.13'
 gem 'simple_form'
 gem 'coffee-rails'
 gem 'sass-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -408,27 +408,6 @@ files:
 - app/assets/images/admin/flags/ja.png
 - app/assets/images/admin/flags/pl.png
 - app/assets/images/admin/flags/ru.png
-- app/assets/images/admin/flags/toremove/b_de.png
-- app/assets/images/admin/flags/toremove/b_en.png
-- app/assets/images/admin/flags/toremove/b_es.png
-- app/assets/images/admin/flags/toremove/b_fr.png
-- app/assets/images/admin/flags/toremove/b_it.png
-- app/assets/images/admin/flags/toremove/b_ru.png
-- app/assets/images/admin/flags/toremove/b_uk.png
-- app/assets/images/admin/flags/toremove/flag_de.gif
-- app/assets/images/admin/flags/toremove/flag_de_nonact.gif
-- app/assets/images/admin/flags/toremove/flag_en.gif
-- app/assets/images/admin/flags/toremove/flag_en_nonact.gif
-- app/assets/images/admin/flags/toremove/flag_es.gif
-- app/assets/images/admin/flags/toremove/flag_es_nonact.gif
-- app/assets/images/admin/flags/toremove/flag_fr.gif
-- app/assets/images/admin/flags/toremove/flag_fr_nonact.gif
-- app/assets/images/admin/flags/toremove/flag_it.gif
-- app/assets/images/admin/flags/toremove/flag_it_nonact.gif
-- app/assets/images/admin/flags/toremove/flag_ru.gif
-- app/assets/images/admin/flags/toremove/flag_ru_nonact.gif
-- app/assets/images/admin/flags/toremove/flag_uk.gif
-- app/assets/images/admin/flags/toremove/flag_uk_nonact.gif
 - app/assets/images/admin/flags/uk.png
 - app/assets/images/admin/main_image.png
 - app/assets/images/admin/preloader.gif
@@ -442,14 +421,12 @@ files:
 - app/assets/javascripts/ab_admin/components/grid_input.js.coffee
 - app/assets/javascripts/ab_admin/components/hotkeys.js.coffee
 - app/assets/javascripts/ab_admin/components/in_place_edit.js.coffee
-- app/assets/javascripts/ab_admin/components/init_nested_filelds.js.coffee
 - app/assets/javascripts/ab_admin/components/locator.js.coffee
 - app/assets/javascripts/ab_admin/components/select2_bridge.js.coffee
 - app/assets/javascripts/ab_admin/components/sortable_tree.js.coffee
 - app/assets/javascripts/ab_admin/core/batch_actions.js.coffee
 - app/assets/javascripts/ab_admin/core/columns_hider.js.coffee
 - app/assets/javascripts/ab_admin/core/confirmation.js.coffee
-- app/assets/javascripts/ab_admin/core/deprecated_utils.js.coffee
 - app/assets/javascripts/ab_admin/core/init.js.coffee
 - app/assets/javascripts/ab_admin/core/pagination.js.coffee
 - app/assets/javascripts/ab_admin/core/pjax.js.coffee
@@ -500,6 +477,7 @@ files:
 - app/views/admin/admin_comments/destroy.js.erb
 - app/views/admin/admin_comments/index.js.erb
 - app/views/admin/assets/batch_edit.html.slim
+- app/views/admin/assets/batch_update.js.erb
 - app/views/admin/base/_form.html.slim
 - app/views/admin/base/_modal_form_layout.html.slim
 - app/views/admin/base/_search_form.html.slim
@@ -728,8 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple and real-life tested Rails::Engine admin interface based on slim,

data/app/assets/javascripts/ab_admin/components/init_nested_filelds.js.coffee

@@ -1,7 +0,0 @@
-window.initNestedFields = (opts={}) ->
-  $(document).on 'nested:fieldAdded', 'form.simple_form', (e) =>
-    window.locale_tabs?.initHandlers() unless opts.skip_tabs
-    window.initFancySelect() unless opts.skip_fancy
-    window.initPickers() unless opts.skip_pickers
-    window.initEditor() unless opts.skip_editor
-    opts.callback.call(e) if opts.callback

data/app/assets/javascripts/ab_admin/core/deprecated_utils.js.coffee

@@ -1,44 +0,0 @@
-Array::last = ->
-  if @.length > 0
-    @[@.length - 1]
-
-Array::first = ->
-  @[0]
-
-Array::removeByIndex = (arrayIndex)->
-  @.splice(arrayIndex, 1)
-
-Array::valDetect = (v, prop = 'id') ->
-  res = null
-  for el in @
-    if el[prop] is v
-      res = el
-  res
-
-Array::includes = (obj) ->
-  for el, i in @
-    if el == obj
-      return i
-  return false
-
-Array::remove = ->
-  what = undefined
-  a = arguments
-  L = a.length
-  ax = undefined
-  while L and @length
-    what = a[--L]
-    until (ax = @indexOf(what)) is -1
-      @splice ax, 1
-      break;
-  this
-
-String::parseQuery = ->
-  h = {}
-  qs = $.trim(this).match(/([^?#]*)(#.*)?$/)[0]
-  return {}  unless qs
-  pairs = qs.split("&")
-  $.each pairs, (i, v) ->
-    pair = v.split("=")
-    h[pair[0]] = pair[1]
-  h