ab_admin 0.6.1 → 0.7.0

data/lib/ab_admin/menu/group.rb

@@ -3,6 +3,7 @@ module AbAdmin
     class Group < BaseGroup
       def initialize(title, options, &block)
         @menu_tree = []
+        @raw_title = title
         @title = title.is_a?(Symbol) ? I18n.t(title, scope: [:admin, :navigation]) : title
         @options = options
         instance_eval &block if block_given?
@@ -12,8 +13,9 @@ 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])
 
+        wrapper_class = "dropdown-wrap-#{@raw_title}" if @raw_title.is_a?(Symbol)
         <<-HTML.html_safe
-      <li class="dropdown">
+      <li class="dropdown #{wrapper_class}">
         <a class="dropdown-toggle" href="#{@options[:url] || '#'}" >#{title(template)}<b class="caret"></b></a>
         <ul class="dropdown-menu">#{render_nested(template)}</ul>
       <li>

data/lib/ab_admin/models/asset.rb

@@ -25,12 +25,12 @@ module AbAdmin
 
       module ClassMethods
         def move_to(index, id)
-          update_all(['sort_order = ?', index], ['id = ?', id.to_i])
+          where(id: id.to_i).update_all(sort_order: index)
         end
 
         def ext_list
           return unless uploaders[:data]
-          uploaders[:data].new.extension_white_list
+          uploaders[:data].new.extension_whitelist
         end
 
         def clean!
@@ -49,7 +49,7 @@ module AbAdmin
 
       def thumb_url
         return unless image?
-        data.versions[thumb_size] ? data.url(thumb_size) : data.url
+        data.versions[thumb_size] ? url(thumb_size) : url
       end
 
       def format_created_at
@@ -91,7 +91,11 @@ module AbAdmin
       end
 
       def main!
-        self.class.update_all('is_main=0', ['assetable_type=? AND assetable_id=? AND type=?', assetable_type, assetable_id, type])
+        cond = {assetable_type: assetable_type, type: type}
+        if assetable_id.to_i.nonzero? || guid.presence
+          cond.merge!(assetable_id.to_i.zero? ? {guid: guid} : {assetable_id: assetable_id})
+          self.class.where(cond).update_all(is_main: false)
+        end
         update_column(:is_main, true)
         refresh_assetable
         self
@@ -127,7 +131,7 @@ module AbAdmin
       end
 
       def full_url(*args)
-        AbAdmin.full_url data.url(*args)
+        AbAdmin.full_url url(*args)
       end
 
       def url_on_fly(version)
@@ -167,7 +171,6 @@ module AbAdmin
           data.cache_stored_file!
         end
       end
-
     end
   end
 end

data/lib/ab_admin/models/header.rb

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

data/lib/ab_admin/models/locator.rb

@@ -16,6 +16,7 @@ module AbAdmin
         end
 
         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":')
         end
 
@@ -65,7 +66,6 @@ module AbAdmin
         end
         {message: message}
       end
-
     end
   end
 end

data/lib/ab_admin/models/settings.rb

@@ -6,15 +6,16 @@ module AbAdmin
       included do
         extend ActiveModel::Naming
         extend ActiveRecord::Translation
-        class_attribute :base_class, :base_paths, :editable_paths
+        class_attribute :base_class, :base_dir, :base_paths, :editable_paths
         self.base_class = self
+        self.base_dir = Rails.root.join('config', 'settings')
         self.base_paths = [
-            Rails.root.join('config', 'settings', 'settings.yml'),
-            Rails.root.join('config', 'settings', "#{Rails.env}.yml")
+            File.join(base_dir, 'settings.yml'),
+            File.join(base_dir, "#{Rails.env}.yml")
         ]
         self.editable_paths = [
-            Rails.root.join('config', 'settings', "#{Rails.env}.local.yml"),
-            Rails.root.join('config', 'settings', 'settings.local.yml')
+            File.join(base_dir, "#{Rails.env}.local.yml"),
+            File.join(base_dir, 'settings.local.yml')
         ]
       end
 
@@ -75,7 +76,6 @@ module AbAdmin
           value
         end
       end
-
     end
   end
 end

data/lib/ab_admin/models/structure.rb

