activeadmin 1.0.0.pre1 → 1.0.0.pre2

data/lib/active_admin/batch_actions.rb

@@ -8,7 +8,6 @@ ActiveAdmin.before_load do |app|
 
   # Require all the views
   require "active_admin/batch_actions/views/batch_action_form"
-  require "active_admin/batch_actions/views/batch_action_popover"
   require "active_admin/batch_actions/views/selection_cells"
   require "active_admin/batch_actions/views/batch_action_selector"
 

data/lib/active_admin/batch_actions/controller.rb

@@ -27,10 +27,10 @@ module ActiveAdmin
 
       COLLECTION_APPLIES = [
         :authorization_scope,
-        :collection_decorator,
         :filtering,
         :scoping,
-        :includes
+        :includes,
+        :collection_decorator
       ].freeze
 
       def batch_action_collection(only = COLLECTION_APPLIES)

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -53,7 +53,9 @@ module ActiveAdmin
 
       # Path to the batch action itself
       def batch_action_path(params = {})
-        [route_collection_path(params), "batch_action"].join("/")
+        path = [route_collection_path(params), "batch_action"].join("/")
+        query = params.slice(:q, :scope).to_param
+        [path, query].reject(&:blank?).join("?")
       end
 
       private

data/lib/active_admin/callbacks.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
     # Simple callback system. Implements before and after callbacks for
     # use within the controllers.
     #
-    # We didn't use the ActiveSupport callbacks becuase they do not support
+    # We didn't use the ActiveSupport callbacks because they do not support
     # passing in any arbitrary object into the callback method (which we
     # need to do)
 

data/lib/active_admin/csv_builder.rb

@@ -6,8 +6,8 @@ module ActiveAdmin
   #   csv_builder = CSVBuilder.new
   #   csv_builder.column :id
   #   csv_builder.column("Name") { |resource| resource.full_name }
-  #   csv_builder.column(:name, humanize: false)
-  #   csv_builder.column("name", humanize: false) { |resource| resource.full_name }
+  #   csv_builder.column(:name, humanize_name: false)
+  #   csv_builder.column("name", humanize_name: false) { |resource| resource.full_name }
   #
   #   csv_builder = CSVBuilder.new col_sep: ";"
   #   csv_builder = CSVBuilder.new humanize_name: false

data/lib/active_admin/dependency.rb

@@ -1,6 +1,8 @@
 module ActiveAdmin
   module Dependency
-    DEVISE = '~> 3.2'
+    module Requirements
+      DEVISE = '~> 3.2'
+    end
 
     # Provides a clean interface to check for gem dependencies at runtime.
     #
@@ -54,38 +56,38 @@ module ActiveAdmin
     end
 
     class Matcher
+      attr_reader :name
+
       def initialize(name)
-        @name, @spec = name, Gem.loaded_specs[name]
+        @name = name
+      end
+
+      def spec
+        @spec ||= Gem.loaded_specs[name]
+      end
+
+      def spec!
+        spec || raise(DependencyError, "To use #{name} you need to specify it in your Gemfile.")
       end
 
       def match?(*reqs)
-        !!@spec && Gem::Requirement.create(reqs).satisfied_by?(@spec.version)
+        !!spec && Gem::Requirement.create(reqs).satisfied_by?(spec.version)
       end
 
       def match!(*reqs)
-        unless @spec
-          raise DependencyError, "To use #{@name} you need to specify it in your Gemfile."
-        end
-
         unless match? reqs
-          raise DependencyError, "You provided #{@spec.name} #{@spec.version} but we need: #{reqs.join ', '}."
+          raise DependencyError, "You provided #{spec!.name} #{spec!.version} but we need: #{reqs.join ', '}."
         end
       end
 
       include Comparable
 
       def <=>(other)
-        if @spec
-          @spec.version <=> Gem::Version.create(other)
-        else
-          # you'd otherwise get an unhelpful error message:
-          # ArgumentError: comparison of ActiveAdmin::Dependency::Matcher with 2 failed
-          raise DependencyError, "To use #{@name} you need to specify it in your Gemfile."
-        end
+        spec!.version <=> Gem::Version.create(other)
       end
 
       def inspect
-        info = @spec ? "#{@spec.name} #{@spec.version}" : '(missing)'
+        info = spec ? "#{spec.name} #{spec.version}" : '(missing)'
         "<ActiveAdmin::Dependency::Matcher for #{info}>"
       end
     end

data/lib/active_admin/devise.rb

