ab_admin 0.4.0 → 0.5.0

data/lib/ab_admin/core_ext/array.rb

@@ -54,11 +54,12 @@ class Array
     !(self & other).empty?
   end
 
-  def to_hash
-    h = {}
-    each { |k, v| h[k] = v }
-    h
-  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 }

data/lib/ab_admin/hooks.rb

@@ -1,44 +1,19 @@
+#
+# ***** IMPORTANT *****
+#
+# This file contains some monkeypatching staff and is not required by default.
+# Please, read code and comments before usage.
+#
 Dir["#{File.dirname(__FILE__)}/hooks/*.rb"].sort.each do |path|
   require "ab_admin/hooks/#{File.basename(path, '.rb')}"
 end
 
-require 'i18n/core_ext/kernel/surpress_warnings'
-
 ActiveSupport::XmlMini.backend = 'Nokogiri'
 
 InheritedResources.flash_keys = Responders::FlashResponder.flash_keys = AbAdmin.flash_keys
 Responders::FlashResponder.namespace_lookup = true
 
 ::SimpleForm.wrapper_mappings ||= {}
-::SimpleForm.wrapper_mappings[:capture_block] = ::SimpleForm.wrapper_mappings[:uploader] = AbAdmin::Views::ContentOnlyWrapper.instance
+::SimpleForm.wrapper_mappings[:uploader] = AbAdmin::Views::ContentOnlyWrapper.instance
 
 CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
-
-Time::DATE_FORMATS[:api] = '%d.%m.%Y'
-Time::DATE_FORMATS[:path] = '%Y_%m_%d_%H_%M_%S'
-Time::DATE_FORMATS[:compare] = '%Y%m%d%H%M'
-Time::DATE_FORMATS[:compare_date] = Date::DATE_FORMATS[:compare_date] = '%Y%m%d'
-
-Kernel.suppress_warnings do
-  # fixed in master branch
-  Russian::LOCALIZE_MONTH_NAMES_MATCH = /(%d|%e|%-d)(.*)(%B)/ if defined? Russian
-end
-
-if defined?(Sunrise::FileUpload)
-  Sunrise::FileUpload.setup do |config|
-    config.base_path = Rails.root.to_s
-  end
-
-  Sunrise::FileUpload::Manager.before_create do |env, asset|
-    asset.user = env['warden'].user if env['warden']
-  end
-end
-
-if defined?(Globalize)
-  module Globalize
-    def self.valid_locale?(loc)
-      return false unless loc
-      available_locales.include?(loc.to_sym)
-    end
-  end
-end

data/lib/ab_admin/hooks/{active_model_hooks.rb → active_model_attr_accessible_few_roles.rb}

@@ -1,3 +1,4 @@
+# enable to pass few roles to `attr_accessible` method which is very useful in defining `default` and `admin` attributes
 module ActiveModel
   module MassAssignmentSecurity
     module ClassMethods
@@ -20,23 +21,30 @@ end
 module ActiveModel
   module MassAssignmentSecurity
     class Sanitizer
-      def sanitize(attributes, authorizers)
-        sanitized_attributes = attributes.reject { |key, value| authorizers.all? { |auth| auth.deny?(key) } }
-        #debug_protected_attribute_removal(attributes, sanitized_attributes)
+
+      def sanitize(klass, attributes, authorizers)
+        rejected = []
+        sanitized_attributes = attributes.reject do |key, value|
+          rejected << key if authorizers.all? { |authorizer| authorizer.deny?(key) }
+        end
+        process_removed_attributes(klass, rejected) unless rejected.empty?
         sanitized_attributes
       end
+
     end
   end
 end
 
 module ActiveModel
   module MassAssignmentSecurity
+
     def sanitize_for_mass_assignment(attributes, roles = nil)
-      _mass_assignment_sanitizer.sanitize(attributes, mass_assignment_authorizer(roles))
+      _mass_assignment_sanitizer.sanitize(self.class, attributes, mass_assignment_authorizer(roles))
     end
 
     def mass_assignment_authorizer(roles)
       Array(roles).map { |role| self.class.active_authorizer[role || :default] }
     end
+
   end
 end

data/lib/ab_admin/hooks/{globalize_hooks.rb → globalize_locale_suffix_accessors.rb}

