ab_admin 0.8.3 → 0.9.0

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.8.3'
+  VERSION = '0.9.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -1,7 +1,6 @@
 module AbAdmin
   module Views
     module AdminHelpers
-
       def admin_form_for(object, *args, &block)
         record = Array(object).last
         record.fallbacks_for_empty_translations = false if record.respond_to?(:fallbacks_for_empty_translations)
@@ -21,11 +20,11 @@ module AbAdmin
         end
       end
 
-      def editable_bool(item, attr, label: nil)
+      def editable_bool(item, attr, label: nil, wrapper_class: nil)
         url = "/admin/#{item.class.model_name.plural}/#{item.id}.json"
         html = check_box_tag("#{item.class.model_name.singular}[#{attr}]", '1', item.send(attr), class: 'js-auto-submit-checkbox', data: {url: url})
         html = content_tag(:label, "#{label} #{html}".html_safe) if label
-        content_tag :div, html, class: 'auto-submit-checkbox-wrap white-space-nowrap'
+        content_tag :div, html, class: ['auto-submit-checkbox-wrap', 'white-space-nowrap', ('tool' unless label), wrapper_class], title: attr
       end
 
       def admin_editable(item, attr, opts=nil)
@@ -82,7 +81,7 @@ module AbAdmin
       end
 
       def options_for_ckeditor(options = {})
-        {width: 930, height: 200, toolbar: 'VeryEasy', namespace: ''}.update(options)
+        {width: 930, height: 200, namespace: ''}.update(options)
       end
 
       def admin_tree_item(item)
@@ -97,13 +96,13 @@ module AbAdmin
       def admin_layout_css
         css = []
         css << 'content_with_sidebar' if settings[:sidebar] || content_for?(:sidebar)
-        css << 'well' if settings[:well] && current_index_view != 'tree'
-        css << "#{current_index_view}_view"
+        css << 'well' if !@settings[:well].is_a?(FalseClass) && (collection_action? || %w(show history).include?(action_name)) && @settings[:current_index_view] != :tree
+        css << "#{settings[:current_index_view]}_view"
         css
       end
 
       def admin_title
-        base = @breadcrumbs ? @breadcrumbs.map_val(:name).reverse : []
+        base = @breadcrumbs ? @breadcrumbs.map{|b| b[:name] }.reverse : []
         base << @page_title || 'Ab Admin'
         base.join(' - ')
       end
@@ -127,6 +126,10 @@ module AbAdmin
         "<i class='icon-#{name} #{'icon-white' if white}'></i> ".html_safe
       end
 
+      def locale_flag(code)
+        (AbAdmin.locale_to_country_code[code] || code).to_s[0..1].upcase.tr('A-Z', '🇦-🇿')
+      end
+
       def admin_pretty_data(object)
         case object
           when String, Integer, BigDecimal, Float
@@ -167,10 +170,6 @@ module AbAdmin
         image_tag_if(item.send(assoc).try(:url, size))
       end
 
-      def per_page_variants
-        AbAdmin.per_page_variants.map{|variant| [variant, max_per_page].min }.uniq
-      end
-
       # input_set 'title', legend_class: 'do_sort', label_class: 'label-info' do
       def input_set(title, options={}, &block)
         options.reverse_merge!(class: "inputs well well-small clearfix #{options.delete(:legend_class) || 'do_sort'}", id: options.delete(:legend_id))
@@ -191,7 +190,6 @@ module AbAdmin
         exec = options[:exec].nil? ? true : options[:exec]
         case symbol_or_proc
           when String
-            ActiveSupport::Deprecation.warn('`call_method_or_proc_on` don\'t accept method name as String, use Symbol instead') if symbol_or_proc =~ /\A\w+\z/
             symbol_or_proc
           when Symbol
             obj.send(symbol_or_proc.to_sym)

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -16,7 +16,7 @@ module AbAdmin
       end
 
       def list_sort_link(attribute, options={})
-        adapter = options[:adapter] || @search
+        adapter = options[:adapter] || ransack_collection
         if adapter && adapter.klass == resource_class
           sort_link(adapter, attribute, options)
         else
@@ -25,7 +25,7 @@ module AbAdmin
       end
 
       def sort_link(adapter, attribute, options={})
-        name = options[:title] || (attribute.is_a?(Symbol) ? ha(attribute) : attribute)
+        name = options.delete(:title) || (attribute.is_a?(Symbol) ? ha(attribute) : attribute)
         return name unless adapter
         search_params = (params[:q] || {}).to_h.with_indifferent_access
         attr_name = (options.delete(:column) || attribute).to_s
