ab_admin 0.5.0 → 0.6.0

data/lib/ab_admin/concerns/has_tracking.rb

@@ -24,7 +24,7 @@ module AbAdmin
 
       module ClassMethods
         def tracking_enabled?
-          tracking_enabled && Activity.tracking_enabled
+          tracking_enabled && Track.tracking_enabled
         end
       end
     end

data/lib/ab_admin/concerns/utilities.rb

@@ -20,7 +20,7 @@ module AbAdmin
         def full_truncate(with_destroy=true)
           destroy_all if with_destroy
           truncate!
-          const_get(:Translation).truncate! if respond_to?(:translates?) && translates?
+          const_get(:Translation).truncate! if try!(:translates?)
         end
 
         def all_ids
@@ -90,6 +90,7 @@ module AbAdmin
         end
 
         def all_columns_names
+          ActiveSupport::Deprecation.warn('#all_columns_names is deprecated without replacement')
           if translates?
             column_names + all_translated_attribute_names + translated_attribute_names.map(&:to_s)
           else

data/lib/ab_admin/devise.rb

@@ -2,7 +2,6 @@ require 'devise'
 
 module AbAdmin
   module Devise
-
     def self.config
       {
         controllers: {
@@ -35,6 +34,5 @@ module AbAdmin
     class PasswordsController < ::Devise::PasswordsController
       include ::AbAdmin::Devise::Controller
     end
-
   end
 end

data/lib/ab_admin/engine.rb

@@ -30,7 +30,6 @@ module AbAdmin
         ActionController::Base.helper AbAdmin::Views::AdminNavigationHelpers
         ActionController::Base.helper AbAdmin::Views::ManagerHelpers
       end
-
     end
   end
 end

data/lib/ab_admin/hooks.rb

@@ -1,7 +1,7 @@
 #
 # ***** IMPORTANT *****
 #
-# This file contains some monkeypatching staff and is not required by default.
+# This file requires hook files with some monkeypatching staff and it is not required by default.
 # Please, read code and comments before usage.
 #
 Dir["#{File.dirname(__FILE__)}/hooks/*.rb"].sort.each do |path|

data/lib/ab_admin/hooks/globalize_locale_suffix_accessors.rb

@@ -1,14 +1,20 @@
 # add accessors with locale suffix like `title_en`, `title_de`
 Globalize::ActiveRecord::ClassMethods.module_eval do
   def define_translations_reader_with_locale_suffix(name)
+    translation_attributes = class_variable_defined?(:@@translation_attributes) ? class_variable_get(:@@translation_attributes) : []
+
     define_translations_reader_without_locale_suffix(name)
 
     Globalize.available_locales.each do |locale|
-      define_method :"#{name}_#{locale}" do
+      method_name = "#{name}_#{locale}"
+      define_method method_name.to_sym do
         read_attribute(name, {locale: locale})
       end
+      translation_attributes.push(method_name)
     end
+    class_variable_set(:@@translation_attributes, translation_attributes)
   end
+
   alias_method_chain :define_translations_reader, :locale_suffix
 
   def define_translations_writer_with_locale_suffix(name)
@@ -16,12 +22,33 @@ Globalize::ActiveRecord::ClassMethods.module_eval do
 
     Globalize.available_locales.each do |locale|
       define_method :"#{name}_#{locale}=" do |value|
-        changed_attributes[:"#{name}_#{locale}"] = value unless value == read_attribute(name, {locale: locale})
+        changed_attributes
+        @changed_attributes[:"#{name}_#{locale}"] = value unless value == read_attribute(name, {locale: locale})
         write_attribute(name, value, {locale: locale})
       end
     end
   end
+
   alias_method_chain :define_translations_writer, :locale_suffix
 end
 
+Globalize::ActiveRecord::InstanceMethods.module_eval do
+  private
+
+  # Filters translation attributes from the attribute names.
+  def attributes_for_update(attribute_names)
+    filter_translation_attributes(super)
+  end
+
+  # Filters translation attributes from the attribute names.
+  def attributes_for_create(attribute_names)
+    filter_translation_attributes(super)
+  end
+
+  def filter_translation_attributes(attributes)
+    translation_attributes = self.class.class_variable_get(:@@translation_attributes)
+    attributes.delete_if { |attr| translation_attributes.include? attr }
+  end
+end
+
 Globalize::ActiveRecord::Translation.attr_accessible :locale

data/lib/ab_admin/i18n_tools/model_translator.rb

@@ -26,7 +26,7 @@ module AbAdmin
               }
               @models_i18n_hash[locale]['activerecord']['models'][model.model_name.i18n_key.to_s]= model_i18n
               attributes = model.columns.map(&:name)
-              attributes.concat(model.translated_attribute_names.map(&:to_s)) if model.translates?
+              attributes.concat(model.translated_attribute_names.map(&:to_s)) if model.try!(:translates?)
               attributes.reject! { |el| IGNORE_COLUMNS.include?(el) }
               h[model.model_name.i18n_key.to_s] = attributes.each_with_object({}) do |attr, o|
                 o[attr] = ha(model, attr, locale).presence || attr

data/lib/ab_admin/menu/group.rb

@@ -14,11 +14,20 @@ module AbAdmin
 
         <<-HTML.html_safe
       <li class="dropdown">
-        <a class="dropdown-toggle" href="#{@options[:url] || '#'}" >#{@title}<b class="caret"></b></a>
+        <a class="dropdown-toggle" href="#{@options[:url] || '#'}" >#{title(template)}<b class="caret"></b></a>
         <ul class="dropdown-menu">#{render_nested(template)}</ul>
       <li>
         HTML
       end
+
+      private
+
+      def title(template)
+        return @title unless @options[:badge]
+        badge = call_method_or_proc_on(template, @options[:badge])
+        return @title if !badge || badge == 0
+        "#{@title}&nbsp;<span class='badge badge-#{@options[:badge_type] || 'important'}'>#{badge}</span>".html_safe
+      end
     end
   end
 end

data/lib/ab_admin/menu/item.rb

@@ -24,10 +24,11 @@ module AbAdmin
       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
+        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])
+        return @title if !badge || badge == 0
+        "#{@title}&nbsp;<span class='badge badge-#{@options[:badge_type] || 'important'}'>#{badge}</span>".html_safe
       end
     end
   end