@@ -1,12 +1,4 @@
-module Globalize
-  mattr_accessor :available_locales
-
-  def self.valid_locale?(loc)
-    return false unless loc
-    available_locales.include?(loc.to_sym)
-  end
-end
-
+# add accessors with locale suffix like `title_en`, `title_de`
 Globalize::ActiveRecord::ClassMethods.module_eval do
   def define_translations_reader_with_locale_suffix(name)
     define_translations_reader_without_locale_suffix(name)

data/lib/ab_admin/hooks/globalize_valid_locale.rb

@@ -0,0 +1,9 @@
+# add `valid_locale?` method to validate locale with globalize
+module Globalize
+  mattr_accessor :available_locales
+
+  def self.valid_locale?(loc)
+    return false unless loc
+    available_locales.include?(loc.to_sym)
+  end
+end

data/lib/ab_admin/hooks/{paginate_hooks.rb → will_paginate_id_prefetch.rb}

@@ -1,8 +1,10 @@
-require 'will_paginate/view_helpers/action_view'
+# 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
 module WillPaginate
   module ActiveRecord
     module RelationMethods
-      attr_accessor :paginate_limit, :paginate_offset, :paginate_ids
+      attr_accessor :paginate_limit, :paginate_offset
 
       def per_page(value = nil)
         if value.nil?
@@ -24,7 +26,7 @@ module WillPaginate
     module Pagination
       def paginate(options)
         options = options.dup
-        pagenum = options.fetch(:page) { raise ArgumentError, ':page parameter required' }
+        page_number = options.fetch(:page) { raise ArgumentError, ':page parameter required' }
         per_page = options.delete(:per_page) || self.per_page
         total = options.delete(:total_entries)
         large = options.delete(:large)
@@ -32,7 +34,7 @@ module WillPaginate
         count_options = options.delete(:count)
         options.delete(:page)
 
-        rel = limit(per_page.to_i).page(pagenum)
+        rel = limit(per_page.to_i).page(page_number)
         rel = rel.apply_finder_options(options) if options.any?
         rel.wp_count_options = count_options if count_options
         rel.total_entries = total.to_i unless total.blank?
@@ -51,21 +53,4 @@ module WillPaginate
       end
     end
   end
-end
-
-WillPaginate::ViewHelpers.pagination_options[:no_uri] = false
-WillPaginate::ActionView::LinkRenderer.class_exec do
-  def url(page)
-    @base_url_params ||= begin
-      url_params = merge_get_params(default_url_params)
-      merge_optional_params(url_params)
-    end
-
-    url_params = @base_url_params.dup
-    add_current_page_param(url_params, page)
-    url_params[param_name.to_sym] = nil if url_params[param_name.to_sym].to_i < 2
-
-    link = @template.url_for(url_params)
-    @options[:no_uri] ? link.split('?').first : link
-  end
-end
+end

data/lib/ab_admin/hooks/will_paginate_no_uri.rb

@@ -0,0 +1,19 @@
+# add `:no_uri` options to skip query params in pagination urls
+require 'will_paginate/view_helpers/action_view'
+
+WillPaginate::ViewHelpers.pagination_options[:no_uri] = false
+WillPaginate::ActionView::LinkRenderer.class_exec do
+  def url(page)
+    @base_url_params ||= begin
+      url_params = merge_get_params(default_url_params)
+      merge_optional_params(url_params)
+    end
+
+    url_params = @base_url_params.dup
+    add_current_page_param(url_params, page)
+    url_params[param_name.to_sym] = nil if url_params[param_name.to_sym].to_i < 2
+
+    link = @template.url_for(url_params)
+    @options[:no_uri] ? link.split('?').first : link
+  end
+end

data/lib/ab_admin/i18n_tools/model_translator.rb

@@ -35,10 +35,11 @@ module AbAdmin
                 end
                 if model.new.respond_to?("#{attr}_#{locale.to_s}".to_sym)
                   @locales.each do |locale_1|
-                    o["#{attr}_#{locale_1.to_s}"] = "#{ha(model, attr, locale)} (#{I18n.t(locale_1, scope: [:attrs])})"
+                    attr_suffix = I18n.t(locale_1, scope: [:attrs], default: locale_1.to_s.humanize)
+                    o["#{attr}_#{locale_1.to_s}"] = "#{ha(model, attr, locale)} (#{attr_suffix})"
                   end
                 end