@@ -48,7 +48,7 @@ module AbAdmin
         html_options = options.delete(:html_options) || {}
         html_options[:class] = ['sort_link', current_dir, html_options[:class]].compact.join(' ')
 
-        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"), **scope_params)
+        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"), **collection_params)
         link_to [name, order_indicator_for(current_dir)].join(' ').html_safe, url_for(options), html_options
       end
 
@@ -62,8 +62,8 @@ module AbAdmin
         end
       end
 
-      def scope_params
-        params.slice(*button_scopes.map(&:first)).permit!.to_h.symbolize_keys
+      def collection_params
+        params.slice(:index_view, *button_scopes.map(&:first)).permit!.to_h.symbolize_keys
       end
 
       def short_action_link(action, item)
@@ -167,8 +167,7 @@ module AbAdmin
         if total_entries.zero?
           t('will_paginate.pagination_info_empty')
         else
-          per_page = (params[:per_page] || resource_class.per_page).to_i
-          t('will_paginate.pagination_info', from: offset + 1, to: [offset + per_page, total_entries].min, count: total_entries).html_safe
+          t('will_paginate.pagination_info', from: offset + 1, to: [offset + settings[:per_page], total_entries].min, count: total_entries).html_safe
         end
       end
 
@@ -192,7 +191,7 @@ module AbAdmin
       end
 
       def admin_comments_button(item)
-        title = [icon('comment', true), item.admin_comments_count_non_zero].compact.join(' ').html_safe
+        title = [icon('comment', true), (item.admin_comments_count unless item.admin_comments_count.zero?)].compact.join(' ').html_safe
         link_to title, admin_admin_comments_path(resource_type: item.class.name, resource_id: item.id), remote: true,
                 class: 'btn btn-info list_admin_comments_link'
       end

data/lib/ab_admin/views/form_builder.rb

@@ -93,21 +93,23 @@ module AbAdmin
         return if @disable_all
         model = @object.class.reflect_on_association(assoc).klass
         title = [@template.icon('plus', true), I18n.t('admin.add'), options[:title] || model.model_name.human].join(' ').html_safe
-        link_to_add title, assoc, class: "btn btn-primary #{options[:class]}"
+        options[:class] = "btn btn-primary #{options[:class]}"
+        link_to_add title, assoc, options
       end
 
-      def link_to_remove_assoc
+      def link_to_remove_assoc(options={})
         return if @disable_all
-        link_to_remove @template.icon('trash', true) + I18n.t('admin.delete'), class: 'btn btn-danger btn-mini pull-right'
+        options[:class] ||= 'btn btn-danger btn-mini pull-right'
+        link_to_remove @template.icon('trash', true) + I18n.t('admin.delete'), options
       end
 
       def locale_tabs(options={}, &block)
         locale_html = {}
-        options[:locales] ||= Globalize.available_locales
+        options[:locales] ||= AbAdmin.translated_locales
         options[:locales].each do |l|
           locale_html[l] = template.capture { block.call(l) }
         end
-        template.render 'admin/shared/locale_tabs', locale_html: locale_html, locales: options[:locales]
+        template.render 'admin/shared/locale_tabs', locale_html: locale_html, locales: options[:locales], tab_nav: options[:tab_nav]
       end
 
       def save_buttons

data/lib/ab_admin/views/helpers.rb

@@ -1,15 +1,6 @@
 module AbAdmin
   module Views
     module Helpers
-
-      def admin?
-        user_signed_in? && current_user.admin?
-      end
-
-      def moderator?
-        user_signed_in? && current_user.moderator?
-      end
-
       def as_html(text)
         return ''.html_safe if text.nil?
         Nokogiri::HTML.fragment(text).to_html.html_safe

data/lib/ab_admin/views/inputs/ckeditor_input.rb

@@ -3,11 +3,11 @@ module AbAdmin
     module Inputs
       class CkeditorInput < ::SimpleForm::Inputs::Base
         def input(wrapper_options=nil)
-          unless @builder.template.instance_variable_get(:@ckeditor_init)
-            @builder.template.concat @builder.template.javascript_include_tag('/javascripts/ckeditor/init')
-            @builder.template.instance_variable_set(:@ckeditor_init, true)
+          unless @builder.template.instance_variable_get(:@ckeditor_loaded)
+            @builder.template.concat @builder.template.javascript_include_tag(Ckeditor.cdn_url)
+            @builder.template.instance_variable_set(:@ckeditor_loaded, true)
           end
-          input_html_options.reverse_merge!({width: 800, height: 200, toolbar: 'Easy'})
+          input_html_options.reverse_merge!({width: 800, height: 200})
           @builder.cktext_area(attribute_name, input_html_options)
         end
       end