data/lib/ab_admin/models/asset.rb

@@ -48,7 +48,8 @@ module AbAdmin
       end
 
       def thumb_url
-        data.url(self.thumb_size) if image?
+        return unless image?
+        data.versions[thumb_size] ? data.url(thumb_size) : data.url
       end
 
       def format_created_at

data/lib/ab_admin/models/settings.rb

@@ -27,17 +27,28 @@ module AbAdmin
 
       def initialize
         @data = {}
-        @editable_path = find_editable_path
         @paths = find_paths
       end
 
-      def find_editable_path
-        path = editable_paths.detect { |path| File.exists?(path) }
-        path or raise("Create settings file for editing: #{editable_paths.join(' or ')}")
+      def editable
+        return {} unless  editable_path
+        YAML.load_file(editable_path) rescue {}
       end
 
-      def find_paths
-        base_paths.dup.unshift(@editable_path).find_all { |path| File.exists?(path) }
+      def save(raw_config)
+        config = {}
+        raw_config.each do |root_key, root_value|
+          if root_value.is_a?(Hash)
+            config[root_key] ||= {}
+            root_value.each do |key, value|
+              config[root_key][key] = typecast_value(value)
+            end
+          else
+            config[root_key] = typecast_value(root_value)
+          end
+        end
+        return unless editable_path
+        File.open(editable_path, 'w') { |file| file.write config.to_yaml } and self.class.load_config
       end
 
       def all
@@ -47,26 +58,17 @@ module AbAdmin
         @data
       end
 
-      def editable
-        YAML.load_file(@editable_path) rescue {}
+      private
+
+      def editable_path
+        @editable_path ||= editable_paths.detect { |path| File.exists?(path) }
       end
 
-      def save(raw_config)
-        conf = {}
-        raw_config.each do |root_key, root_value|
-          if root_value.is_a?(Hash)
-            conf[root_key] ||= {}
-            root_value.each do |key, value|
-              conf[root_key][key] = case_value(value)
-            end
-          else
-            conf[root_key] = case_value(root_value)
-          end
-        end
-        File.open(@editable_path, 'w') { |file| file.write conf.to_yaml } and self.class.load_config
+      def find_paths
+        base_paths.dup.unshift(editable_path).compact.find_all { |path| File.exists?(path) }
       end
 
-      def case_value(value)
+      def typecast_value(value)
         if %w(true false).include?(value) || value.to_s.is_number?
           YAML::load(value)
         else

