activeadmin 1.0.0 → 1.1.0

data/lib/active_admin/page_controller.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
 
     before_action :authorize_access!
 
-    def index(options={}, &block)
+    def index(options = {}, &block)
       render "active_admin/page/index"
     end
 

data/lib/active_admin/resource/action_items.rb

@@ -106,6 +106,10 @@ module ActiveAdmin
       @block = block
       normalize_display_options!
     end
+
+    def html_class
+      "action_item #{@options[:class]}".rstrip
+    end
   end
 
 end

data/lib/active_admin/resource/attributes.rb

@@ -41,4 +41,4 @@ module ActiveAdmin
 
     end
   end
-end
+end

data/lib/active_admin/resource/page_presenters.rb

@@ -33,7 +33,7 @@ module ActiveAdmin
       # @param [Symbol, String] action The action to get the config for
       # @param [String] type The string specified in the presenters index_name method
       # @return [PagePresenter, nil]
-      def get_page_presenter(action, type=nil)
+      def get_page_presenter(action, type = nil)
 
         if action.to_s == "index" && type && page_presenters[:index].kind_of?(Hash)
           page_presenters[:index][type.to_sym]

data/lib/active_admin/resource/routes.rb

@@ -102,7 +102,6 @@ module ActiveAdmin
           route.compact.join('_').to_sym      # :admin_category_posts_path
         end
 
-
         # @return params to pass to instance path
         def route_instance_params(instance)
           if nested?

data/lib/active_admin/resource/scopes.rb

@@ -27,7 +27,8 @@ module ActiveAdmin
       # If you want to internationalize the scope name, you can add
       # to your i18n files a key like "active_admin.scopes.scope_method".
       def scope(*args, &block)
-        options = args.extract_options!
+        default_options = {show_count: namespace.scopes_show_count}
+        options = default_options.merge(args.extract_options!)
         title = args[0] rescue nil
         method = args[1] rescue nil
 

data/lib/active_admin/resource_controller.rb

@@ -52,7 +52,7 @@ module ActiveAdmin
     def restrict_format_access!
       unless request.format.html?
         presenter = active_admin_config.get_page_presenter(:index)
-        download_formats  = (presenter || {}).fetch(:download_links, active_admin_config.namespace.download_links)
+        download_formats = (presenter || {}).fetch(:download_links, active_admin_config.namespace.download_links)
         unless build_download_formats(download_formats).include?(request.format.symbol)
           raise ActiveAdmin::AccessDenied.new(current_active_admin_user, :index)
         end

data/lib/active_admin/resource_controller/data_access.rb

@@ -14,6 +14,8 @@ module ActiveAdmin
           include ScopeChain
 
           define_active_admin_callbacks :build, :create, :update, :save, :destroy
+
+          helper_method :current_scope
         end
       end
 
@@ -45,7 +47,6 @@ module ActiveAdmin
         end
       end
 
-
       # Does the actual work of retrieving the current collection from the db.
       # This is a great method to override if you would like to perform
       # some additional db # work before your controller returns and
@@ -60,7 +61,6 @@ module ActiveAdmin
         collection
       end
 
-
       # Override this method in your controllers to modify the start point
       # of our searches and index.
       #
@@ -103,7 +103,6 @@ module ActiveAdmin
         scoped_collection.send method_for_find, params[:id]
       end
 
-
       # Builds, memoize and authorize a new instance of the resource. The
       # actual work of building the new instance is delegated to the
       # #build_new_resource method.
@@ -180,12 +179,10 @@ module ActiveAdmin
         end
       end
 
-
       #
       # Collection Helper Methods
       #
 
-
       # Gives the authorization library a change to pre-scope the collection.
       #
       # In the case of the CanCan adapter, it calls `#accessible_by` on
@@ -241,13 +238,15 @@ module ActiveAdmin
 
       def current_scope
         @current_scope ||= if params[:scope]
-          active_admin_config.get_scope_by_id(params[:scope])
-        else
-          active_admin_config.default_scope(self)
-        end
+                             active_admin_config.get_scope_by_id(params[:scope])
+                           else
+                             active_admin_config.default_scope(self)
+                           end
       end
 
       def apply_pagination(chain)
+        # skip pagination if already was paginated by scope
+        return chain if chain.respond_to?(:total_pages)
         page_method_name = Kaminari.config.page_method_name
         page = params[Kaminari.config.param_name]
 

data/lib/active_admin/resource_dsl.rb

@@ -105,7 +105,7 @@ module ActiveAdmin
     #     column :name
     #   end
     #
-    def csv(options={}, &block)
+    def csv(options = {}, &block)
       options[:resource] = config
 
       config.csv_builder = CSVBuilder.new(options, &block)
@@ -192,17 +192,17 @@ module ActiveAdmin
       :around, :skip
     ]
     keywords = if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 1
-                       [:action]
-                     else
-                       [:action, :filter]
-                     end
+                 [:action]
+               else
+                 [:action, :filter]
+               end
 
     keywords.each do |name|