data/lib/ab_admin/views/manager_helpers.rb

@@ -1,9 +1,6 @@
 module AbAdmin
   module Views
     module ManagerHelpers
-
-      INDEX_VIEW_ICONS = {table: 'list', tree: 'move', grid: 'th', chart: 'signal'}
-
       def table_builder
         manager.table ||= ::AbAdmin::Config::Table.default_for_model(resource_class)
       end
@@ -20,6 +17,10 @@ module AbAdmin
         manager.chart ||= ::AbAdmin::Config::Chart.default_for_model(resource_class)
       end
 
+      def map_builder
+        manager.map ||= ::AbAdmin::Config::Map.default_for_model(resource_class)
+      end
+
       def modal_form_builder
         manager.modal_form ||= ::AbAdmin::Config::ModalForm.default_for_model(resource_class, skip: [:id, :created_at, :updated_at, :lft, :rgt, :depth])
       end
@@ -52,10 +53,12 @@ module AbAdmin
         end
       end
 
+      INDEX_VIEW_ICONS = {table: 'list', tree: 'move', grid: 'th', chart: 'signal', map: 'map-marker', stats: 'eye-open'}
       def index_view_link(index_view)
-        options = {class: "btn #{('active' if current_index_view == index_view)}", title: t("admin.index_view.#{index_view}", default: index_view.to_s)}
+        options = {class: "btn tool tool-bottom #{('active' if settings[:current_index_view] == index_view)}", title: t("admin.index_view.#{index_view}", default: index_view.to_s)}
         url = url_for({index_view: index_view, q: params[:q]}.reject_blank)
-        link_to icon(INDEX_VIEW_ICONS[index_view.to_sym]), url, options
+        title = INDEX_VIEW_ICONS[index_view.to_sym] ? icon(INDEX_VIEW_ICONS[index_view.to_sym]) : index_view
+        link_to title, url, options
       end
     end
   end

data/lib/ab_admin/views/search_form_builder.rb