data/lib/ab_admin/models/user.rb

@@ -47,10 +47,6 @@ module AbAdmin
         raw_password
       end
 
-      def moderator?
-        has_role?(:admin) || has_role?(:moderator)
-      end
-
       def admin_access?
         moderator?
       end
@@ -59,6 +55,14 @@ module AbAdmin
         has_role?(:default)
       end
 
+      def redactor?
+        has_role?(:redactor)
+      end
+
+      def moderator?
+        has_role?(:admin) || has_role?(:moderator)
+      end
+
       def admin?
         has_role?(:admin)
       end

data/lib/ab_admin/utils.rb

@@ -59,7 +59,7 @@ module AbAdmin
     # normalized to: "<p>div content</p><p>p content</p>"
     def normalize_html(raw_html, options = {}, &block)
       @@sanitizer ||= Sanitizer.new(options)
-      @@sanitizer.normalize_html(raw_html, &block)
+      @@sanitizer.normalize_html(raw_html, options[:sanitize] || {}, &block)
     end
 
     def url_helpers
@@ -93,10 +93,10 @@ module AbAdmin
         @options = options
       end
 
-      def normalize_html(raw_html)
+      def normalize_html(raw_html, options = {})
         return '' if raw_html.blank?
         cleaned_html = raw_html.gsub(CLEAN_HTML_COMMENTS_REGEXP, '')#.gsub(CLEAN_LINE_BREAKS_REGEXP, '<br/>')
-        html = sanitize(cleaned_html, @options[:sanitize] || {})
+        html = sanitize(cleaned_html, options || {})
         doc = Nokogiri::HTML.fragment(html)
         #doc.xpath('comment()').each { |c| c.remove }
         yield doc if block_given?
@@ -142,7 +142,7 @@ module AbAdmin
     end
 
     def friendly_token(n=10)
-      SecureRandom.base64(16).tr('+/=', 'xyz').first(n)
+      SecureRandom.base64(n * 2).tr('+/=', 'xyz').first(n)
     end
   end
 end

data/lib/ab_admin/utils/logger.rb

@@ -6,7 +6,7 @@ module AbAdmin
         def exception(e, options={})
           message = "#{e.message} #{"DATA:#{options[:data].inspect}" if options && options[:data]}"
           backtrace = e.backtrace.map { |l| "#{' ' * 2}#{l}" }.join("\n")
-          error("#{message}\n#{backtrace}\n\n")
+          error("#{e.class} #{message}\n#{backtrace}\n\n")
         end
 
         def reopen

data/lib/ab_admin/version.rb

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

data/lib/ab_admin/views/admin_helpers.rb

@@ -133,6 +133,10 @@ 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))

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -10,6 +10,7 @@ module AbAdmin
         options[:html][:class] ||= 'pjax-form'
         options[:builder] ||= ::AbAdmin::Views::SearchFormBuilder
         options[:method] ||= :get
+        options[:as] ||= 'q'
         form_for([:admin, object].flatten, *(args << options), &block)
       end
 

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

@@ -2,7 +2,7 @@ module AbAdmin
   module Views
     module Inputs
       class CkeditorInput < ::SimpleForm::Inputs::Base
-        def input
+        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)

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

@@ -2,7 +2,7 @@ module AbAdmin
   module Views
     module Inputs
       class ColorInput < ::SimpleForm::Inputs::Base
