ab_admin 0.8.3 → 0.10.0

data/lib/ab_admin/controllers/callbacks.rb

@@ -3,44 +3,21 @@ module AbAdmin
     module Callbacks
       extend ActiveSupport::Concern
 
-      #included do
-      #  define_admin_callbacks :build, :create, :update, :save, :destroy
-      #end
-
       protected
 
-      def build_resource
-       object = get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, resource_params))
-       # run_build_callbacks object
-       object
-      end
-
       def create_resource(object)
-        run_create_callbacks object do
-          save_resource(object)
-        end
+        run_create_callbacks(object) {save_resource(object)}
       end
 
       def save_resource(object)
-        run_save_callbacks object do
-          object.save
-        end
+        run_save_callbacks(object) {object.save}
       end
 
       def update_resource(object, attributes)
         object.assign_attributes(attributes)
-
-        #run_update_callbacks object do
-          save_resource(object)
-        #end
+        save_resource(object)
       end
 
-      #def destroy_resource(object)
-      #  run_destroy_callbacks object do
-      #    object.destroy
-      #  end
-      #end
-
       # Simple callback system. Implements before and after callbacks for
       # use within the controllers.
       #

data/lib/ab_admin/core_ext/array.rb

@@ -1,15 +1,4 @@
 class Array
-  def add_or_delete(el)
-    include?(el) ? delete(el) : push(el)
-  end
-
-  def word_count
-    each_with_object({}) do |word, h|
-      h[word] ||= 0
-      h[word] += 1
-    end
-  end
-
   def deep_merge_hashes
     self.inject({}) do |res, h|
       raise Exception.new("Not a hash #{h}") unless h.is_a?(Hash)
@@ -22,30 +11,12 @@ class Array
     inject(:+) / size
   end
 
-  #def zip_all
-  #  self[0].zip *self[1..-1]
-  #end
-  #
-  #def pluck!(method, *args)
-  #  each_index { |x| self[x] = self[x].send method, *args }
-  #end
-  #
-  #alias invoke! pluck!
-
-  def without(*values)
-    copy = self.dup
-    copy.without!(*values)
-  end
-
   def without!(*values)
+    ActiveSupport::Deprecation.warn('Array#without! is deprecated without replacement')
     values.flatten.each { |value| self.delete(value) }
     self
   end
 
-  def map_val(attr='id')
-    map{|el| el[attr] }
-  end
-
   def contain?(other)
     (other - self).empty?
   end
@@ -53,24 +24,4 @@ class Array
   def intersect?(other)
     !(self & other).empty?
   end
-
-  # def to_hash
-  #   ActiveSupport::Deprecation.warn('Array#to_hash is deprecated, use Array#to_h or Hash[] instead')
-  #   h = {}
-  #   each { |k, v| h[k] = v }
-  #   h
-  # end
-
-  def val_detect(attr, val)
-    detect{|v| v[attr] == val }
-  end
 end
-
-#module Enumerable
-#  def pluck(method, *args)
-#    map { |x| x.send method, *args }
-#  end
-#
-#  alias invoke pluck
-#end
-

data/lib/ab_admin/core_ext/hash.rb

@@ -1,5 +1,4 @@
 class Hash
-
   def reverse_deep_merge!(other_hash)
     other_hash.each_pair do |k, v|
       tv = self[k]
@@ -68,29 +67,13 @@ class Hash
     end
   end
 
-  def val(*array)
-    if array.empty?
-      self
-    else
-      key = array.shift
-      value = self[key]
-      if array.empty?
-        value
-      elsif value.is_a? Hash
-        value.val(*array)
-      else
-        nil
-      end
-    end
-  end
-
-  def store_multi(value, *keys)
+  def dig_store(value, *keys)
     key = keys.shift
     self[key] ||= {}
     if keys.empty?
       self[key] = value
     else