@@ -1,4 +1,4 @@
-ActiveAdmin::Dependency.devise! ActiveAdmin::Dependency::DEVISE
+ActiveAdmin::Dependency.devise! ActiveAdmin::Dependency::Requirements::DEVISE
 
 require 'devise'
 

data/lib/active_admin/dsl.rb

@@ -128,7 +128,7 @@ module ActiveAdmin
       config.menu_item_options = options
     end
 
-    # Set the name of the navigation menu to display. This is mainly used in conjuction with the
+    # Set the name of the navigation menu to display. This is mainly used in conjunction with the
     # `#belongs_to` functionality.
     #
     # @param [Symbol] menu_name The name of the menu to display as the global navigation

data/lib/active_admin/event.rb

@@ -1,33 +1,24 @@
 module ActiveAdmin
 
   class EventDispatcher
-    def initialize
-      @events = {}
-    end
-
-    def clear_all_subscribers!
-      @events = {}
-    end
-
     def subscribe(*event_names, &block)
+      Deprecation.warn "`ActiveAdmin::Event.subscribe` is deprecated, use `ActiveSupport::Notifications.subscribe`"
       event_names.each do |event|
-        @events[event] ||= []
-        @events[event] << block
+        ActiveSupport::Notifications.subscribe event,
+          &wrap_block_for_active_support_notifications(block)
       end
     end
 
-    def subscribers(event)
-      @events[event] || []
+    def dispatch(event, *args)
+      Deprecation.warn "`ActiveAdmin::Event.dispatch` is deprecated, use `ActiveSupport::Notifications.publish`"
+      ActiveSupport::Notifications.publish event, *args
     end
 
-    def dispatch(event, *args)
-      subscribers(event).each do |subscriber|
-        subscriber.call(*args)
-      end
+    def wrap_block_for_active_support_notifications block
+      proc { |event, *args| block.call *args }
     end
   end
 
   # ActiveAdmin::Event is set to a dispatcher
   Event = EventDispatcher.new
-
 end

data/lib/active_admin/filters/active.rb

@@ -0,0 +1,29 @@
+require 'active_admin/filters/humanized'
+
+module ActiveAdmin
+  module Filters
+
+    class Active
+      attr_accessor :filters, :scope
+
+      def initialize(resource_class, params)
+        @resource_class, @params = resource_class, params
+        @scope = humanize_scope
+        @filters = build_filters
+      end
+
+      private
+
+      def build_filters
+        @params[:q] ||= []
+        @params[:q].map { |param| Humanized.new(param) }
+      end
+
+      def humanize_scope
+        scope = @params['scope']
+        scope ? scope.humanize : "All"
+      end
+    end
+
+  end
+end

data/lib/active_admin/filters/forms.rb

@@ -65,13 +65,18 @@ module ActiveAdmin
           buttons = content_tag :div, class: "buttons" do
             f.submit(I18n.t('active_admin.filters.buttons.filter')) +
               link_to(I18n.t('active_admin.filters.buttons.clear'), '#', class: 'clear_filters_btn') +
-              hidden_field_tags_for(params, except: [:q, :page])
+              hidden_field_tags_for(params, except: except_hidden_fields)
           end
 
           f.template.concat buttons
         end
       end
 
+      private
+
+      def except_hidden_fields
+        [:q, :page]
+      end
     end
 
   end

data/lib/active_admin/filters/humanized.rb

@@ -0,0 +1,68 @@
+module ActiveAdmin
+  module Filters
+
+    class Humanized
+      include ActiveAdmin::ViewHelpers
+
+      def initialize(param)
+        @body = param[0]
+        @value = param[1]
+      end
+
+      def value
+        @value.is_a?(::Array) ? @value.compact.join(', ') : @value
+      end
+
+      def body
+        predicate = ransack_predicate_translation
+
+        if current_predicate.nil?
+          predicate = @body.titleize
+        elsif translation_missing?(predicate)
+          predicate = active_admin_predicate_translation
+        end
+
+        "#{parse_parameter_body} #{predicate}".strip
+      end
+
+      private
+
+      def parse_parameter_body
+        return if current_predicate.nil?
+
+        # Accounting for strings that might contain other predicates. Example:
+        # 'requires_approval' contains the substring 'eq'
+        split_string = "_#{current_predicate}"
+
+        @body.split(split_string)
+          .first
+          .gsub('_', ' ')
+          .strip
+          .titleize
+          .gsub('Id', 'ID')
+      end
+
+      def current_predicate
+        @current_predicate ||= predicates.detect { |p| @body.include?(p) }
+      end
+
+      def predicates
+        Ransack::Predicate.names_by_decreasing_length
+      end
+
+      def ransack_predicate_translation
+        I18n.t("ransack.predicates.#{current_predicate}")
+      end
+
+      def active_admin_predicate_translation
+        translation = I18n.t("active_admin.filters.predicates.#{current_predicate}").downcase
+      end
+
+      def translation_missing?(predicate)
+        predicate.downcase.include?('translation missing')
+      end
+
+    end
+
+  end
+end

