activeadmin 0.6.6 → 1.0.0.pre1

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

@@ -46,21 +46,21 @@ module ActiveAdmin
       private
 
       def build_button(name, button_options)
-        button_options[:class] ||= ""
-        button_options[:class] << " dropdown_menu_button"
+        button_options[:class] ||= ''
+        button_options[:class] << ' dropdown_menu_button'
 
-        button_options[:href] = "#"
+        button_options[:href] = '#'
 
         a name, button_options
       end
 
       def build_menu(options)
-        options[:class] ||= ""
-        options[:class] << " dropdown_menu_list"
+        options[:class] ||= ''
+        options[:class] << ' dropdown_menu_list'
 
         menu_list = nil
 
-        div :class => "dropdown_menu_list_wrapper", :style => "display:none;" do
+        div :class => 'dropdown_menu_list_wrapper' do
           menu_list = ul(options)
         end
 

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

@@ -1,11 +1,11 @@
 require 'active_admin/helpers/collection'
 
 module ActiveAdmin
-	module Views
+  module Views
 
     # Renders a collection of index views available to the resource
     # as a list with a separator
-		class IndexList < ActiveAdmin::Component
+    class IndexList < ActiveAdmin::Component
       builder_method :index_list_renderer
 
       include ::ActiveAdmin::Helpers::Collection
@@ -35,10 +35,10 @@ module ActiveAdmin
       #
       # @param [Class] index_class The class on which to build the link and html classes
       def build_index_list(index_class)
-        li :class => classes_for_index(index_class) do
-          a :href => url_for(params.merge(:as => index_class.index_name.to_sym)), :class => "table_tools_button" do
+        li class: classes_for_index(index_class) do
+          a href: url_for(params.merge(as: index_class.index_name.to_sym)), class: "table_tools_button" do
             name = index_class.index_name
-            I18n.t("active_admin.index_list.#{name}", :default => name.to_s.titleize)
+            I18n.t("active_admin.index_list.#{name}", default: name.to_s.titleize)
           end
         end
       end
@@ -61,8 +61,8 @@ module ActiveAdmin
         params.include?(:q) && collection_is_empty?
       end
 
-		end
-	end
+    end
+  end
 end
 
 

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

@@ -7,7 +7,7 @@ module ActiveAdmin
     #
     # *Example:*
     #
-    #   paginated_collection collection, :entry_name => "Post" do
+    #   paginated_collection collection, entry_name: "Post" do
     #     div do
     #       h2 "Inside the
     #     end
@@ -40,12 +40,13 @@ module ActiveAdmin
         @param_name     = options.delete(:param_name)
         @download_links = options.delete(:download_links)
         @display_total  = options.delete(:pagination_total) { true }