-      self[key] = self[key].store_multi(value, *keys)
+      self[key] = self[key].dig_store(value, *keys)
     end
     self
   end
@@ -107,18 +90,6 @@ class Hash
     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)
-    end
-    default
-  end
-
   def deep_stringify_keys
     inject({}) { |result, (key, value)|
       value = value.deep_stringify_keys if value.is_a?(Hash)

data/lib/ab_admin/core_ext/other.rb

@@ -1,9 +1,3 @@
-class NilClass
-  def val(*args)
-    self
-  end
-end
-
 class TrueClass
   def to_i
     1

data/lib/ab_admin/core_ext/string.rb

@@ -1,91 +1,6 @@
 class String
-  # http://lucene.apache.org/core/old_versioned_docs/versions/2_9_1/queryparsersyntax.html
-  #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\/)/
-  #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\s)/
-
-  KEYBOARDS = {
-      en: 'qwertyuiop[]asdfghjkl;\'zxcvbnm,./',
-      ru: 'йцукенгшщзхъфывапролджэячсмитьбю/'
-  }
-
-  unless defined? LUCENE_ESCAPE_REGEX
-    LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|\^|"|~|\*|\?|:|\\|\/)/
-
-    def lucene_escape
-      self.gsub(LUCENE_ESCAPE_REGEX, "\\\\\\1")
-    end
-  end
-
-  def capitalize_first
-    self.mb_chars[0].capitalize + self.mb_chars[1..-1]
-  end
-
-  def is_int?
-    self =~ /^[-+]?[0-9]+$/
-  end
-
-  def is_number?
-    self =~ /^[-+]?[0-9]+(\.[0-9]+)?$/
-  end
-
-  def to_utc
-    begin
-      Time.zone.parse(self).utc
-    rescue
-      Time.now.utc
-    end
-  end
-
   def no_html
-    str = self.dup
-    str.gsub!(/<br\/?>/, ' ')
-    str.gsub!(/<\/?[^>]*>/, '')
-    str.strip!
-    str.gsub!('&nbsp;', ' ')
-    str
-  end
-
-  def tr_lang(from=nil, to=nil)
-    return '' if self.blank?
-
-    unless from || to
-      if KEYBOARDS[:en].index(self[0])
-        from, to = :en, :ru
-      elsif KEYBOARDS[:ru].index(self[0])
-        from, to = :ru, :en
-      else
-        from, to = :en, :ru
-      end
-    end
-
-    self.tr(KEYBOARDS[from], KEYBOARDS[to])
-  end
-
-  def count_words
-    clean_text.scan(/(\p{Alnum}+([-'.]\p{Alnum}+)*)/u).size
-  end
-
-  def words_count
-		frequencies = Hash.new(0)  
-		downcase.scan(/(\w+([-'.]\w+)*)/) { |word, ignore| frequencies[word] += 1 }
-		frequencies
-	end
-	
-	def self.randomize(length = 8)
-	  Array.new(length) { (rand(122-97) + 97).chr }.join
-  end
-
-  def clean_text
-    coder = HTMLEntities.new
-    coder.decode(self.no_html)
-  end
-
-  def mb_upcase
-    mb_chars.upcase.to_s
-  end
-
-  def mb_downcase
-    mb_chars.downcase.to_s
+    self.dup.gsub(/<br\/?>/, ' ').gsub(/<\/?[^>]*>/, '').strip.gsub('&nbsp;', ' ').gsub('&gt;', '>').gsub('&lt;', '<')
   end
 end
 

data/lib/ab_admin/devise.rb

@@ -29,6 +29,13 @@ module AbAdmin
               super
             end
       end
+
+      protected
+
+      def sign_in_params
+        devise_parameter_sanitizer.permit(:sign_in, keys: [:otp_attempt]) if devise_mapping.try(:two_factor_authenticatable?)
+        devise_parameter_sanitizer.sanitize(:sign_in)
+      end
     end
 
     class PasswordsController < ::Devise::PasswordsController

data/lib/ab_admin/engine.rb

@@ -2,7 +2,7 @@ module AbAdmin
   class Engine < ::Rails::Engine
     engine_name 'ab_admin'
 
-    initializer 'ab_admin.assets_precompile', :group => :all do |app|
+    initializer 'ab_admin.assets_precompile', group: :all do |app|
       app.config.assets.precompile += AbAdmin.assets
     end
 
@@ -19,6 +19,7 @@ module AbAdmin
         ActiveRecord::Base.send :extend, AbAdmin::Concerns::Silencer
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Validations
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Fileuploads
+        ActiveRecord::Base.send :extend, AbAdmin::Concerns::TranslationsMacro
         ActiveRecord::Base.send :extend, EnumField::EnumeratedAttribute
       end
 

data/lib/ab_admin/hooks/ckeditor_lazy.rb

@@ -0,0 +1,13 @@
+begin
+  require 'ckeditor'
+
+  Ckeditor::Utils.module_eval do
+    class << self
+      def js_replace(dom_id, options = nil)
+        options.present? ? "lazyInitCkeditor('#{dom_id}', #{ActiveSupport::JSON.encode(options)});" : "lazyInitCkEditor('#{dom_id}');"
+      end
+    end
+  end
+rescue LoadError => e
+  raise unless e.message.include?('ckeditor')
+end

data/lib/ab_admin/hooks/will_paginate_id_prefetch.rb

@@ -1,3 +1,5 @@
+require 'will_paginate/active_record'
+
 # add `:large` option with make pagination on large tables easier, because `SELECT *` is slow with large `OFFSET`:
 #   first it fetch ids of the records using `SELECT id`
 #   and in the second query it fetch records
@@ -10,7 +12,7 @@ module WillPaginate
         if value.nil?
           paginate_limit || limit_value
         else
-          limit(value)
+          limit(value.to_i)
         end
       end
 
@@ -18,7 +20,7 @@ module WillPaginate
         if value.nil?
           paginate_offset || offset_value
         else
-          super(value)
+          super(value.to_i)
         end
       end
     end
@@ -26,8 +28,8 @@ module WillPaginate
     module Pagination
       def paginate(options)
         options = options.dup
-        page_number = options.fetch(:page) { raise ArgumentError, ':page parameter required' }
-        per_page = options.delete(:per_page) || self.per_page
+        page_number = [1, options[:page].to_i].max
+        per_page = (options.delete(:per_page) || self.per_page).to_i
         total = options.delete(:total_entries)
         large = options.delete(:large)
 
@@ -40,8 +42,8 @@ module WillPaginate
         rel.total_entries = total.to_i unless total.blank?
 
         if large
-          ids = rel.except(:includes).pluck(Arel.sql("#{quoted_table_name}.id"))
-          new_rel = rel.except(:limit, :offset, :where).where(id: ids)
+          ids = rel.except(:includes).pluck(Arel.sql("#{quoted_table_name}.#{primary_key}"))
+          new_rel = rel.except(:limit, :offset, :where).where(primary_key => ids)
           new_rel.paginate_limit = rel.limit_value.to_i
           new_rel.paginate_offset = rel.offset_value.to_i
           new_rel.total_entries = rel.total_entries

data/lib/ab_admin/hooks/will_paginate_no_uri.rb

@@ -1,6 +1,6 @@
-# add `:no_uri` options to skip query params in pagination urls
 require 'will_paginate/view_helpers/action_view'
 
+# add `:no_uri` options to skip query params in pagination urls
 WillPaginate::ViewHelpers.pagination_options[:no_uri] = false
 WillPaginate::ActionView::LinkRenderer.class_exec do
   def url(page)

data/lib/ab_admin/i18n_tools/google_translate.rb

@@ -19,7 +19,9 @@ module AbAdmin
 
         if response.code == 200
           json = MultiJson.decode(response)
-          json['data']['translations'][0]['translatedText']
+          res = json['data']['translations'][0]['translatedText'].to_s.gsub(/%\s{/, ' %{')
+          res = "#{res[0].upcase}#{res[1..-1]}" if text.first[/[[:upper:]]/]
+          res
         else
           raise StandardError, response.inspect
         end

data/lib/ab_admin/i18n_tools/model_translator.rb

@@ -7,7 +7,7 @@ module AbAdmin
 
       def initialize(options: {})
         @options = options
-        @locales = Globalize.available_locales
+        @locales = AbAdmin.translated_locales
         @models = AbAdmin.translate_models.map{|m| m.constantize }
         @models_i18n_hash = {}
       end

data/lib/ab_admin/menu/base_group.rb

@@ -2,7 +2,6 @@ module AbAdmin
   module Menu
     class BaseGroup
       include ::Rails.application.routes.url_helpers
-      include ::AbAdmin::Utils::EvalHelpers
 
       def link(title, path, options={})
         @menu_tree << Item.new(title, path, options)

data/lib/ab_admin/menu/group.rb

@@ -10,9 +10,7 @@ module AbAdmin
       end
 
       def render(template)
-        return if @options[:if] && !call_method_or_proc_on(template, @options[:if])
-        return if @options[:unless] && call_method_or_proc_on(template, @options[:unless])
-
+        return unless template.option_conditions_met?(@options)
         wrapper_class = "dropdown-wrap-#{@raw_title}" if @raw_title.is_a?(Symbol)
         <<-HTML.html_safe
       <li class="dropdown #{wrapper_class}">
@@ -26,7 +24,7 @@ module AbAdmin
 
       def title(template)
         return @title unless @options[:badge]
-        badge = call_method_or_proc_on(template, @options[:badge])
+        badge = @options[:badge].is_a?(Symbol) ? template.public_send(@options[:badge]) : template.instance_exec(&@options[:badge])
         return @title if !badge || badge == 0
         "#{@title}&nbsp;<span class='badge badge-#{@options[:badge_type] || 'important'}'>#{badge}</span>".html_safe
       end

data/lib/ab_admin/menu/item.rb

@@ -1,8 +1,6 @@
 module AbAdmin
   module Menu
     class Item
-      include ::AbAdmin::Utils::EvalHelpers
-
       def initialize(title, url, options)
         @title = title.is_a?(Symbol) ? I18n.t(title, scope: [:admin, :navigation]) : title
         @url = url
@@ -10,23 +8,21 @@ module AbAdmin
       end
 
       def render(template)
-        return if @options[:if] && !call_method_or_proc_on(template, @options[:if])
-        return if @options[:unless] && call_method_or_proc_on(template, @options[:unless])
+        return unless template.option_conditions_met?(@options)
 
-        item_url = @url.is_a?(String) ? @url : call_method_or_proc_on(template, @url)
+        item_url = @url.is_a?(String) ? @url : template.instance_exec(&@url)
         active = template.request.path.split('/')[2] == item_url.split('/')[2]
 
         <<-HTML.html_safe
-          <li class="#{'active' if active}">#{template.link_to title(template), item_url, @options.except(:if, :unless)}</li>
+          <li class="#{'active' if active}">#{template.link_to title(template), item_url, @options.except(:if, :unless, :badge)}</li>
         HTML
       end
 
       private
 
       def title(template)
-        ActiveSupport::Deprecation.warn('Menu item :badge_counter option is deprecated, use :badge instead') if @options[:badge_counter]
         return @title unless @options[:badge]
-        badge = call_method_or_proc_on(template, @options[:badge])
+        badge = @options[:badge].is_a?(Symbol) ? template.public_send(@options[:badge]) : template.instance_exec(&@options[:badge])
         return @title if !badge || badge == 0
         "#{@title}&nbsp;<span class='badge badge-#{@options[:badge_type] || 'important'}'>#{badge}</span>".html_safe
       end

data/lib/ab_admin/models/asset.rb

@@ -30,7 +30,7 @@ module AbAdmin
 
         def ext_list
           return unless uploaders[:data]
-          uploaders[:data].new.extension_whitelist
+          uploaders[:data].new.extension_allowlist
         end
 
         def clean!
@@ -76,14 +76,12 @@ module AbAdmin
         AbAdmin.image_types.include?(self.data_content_type)
       end
 
-      def base_filename
-        base = File.basename(data_file_name, '.*')
-        base == data_secure_token ? File.basename(original_name, '.*') : base
+      def human_filename
+        data.human_part
       end
 
-      def base_filename=(value)
-        return false if value.blank? || File.basename(data_file_name, '.*') == value
-        self.original_name = value + File.extname(data_file_name)
+      def human_filename=(value)
+        return if (human_filename.blank? && value.blank?) || human_filename == value
         rename!(value)
       end
 
@@ -116,14 +114,13 @@ module AbAdmin
 
       def rename!(name=nil)
         normalized_name = name ? data.normalize_filename(name) : rand(9999)
-        return false if normalized_name.blank?
-        data.rename_via_move "#{normalized_name}#{File.extname(data_file_name)}"
+        return if normalized_name.blank?
+        data.rename_via_move normalized_name
       end
 
       def refresh_assetable
         return unless assetable.try(:persisted?)
         assetable.touch
-        assetable.tire.update_index if assetable.respond_to?(:tire)
         true
       end
 

data/lib/ab_admin/models/header.rb

@@ -24,12 +24,12 @@ module AbAdmin
       end
 
       def normalize_html
-        ::Globalize.available_locales.each do |loc|
+        AbAdmin.translated_locales.each do |loc|
           %w(title h1 keywords description).each do |attr|
             send("#{attr}_#{loc}=", send("#{attr}_#{loc}").to_s.no_html)
           end
         end
-        ::Globalize.available_locales.each do |loc|
+        AbAdmin.translated_locales.each do |loc|
           send("seo_block_#{loc}=", sanitize(send("seo_block_#{loc}").to_s))
         end
       end

data/lib/ab_admin/models/locator.rb

@@ -58,12 +58,38 @@ module AbAdmin
             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)
+              data.dig_store(d[i], *key_parts)
             end
             save path, data
           end
         end
 
+        INTERPOLATION_REGEXP = /%{[^}]+}/
+        def csv_errors(csv)
+          return ['CSV blank'] if csv.blank?
+          csv_data = CSV.parse(csv)
+          errors = []
+          csv_data.shift.each_with_index do |l, i|
+            next if i.zero?
+            unless I18n.available_locales.include?(l.to_sym)
+              errors << "Unknown locale #{l}"
+              next
+            end
+            csv_data.each do |d|
+              key = d[0]
+              next if d[i].blank?
+              if translations.dig(I18n.default_locale, key)
+                unless translations.dig(I18n.default_locale, key).scan(INTERPOLATION_REGEXP).sort == d[i].scan(INTERPOLATION_REGEXP).sort
+                  errors << "Wrong interpolations #{I18n.default_locale}:'#{translations.dig(I18n.default_locale, key)}' #{l}:#{d[i]}"
+                end
+              else
+                errors << "Extra interpolations #{l}:#{d[i]}" if d[i].scan(INTERPOLATION_REGEXP).present?
+              end
+            end
+          end
+          errors
+        end
+
         def translations
           @translations ||= I18n.backend.send(:translations).slice(*I18n.available_locales).transform_values{|v| v.flatten_hash.transform_keys{|k| k.join('.') } }
         end
@@ -93,7 +119,7 @@ module AbAdmin
         message = nil
         locale_replace_regexp = Regexp.new("(^#{I18n.default_locale}|(?<=\.)#{I18n.default_locale}(?=\.yml))")
 
-        locale_files = @files.map { |path| self.class.prepare_data(path) }
+        locale_files = @files.find_all{|f| f =~ /\/\w+(\.readonly)?\.yml/ }.map { |path| self.class.prepare_data(path) }
         main_locale_files = locale_files.find_all { |file| file.locale == I18n.default_locale }
 
         main_locale_files.each do |main_file|
@@ -101,7 +127,7 @@ module AbAdmin
             next if locale == I18n.default_locale
             clean_locale_hash = main_file.data.deep_clear_values
             path = File.join(main_file.dir, main_file.filename.sub(locale_replace_regexp, locale.to_s))
-            if File.exists?(path)
+            if File.exist?(path)
               file = self.class.prepare_data(path)
               self.class.save(path, {locale.to_s => clean_locale_hash.deep_add(file.data)})
             else

data/lib/ab_admin/models/settings.rb

@@ -38,7 +38,7 @@ module AbAdmin
         end
 
         def read_data
-          paths = base_paths.dup.push(editable_path).compact.find_all { |path| File.exists?(path) }
+          paths = base_paths.dup.push(editable_path).compact.find_all { |path| File.exist?(path) }
           hash = paths.map{|path| YAML.safe_load(File.read(path)) }.inject(&:deep_merge).deep_symbolize_keys
           SettingsStruct.new(hash)
         end
@@ -53,7 +53,7 @@ module AbAdmin
         end
 
         def editable_path
-          editable_paths.detect { |path| File.exists?(path) }
+          editable_paths.detect { |path| File.exist?(path) }
         end
       end
 

data/lib/ab_admin/models/structure.rb

@@ -15,12 +15,12 @@ module AbAdmin
         validates_numericality_of :structure_type_id, only_integer: true
 
         has_one :static_page, dependent: :destroy
-        has_many :visible_children, -> { where(is_visible: true) }, class_name: name, foreign_key: 'parent_id'
+        has_many :visible_children, -> { where(is_visible: true) }, class_name: name, foreign_key: :parent_id
 
         scope :visible, lambda { where(is_visible: true) }
-        scope :with_type, lambda { |structure_type| where(structure_type_id: structure_type.id) }
+        scope :with_type, lambda { |type| where(structure_type_id: (type.is_a?(Symbol) ? StructureType.public_send(type) : type.id)) }
         scope :with_depth, lambda { |level| where(depth: level.to_i) }
-        scope :with_position, lambda { |position_type| where(position_type_id: position_type.id).order('lft DESC') }
+        scope :with_position, lambda { |type| where(position_type_id: (type.is_a?(Symbol) ? StructureType.public_send(type) : type.id)).order(lft: :desc) }
       end
 
       def redirect?

data/lib/ab_admin/models/track.rb

@@ -44,9 +44,9 @@ module AbAdmin
           lookups << ['actions', key]
         end
         lookups.map!{|l| l.join('.').to_sym }
-        lookups << key
+        lookups << parts.last.humanize
 
-        I18n.t(lookups.shift, (parameters.merge(params) || {}).merge(scope: :admin, default: lookups))
+        I18n.t(lookups.shift, **(parameters.merge(params) || {}).merge(scope: :admin, default: lookups))
       end
 
       def trackable_changed_attrs
@@ -63,7 +63,19 @@ module AbAdmin
 
       def make_trackable
         self.name ||= trackable.han.first(250)
-        self.trackable_changes = trackable.saved_changes.except(:updated_at)
+        self.trackable_changes = format_trackable_changes(trackable.saved_changes.except(:updated_at))
+      end
+
+      def format_trackable_changes(value)
+        value.to_h.deep_transform_values do |v|
+          if v.is_a?(BigDecimal)
+            v.to_f
+          elsif v.is_a?(ActiveSupport::TimeWithZone)
+            v.to_s
+          else
+            v
+          end
+        end
       end
     end
   end