@@ -59,7 +59,7 @@ 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[#{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}")
         end
       end
@@ -68,7 +68,7 @@ module AbAdmin
         if builder_options[:compact_labels]
           options[:input_html] ||= {}
           options[:input_html][:placeholder] ||= extract_label(attr, options)
-          wrapper_html = {'class' => 'controls js-tooltip', 'data-placement' => 'left', 'title' => options[:input_html][:placeholder]}
+          wrapper_html = {'class' => 'controls tool tool-left', 'data-placement' => 'left', 'title' => options[:input_html][:placeholder]}
           content_tag(:div, wrapper_html, &block)
         else
           label(attr, options[:label]) + content_tag(:div, class: 'controls', &block)

data/lib/ab_admin/views/will_paginate_bootstrap_renderer.rb

@@ -0,0 +1,60 @@
+# Extracted from `will_paginate-bootstrap` (v0.2.5 written by Nicholas Dainty) because of some deprecated staff
+require "will_paginate/view_helpers/action_view"
+module AbAdmin
+  module Views
+    class WillPaginateBootstrapRenderer < WillPaginate::ActionView::LinkRenderer
+      # Contains functionality shared by all renderer classes.
+      ELLIPSIS = "&hellip;"
+
+      def to_html
+        list_items = pagination.map do |item|
+          item.is_a?(Integer) ? page_number(item) : send(item)
+        end.join(@options[:link_separator])
+
+        if @options[:bootstrap].to_i >= 3
+          tag("ul", list_items, class: "pagination")
+        else
+          html_container(tag("ul", list_items))
+        end
+      end
+
+      def container_attributes
+        @container_attributes ||= @options.except(*(WillPaginate::ViewHelpers.pagination_options.keys + [:renderer, :link_options] - [:class]))
+      end
+
+      protected
+
+      def page_number(page)
+        link_options = @options[:link_options] || {}
+        if page == current_page
+          tag("li", tag("span", page), class: "active")
+        else
+          tag("li", link(page, page, link_options.merge(rel: rel_value(page))))
+        end
+      end
+
+      def gap
+        tag("li", link(ELLIPSIS, "#"), class: "disabled")
+      end
+
+      def previous_page
+        num = @collection.current_page > 1 && @collection.current_page - 1
+        previous_or_next_page(num, @options[:previous_label], "prev")
+      end
+
+      def next_page
+        num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
+        previous_or_next_page(num, @options[:next_label], "next")
+      end
+
+      def previous_or_next_page(page, text, classname)
+        link_options = @options[:link_options] || {}
+        if page
+          tag("li", link(text, page, link_options), class: classname)
+        else
+          tag("li", tag("span", text), class: "%s disabled" % classname)
+        end
+      end
+    end
+  end
+end

data/lib/generators/ab_admin/glob/glob_generator.rb

@@ -2,7 +2,7 @@ require 'rails/generators/active_record'
 module AbAdmin
   module Generators
     class GlobGenerator < ActiveRecord::Generators::Base
-      desc 'Generates migration for models without globalize tables'
+      desc 'Generates migration for models without translations tables'
 
       source_root File.expand_path('../templates', __FILE__)
 
@@ -17,18 +17,18 @@ module AbAdmin
       def model_attrs
         @model_attrs ||= begin
           models.each_with_object({}) do |m, h|
-            h[m.name] = m.translated_attribute_names.map { |attr| "#{attr}: :#{get_type(attr)}" }.join(', ')
+            h[m.name] = m.translated_attribute_names.map { |attr| [attr, get_type(attr)] }
           end
         end
       end
 
       def migration_name
-        "create_globalize_#{models.map { |m| m.model_name.singular }.join('_')}"
+        "create_translations_#{models.map { |m| m.model_name.singular }.join('_')}"
       end
 
       def models
         @models ||= begin
-          all_translated.reject { |m| conn.data_source_exists? m.translations_table_name }
+          all_translated.reject { |m| conn.data_source_exists? m.translation_class.table_name }
         end
       end
 
@@ -53,7 +53,6 @@ module AbAdmin
             :string
         end
       end
-
     end
   end
 end

data/lib/generators/ab_admin/glob/templates/migration.erb

@@ -1,13 +1,16 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
-  def up
+  def change
     <%- models.each do |m| -%>
-    <%= m.name %>.create_translation_table! <%= model_attrs[m.name] %>
-    <%- end -%>
-  end
+    create_table :<%= m.model_name.singular %>_translations do |t|
+      t.references :<%= m.model_name.singular %>, null: false
+      t.string :locale, limit: 5, null: false
+      <%- model_attrs[m.name].each do |attr, type| -%>
+      t.<%= type %> :<%= attr %>
+      <%- end -%>
 
-  def down
-    <%- models.each do |m| -%>
-    <%= m.name %>.drop_translation_table!
+      t.timestamps
+    end
+    add_index :<%= m.model_name.singular %>_translations, [:<%= m.model_name.singular %>_id, :locale], unique: true, name: '<%= m.table_name %>_ts_<%= m.model_name.singular %>_id_locale'
     <%- end -%>
   end
 end

data/lib/generators/ab_admin/install/templates/config/ab_admin.rb.erb

@@ -1,6 +1,6 @@
 require 'ab_admin/hooks'
 
-I18n.available_locales = Globalize.available_locales = [:ru, :en]
+I18n.available_locales = AbAdmin.translated_locales = [:en]
 
 AbAdmin.setup do |config|
   config.site_name = '<%= app_const_base.titleize %>'

data/lib/generators/ab_admin/install/templates/models/user.rb

@@ -8,15 +8,4 @@ class User < ApplicationRecord
 
   fileuploads :avatar
 
-  def init
-    set_default_role
-    self.locale ||= 'ru'
-    self.time_zone ||= 'Kiev'
-  end
-
-  def password_required?
-    return true if password.present?
-    return false if persisted? && password.blank?
-    super
-  end
 end

data/lib/generators/ab_admin/install/templates/spec/spec_helper.rb

@@ -15,5 +15,4 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :controller
   config.include MailerMacros
   config.before(:each) { reset_email }
-
 end

data/lib/generators/ab_admin/install/templates/spec/support/database_cleaner.rb

@@ -1,17 +1,14 @@
-RSpec.configure do |config|
-  config.use_transactional_fixtures = false
+require 'database_cleaner'
 
-  config.before :all do
+RSpec.configure do |config|
+  config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata countries country_translations))
   end
 
-  config.before :each do
-    DatabaseCleaner.start
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
   end
-
-  config.after :each do
-    DatabaseCleaner.clean
-  end
-
 end

data/lib/generators/ab_admin/model/model_generator.rb

@@ -31,17 +31,16 @@ module AbAdmin
       protected
 
       def model_instance
-        @model_instance ||= model.new
+        model.new
       end
 
       def translated_columns
-        @translated_columns ||= model.respond_to?(:translated_attribute_names) ? model.translated_attribute_names.map(&:to_s) : []
+        model.respond_to?(:translated_attribute_names) ? model.translated_attribute_names.map(&:to_s) : []
       end
 
       def index_attrs
-        @attrs ||= model_instance.attributes.keys.map(&:to_s)
+        model_instance.attributes.keys.map(&:to_s)
       end
-
     end
   end
 end