-       phases.each do |action|
-        define_method "#{action}_#{name}" do |*args, &block|
-          controller.public_send "#{action}_action", *args, &block
-        end
-      end
+      phases.each do |action|
+       define_method "#{action}_#{name}" do |*args, &block|
+         controller.public_send "#{action}_action", *args, &block
+       end
+     end
     end
 
     # Specify which actions to create in the controller

data/lib/active_admin/router.rb

@@ -71,7 +71,7 @@ module ActiveAdmin
     def resource_routes(config)
       Proc.new do
         # Builds one route for each HTTP verb passed in
-        build_route  = proc{ |verbs, *args|
+        build_route = proc{ |verbs, *args|
           [*verbs].each{ |verb| send verb, *args }
         }
         # Deals with +ControllerAction+ instances

data/lib/active_admin/scope.rb

@@ -46,9 +46,9 @@ module ActiveAdmin
 
     def name
       case @name
-        when String then @name
-        when Symbol then @localizer ? @localizer.t(@name, scope: 'scopes') : @name.to_s.titleize
-        else             @name
+      when String then @name
+      when Symbol then @localizer ? @localizer.t(@name, scope: 'scopes') : @name.to_s.titleize
+      else @name
       end
     end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/active_admin/view_helpers.rb

@@ -14,6 +14,7 @@ module ActiveAdmin
     include TitleHelper
     include ViewFactoryHelper
     include FlashHelper
+    include ScopeNameHelper
 
   end
 end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -82,7 +82,7 @@ module ActiveAdmin
       def boolean_attr?(resource, attr, value)
         case value
         when TrueClass, FalseClass
-           true
+          true
         else
           if resource.class.respond_to? :columns_hash
             column = resource.class.columns_hash[attr.to_s] and column.type == :boolean

data/lib/active_admin/view_helpers/form_helper.rb

@@ -8,7 +8,7 @@ module ActiveAdmin
         end.content
       end
 
-      def hidden_field_tags_for(params, options={})
+      def hidden_field_tags_for(params, options = {})
         fields_for_params(params.to_unsafe_hash, options).map do |kv|
           k, v = kv.first
           hidden_field_tag k, v, id: sanitize_to_id("hidden_active_admin_#{k}")

data/lib/active_admin/view_helpers/scope_name_helper.rb

@@ -0,0 +1,16 @@
+module ActiveAdmin
+  module ViewHelpers
+    module ScopeNameHelper
+
+      def scope_name(scope)
+        case scope.name
+        when Proc then
+          self.instance_exec(&scope.name).to_s
+        else
+          scope.name.to_s
+        end
+      end
+
+    end
+  end
+end

data/lib/active_admin/views/action_items.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
 
       def build(action_items)
         action_items.each do |action_item|
-          span class: "action_item" do
+          span class: action_item.html_class do
             instance_exec(&action_item.block)
           end
         end

data/lib/active_admin/views/components/active_admin_form.rb

@@ -78,7 +78,7 @@ module ActiveAdmin
       end
 
       def add_create_another_checkbox
-        if %w(new create).include?(helpers.action_name) &&  active_admin_config && active_admin_config.create_another
+        if %w(new create).include?(helpers.action_name) && active_admin_config && active_admin_config.create_another
           current_arbre_element.add_child(create_another_checkbox)
         end
       end

data/lib/active_admin/views/components/dropdown_menu.rb

@@ -26,10 +26,10 @@ module ActiveAdmin
         options = options.dup
 
         # Easily set options for the button or menu
-        button_options  = options.delete(:button) || {}
+        button_options = options.delete(:button) || {}
         menu_options = options.delete(:menu) || {}
 
-        @button  = build_button(name, button_options)
+        @button = build_button(name, button_options)
         @menu = build_menu(menu_options)
 
         super(options)

data/lib/active_admin/views/components/index_list.rb

@@ -67,5 +67,3 @@ module ActiveAdmin
     end
   end
 end
-
-

data/lib/active_admin/views/components/paginated_collection.rb

@@ -92,7 +92,7 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = {}
+        options = { theme: 'active_admin' }
         options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 

data/lib/active_admin/views/components/scopes.rb

@@ -12,7 +12,6 @@ module ActiveAdmin
       include ActiveAdmin::ScopeChain
       include ::ActiveAdmin::Helpers::Collection
 
-
       def default_class_name
         "scopes table_tools_segmented_control"
       end
@@ -31,11 +30,10 @@ module ActiveAdmin
 
       def build_scope(scope, options)
         li class: classes_for_scope(scope) do
-          scope_name = I18n.t "active_admin.scopes.#{scope.id}", default: name_for_scope(scope)
-          params     = request.query_parameters.except :page, :scope, :commit, :format
+          params = request.query_parameters.except :page, :scope, :commit, :format
 
           a href: url_for(scope: scope.id, params: params), class: 'table_tools_button' do
-            text_node scope_name
+            text_node scope_name(scope)
             span class: 'count' do
               "(#{get_scope_count(scope)})"
             end if options[:scope_count] && scope.show_count
@@ -62,12 +60,6 @@ module ActiveAdmin
         collection_size(scope_chain(scope, collection_before_scope))
       end
 
-      def name_for_scope(scope)
-        case scope.name
-          when Proc then self.instance_exec(&scope.name).to_s
-          else      scope.name.to_s
-        end
-      end
     end
   end
 end

data/lib/active_admin/views/components/status_tag.rb

@@ -12,9 +12,8 @@ module ActiveAdmin
         'status_tag'
       end
 
-      # @overload status_tag(status, type = nil, options = {})
+      # @overload status_tag(status, options = {})
       #   @param [String] status the status to display. One of the span classes will be an underscored version of the status.
-      #   @param [Symbol] type type of status. Will become a class of the span. ActiveAdmin provide style for :ok, :warning and :error.
       #   @param [Hash] options
       #   @option options [String] :class to override the default class
       #   @option options [String] :id to override the default id
@@ -26,31 +25,40 @@ module ActiveAdmin
       #   # => <span class='status_tag in_progress'>In Progress</span>
       #
       # @example
-      #   status_tag('active', :ok)
-      #   # => <span class='status_tag active ok'>Active</span>
-      #
-      # @example
-      #   status_tag('active', :ok, class: 'important', id: 'status_123', label: 'on')
-      #   # => <span class='status_tag active ok important' id='status_123'>on</span>
+      #   status_tag('active', class: 'important', id: 'status_123', label: 'on')
+      #   # => <span class='status_tag active important' id='status_123'>on</span>
       #
       def build(*args)
         options = args.extract_options!
         status = args[0]
         type = args[1]
+
         label = options.delete(:label)
         classes = options.delete(:class)
         status = convert_to_boolean_status(status)
 
         if status
           content = label || if s = status.to_s and s.present?
-            I18n.t "active_admin.status_tag.#{s.downcase}", default: s.titleize
-          end
+                               I18n.t "active_admin.status_tag.#{s.downcase}", default: s.titleize
+                             end
         end
 
         super(content, options)
 
         add_class(status_to_class(status)) if status
-        add_class(type.to_s) if type
+
+        if type
+          Deprecation.warn <<-MSG.strip_heredoc
+            The `type` parameter has been deprecated. Provide the "#{type}" type as
+            a class instead. For example, `status_tag(status, :#{type}, class: "abc")`
+            would change to `status_tag(status, class: "#{type} abc")`. Also note that
+            the "#{type}" CSS rule will be removed too, so you'll have to provide
+            the styles yourself. See https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md#110-
+            for more information.
+          MSG
+          add_class(type.to_s)
+        end
+
         add_class(classes) if classes
       end
 

data/lib/active_admin/views/components/tabs.rb

@@ -15,8 +15,8 @@ module ActiveAdmin
       end
 
       def build_menu_item(title, options, &block)
-        options = options.reverse_merge({})
-        li { link_to title, "##{title.parameterize}", options }
+        fragment = options.fetch(:id, title.parameterize)
+        li { link_to title, "##{fragment}" }
       end
 
       def build_content_item(title, options, &block)

data/lib/active_admin/views/header.rb

@@ -14,7 +14,6 @@ module ActiveAdmin
         build_utility_navigation
       end
 
-
       def build_site_title
         insert_tag view_factory.site_title, @namespace
       end

data/lib/active_admin/views/index_as_blog.rb

@@ -89,7 +89,6 @@ module ActiveAdmin
         @title
       end
 
-
       # Setter method for the configuration of the body
       #
       def body(method = nil, &block)
@@ -124,7 +123,7 @@ module ActiveAdmin
         if @title
           h3 do
             a(href: resource_path(post)) do
-             render_method_on_post_or_call_proc post, @title
+              render_method_on_post_or_call_proc post, @title
             end
           end
         else

data/lib/active_admin/views/index_as_grid.rb

@@ -25,7 +25,7 @@ module ActiveAdmin
      # end
      # ```
      #
-     class IndexAsGrid < ActiveAdmin::Component
+    class IndexAsGrid < ActiveAdmin::Component
 
       def build(page_presenter, collection)
         @page_presenter = page_presenter
@@ -42,7 +42,7 @@ module ActiveAdmin
         "grid"
       end
 
-      protected
+     protected
 
       def build_table
         resource_selection_toggle_panel if active_admin_config.batch_actions.any?

data/lib/active_admin/views/index_as_table.rb

@@ -159,6 +159,24 @@ module ActiveAdmin
     # end
     # ```
     #
+    # ## Custom sorting
+    #
+    # It is also possible to use database specific expressions and options for sorting by column
+    #
+    # ```ruby
+    # order_by(:title) do |order_clause|
+    #    if order_clause.order == 'desc'
+    #      [order_clause.to_sql, 'NULLS LAST'].join(' ')
+    #    else
+    #      [order_clause.to_sql, 'NULLS FIRST'].join(' ')
+    #    end
+    # end
+    #
+    # index do
+    #   column :title
+    # end
+    # ```
+    #
     # ## Associated Sorting
     #
     # You're normally able to sort columns alphabetically, but by default you
@@ -368,6 +386,6 @@ module ActiveAdmin
         end
       end # IndexTableFor
 
-    end # IndexAsTable
+    end
   end
 end