ab_admin 0.8.3 → 0.9.0

data/config/locales/uk.yml

@@ -105,7 +105,6 @@ uk:
       drop_here: "или бросьте файл(ы) сюда"
       main_image: "Сделать главным"
       max_size: "Макс разм."
-      crop: "Обрезать"
       rotate: "Повернуть"
     form:
       cancel: "Отмена"

data/lib/ab_admin.rb

@@ -9,7 +9,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'
@@ -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,11 +144,8 @@ 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'
@@ -154,46 +160,41 @@ 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 :default_per_page
-  @@default_per_page = 50
-
-  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,
+      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),
+  }
 
   extend Utils
 

data/lib/ab_admin/abstract_resource.rb

@@ -6,7 +6,7 @@ module AbAdmin
       ACTIONS = [:index, :show, :new, :edit, :create, :update, :destroy, :preview, :batch, :rebuild, :custom_action, :history]
     end
 
-    attr_accessor :model, :table, :search, :export, :form, :chart, :modal_form, :show, :preview_path, :actions, :custom_settings,
+    attr_accessor :model, :table, :search, :export, :form, :chart, :map, :modal_form, :show, :preview_path, :actions, :custom_settings,
                   :batch_action_list, :action_items, :disabled_action_items, :resource_action_items, :tree_node_renderer,
                   :parent_resources, :custom_actions, :permitted_params, :scopes
 

data/lib/ab_admin/carrierwave/base_uploader.rb

@@ -1,4 +1,3 @@
-require 'mime/types'
 require 'mini_magick'
 require 'carrierwave/processing/mini_magick'
 
@@ -89,7 +88,7 @@ module AbAdmin
 
       def normalize_filename(raw_filename)
         parameterize_args = ActiveSupport::VERSION::MAJOR > 4 ? {separator: '_'} : '_'
-        I18n.transliterate(raw_filename).parameterize(parameterize_args).gsub(/[\-_]+/, '_').downcase
+        I18n.transliterate(raw_filename).parameterize(**parameterize_args).gsub(/[\-_]+/, '_').downcase
       end
 
       # rename files via move

data/lib/ab_admin/concerns/admin_addition.rb

@@ -12,13 +12,6 @@ module AbAdmin
         self.batch_actions = [:destroy]
       end
 
-      module ClassMethods
-        def for_input_token(r, attr=nil)
-          text = attr ? r[attr] : (r['name_ru'] || r['name'])
-          {id: r.id, text: text}
-        end
-      end
-
       def for_input_token
         {id: id, text: AbAdmin.safe_display_name(self).to_s}
       end
@@ -27,28 +20,6 @@ module AbAdmin
         "#{self.class.model_name.human(count: 1)} ##{self.id} #{AbAdmin.safe_display_name(self)}"
       end
 
-      def translated_any(attr)
-        send(attr).presence || translations.detect { |r| r.send(attr).present? }.try!(attr)
-      end
-
-      def new_changes
-        excluded_attrs = [:updated_at]
-        excluded_attrs += translated_attribute_names if self.class.translates?
-        all_changes = changes.except(*excluded_attrs).map { |k, v| [k, v[1]] }.to_h
-        if self.class.translates?
-          globalize.dirty.each do |attr, changes|
-            changes.each do |change|
-              all_changes["#{attr}_#{change[0]}"] = send("#{attr}_#{change[0]}")
-            end
-          end
-        end
-        all_changes
-      end
-
-      def admin_comments_count_non_zero
-        self[:admin_comments_count].to_i.zero? ? nil : self[:admin_comments_count]
-      end
-
       def token_data(method, options={})
         assoc = self.class.reflect_on_association(method)
         scope = send(method)
@@ -92,7 +63,6 @@ module AbAdmin
         sql = "(#{quoted_order_col} #{predicate} :val OR (#{quoted_order_col} = :val AND #{self.class.quote_column('id')} #{id_predicate} #{id}))"
         scope.where(sql, val: send(order_col)).ransack(query[:q]).result(distinct: true).first
       end
-
     end
   end
 end

data/lib/ab_admin/concerns/translations_macro.rb