-        def input
+        def input(wrapper_options=nil)
           value = @builder.object[attribute_name].to_s.sub(/^#|/, '#')
           name = "#{@builder.object_name}[#{attribute_name}]"
           @builder.template.tag(:input, input_html_options.merge(type: 'color', name: name, value: value))

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

@@ -2,8 +2,7 @@ module AbAdmin
   module Views
     module Inputs
       class DateTimePickerInput < ::SimpleForm::Inputs::Base
-
-        def input
+        def input(wrapper_options=nil)
           input_html_options[:value] ||= formated_value
           input_html_classes << input_type
           @builder.text_field(attribute_name, input_html_options)
@@ -38,7 +37,6 @@ module AbAdmin
               "#{attribute_name}_4i"
           end
         end
-
       end
     end
   end

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

@@ -2,7 +2,7 @@ module AbAdmin
   module Views
     module Inputs
       class EditorInput < ::SimpleForm::Inputs::TextInput
-        def input
+        def input(wrapper_options=nil)
           input_html_options[:class] = "#{Array(input_html_options[:class]).join(' ')} do_wysihtml5"
           super
         end

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

@@ -2,14 +2,12 @@ module AbAdmin
   module Views
     module Inputs
       class TokenInput < ::SimpleForm::Inputs::StringInput
-
-        def input
+        def input(wrapper_options=nil)
           attr = options.delete(:assoc) || attribute_name.to_s.sub(/^token_|_id$/, '')
           token_data = object.token_data(attr.to_sym, options.extract!(:geo_order, :c, :sortable))
           input_html_options.reverse_deep_merge!(token_data)
           super
         end
-
       end
     end
   end

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

@@ -11,17 +11,17 @@ module AbAdmin
               file_type: 'image',
               container_id: "#{attribute_name}_#{object.fileupload_guid}",
               multiple: @assoc.collection?,
-              extensions: @assoc.klass.ext_list,
               max_size: @assoc.klass.try(:max_size),
               error: @builder.error(attribute_name)
           }
           @options.reverse_merge!(defaults)
+          @options[:extensions] = @assoc.klass.ext_list if @assoc.klass.ext_list
           @options[:sortable] = @options[:multiple] unless @options.has_key?(:sortable)
           @options[:asset_template] ||= @options[:file_type]
           @options[:container_class] = container_class
         end
 
-        def input
+        def input(wrapper_options=nil)
           title = options[:title] || object.class.han(attribute_name)
           template.capture do
             if @options[:unwrapped]

data/lib/ab_admin/views/search_form_builder.rb

@@ -8,7 +8,7 @@ module AbAdmin
       def input(attr, options={})
         field_type = field_type(attr, options)
         content_tag :div, class: "clearfix #{field_type} #{options[:wrapper_class]}" do
-          send("#{field_type}_field", attr, options)
+          public_send("#{field_type}_field", attr, options)
         end
       end
 
@@ -89,18 +89,14 @@ module AbAdmin
       end
 
       def presence_field(attr, options={})
-        content_tag(:div, class: 'pull-left') do
-          content_tag(:label, class: 'checkbox inline') do
-            param = "#{attr}_present"
-            check_box_tag("q[#{param}]", 1, params[:q][param].to_i == 1, class: 'inline', id: "q_#{attr}") + I18n.t('simple_form.yes')
-          end +
-          content_tag(:label, class: 'checkbox inline') do
-            param = "#{attr}_null"
-            check_box_tag("q[#{param}]", 1, params[:q][param].to_i == 1, class: 'inline') + I18n.t('simple_form.no')
-          end
-        end + label(attr, options[:label], class: 'right-label')
+        yes_no_field(attr, {yes: %w(present 1), no: %w(present 0)}, options)
       end
 
+      def null_field(attr, options={})
+        yes_no_field(attr, {yes: %w(null 0), no: %w(null 1)}, options)
+      end
+
+
       def hidden_field(attr, options={})
         hidden_field_tag("q[#{attr}_eq]", options[:value], options)
       end
@@ -119,7 +115,7 @@ module AbAdmin
         if input_type
           return :select if options[:collection]
           return :string if input_type == :text
-        elsif @object.klass.translates? && @object.klass.translated?(attr)
+        elsif @object.klass.try!(:translates?) && @object.klass.translated?(attr)
           options[:value_attr] = "translations_#{attr}"
           return :string
         elsif assoc = @object.klass.reflect_on_association(attr.to_sym)
@@ -137,6 +133,21 @@ module AbAdmin
             input_type or raise "No available input type for #{attr}"
         end
       end
+
+      private
+
+      def yes_no_field(attr, predicates, options={})
+        content_tag(:div, class: 'pull-left') do
+          content_tag(:label, class: 'checkbox inline') do
+            param = "#{attr}_#{predicates[:yes][0]}"
+            check_box_tag("q[#{param}]", predicates[:yes][1], params[:q][param] == predicates[:yes][1], class: 'inline', id: "q_#{attr}") + I18n.t('simple_form.yes')
+          end +
+          content_tag(:label, class: 'checkbox inline') do
+            param = "#{attr}_#{predicates[:no][0]}"
+            check_box_tag("q[#{param}]", predicates[:no][1], params[:q][param] == predicates[:no][1], class: 'inline') + I18n.t('simple_form.no')
+          end
+        end + label(attr, options[:label], class: 'right-label')
+      end
     end
   end
 end