-              end.sort.to_hash
+              end.sort.to_h
             end
             @models_i18n_hash[locale]['activerecord']['attributes'] = models_hash
           end

data/lib/ab_admin/menu/base_group.rb

@@ -9,9 +9,9 @@ module AbAdmin
       end
 
       def model(model, options={})
-        title = model.model_name.human(count: 9)
-        path = options[:url] || "/admin/#{model.model_name.plural}"
-        @menu_tree << Item.new(title, path, options)
+        title = options[:title] || model.model_name.human(count: 9)
+        url = options[:url] || "/admin/#{model.model_name.plural}"
+        @menu_tree << Item.new(title, url, options)
       end
 
       def group(title, options={}, &block)

data/lib/ab_admin/menu/item.rb

@@ -3,9 +3,9 @@ module AbAdmin
     class Item
       include ::AbAdmin::Utils::EvalHelpers
 
-      def initialize(title, path, options)
+      def initialize(title, url, options)
         @title = title.is_a?(Symbol) ? I18n.t(title, scope: [:admin, :navigation]) : title
-        @path = path
+        @url = url
         @options = options
       end
 
@@ -13,11 +13,22 @@ module AbAdmin
         return if @options[:if] && !call_method_or_proc_on(template, @options[:if])
         return if @options[:unless] && call_method_or_proc_on(template, @options[:unless])
 
-        active = template.request.path.split('/')[2] == @path.split('/')[2]
+        item_url = @url.is_a?(String) ? @url : call_method_or_proc_on(template, @url)
+        active = template.request.path.split('/')[2] == item_url.split('/')[2]
+
         <<-HTML.html_safe
-      <li class="#{'active' if active}">#{template.link_to @title, @path, @options.except(:if, :unless)}</li>
+          <li class="#{'active' if active}">#{template.link_to title(template), item_url, @options.except(:if, :unless)}</li>
         HTML
       end
+
+      private
+
+      def title(template)
+        return @title unless @options[:badge_counter]
+        badge_counter = call_method_or_proc_on(template, @options[:badge_counter])
+        return @title if !badge_counter || badge_counter.zero?
+        "#{@title}&nbsp;<span class='badge badge-#{@options[:badge_type] || 'important'}'>#{badge_counter}</span>".html_safe
+      end
     end
   end
 end

data/lib/ab_admin/models/asset.rb

@@ -129,6 +129,12 @@ module AbAdmin
         AbAdmin.full_url data.url(*args)
       end
 
+      def url_on_fly(version)
+        file_url = url(version)
+        data.recreate_versions!(version) unless Rails.root.join("public/#{file_url}").exist?
+        file_url
+      end
+
       def cropper_geometry=(value)
         geometry = (value || '').to_s.split(',')
 

data/lib/ab_admin/models/settings.rb

@@ -6,8 +6,12 @@ module AbAdmin
       included do
         extend ActiveModel::Naming
         extend ActiveRecord::Translation
-        class_attribute :base_class, :editable_paths
+        class_attribute :base_class, :base_paths, :editable_paths
         self.base_class = self
+        self.base_paths = [
+            Rails.root.join('config', 'settings', 'settings.yml'),
+            Rails.root.join('config', 'settings', "#{Rails.env}.yml")
+        ]
         self.editable_paths = [
             Rails.root.join('config', 'settings', "#{Rails.env}.local.yml"),
             Rails.root.join('config', 'settings', 'settings.local.yml')
@@ -33,11 +37,7 @@ module AbAdmin
       end
 
       def find_paths
-        [
-            Rails.root.join('config', 'settings', 'settings.yml'),
-            Rails.root.join('config', 'settings', "#{Rails.env}.yml"),
-            @editable_path
-        ].find_all { |path| File.exists?(path) }
+        base_paths.dup.unshift(@editable_path).find_all { |path| File.exists?(path) }
       end
 
       def all

data/lib/ab_admin/models/user.rb

@@ -36,6 +36,10 @@ module AbAdmin
         unlock_access! if access_locked?
       end
 
+      def active?
+        active_for_authentication?
+      end
+
       def generate_password!
         raw_password = AbAdmin.test_env? ? '654321' : AbAdmin.friendly_token
         self.password = self.password_confirmation = raw_password

data/lib/ab_admin/utils.rb

@@ -14,7 +14,7 @@ module AbAdmin
     def bm(message = 'Benchmarking', options = {})
       result = nil
       ms = Benchmark.ms { result = yield }
-      Rails.logger.debug '%s (%.3fms)' % [message, ms]
+      (options[:logger] || Rails.logger).info '%s (%.3fms)' % [message, ms]
       result
     end
 
@@ -57,9 +57,9 @@ 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)
-      @@sanitizer ||= Sanitizer.new
-      @@sanitizer.normalize_html(raw_html)
+    def normalize_html(raw_html, options = {}, &block)
+      @@sanitizer ||= Sanitizer.new(options)
+      @@sanitizer.normalize_html(raw_html, &block)
     end
 
     def url_helpers
