activeadmin 1.0.0 → 1.1.0

data/lib/active_admin/csv_builder.rb

@@ -30,12 +30,12 @@ module ActiveAdmin
 
     COLUMN_TRANSITIVE_OPTIONS = [:humanize_name].freeze
 
-    def initialize(options={}, &block)
+    def initialize(options = {}, &block)
       @resource = options.delete(:resource)
       @columns, @options, @block = [], options, block
     end
 
-    def column(name, options={}, &block)
+    def column(name, options = {}, &block)
       @columns << Column.new(name, @resource, column_transitive_options.merge(options), block)
     end
 
@@ -45,7 +45,7 @@ module ActiveAdmin
       options      = ActiveAdmin.application.csv_options.merge self.options
       bom          = options.delete :byte_order_mark
       column_names = options.delete(:column_names) { true }
-      csv_options  = options.except :encoding_options
+      csv_options  = options.except :encoding_options, :humanize_name
 
       csv << bom if bom
 

data/lib/active_admin/dependency.rb

@@ -38,7 +38,7 @@ module ActiveAdmin
     #
     # Which is especially useful if you're looking up a gem with dashes in the name.
     #
-    # ActiveAdmin::Dependency['jquery-ui-rails'] < 5
+    # ActiveAdmin::Dependency['jquery-rails'] < 5
     # => false
     #
     def self.method_missing(name, *args)

data/lib/active_admin/devise.rb

@@ -63,11 +63,11 @@ module ActiveAdmin
     end
 
     class RegistrationsController < ::Devise::RegistrationsController
-       include ::ActiveAdmin::Devise::Controller
+      include ::ActiveAdmin::Devise::Controller
     end
 
     class ConfirmationsController < ::Devise::ConfirmationsController
-       include ::ActiveAdmin::Devise::Controller
+      include ::ActiveAdmin::Devise::Controller
     end
 
     def self.controllers_for_filters

data/lib/active_admin/dsl.rb

@@ -116,7 +116,7 @@ module ActiveAdmin
 
       # Either add/remove the batch action
       unless options == false
-        config.add_batch_action( sym, title, options, &block )
+        config.add_batch_action(sym, title, options, &block)
       else
         config.remove_batch_action sym
       end
@@ -137,7 +137,7 @@ module ActiveAdmin
     # Pass a block returning the name of a menu you want rendered for the request, being
     # executed in the context of the controller
     #
-    def navigation_menu(menu_name=nil, &block)
+    def navigation_menu(menu_name = nil, &block)
       config.navigation_menu_name = menu_name || block
     end
 

data/lib/active_admin/filters.rb

@@ -2,6 +2,8 @@ require 'active_admin/filters/dsl'
 require 'active_admin/filters/resource_extension'
 require 'active_admin/filters/formtastic_addons'
 require 'active_admin/filters/forms'
+require 'active_admin/helpers/optional_display'
+require 'active_admin/filters/active_sidebar'
 
 # Add our Extensions
 ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL

data/lib/active_admin/filters/active.rb

@@ -1,29 +1,28 @@
-require 'active_admin/filters/humanized'
+require 'active_admin/filters/active_filter'
 
 module ActiveAdmin
   module Filters
 
     class Active
-      attr_accessor :filters, :scope
+      attr_accessor :filters, :resource
 
-      def initialize(resource_class, params)
-        @resource_class = resource_class
-        @params = params.to_unsafe_h
-        @scope = humanize_scope
-        @filters = build_filters
+      # Instantiate a `Active` object containing collection of current active filters
+
+      # @param resource [ActiveAdmin::Resource] current resource
+      # @param search [Ransack::Search] search object
+      #
+      # @see ActiveAdmin::ResourceController::DataAcces#apply_filtering
+      def initialize(resource, search)
+        @resource = resource
+        @filters = build_filters(search.conditions)
       end
 
       private
 
-      def build_filters
-        filters = @params['q'] || []
-        filters.map{ |param| Humanized.new(param) }
+      def build_filters(conditions)
+        conditions.map { |condition| ActiveFilter.new(resource, condition.dup) }
       end
 
-      def humanize_scope
-        scope = @params['scope']
-        scope ? scope.humanize : "All"
-      end
     end
 
   end

data/lib/active_admin/filters/active_filter.rb

