ab_admin 0.9.0 → 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
 
@@ -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.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(?#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/
+  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'
@@ -150,6 +150,9 @@ module AbAdmin
   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)
 
@@ -171,6 +174,12 @@ module AbAdmin
   mattr_accessor :uploads_dir
   @@uploads_dir = 'uploads'
 
+  mattr_accessor :date_format
+  @@date_format = '%d.%m.%y'
+
+  mattr_accessor :datetime_format
+  @@datetime_format = '%d.%m.%y %H:%M'
+
   mattr_accessor :default_permitted_params
   @@default_permitted_params = [:fileupload_guid]
 
@@ -184,6 +193,7 @@ module AbAdmin
   @@default_resource_settings = {
       index_views: [:table],
       search: true,
+      export: true,
       batch: true,
       hotkeys: true,
       button_scopes: true,
@@ -194,6 +204,7 @@ module AbAdmin
       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/install/templates/models/user.rb

@@ -1,7 +1,6 @@
 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

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/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,13 +5,6 @@ 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
 

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 = '='

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Alex Leschenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 7.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 7.0.7
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: has_scope
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_slug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -471,6 +471,7 @@ files:
 - app/views/admin/manager/_modal_form.html.slim
 - app/views/admin/manager/_search_form.html.slim
 - app/views/admin/manager/_show_table.html.slim
+- app/views/admin/manager/_stats.html.slim
 - app/views/admin/manager/_table.html.slim
 - app/views/admin/manager/show.html.slim
 - app/views/admin/settings/_form.html.slim
@@ -542,6 +543,7 @@ files:
 - lib/ab_admin/devise.rb
 - lib/ab_admin/engine.rb
 - lib/ab_admin/hooks.rb
+- lib/ab_admin/hooks/ckeditor_lazy.rb
 - lib/ab_admin/hooks/will_paginate_id_prefetch.rb
 - lib/ab_admin/hooks/will_paginate_no_uri.rb
 - lib/ab_admin/i18n_tools/google_translate.rb
@@ -649,7 +651,7 @@ files:
 homepage: https://github.com/leschenko/ab_admin
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -664,8 +666,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Simple and real-life tested Rails::Engine admin interface based on slim,
   bootstrap, inherited_resources, simple_form, device, cancan