ab_admin 0.8.3 → 0.10.0

data/lib/ab_admin/views/search_form_builder.rb

@@ -1,7 +1,7 @@
 module AbAdmin
   module Views
     class SearchFormBuilder < ::Ransack::Helpers::FormBuilder
-      delegate :content_tag, :tag, :params,
+      delegate :content_tag, :tag, :query_params,
                :text_field_tag, :check_box_tag, :radio_button_tag, :label_tag, :select_tag,
                :options_for_select, :options_from_collection_for_select, :hidden_field_tag, to: :@template
 
@@ -43,14 +43,14 @@ module AbAdmin
           else
             options[:input_html][:include_blank] = true
           end
-          select_tag("q[#{param}]", options_for_select(collection, params[:q][param]), options[:input_html])
+          select_tag("q[#{param}]", options_for_select(collection, query_params[param]), options[:input_html])
         end
       end
 
       def ac_select_field(attr, options={})
         klass = options[:klass]
         options[:param] ||= "#{options[:value_attr] || attr}_eq"
-        pre_select = params[:q].try!(:[], options[:param]) ? klass.where(id: params[:q][options[:param]]).map(&:for_input_token) : []
+        pre_select = query_params.try!(:[], options[:param]) ? klass.where(id: query_params[options[:param]]).map(&:for_input_token) : []
         options[:input_html] ||= {}
         options[:input_html].deep_merge! class: 'fancy_select', data: {class: klass.name, pre: pre_select.to_json}
         string_field attr, options
@@ -59,8 +59,8 @@ module AbAdmin
       def date_field(attr, options={})
         label(attr, options[:label]) + content_tag(:div, class: 'controls') do
           gt_param, lt_param = "#{attr}_gteq", "#{attr}_lteq"
-          text_field_tag("q[#{gt_param}]", params[:q][gt_param], class: 'input-small datepicker', autocomplete: 'off') + ' - ' +
-          text_field_tag("q[#{lt_param}]", params[:q][lt_param], class: 'input-small datepicker', autocomplete: 'off', id: "q_#{attr}")
+          text_field_tag("q[#{gt_param}]", query_params[gt_param], class: 'input-small datepicker', autocomplete: 'off') +
+          text_field_tag("q[#{lt_param}]", query_params[lt_param], class: 'input-small datepicker', autocomplete: 'off', id: "q_#{attr}")
         end
       end
 
@@ -68,7 +68,7 @@ module AbAdmin
         if builder_options[:compact_labels]
           options[:input_html] ||= {}
           options[:input_html][:placeholder] ||= extract_label(attr, options)
-          wrapper_html = {'class' => 'controls js-tooltip', 'data-placement' => 'left', 'title' => options[:input_html][:placeholder]}
+          wrapper_html = {'class' => 'controls tool tool-left', 'data-placement' => 'left', 'title' => options[:input_html][:placeholder]}
           content_tag(:div, wrapper_html, &block)
         else
           label(attr, options[:label]) + content_tag(:div, class: 'controls', &block)
@@ -80,7 +80,7 @@ module AbAdmin
           param = options[:param] || "#{options[:value_attr] || attr}_cont"
           options[:input_html] ||= {}
           options[:input_html][:id] = "q_#{attr}"
-          text_field_tag("q[#{param}]", params[:q][param], options[:input_html])
+          text_field_tag("q[#{param}]", query_params[param], options[:input_html])
         end
       end
 
@@ -92,9 +92,9 @@ module AbAdmin
       def number_field(attr, options={})
         label(attr, options[:label]) + content_tag(:div, class: 'controls') do
           opts = [['=', 'eq'], ['>', 'gt'], ['<', 'lt']].map { |m| [m[0], "#{attr}_#{m[1]}"] }
-          current_filter = (opts.detect { |m| params[:q][m[1]].present? } || opts.first)[1]
+          current_filter = (opts.detect { |m| query_params[m[1]].present? } || opts.first)[1]
           select_tag('', options_for_select(opts, current_filter), class: 'input-small predicate-select') +