@@ -0,0 +1,87 @@
+module ActiveAdmin
+  module Filters
+
+    class ActiveFilter
+      include ActiveAdmin::ViewHelpers
+
+      attr_reader :resource, :condition, :related_class
+
+      # Instantiate a `ActiveFilter`
+      #
+      # @param resource [ActiveAdmin::Resource] current resource
+      # @param condition [Ransack::Nodes::Condition] applied ransack condition
+      def initialize(resource, condition)
+        @resource = resource
+        @condition = condition
+        @related_class = find_class if find_class?
+      end
+
+      def values
+        condition_values = condition.values.map(&:value)
+        if related_class
+          related_class.find(condition_values)
+        else
+          condition_values
+        end
+      end
+
+      def label
+        # TODO: to remind us to go back to the simpler str.downcase once we support ruby >= 2.4 only.
+        translated_predicate = predicate_name.mb_chars.downcase.to_s
+        if related_class
+          "#{related_class.model_name.human} #{translated_predicate}".strip
+        else
+          "#{attribute_name} #{translated_predicate}".strip
+        end
+      end
+
+      def predicate_name
+        I18n.t("active_admin.filters.predicates.#{condition.predicate.name}",
+               default: ransack_predicate_name)
+      end
+
+      def html_options
+        { class: "current_filter current_filter_#{condition.key}" }
+      end
+
+      private
+
+      def resource_class
+        resource.resource_class
+      end
+
+      def attribute_name
+        resource_class.human_attribute_name(name)
+      end
+
+      #@return Ransack::Nodes::Attribute
+      def condition_attribute
+        condition.attributes[0]
+      end
+
+      def name
+        condition_attribute.attr_name
+      end
+
+      def ransack_predicate_name
+        Ransack::Translate.predicate(condition.predicate.name)
+      end
+
+      def find_class?
+        ['eq', 'in'].include? condition.predicate.arel_predicate
+      end
+
+      # detect related class for Ransack::Nodes::Attribute
+      def find_class
+        if condition_attribute.klass != resource_class && condition_attribute.klass.primary_key == name.to_s
+          condition_attribute.klass
+        else
+          assoc = condition_attribute.klass.reflect_on_all_associations.
+            reject { |r| r.options[:polymorphic] }. #skip polymorphic
+            detect { |r| r.foreign_key.to_s == name.to_s }
+          assoc.class_name.constantize if assoc
+        end
+      end
+    end
+  end
+end

data/lib/active_admin/filters/active_sidebar.rb

@@ -0,0 +1,50 @@
+require 'active_admin/filters/active'
+
+module ActiveAdmin
+  module Filters
+    class ActiveSidebar < ActiveAdmin::SidebarSection
+
+      def initialize
+        super I18n.t("active_admin.search_status.headline"), sidebar_options
+      end
+
+      def block
+        -> do
+          active_filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
+          span do
+            if current_scope
+              h4 I18n.t("active_admin.search_status.current_scope"), style: 'display: inline'
+              b scope_name(current_scope), class: 'current_scope_name', style: "display: inline"
+            end
+            div style: "margin-top: 10px" do
+              h4 I18n.t("active_admin.search_status.current_filters"), style: 'margin-bottom: 10px'
+              ul do
+                if active_filters.filters.blank?
+                  li I18n.t("active_admin.search_status.no_current_filters")
+                else
+                  active_filters.filters.each do |filter|
+                    li filter.html_options do
+                      span do
+                        text_node filter.label
+                      end
+                      b do
+                        text_node filter.values.map { |v| pretty_format(v) }.to_sentence.html_safe
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      protected
+
+      def sidebar_options
+        { only: :index, if: -> { active_admin_config.current_filters_enabled? && (params[:q] || params[:scope]) } }
+      end
+
+    end
+  end
+end

data/lib/active_admin/filters/forms.rb

@@ -41,7 +41,6 @@ module ActiveAdmin
       end
     end
 
-
     # This module is included into the view
     module ViewHelper
 
@@ -58,7 +57,7 @@ module ActiveAdmin
           filters.each do |attribute, opts|
             next if opts.key?(:if)     && !call_method_or_proc_on(self, opts[:if])
             next if opts.key?(:unless) &&  call_method_or_proc_on(self, opts[:unless])
-
+            opts[:input_html] = instance_exec(&opts[:input_html]) if opts[:input_html].is_a?(Proc)
             f.filter attribute, opts.except(:if, :unless)
           end
 

data/lib/active_admin/filters/resource_extension.rb

@@ -1,5 +1,3 @@
-require 'active_admin/filters/active'
-
 module ActiveAdmin
   module Filters
 
@@ -148,35 +146,9 @@ module ActiveAdmin
       end
 
       def add_search_status_sidebar_section
-        self.sidebar_sections << search_status_section
-      end
-
-      def search_status_section
-        ActiveAdmin::SidebarSection.new I18n.t("active_admin.search_status.headline"), only: :index, if: -> {active_admin_config.current_filters_enabled? && (params[:q] || params[:scope]) } do
-          active = ActiveAdmin::Filters::Active.new(resource_class, params)
-
-          span do
-            h4 I18n.t("active_admin.search_status.current_scope"), style: 'display: inline'
-            b active.scope, style: "display: inline"
-
-            div style: "margin-top: 10px" do
-              h4 I18n.t("active_admin.search_status.current_filters"), style: 'margin-bottom: 10px'
-              ul do
-                if active.filters.blank?
-                  li I18n.t("active_admin.search_status.no_current_filters")
-                else
-                  active.filters.each do |filter|
-                    li do
-                      span filter.body
-                      b filter.value
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
+        self.sidebar_sections << ActiveAdmin::Filters::ActiveSidebar.new
       end