+        @per_page       = options.delete(:per_page)
 
         unless collection.respond_to?(:num_pages)
           raise(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
         end
 
-        @contents = div(:class => "paginated_collection_contents")
+        @contents = div(class: "paginated_collection_contents")
         build_pagination_with_formats(options)
         @built = true
       end
@@ -62,24 +63,41 @@ module ActiveAdmin
       protected
 
       def build_pagination_with_formats(options)
-        div :id => "index_footer" do
+        div id: "index_footer" do
+          build_per_page_select if @per_page.is_a?(Array)
           build_pagination
-          div(page_entries_info(options).html_safe, :class => "pagination_information")
+          div(page_entries_info(options).html_safe, class: "pagination_information")
 
-          if @download_links.is_a?(Array) && !@download_links.empty?
-            build_download_format_links @download_links
+          download_links = @download_links.is_a?(Proc) ? instance_exec(&@download_links) : @download_links
+
+          if download_links.is_a?(Array) && !download_links.empty?
+            build_download_format_links download_links
           else
-            build_download_format_links unless @download_links == false
+            build_download_format_links unless download_links == false
           end
+        end
+      end
 
+      def build_per_page_select
+        div class: "pagination_per_page" do
+          text_node "Per page:"
+          select do
+            @per_page.each do |per_page|
+              option(
+                per_page,
+                value: per_page,
+                selected: collection.limit_value == per_page ? "selected" : nil
+              )
+            end
+          end
         end
       end
 
       def build_pagination
-        options =  request.query_parameters.except(:commit, :format)
+        options = {}
         options[:param_name] = @param_name if @param_name
 
-        text_node paginate(collection, options.symbolize_keys)
+        text_node paginate collection, options
       end
 
       include ::ActiveAdmin::Helpers::Collection
@@ -91,29 +109,29 @@ module ActiveAdmin
           entry_name   = options[:entry_name]
           entries_name = options[:entries_name] || entry_name.pluralize
         elsif collection_is_empty?
-          entry_name   = I18n.t "active_admin.pagination.entry", :count => 1, :default => 'entry'
-          entries_name = I18n.t "active_admin.pagination.entry", :count => 2, :default => 'entries'
+          entry_name   = I18n.t "active_admin.pagination.entry", count: 1, default: 'entry'
+          entries_name = I18n.t "active_admin.pagination.entry", count: 2, default: 'entries'
         else
           key = "activerecord.models." + collection.first.class.model_name.i18n_key.to_s
-          entry_name   = I18n.translate key, :count => 1,               :default => collection.first.class.name.underscore.sub('_', ' ')
-          entries_name = I18n.translate key, :count => collection.size, :default => entry_name.pluralize
+          entry_name   = I18n.translate key, count: 1,               default: collection.first.class.name.underscore.sub('_', ' ')
+          entries_name = I18n.translate key, count: collection.size, default: entry_name.pluralize
         end
 
         if collection.num_pages < 2
           case collection_size
-          when 0; I18n.t('active_admin.pagination.empty',    :model => entries_name)
-          when 1; I18n.t('active_admin.pagination.one',      :model => entry_name)
-          else;   I18n.t('active_admin.pagination.one_page', :model => entries_name, :n => collection.total_count)
+          when 0; I18n.t('active_admin.pagination.empty',    model: entries_name)
+          when 1; I18n.t('active_admin.pagination.one',      model: entry_name)
+          else;   I18n.t('active_admin.pagination.one_page', model: entries_name, n: collection.total_count)
           end
         else
           offset = (collection.current_page - 1) * collection.limit_value
           if @display_total
             total  = collection.total_count
-            I18n.t 'active_admin.pagination.multiple', :model => entries_name, :total => total,
-              :from => offset + 1, :to => offset + collection_size
+            I18n.t 'active_admin.pagination.multiple', model: entries_name, total: total,
+              from: offset + 1, to: offset + collection_size
           else
-            I18n.t 'active_admin.pagination.multiple_without_total', :model => entries_name,
-              :from => offset + 1, :to => offset + collection_size
+            I18n.t 'active_admin.pagination.multiple_without_total', model: entries_name,
+              from: offset + 1, to: offset + collection_size
           end
         end
       end

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

@@ -10,7 +10,7 @@ module ActiveAdmin
         super(attributes)
         add_class "panel"
         @title = h3(icn + title.to_s)
-        @contents = div(:class => "panel_contents")
+        @contents = div(class: "panel_contents")
       end
 
       def add_child(child)
@@ -28,7 +28,13 @@ module ActiveAdmin
         @contents.children?
       end
 
-    end
+      def header_action(*args)
+        action = args[0]
 
+        @title << div(class: 'header_action') do
+          action
+        end
+      end
+    end
   end
 end

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

@@ -11,7 +11,7 @@ module ActiveAdmin
 
         super(options)
 
-        @contents_root = send(contents_root_tag, :class => "popover_contents")
+        @contents_root = send(contents_root_tag, class: "popover_contents")
       end
 
       def add_child(child)

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

@@ -30,12 +30,13 @@ module ActiveAdmin
       protected
 
       def build_scope(scope, options)
-        li :class => classes_for_scope(scope) do
-          scope_name = I18n.t("active_admin.scopes.#{scope.id}", :default => scope.name)
+        li class: classes_for_scope(scope) do
+          scope_name = I18n.t "active_admin.scopes.#{scope.id}", default: scope.name
+          params     = request.query_parameters.except :page, :scope, :commit, :format
 
-          a :href => url_for(params.merge(:scope => scope.id, :page => 1)), :class => "table_tools_button" do
+          a href: url_for(scope: scope.id, params: params), class: 'table_tools_button' do
             text_node scope_name
-            span :class => 'count' do
+            span class: 'count' do
               "(#{get_scope_count(scope)})"
             end if options[:scope_count] && scope.show_count
           end

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

@@ -7,7 +7,8 @@ module ActiveAdmin
       # Takes a ActiveAdmin::SidebarSection instance
       def build(section)
         @section = section
-        super(@section.title, :icon => @section.icon)
+        super(@section.title, icon: @section.icon)
+        add_class @section.custom_class if @section.custom_class
         self.id = @section.id
         build_sidebar_content
       end
@@ -16,7 +17,7 @@ module ActiveAdmin
 
       def build_sidebar_content
         if @section.block
-          rvalue = instance_eval(&@section.block)
+          rvalue = instance_exec(&@section.block)
           self << rvalue if rvalue.is_a?(String)
         else
           render(@section.partial_name)

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

@@ -8,7 +8,7 @@ module ActiveAdmin
       end
 
       def build(namespace)
-        super(:id => "site_title")
+        super(id: "site_title")
         @namespace = namespace
 
         if site_title_link?
@@ -46,7 +46,7 @@ module ActiveAdmin
 
       def title_image
         path = helpers.render_or_call_method_or_proc_on(self, @namespace.site_title_image)
-        helpers.image_tag(path, :id => "site_title_image", :alt => @namespace.site_title)
+        helpers.image_tag(path, id: "site_title_image", alt: @namespace.site_title)
       end
 
     end

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

@@ -12,22 +12,25 @@ module ActiveAdmin
         'status_tag'
       end
 
-      # @method status_tag(status, type = nil, options = {})
+      # @overload status_tag(status, type = nil, 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
+      #   @option options [String] :label to override the default label
+      #   @return [ActiveAdmin::Views::StatusTag]
       #
-      # @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 such as :class, :id and :label to override the default label
-      #
-      # @return [ActiveAdmin::Views::StatusTag]
-      #
-      # Examples:
+      # @example
       #   status_tag('In Progress')
       #   # => <span class='status_tag in_progress'>In Progress</span>
       #
+      # @example
       #   status_tag('active', :ok)
       #   # => <span class='status_tag active ok'>Active</span>
       #
-      #   status_tag('active', :ok, :class => 'important', :id => 'status_123', :label => 'on')
+      # @example
+      #   status_tag('active', :ok, class: 'important', id: 'status_123', label: 'on')
       #   # => <span class='status_tag active ok important' id='status_123'>on</span>
       #
       def build(*args)
@@ -36,8 +39,13 @@ module ActiveAdmin
         type = args[1]
         label = options.delete(:label)
         classes = options.delete(:class)
+        status = convert_to_boolean_status(status)
 
-        content = label || status.titleize if 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
+        end
 
         super(content, options)
 
@@ -48,8 +56,23 @@ module ActiveAdmin
 
       protected
 
+      def convert_to_boolean_status(status)
+        if status == 'true'
+          'Yes'
+        elsif ['false', nil].include?(status)
+          'No'
+        else
+          status
+        end
+      end
+
       def status_to_class(status)
-        status.titleize.gsub(/\s/, '').underscore
+        case status
+        when String, Symbol
+          status.to_s.titleize.gsub(/\s/, '').underscore
+        else
+          ''
+        end
       end
     end
   end

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

@@ -7,13 +7,21 @@ module ActiveAdmin
         'table'
       end
 
-      def build(collection, options = {})
-        @sortable = options.delete(:sortable)
+      def build(obj, *attrs)
+        options         = attrs.extract_options!
+        @sortable       = options.delete(:sortable)
         @resource_class = options.delete(:i18n)
-        @collection = collection
-        @columns = []
+        @collection     = obj.respond_to?(:each) && !obj.is_a?(Hash) ? obj : [obj]
+        @columns        = []
+        @row_class      = options.delete(:row_class)
+
         build_table
         super(options)
+        columns(*attrs)
+      end
+
+      def columns(*attrs)
+        attrs.each {|attr| column(attr) }
       end
 
       def column(*args, &block)
@@ -32,18 +40,13 @@ module ActiveAdmin
         # Add a table cell for each item
         @collection.each_with_index do |item, i|
           within @tbody.children[i] do
-            build_table_cell(col, item)
+            build_table_cell col, item
           end
         end
       end
 
       def sortable?
-        @sortable
-      end
-
-      # Returns the columns to display based on the conditional block
-      def visible_columns
-        @visible_columns ||= @columns.select{|col| col.display_column? }
+        !!@sortable
       end
 
       protected
@@ -60,36 +63,62 @@ module ActiveAdmin
       end
 
       def build_table_header(col)
-        classes = Arbre::HTML::ClassList.new
+        classes  = Arbre::HTML::ClassList.new
         sort_key = sortable? && col.sortable? && col.sort_key
+        params   = request.query_parameters.except :page, :order, :commit, :format
 
         classes << 'sortable'                         if sort_key
         classes << "sorted-#{current_sort[1]}"        if sort_key && current_sort[0] == sort_key
         classes << col.html_class
 
         if sort_key
-          th :class => classes do
-            link_to(col.pretty_title, params.merge(:order => "#{sort_key}_#{order_for_sort_key(sort_key)}").except(:page))
+          th class: classes do
+            link_to col.pretty_title, params: params, order: "#{sort_key}_#{order_for_sort_key(sort_key)}"
           end
         else
-          th(col.pretty_title, :class => classes)
+          th col.pretty_title, class: classes
         end
       end
 
       def build_table_body
         @tbody = tbody do
           # Build enough rows for our collection
-          @collection.each{|elem| tr(:class => cycle('odd', 'even'), :id => dom_id(elem)) }
+          @collection.each do |elem|
+            classes = [cycle('odd', 'even')]
+
+            if @row_class
+              classes << @row_class.call(elem)
+            end
+
+            tr(class: classes.flatten.join(' '), id: dom_id_for(elem))
+          end
         end
       end
 
       def build_table_cell(col, item)
-        td(:class =>  col.html_class) do
-          rvalue = call_method_or_proc_on(item, col.data, :exec => false)
-          if col.data.is_a?(Symbol)
-            rvalue = pretty_format(rvalue)
-          end
-          rvalue
+        td class: col.html_class do
+          render_data col.data, item
+        end
+      end
+
+      def render_data(data, item)
+        value = if data.is_a? Proc
+          data.call item
+        elsif item.respond_to? data
+          item.public_send data
+        elsif item.respond_to? :[]
+          item[data]
+        end
+        value = pretty_format(value) if data.is_a?(Symbol)
+        value = status_tag value     if is_boolean? data, item
+        value
+      end
+
+      def is_boolean?(data, item)
+        if item.respond_to? :has_attribute?
+          item.has_attribute?(data) &&
+            item.column_for_attribute(data) &&
+            item.column_for_attribute(data).type == :boolean
         end
       end
 
@@ -97,10 +126,14 @@ module ActiveAdmin
       #   current_sort[0] #=> sort_key
       #   current_sort[1] #=> asc | desc
       def current_sort
-        @current_sort ||= if params[:order] && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
-          [$1,$2]
-        else
-          []
+        @current_sort ||= begin
+          order_clause = OrderClause.new params[:order]
+
+          if order_clause.valid?
+            [order_clause.field, order_clause.order]
+          else
+            []
+          end
         end
       end
 
@@ -116,7 +149,7 @@ module ActiveAdmin
 
       def default_options
         {
-          :i18n => @resource_class
+          i18n: @resource_class
         }
       end
 
@@ -124,25 +157,29 @@ module ActiveAdmin
 
         attr_accessor :title, :data , :html_class
 
-        def initialize(*args, &block)
+        def initialize(*args, &block) 
           @options = args.extract_options!
 
           @title = args[0]
-          @html_class = @options.delete(:class) || @title.to_s.downcase.underscore.gsub(/ +/,'_')
-          @data  = args[1] || args[0]
+          html_classes = [:col]
+          if @options.has_key?(:class)
+            html_classes << @options.delete(:class)
+          elsif @title.present?
+            html_classes << "col-#{@title.to_s.parameterize('_')}"
+          end
+          @html_class = html_classes.join(' ')
+          @data = args[1] || args[0]
           @data = block if block
           @resource_class = args[2]
         end
 
         def sortable?
-          if @data.is_a?(Proc)
-            [String, Symbol].include?(@options[:sortable].class)
-          elsif @options.has_key?(:sortable)
-            @options[:sortable]
-          elsif @data.respond_to?(:to_sym) && @resource_class
-            !@resource_class.reflect_on_association(@data.to_sym)
+          if @options.has_key?(:sortable)
+            !!@options[:sortable]
+          elsif @resource_class
+            @resource_class.column_names.include?(sort_column_name)
           else
-            true
+            @title.present?
           end
         end
 
@@ -155,36 +192,44 @@ module ActiveAdmin
         #
         # You can set the sort key by passing a string or symbol
         # to the sortable option:
-        #   column :username, :sortable => 'other_column_to_sort_on'
+        #   column :username, sortable: 'other_column_to_sort_on'
         #
         # If you pass a block to be rendered for this column, the column
         # will not be sortable unless you pass a string to sortable to
         # sort the column on:
         #
-        #   column('Username', :sortable => 'login'){ @user.pretty_name }
+        #   column('Username', sortable: 'login'){ @user.pretty_name }
         #   # => Sort key will be 'login'
         #
         def sort_key
           # If boolean or nil, use the default sort key.
-          if @options[:sortable] == true || @options[:sortable] == false || @options[:sortable].nil?
+          if @options[:sortable] == true || @options[:sortable] == false
             @data.to_s
+          elsif @options[:sortable].nil?
+            sort_column_name
           else
             @options[:sortable].to_s
           end
         end
 
         def pretty_title
-          if @title.is_a?(Symbol)
-            default_title =  @title.to_s.titleize
-            if @options[:i18n] && @options[:i18n].respond_to?(:human_attribute_name)
-              @title = @options[:i18n].human_attribute_name(@title, :default => default_title)
+          if @title.is_a? Symbol
+            default = @title.to_s.titleize
+            if @options[:i18n].respond_to? :human_attribute_name
+              @title = @options[:i18n].human_attribute_name @title, default: default
             else
-              default_title
+              default
             end
           else
             @title
           end
         end
+
+        private
+
+        def sort_column_name
+          @data.is_a?(Symbol) ? @data.to_s : @title.to_s
+        end
       end
     end
   end