-          text_field_tag("q[#{current_filter}]", params[:q][current_filter], class: 'input-small', type: :number)
+          text_field_tag("q[#{current_filter}]", query_params[current_filter], class: 'input-small', type: :number, step: 0.01)
         end
       end
 
@@ -102,10 +102,10 @@ module AbAdmin
         content_tag(:div, class: 'pull-left') do
           param = options[:param] || "#{attr}_eq"
           content_tag(:label, class: 'checkbox inline') do
-            check_box_tag("q[#{param}]", 1, params[:q][param].to_i == 1, class: 'inline', id: "q_#{attr}") + I18n.t('simple_form.yes')
+            check_box_tag("q[#{param}]", 1, query_params[param].to_i == 1, class: 'inline', id: "q_#{attr}") + I18n.t('simple_form.yes')
           end +
           content_tag(:label, class: 'checkbox inline') do
-            check_box_tag("q[#{param}]", 0, params[:q][param] && params[:q][param].to_i == 0, class: 'inline') + I18n.t('simple_form.no')
+            check_box_tag("q[#{param}]", 0, query_params[param] && query_params[param].to_i == 0, class: 'inline') + I18n.t('simple_form.no')
           end
         end + label(attr, options[:label], class: 'right-label')
       end
@@ -165,11 +165,11 @@ module AbAdmin
         content_tag(:div, class: 'pull-left') do
           content_tag(:label, class: 'checkbox inline') do
             param = "#{attr}_#{predicates[:yes][0]}"
-            check_box_tag("q[#{param}]", predicates[:yes][1], params[:q][param] == predicates[:yes][1], class: 'inline', id: "q_#{attr}") + I18n.t('simple_form.yes')
+            check_box_tag("q[#{param}]", predicates[:yes][1], query_params[param] == predicates[:yes][1], class: 'inline', id: "q_#{attr}") + I18n.t('simple_form.yes')
           end +
           content_tag(:label, class: 'checkbox inline') do
             param = "#{attr}_#{predicates[:no][0]}"
-            check_box_tag("q[#{param}]", predicates[:no][1], params[:q][param] == predicates[:no][1], class: 'inline') + I18n.t('simple_form.no')
+            check_box_tag("q[#{param}]", predicates[:no][1], query_params[param] == predicates[:no][1], class: 'inline') + I18n.t('simple_form.no')
           end
         end + label(attr, options[:label], class: 'right-label')
       end

data/lib/ab_admin/views/will_paginate_bootstrap_renderer.rb

@@ -0,0 +1,60 @@
+# Extracted from `will_paginate-bootstrap` (v0.2.5 written by Nicholas Dainty) because of some deprecated staff
+require "will_paginate/view_helpers/action_view"
+module AbAdmin
+  module Views
+    class WillPaginateBootstrapRenderer < WillPaginate::ActionView::LinkRenderer
+      # Contains functionality shared by all renderer classes.
+      ELLIPSIS = "&hellip;"
+
+      def to_html
+        list_items = pagination.map do |item|
+          item.is_a?(Integer) ? page_number(item) : send(item)
+        end.join(@options[:link_separator])
+
+        if @options[:bootstrap].to_i >= 3
+          tag("ul", list_items, class: "pagination")
+        else
+          html_container(tag("ul", list_items))
+        end
+      end
+
+      def container_attributes
+        @container_attributes ||= @options.except(*(WillPaginate::ViewHelpers.pagination_options.keys + [:renderer, :link_options] - [:class]))
+      end
+
+      protected
+
+      def page_number(page)
+        link_options = @options[:link_options] || {}
+        if page == current_page
+          tag("li", tag("span", page), class: "active")
+        else
+          tag("li", link(page, page, link_options.merge(rel: rel_value(page))))
+        end
+      end
+
+      def gap
+        tag("li", link(ELLIPSIS, "#"), class: "disabled")
+      end
+
+      def previous_page
+        num = @collection.current_page > 1 && @collection.current_page - 1
+        previous_or_next_page(num, @options[:previous_label], "prev")
+      end
+
+      def next_page
+        num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
+        previous_or_next_page(num, @options[:next_label], "next")
+      end
+
+      def previous_or_next_page(page, text, classname)
+        link_options = @options[:link_options] || {}
+        if page
+          tag("li", link(text, page, link_options), class: classname)
+        else
+          tag("li", tag("span", text), class: "%s disabled" % classname)
+        end
+      end
+    end
+  end
+end