@@ -0,0 +1,97 @@
+module AbAdmin
+  module Concerns
+    module TranslationsMacro
+      def translates(*attr_names)
+        options = attr_names.extract_options!
+        setup_translations(options) unless translates?
+        add_translated_attributes(attr_names.map(&:to_sym) - translated_attribute_names)
+      end
+
+      def setup_translations(options)
+        include InstanceMethods
+        extend ClassMethods
+
+        class_attribute :translated_attribute_names, :translation_options
+        self.translated_attribute_names = []
+        self.translation_options = options
+
+        has_many :translations, class_name: translation_class.name, foreign_key: class_name.foreign_key, dependent: :destroy, autosave: true, inverse_of: :translated_model
+      end
+
+      def add_translated_attributes(attr_names)
+        attr_names.each do |attr_name|
+          define_translation_accessors(attr_name)
+          self.translated_attribute_names << attr_name
+        end
+      end
+
+      def define_translation_accessors(attr_name)
+        define_method("#{attr_name}_translation") { translation_for_locale(I18n.locale).try!(:send, attr_name) }
+        define_method("#{attr_name}_translation=") {|v| translation_for_locale(I18n.locale).try!(:send, "#{attr_name}=", v) }
+        alias_method attr_name, "#{attr_name}_translation"
+        alias_method "#{attr_name}=", "#{attr_name}_translation="
+        define_method("#{attr_name}_default"){ translation_for_locale(I18n.default_locale).try!(:send, attr_name) }
+        AbAdmin.translated_locales.each do |l|
+          define_method("#{attr_name}_#{l}") {translation_for_locale(l).try!(:send, attr_name)}
+          define_method("#{attr_name}_#{l}=") {|v| translation_for_locale(l).try!(:send, "#{attr_name}=", v)}
+        end
+      end
+
+      def class_name
+        name.split('::').last
+      end
+
+      def translates?
+        included_modules.include?(InstanceMethods)
+      end
+
+      module InstanceMethods
+        def translation_for_locale(l)
+          return unless AbAdmin.translated_locales.include?(l)
+          translations.detect{|r| r.locale == l.to_s} || translations.new(locale: l.to_s)
+        end
+
+        def translated_attributes
+          translated_attribute_names.map{|attr| [attr, send(attr)] }.to_h.stringify_keys
+        end
+
+        def attributes
+          super.merge!(translated_attributes)
+        end
+      end
+
+      module ClassMethods
+        def translation_class
+          @translation_class ||= begin
+            klass = self.const_defined?(:Translation, false) ? self.const_get(:Translation, false) : self.const_set(:Translation, Class.new(BaseTranslation))
+            klass.belongs_to :translated_model, class_name: self.name, foreign_key: class_name.foreign_key, inverse_of: :translations, touch: translation_options.fetch(:touch, false)
+            klass
+          end
+        end
+
+        def translations_table_name
+          translation_class.table_name
+        end
+
+        def translated?(name)
+          translated_attribute_names.include?(name.to_sym)
+        end
+      end
+    end
+
+    class BaseTranslation < ::ActiveRecord::Base
+      self.abstract_class = true
+
+      validates :locale, presence: true
+      after_initialize :init
+
+      def init
+        self.locale ||= I18n.locale.to_s
+      end
+
+      def self.table_exists?
+        table_name.present? && super
+      end
+    end
+  end
+end

data/lib/ab_admin/concerns/utilities.rb

@@ -85,7 +85,7 @@ module AbAdmin
 
         def all_translated_attribute_names
           if translates?
-            ::Globalize.available_locales.map do |loc|
+            AbAdmin.translated_locales.map do |loc|
               translated_attribute_names.map { |attr| "#{attr}_#{loc}" }
             end.flatten
           else

data/lib/ab_admin/config/base.rb

@@ -23,6 +23,9 @@ module AbAdmin
             next if column_name == :id || options[:skip].try(:include?, column_name)
             builder.field(column_name)
           end
+          model.translated_attribute_names.each do |column_name|
+            builder.field(column_name, sortable: false)
+          end if model.translates?
         end
       end
     end
@@ -39,6 +42,10 @@ module AbAdmin
       self.partial_name = 'chart'
     end
 
+    class Map < BaseBuilder
+      self.partial_name = 'map'
+    end
+
     class Export < BaseBuilder
       def render_options
         {column_names: fields.map(&:name), column_data: fields.map(&:data),

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,13 +1,7 @@
 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
+  # TOREMOVE after ruby 2.7.0
+  def tally
+    each_with_object(Hash.new(0)) { |v, h| h[v] += 1 }
   end
 
   def deep_merge_hashes
@@ -22,30 +16,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 +29,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
-