+
     end
 
   end

data/lib/active_admin/helpers/settings.rb

@@ -70,7 +70,6 @@ module ActiveAdmin
 
     end
 
-
     # Allows you to define child classes that should receive the same
     # settings, as well as the same default values.
     #

data/lib/active_admin/inputs/datepicker_input.rb

@@ -10,11 +10,11 @@ module ActiveAdmin
       end
 
       private
-        def datepicker_options
-          options = self.options.fetch(:datepicker_options, {})
-          options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
-          { datepicker_options: options }
-        end
+      def datepicker_options
+        options = self.options.fetch(:datepicker_options, {})
+        options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
+        { datepicker_options: options }
+      end
     end
   end
 end

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -7,9 +7,8 @@ module ActiveAdmin
         def to_html
           input_wrapping do
             [ label_html,
-              builder.text_field(gt_input_name, input_html_options(gt_input_name)),
-              template.content_tag(:span, "-", class: "seperator"),
-              builder.text_field(lt_input_name, input_html_options(lt_input_name)),
+              builder.text_field(gt_input_name, input_html_options(gt_input_name, gt_input_placeholder)),
+              builder.text_field(lt_input_name, input_html_options(lt_input_name, lt_input_placeholder)),
             ].join("\n").html_safe
           end
         end
@@ -23,7 +22,7 @@ module ActiveAdmin
           column && column.type == :date ? "#{method}_lteq" : "#{method}_lteq_datetime"
         end
 
-        def input_html_options(input_name = gt_input_name)
+        def input_html_options(input_name = gt_input_name, placeholder = gt_input_placeholder)
           current_value = begin
             #cast value to date object before rendering input
             @object.public_send(input_name).to_s.to_date
@@ -33,8 +32,17 @@ module ActiveAdmin
           { size: 12,
             class: "datepicker",
             maxlength: 10,
+            placeholder: placeholder,
             value: current_value ? current_value.strftime("%Y-%m-%d") : "" }
         end
+
+        def gt_input_placeholder
+          I18n.t("active_admin.filters.predicates.from")
+        end
+
+        def lt_input_placeholder
+          I18n.t("active_admin.filters.predicates.to")
+        end
       end
     end
   end

data/lib/active_admin/inputs/filters/text_input.rb

@@ -23,4 +23,3 @@ module ActiveAdmin
     end
   end
 end
-

data/lib/active_admin/menu.rb

@@ -48,10 +48,10 @@ module ActiveAdmin
       #
       def add(options)
         item = if parent = options.delete(:parent)
-          (self[parent] || add(label: parent)).add options
-        else
-          _add options.merge parent: self
-        end
+                 (self[parent] || add(label: parent)).add options
+               else
+                 _add options.merge parent: self
+               end
 
         yield(item) if block_given?
 

data/lib/active_admin/menu_collection.rb

@@ -86,8 +86,6 @@ module ActiveAdmin
       @menus[menu_name] ||= ActiveAdmin::Menu.new
     end
 
-
-
   end
 
 end

data/lib/active_admin/namespace.rb

@@ -219,7 +219,7 @@ module ActiveAdmin
       end
     end
 
-    # TODO replace `eval` with `Class.new`
+    # TODO: replace `eval` with `Class.new`
     def register_resource_controller(config)
       eval "class ::#{config.controller_name} < ActiveAdmin::ResourceController; end"
       config.controller.active_admin_config = config

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -1,15 +1,11 @@
 module ActiveAdmin
   class Comment < ActiveRecord::Base
 
-    self.table_name = 'active_admin_comments'
+    self.table_name = "#{table_name_prefix}active_admin_comments#{table_name_suffix}"
 
     belongs_to :resource, polymorphic: true
     belongs_to :author,   polymorphic: true
 
-    if defined? ProtectedAttributes
-      attr_accessible :resource, :resource_id, :resource_type, :body, :namespace
-    end
-
     validates_presence_of :body, :namespace, :resource
 
     before_create :set_resource_type

data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb

@@ -12,7 +12,7 @@ module ActiveAdmin
 
         def build(resource)
           @resource = resource
-          @comments = ActiveAdmin::Comment.find_for_resource_in_namespace resource, active_admin_namespace.name
+          @comments = ActiveAdmin::Comment.find_for_resource_in_namespace(resource, active_admin_namespace.name).page(params[:page])
           super(title, for: resource)
           build_comments
         end
@@ -20,11 +20,13 @@ module ActiveAdmin
         protected
 
         def title
-          I18n.t 'active_admin.comments.title_content', count: @comments.count
+          I18n.t 'active_admin.comments.title_content', count: @comments.total_count
         end
 
         def build_comments
           @comments.any? ? @comments.each(&method(:build_comment)) : build_empty_message
+          div page_entries_info(@comments).html_safe, class: 'pagination_information'
+          text_node paginate @comments
           build_comment_form
         end