data/lib/ab_admin.rb

@@ -1,6 +1,5 @@
 require 'inherited_resources'
 require 'rack-pjax'
-require 'has_scope'
 require 'cancan'
 
 require 'ab_admin/version'
@@ -9,7 +8,7 @@ require 'ab_admin/engine'
 
 module AbAdmin
   DOMAINNAME_REGEXP = /\A(?:[0-9a-z]\.|[0-9a-z][0-9a-z\-]*[0-9a-z]+\.)+[a-z]{2,6}\z/
-  EMAIL_REGEXP = /\A[_A-Za-z0-9\-\+]+(?:\.[_A-Za-z0-9\-\+]+)*@(?:[0-9a-z]\.|[0-9a-z][0-9a-z\-]*[0-9a-z]+\.)+[a-z]{2,6}\z/
+  EMAIL_REGEXP = /\A(?#Local part)[_A-Za-z0-9\-+]+(?:\.[_A-Za-z0-9\-+]+)*@(?#Subdomains)(?:[0-9a-z]\.|[0-9a-z][0-9a-z\-]*[0-9a-z]+\.)+(?#TopLevel Domains)[a-z]{2,18}\z/
 
   autoload :Utils, 'ab_admin/utils'
   autoload :Devise, 'ab_admin/devise'
@@ -20,6 +19,7 @@ module AbAdmin
     autoload :Search, 'ab_admin/config/base'
     autoload :Export, 'ab_admin/config/base'
     autoload :Form, 'ab_admin/config/base'
+    autoload :Scope, 'ab_admin/config/base'
     autoload :BaseBuilder, 'ab_admin/config/base'
     autoload :FieldGroup, 'ab_admin/config/base'
     autoload :Field, 'ab_admin/config/base'
@@ -63,6 +63,7 @@ module AbAdmin
     autoload :HasTracking, 'ab_admin/concerns/has_tracking'
     autoload :AssetHumanNames, 'ab_admin/concerns/asset_human_names'
     autoload :Fileuploads, 'ab_admin/concerns/fileuploads'
+    autoload :TranslationsMacro, 'ab_admin/concerns/translations_macro'
   end
 
   module Controllers
@@ -100,6 +101,7 @@ module AbAdmin
     autoload :SearchFormBuilder, 'ab_admin/views/search_form_builder'
     autoload :UrlForRoutes, 'ab_admin/views/url_for_routes'
     autoload :ContentOnlyWrapper, 'ab_admin/views/content_only_wrapper'
+    autoload :WillPaginateBootstrapRenderer, 'ab_admin/views/will_paginate_bootstrap_renderer'
 
     module Inputs
       autoload :CkeditorInput, 'ab_admin/views/inputs/ckeditor_input'
@@ -125,6 +127,13 @@ module AbAdmin
   end
 
   mattr_accessor :menu
+  mattr_accessor :body_css_class
+  mattr_accessor :favicon_path
+  mattr_accessor :footer_notes
+  mattr_accessor :default_url_options
+  mattr_accessor :locale
+  mattr_accessor :root_path
+  mattr_accessor :base_url
 
   mattr_accessor :flash_keys
   @@flash_keys = [:notice, :error]
@@ -135,15 +144,15 @@ module AbAdmin
   mattr_accessor :site_name
   @@site_name = 'AbAdmin'
 
-  mattr_accessor :root_path
-
-  mattr_accessor :body_css_class
-
-  mattr_accessor :favicon_path
+  mattr_accessor :footer
+  @@footer = true
 
   mattr_accessor :devise_layout
   @@devise_layout = 'admin/devise'
 
+  mattr_accessor :render_unauthorized
+  @@render_unauthorized = true
+
   mattr_accessor :image_types
   @@image_types = %w(image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png)
 
@@ -154,46 +163,49 @@ 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 ab_admin/clear.png admin/flags/*.png)
+  @@assets = %w(ab_admin/devise.css bootstrap.js ab_admin/loading.gif ab_admin/clear.png ab_admin/clear.png)
 
   mattr_accessor :test_settings
   @@test_settings = {}
 
-  mattr_accessor :footer
-  @@footer = true
-
-  mattr_accessor :footer_notes
-
-  mattr_accessor :default_url_options
-
-  mattr_accessor :locale
-
   mattr_accessor :fileupload_url
   @@fileupload_url = '/admin/assets'
 
   mattr_accessor :uploads_dir
   @@uploads_dir = 'uploads'
 
-  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 :date_format
+  @@date_format = '%d.%m.%y'
 
-  mattr_accessor :default_per_page
-  @@default_per_page = 50
+  mattr_accessor :datetime_format
+  @@datetime_format = '%d.%m.%y %H:%M'
 
-  mattr_accessor :view_default_per_page
-  @@view_default_per_page = Hash.new { AbAdmin.default_per_page }
-  @@view_default_per_page[:tree] = 1000
+  mattr_accessor :default_permitted_params
+  @@default_permitted_params = [:fileupload_guid]
 
-  mattr_accessor :max_per_page
-  @@max_per_page = Float::INFINITY
+  mattr_accessor :translated_locales
+  @@translated_locales = []
 
-  mattr_accessor :per_page_variants
-  @@per_page_variants = [50, 100, 500, 1000]
+  mattr_accessor :locale_to_country_code
+  @@locale_to_country_code = {ja: :jp, en: :gb, uk: :ua}
 
-  mattr_accessor :default_permitted_params
-  @@default_permitted_params = [:fileupload_guid]
+  mattr_accessor :default_resource_settings
+  @@default_resource_settings = {
+      index_views: [:table],
+      search: true,
+      export: true,
+      batch: true,
+      hotkeys: true,
+      button_scopes: true,
+      list_dblclick: true,
+      max_per_page: 10_000,
+      per_page_variants: [50, 100, 500, 1000],
+      default_per_page: 50,
+      view_default_per_page: Hash.new { 50 }.update(table: 50, tree: 1000, map: 1000),
+      pagination_index_views: [:table, :grid],
+      collection_actions: %w(index search batch rebuild),
+      id_column_with_created_at: true
+  }
 
   extend Utils
 

data/lib/generators/ab_admin/glob/glob_generator.rb

@@ -2,7 +2,7 @@ require 'rails/generators/active_record'
 module AbAdmin
   module Generators
     class GlobGenerator < ActiveRecord::Generators::Base
-      desc 'Generates migration for models without globalize tables'
+      desc 'Generates migration for models without translations tables'
 
       source_root File.expand_path('../templates', __FILE__)
 
@@ -17,18 +17,18 @@ module AbAdmin
       def model_attrs
         @model_attrs ||= begin
           models.each_with_object({}) do |m, h|
-            h[m.name] = m.translated_attribute_names.map { |attr| "#{attr}: :#{get_type(attr)}" }.join(', ')
+            h[m.name] = m.translated_attribute_names.map { |attr| [attr, get_type(attr)] }
           end
         end
       end
 
       def migration_name
-        "create_globalize_#{models.map { |m| m.model_name.singular }.join('_')}"
+        "create_translations_#{models.map { |m| m.model_name.singular }.join('_')}"
       end
 
       def models
         @models ||= begin
-          all_translated.reject { |m| conn.data_source_exists? m.translations_table_name }
+          all_translated.reject { |m| conn.data_source_exists? m.translation_class.table_name }
         end
       end
 
@@ -53,7 +53,6 @@ module AbAdmin
             :string
         end
       end
-
     end
   end
 end

data/lib/generators/ab_admin/glob/templates/migration.erb

@@ -1,13 +1,16 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
-  def up
+  def change
     <%- models.each do |m| -%>
-    <%= m.name %>.create_translation_table! <%= model_attrs[m.name] %>
-    <%- end -%>
-  end
+    create_table :<%= m.model_name.singular %>_translations do |t|
+      t.references :<%= m.model_name.singular %>, null: false
+      t.string :locale, limit: 5, null: false
+      <%- model_attrs[m.name].each do |attr, type| -%>
+      t.<%= type %> :<%= attr %>
+      <%- end -%>
 
-  def down
-    <%- models.each do |m| -%>
-    <%= m.name %>.drop_translation_table!
+      t.timestamps
+    end
+    add_index :<%= m.model_name.singular %>_translations, [:<%= m.model_name.singular %>_id, :locale], unique: true, name: '<%= m.table_name %>_ts_<%= m.model_name.singular %>_id_locale'
     <%- end -%>
   end
 end

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

@@ -1,6 +1,6 @@
 require 'ab_admin/hooks'
 
-I18n.available_locales = Globalize.available_locales = [:ru, :en]
+I18n.available_locales = AbAdmin.translated_locales = [:en]
 
 AbAdmin.setup do |config|
   config.site_name = '<%= app_const_base.titleize %>'

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

@@ -1,22 +1,10 @@
 class User < ApplicationRecord
   devise :database_authenticatable, :confirmable, :lockable,
-         :recoverable, :rememberable, :trackable, :validatable, :registerable,
-         :encryptable, encryptor: :sha512
+         :recoverable, :rememberable, :trackable, :validatable, :registerable
 
   include AbAdmin::Concerns::AdminAddition
   include AbAdmin::Models::User
 
   fileuploads :avatar
 
-  def init
-    set_default_role
-    self.locale ||= 'ru'
-    self.time_zone ||= 'Kiev'
-  end
-
-  def password_required?
-    return true if password.present?
-    return false if persisted? && password.blank?
-    super
-  end
 end

data/lib/generators/ab_admin/install/templates/spec/spec_helper.rb

@@ -15,5 +15,4 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :controller
   config.include MailerMacros
   config.before(:each) { reset_email }
-
 end

data/lib/generators/ab_admin/install/templates/spec/support/database_cleaner.rb

@@ -1,17 +1,14 @@
-RSpec.configure do |config|
-  config.use_transactional_fixtures = false
+require 'database_cleaner'
 
-  config.before :all do
+RSpec.configure do |config|
+  config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata countries country_translations))
   end
 
-  config.before :each do
-    DatabaseCleaner.start
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
   end
-
-  config.after :each do
-    DatabaseCleaner.clean
-  end
-
 end

data/lib/generators/ab_admin/install/templates/uploaders/attachment_file_uploader.rb

@@ -1,5 +1,5 @@
 class AttachmentFileUploader < AbAdmin::CarrierWave::BaseUploader
-  def extension_whitelist
+  def extension_allowlist
     %w(pdf doc docx xls xlsx ppt pptx jpg jpeg gif png zip rar csv)
   end
 end

data/lib/generators/ab_admin/install/templates/uploaders/avatar_uploader.rb

@@ -6,7 +6,7 @@ class AvatarUploader < AbAdmin::CarrierWave::BaseUploader
     process resize_to_fill: [80, 80, 'North']
   end
 
-  def extension_whitelist
+  def extension_allowlist
     %w(jpg jpeg gif png)
   end
 

data/lib/generators/ab_admin/install/templates/uploaders/picture_uploader.rb

@@ -1,13 +1,26 @@
 class PictureUploader < AbAdmin::CarrierWave::BaseUploader
   
-  process quality: 80
-  process cropper: :cropper_geometry
+  # process quality: 80
+  # process cropper: :cropper_geometry
 
   version :thumb do
     process resize_to_fill: [80, 80]
   end
 
-  def extension_whitelist
+  version :content do
+    process quality: 80
+    process resize_to_fill: [800, 800]
+  end
+
+  version :content_webp do
+    process convert_to_webp: [{quality: 90, method: 5, resize_to_fill: [800, 800]}]
+  end
+
+  # version :content_webp do
+  #   process convert_to_webp: [{quality: 80, method: 5, resize_w: 800, resize_h: 800}]
+  # end
+
+  def extension_allowlist
     %w(jpg jpeg gif png)
   end
 end

data/lib/generators/ab_admin/model/model_generator.rb

@@ -31,17 +31,16 @@ module AbAdmin
       protected
 
       def model_instance
-        @model_instance ||= model.new
+        model.new
       end
 
       def translated_columns
-        @translated_columns ||= model.respond_to?(:translated_attribute_names) ? model.translated_attribute_names.map(&:to_s) : []
+        model.respond_to?(:translated_attribute_names) ? model.translated_attribute_names.map(&:to_s) : []
       end
 
       def index_attrs
-        @attrs ||= model_instance.attributes.keys.map(&:to_s)
+        model_instance.attributes.keys.map(&:to_s)
       end
-
     end
   end
 end

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

@@ -2,11 +2,14 @@ class AbAdmin<%= model.name %> < AbAdmin::AbstractResource
   permitted_params :all
 
 <% if model.respond_to?(:acts_as_nested_set_options) -%>
-  settings index_view: 'tree'
+  settings index_views: [:tree]
 <% else -%>
   table do
 <% index_attrs.without('id', 'updated_at').each do |attr| -%>
-    field :<%= attr -%><%= ', sortable: false' if translated_columns.include?(attr) %>
+    field :<%= attr -%><%= ', sortable: false' if translated_columns.include?(attr.to_s) %>
+<% end -%>
+<% translated_columns.each do |attr| -%>
+    field :<%= attr -%>, sortable: false
 <% end -%>
   end
 

data/lib/generators/ab_admin/resource/resource_generator.rb

@@ -13,10 +13,6 @@ module AbAdmin
       class_option :skip_table, type: :boolean, default: false, description: 'Don\'t create table template'
       class_option :skip_search_form, type: :boolean, default: false, description: 'Don\'t create search_form template'
 
-      hook_for :helper, in: :rails do |instance, helper|
-        instance.invoke helper, ["admin/#{instance.send(:plural_name)}"]
-      end
-
       def create_controller_files
         template 'controller.erb', File.join('app/controllers/admin', "#{controller_file_name}_controller.rb")
       end

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

@@ -5,18 +5,11 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
 <% end -%>
   load_and_authorize_resource
 
-<% if model.respond_to?(:visible) -%>
-  has_scope :visible
-<% end -%>
-<% if model.respond_to?(:un_visible) -%>
-  has_scope :un_visible
-<% end -%>
-
 <% if model.respond_to?(:acts_as_nested_set_options) -%>
   protected
 
-  def settings
-    {index_view: 'tree'}
+  def build_settings
+    super.merge!(index_views: 'tree')
   end
 <% end -%>
 end

data/lib/tasks/assets.rake

@@ -6,14 +6,14 @@ namespace :assets do
   task reprocess: :environment do
     name = (ENV['CLASS'] || ENV['class'] || 'Asset').to_s
     klass = name.safe_constantize
+    raise "Cannot find a constant with the #{name} specified in the argument string" if klass.nil?
 
+    versions = []
     if ENV['VERSIONS']
-      versions = ENV['VERSIONS'].split(',').map(&:to_sym)
-    else
-      versions = []
+      all_versions = klass.uploaders[:data].versions.keys.map(&:to_s)
+      versions = ENV['VERSIONS'].split(',').flat_map{|v| all_versions.find_all {|vv| vv =~ Regexp.new("^#{v.gsub('*', '.*')}$") } }.map(&:to_sym).uniq
     end
-
-    raise "Cannot find a constant with the #{name} specified in the argument string" if klass.nil?
+    puts "Model: #{klass.name}, versions: #{versions.presence || 'ALL'}"
 
     bar = ProgressBar.create(title: name, total: klass.count, format: '%c of %C - %a %e |%b>>%i| %p%% %t')
     bar.progress_mark = '='