@@ -86,11 +86,20 @@ module AbAdmin
     class Sanitizer
       include ActionView::Helpers::SanitizeHelper
 
+      CLEAN_HTML_COMMENTS_REGEXP = /(&lt;|<)\!--.*?--(&gt;|>)/m
+      CLEAN_LINE_BREAKS_REGEXP = /[^>]\r\n/
+
+      def initialize(options = {})
+        @options = options
+      end
+
       def normalize_html(raw_html)
         return '' if raw_html.blank?
-        html = sanitize(raw_html.gsub(/<!--(.*?)-->[\n]?/m, ''))
+        cleaned_html = raw_html.gsub(CLEAN_HTML_COMMENTS_REGEXP, '')#.gsub(CLEAN_LINE_BREAKS_REGEXP, '<br/>')
+        html = sanitize(cleaned_html, @options[:sanitize] || {})
         doc = Nokogiri::HTML.fragment(html)
         #doc.xpath('comment()').each { |c| c.remove }
+        yield doc if block_given?
         doc.search('div').each { |el| el.name = 'p' }
         doc.to_html
       end
@@ -103,7 +112,7 @@ module AbAdmin
 
     def display_name(resource)
       return unless resource
-      resource.send(display_name_method_for(resource))
+      resource.send(display_name_method_for(resource)).to_s.no_html
     end
 
     def safe_display_name(resource)
@@ -136,4 +145,4 @@ module AbAdmin
       SecureRandom.base64(16).tr('+/=', 'xyz').first(n)
     end
   end
-end
+end

data/lib/ab_admin/utils/xls_document.rb

@@ -2,6 +2,14 @@ require 'ruby2xlsx'
 
 module AbAdmin
   module Utils
+    class Default
+      extend ActiveModel::Naming
+
+      def self.human_attribute_name(*)
+        ''
+      end
+    end
+
     class XlsDocument < Ruby2xlsx::Base
       include AbAdmin::Utils::EvalHelpers
 
@@ -65,7 +73,7 @@ module AbAdmin
             count += 1
           end
         else
-          items = Array.wrap(@source)
+          items = @source.respond_to?(:to_a) ? @source.to_a : Array.wrap(@source)
           @klass ||= items.first.class unless items.empty?
           @klass ||= Default
 

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -24,17 +24,21 @@ module AbAdmin
       def admin_editable(item, attr, options=nil)
         options = {} unless options.is_a?(Hash)
         options[:type] ||= 'select' if options[:source]
-        options[:type] ||= case attr.to_s
-                             when /_at$/
-                               'date'
-                             when /^is_/
-                               'select'
-                             when /description|body|content/
-                               'textarea'
-                             else
-                               'text'
-                           end
-        options[:source] ||= {'true' => 'yes', 'false' => 'no'} if options[:type] == 'select'
+        
+        case attr.to_s
+          when /_at$/
+            options[:type] ||= 'date'
+          when /^is_/
+            options[:type] ||= 'select'
+            options[:source] ||= {1 => 'yes', 0 => 'no'}
+            options[:value] ||= item[attr] ? 1 : 0
+            options[:title] ||= item[attr] ? 'yes' : 'no'
+          when /description|body|content/
+            options[:type] ||= 'textarea'
+          else
+            options[:type] ||= 'text'
+        end
+
         data = {
             type: options[:type],
             source: options[:source].try(:to_json),