data/lib/active_admin/filters/resource_extension.rb

@@ -1,3 +1,5 @@
+require 'active_admin/filters/active'
+
 module ActiveAdmin
   module Filters
 
@@ -12,10 +14,11 @@ module ActiveAdmin
       def initialize(*)
         super
         add_filters_sidebar_section
+        add_search_status_sidebar_section
       end
 
       # Returns the filters for this resource. If filters are not enabled,
-      # it will always return an empty array.
+      # it will always return an empty hash.
       #
       # @return [Hash] Filters that apply for this resource
       def filters
@@ -29,11 +32,23 @@ module ActiveAdmin
         @filters_enabled = bool
       end
 
+      # Setter to enable/disable showing current filters on this resource.
+      #
+      # Set to `nil` to inherit the setting from the namespace
+      def current_filters=(bool)
+        @current_filters_enabled = bool
+      end
+
       # @return [Boolean] If filters are enabled for this resource
       def filters_enabled?
         @filters_enabled.nil? ? namespace.filters : @filters_enabled
       end
 
+      # @return [Boolean] If show current filters are enabled for this resource
+      def current_filters_enabled?
+        @current_filters_enabled.nil? ? namespace.current_filters : @current_filters_enabled
+      end
+
       def preserve_default_filters!
         @preserve_default_filters = true
       end
@@ -137,6 +152,38 @@ module ActiveAdmin
         end
       end
 
+      def add_search_status_sidebar_section
+        if current_filters_enabled?
+          self.sidebar_sections << search_status_section
+        end
+      end
+
+      def search_status_section
+        ActiveAdmin::SidebarSection.new :search_status, only: :index, if: -> { params[:q] || params[:scope] } do
+          active = ActiveAdmin::Filters::Active.new(resource_class, params)
+
+          span do
+            h4 I18n.t("active_admin.search_status.headline"), 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
+      end
     end
 
   end

data/lib/active_admin/form_builder.rb

@@ -4,7 +4,7 @@ module Formtastic
     module Base
       def input_wrapping(&block)
         html = super
-        template.concat(html) if template.output_buffer && template.assigns['has_many_block']
+        template.concat(html) if template.output_buffer && template.assigns[:has_many_block]
         html
       end
     end
@@ -60,8 +60,8 @@ module ActiveAdmin
           template.concat has_many_actions(has_many_form, builder_options, "".html_safe)
         end
         
-        template.assign('has_many_block'=> true)
-        contents = without_wrapper { inputs(options, &form_block) }
+        template.assign(has_many_block: true)
+        contents = without_wrapper { inputs(options, &form_block) } || "".html_safe
 
         if builder_options[:new_record]
           contents << js_for_has_many(assoc, form_block, template, builder_options[:new_record], options[:class])
@@ -93,7 +93,7 @@ module ActiveAdmin
         has_many_form.input builder_options[:sortable], as: :hidden
 
         contents << template.content_tag(:li, class: 'handle') do
-          Iconic.icon :move_vertical
+          "MOVE"
         end
       end
 

data/lib/active_admin/generators/boilerplate.rb

@@ -0,0 +1,37 @@
+module ActiveAdmin
+  module Generators
+    class Boilerplate
+      def initialize(class_name)
+        @class_name = class_name
+      end
+
+      def attributes
+        @class_name.constantize.new.attributes.keys
+      end
+
+      def rows
+        attributes.map { |a| row(a) }.join("\n")
+      end
+
+      def row(name)
+        "#   row :#{name.gsub(/_id$/, '')}"
+      end
+
+      def columns
+        attributes.map { |a| column(a) }.join("\n")
+      end
+
+      def column(name)
+        "#   column :#{name.gsub(/_id$/, '')}"
+      end
+
+      def filters
+        attributes.map { |a| filter(a) }.join("\n")
+      end
+
+      def filter(name)
+        "# filter :#{name.gsub(/_id$/, '')}"
+      end
+    end
+  end
+end