@@ -21,11 +21,6 @@ module AbAdmin
         scope :with_type, lambda { |structure_type| where(structure_type_id: structure_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_kind, lambda { |structure_type|
-          ActiveSupport::Deprecation.warn('with_kind is deprecated, use with_type instead')
-          with_type.call(structure_type)
-        }
       end
 
       def redirect?
@@ -35,7 +30,6 @@ module AbAdmin
       def admin_title
         [title, structure_type.title, position_type.title, "#{self.class.han(:is_visible)}: #{is_visible ? '+' : '-'}"].join(' | ')
       end
-
     end
   end
 end

data/lib/ab_admin/models/track.rb

@@ -22,6 +22,16 @@ module AbAdmin
         scope :recently, -> { order('id DESC') }
       end
 
+      module ClassMethods
+        def import_from_batch_collection_action(tracks)
+          tracks.each do |track|
+            track.run_callbacks(:save) { false }
+            track.run_callbacks(:create) { false }
+          end
+          ::Track.import(tracks)
+        end
+      end
+
       def action_title(params = {})
         parts = key.split('.')
         lookups = []
@@ -52,10 +62,9 @@ module AbAdmin
       private
 
       def make_trackable
-        self.name ||= trackable.han
-        self.trackable_changes = trackable.changes.except(:updated_at)
+        self.name ||= trackable.han.first(250)
+        self.trackable_changes = trackable.saved_changes.except(:updated_at)
       end
-
     end
   end
 end

data/lib/ab_admin/models/type_model.rb

@@ -51,7 +51,6 @@ module AbAdmin
       rescue I18n::MissingTranslationData
         @code.to_s.humanize
       end
-
     end
   end
 end

data/lib/ab_admin/models/user.rb

@@ -89,7 +89,6 @@ module AbAdmin
       def check_role
         errors.add(:user_role_id, :invalid) unless ::UserRoleType.valid?(user_role_id)
       end
-
     end
   end
 end

data/lib/ab_admin/models/validations/all.rb

@@ -0,0 +1,4 @@
+Dir["#{File.dirname(__FILE__)}/*.rb"].sort.each do |path|
+  next if File.basename(path) == 'all.rb'
+  require "ab_admin/models/validations/#{File.basename(path)}"
+end

data/lib/ab_admin/models/validations/domain_name_validator.rb

@@ -0,0 +1,9 @@
+module ActiveModel
+  module Validations
+    class DomainNameValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        record.errors.add(attribute) unless value.to_s =~ ::AbAdmin::DOMAINNAME_REGEXP
+      end
+    end
+  end
+end

data/lib/ab_admin/models/validations/email_validator.rb

@@ -0,0 +1,9 @@
+module ActiveModel
+  module Validations
+    class EmailValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        record.errors.add(attribute) unless value.to_s =~ ::AbAdmin::EMAIL_REGEXP
+      end
+    end
+  end
+end

data/lib/ab_admin/utils.rb

@@ -5,6 +5,13 @@ module AbAdmin
     autoload :Logger, 'ab_admin/utils/logger'
     autoload :Mysql, 'ab_admin/utils/mysql'
 
+    def all_models
+      Kernel.suppress_warnings do
+        Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').reject { |path| path =~ /concerns|shared/ }.each { |file| require file }
+      end
+      ActiveRecord::Base.direct_descendants
+    end
+
     def load_files!(base_path = 'lib/utils')
       Dir[Rails.root.join("#{base_path}/**/*.rb")].each do |path|
         require_dependency path
@@ -66,10 +73,11 @@ module AbAdmin
       Rails.application.routes.url_helpers
     end
 
-    def full_url(path)
+    def full_url(path, protocol='http://')
       return path if path =~ %r{^(http|//)}
-      host = AbAdmin.base_url || Rails.application.config.action_mailer.default_url_options[:host] || 'www.example.com'
-      "http://#{host}#{path}"
+      duo = Rails.application.config.action_mailer.default_url_options
+      host = AbAdmin.base_url || [duo[:host], duo[:port]].compact.join(':') || 'www.example.com'
+      "#{protocol}#{host}#{path}"
     end
 
     def js_date_data
@@ -142,7 +150,7 @@ module AbAdmin
     end
 
     def friendly_token(n=10)
-      SecureRandom.base64(n * 2).tr('+/=', 'xyz').first(n)
+      SecureRandom.base64(n * 2).tr('+/=', 'xyz').first(n).downcase
     end
   end
 end

data/lib/ab_admin/utils/eval_helpers.rb

@@ -88,7 +88,7 @@ module AbAdmin
         exec = options[:exec].nil? ? true : options[:exec]
         case symbol_or_proc
           when Symbol, String
-            obj.send(symbol_or_proc.to_sym)
+            obj.send(symbol_or_proc.to_sym, *options[:attrs])
           when Proc
             if exec
               obj.instance_exec(&symbol_or_proc)

data/lib/ab_admin/utils/logger.rb

@@ -1,7 +1,6 @@
 module AbAdmin
   module Utils
     module Logger
-
       class ExtendedLogger < ::Logger
         def exception(e, options={})
           message = "#{e.message} #{"DATA:#{options[:data].inspect}" if options && options[:data]}"
@@ -19,7 +18,6 @@ module AbAdmin
         logger.formatter = ::Logger::Formatter.new
         logger
       end
-
     end
   end
 end

data/lib/ab_admin/utils/xls_document.rb

@@ -1,4 +1,5 @@
-require 'ruby2xlsx'
+require 'write_xlsx'
+require 'stringio'
 
 module AbAdmin
   module Utils
@@ -10,9 +11,28 @@ module AbAdmin
       end
     end
 
-    class XlsDocument < Ruby2xlsx::Base
+    class XlsDocument
       include AbAdmin::Utils::EvalHelpers
 
+      def initialize(source, options = {})
+        @source = source
+        @options = options
+        @compiled = false
+        @io = ::StringIO.new
+      end
+
+      def workbook
+        @workbook ||= ::WriteXLSX.new(@io)
+      end
+
+      def worksheet
+        @worksheet ||= add_worksheet(worksheet_name)
+      end
+
+      def add_worksheet(*args)
+        @worksheet = workbook.add_worksheet(*args)
+      end
+
       def default_columns
         @default_columns ||= @klass.column_names
       end
@@ -26,7 +46,7 @@ module AbAdmin
       end
 
       def filename
-        @filename ||= [@options[:filename] || "#{@klass.model_name.plural}-#{Time.now.strftime('%Y-%m-%d')}", '.xls'].join
+        @filename ||= [@options[:filename] || "#{@klass.model_name.plural}-#{Time.now.strftime('%Y-%m-%d')}", '.xlsx'].join
       end
 
       def render
@@ -55,8 +75,8 @@ module AbAdmin
         bold = workbook.add_format(bold: 1)
         worksheet.write('A1', columns_names, bold)
 
-        super
-
+        workbook.close
+        @io.string
       end
 
       def worksheet_name
@@ -83,7 +103,6 @@ module AbAdmin
           end
         end
       end
-
     end
   end
 end

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -42,13 +42,13 @@ module AbAdmin
         data = {
             type: options[:type],
             source: options[:source].try(:to_json),
-            model: item.class.model_name.singular,
+            model: options[:model] || item.class.model_name.singular,
             url: options[:url] || "/admin/#{item.class.model_name.plural}/#{item.id}",
             name: attr,
             value: options[:value] || item[attr],
             title: options[:title] || item[attr]
         }
-        link_to admin_pretty_data(data[:title].to_s).html_safe, '#', class: "editable #{options[:class]}", data: data.update(options[:data] || {})
+        link_to admin_pretty_data(data[:title]).html_safe, '#', class: "editable #{options[:class]}", data: data.update(options[:data] || {})
       end
 
       def options_for_ckeditor(options = {})
@@ -121,12 +121,13 @@ module AbAdmin
         image = item.send(options[:assoc])
         return nil unless image
         version = options[:version] || image.class.thumb_size
-        popover_content = "<img class='image_link_popover popover_#{options[:assoc]}' src='#{image.url(options[:full_version])}'></img>"
+        image_url_method = options[:image_url_method] || :url
+        popover_content = "<img class='image_link_popover popover_#{options[:assoc]}' src='#{image.send(image_url_method, options[:full_version])}'></img>"
         popover_data = {content: popover_content, title: AbAdmin.display_name(item)}
 
         html_options = options.delete(:html_options) || {}
         html_options.reverse_merge!(rel: 'popover', remote: options[:remote], data: popover_data)
-        link_to image_tag(image.url(version)), options[:url], html_options
+        link_to image_tag(image.send(image_url_method, version)), options[:url], html_options
       end
 
       def item_image(item, assoc=:photo, size=:thumb)

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -9,6 +9,7 @@ module AbAdmin
         options[:html][:id] ||= 'search_form'
         options[:html][:class] ||= 'pjax-form'
         options[:builder] ||= ::AbAdmin::Views::SearchFormBuilder
+        options[:compact_labels] = settings.dig(:search_form, :compact_labels)
         options[:method] ||= :get
         options[:as] ||= 'q'
         form_for([:admin, object].flatten, *(args << options), &block)
@@ -28,7 +29,7 @@ module AbAdmin
         return name unless search
 
         options = args.first.is_a?(Hash) ? args.shift.dup : {}
-        search_params = params[:q] || {}.with_indifferent_access
+        search_params = (params[:q] || {}).to_h.with_indifferent_access
         attr_name = (options.delete(:column) || attribute).to_s
         default_order = options.delete :default_order
 
@@ -85,8 +86,13 @@ module AbAdmin
           when AbAdmin::Config::ActionItem
             instance_exec(item, &action.data) if action.for_context?(self)
           else
-            meth = "#{resource_instance_name}_short_action_link"
-            send(meth, action, item) if respond_to? meth
+            resource_action_link_method = "#{resource_instance_name}_short_action_link"
+            list_link_method = "#{resource_instance_name}_#{action}_list_link"
+            if respond_to?(list_link_method)
+              send(list_link_method, item)
+            elsif respond_to?(resource_action_link_method)
+              send(resource_action_link_method, action, item)
+            end
         end
       end
 
@@ -110,8 +116,13 @@ module AbAdmin
           when AbAdmin::Config::ActionItem
             instance_exec(&action.data) if action.for_context?(self)
           else
-            meth = "#{resource_instance_name}_action_link"
-            send(meth, action) if respond_to? meth
+            resource_action_link_method = "#{resource_instance_name}_action_link"
+            list_link_method = "#{resource_instance_name}_#{action}_link"
+            if respond_to?(list_link_method)
+              send(list_link_method)
+            elsif respond_to?(resource_action_link_method)
+              send(resource_action_link_method, action)
+            end
         end
       end