activeadmin 0.4.0 → 0.4.1

data/lib/active_admin/resource_controller/collection.rb

@@ -6,10 +6,6 @@ module ActiveAdmin
     module Collection
       extend ActiveSupport::Concern
 
-      included do
-        before_filter :setup_pagination_for_csv
-      end
-
       module BaseCollection
         protected
 
@@ -50,7 +46,8 @@ module ActiveAdmin
             column = $1
             order  = $2
             table  = active_admin_config.resource_table_name
-            table_column = (column =~ /\./) ? column : "#{table}.#{column}"
+            table_column = (column =~ /\./) ? column :
+              "#{table}.#{active_admin_config.resource_quoted_column_name(column)}"
 
             chain.order("#{table_column} #{order}")
           else
@@ -118,13 +115,23 @@ module ActiveAdmin
           paginate(super)
         end
 
-        # Allow more records for csv files
-        def setup_pagination_for_csv
-          @per_page = 10_000 if request.format == 'text/csv'
+        def paginate(chain)
+          chain.send(Kaminari.config.page_method_name, params[:page]).per(per_page)
         end
 
-        def paginate(chain)
-          chain.send(Kaminari.config.page_method_name, params[:page]).per(@per_page || active_admin_namespace.default_per_page)
+        def per_page
+          return max_csv_records if request.format == 'text/csv'
+          return max_per_page if active_admin_config.paginate == false
+
+          @per_page || active_admin_config.per_page
+        end
+
+        def max_csv_records
+          10_000
+        end
+
+        def max_per_page
+          10_000
         end
       end
 

data/lib/active_admin/router.rb

@@ -53,6 +53,9 @@ module ActiveAdmin
               end
             when Page
               match "/#{config.underscored_resource_name}" => "#{config.underscored_resource_name}#index"
+              config.page_actions.each do |action|
+                match "/#{config.underscored_resource_name}/#{action.name}" => "#{config.underscored_resource_name}##{action.name}", :via => action.http_verb
+              end
             else
               raise "Unsupported config class: #{config.class}"
             end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

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

@@ -1,9 +1,70 @@
 module ActiveAdmin
   module Views
 
+    # = Columns Component
+    #
+    # The Columns component allows you draw content into scalable columns. All
+    # you need to do is define the number of columns and the component will
+    # take care of the rest.
+    #
+    # == Simple Columns
+    #
+    # To display columns, use the #columns method. Within the block, call the 
+    # #column method to create a new column.
+    #
+    # To createa a two column layout:
+    #
+    #     colums do
+    #       column do
+    #         span "Column # 1
+    #       end
+    #       column do
+    #         span "Column # 2
+    #       end
+    #     end
+    #
+    #
+    # == Multiple Span Columns
+    #
+    # To make a column span multiple, pass the :span option to the column method:
+    #
+    #     colums do
+    #       column :span => 2 do
+    #         span "Column # 1
+    #       end
+    #       column do
+    #         span "Column # 2
+    #       end
+    #     end
+    #
+    # By default, each column spans 1 column. So the above layout would have 2 columns,
+    # the first being 2 time bigger than the second.
+    #
+    #
+    # == Max and Mix Column Sizes
+    #
+    # Active Admin is a fluid width layout, which means that columns are all defined
+    # using percentages. Sometimes this can cause issues if you don't want a column
+    # to shrink or expand past a certain point.
+    #
+    # To overcome this, columns include a :max_width and :min_width option.
+    #
+    #     colums do
+    #       column :max_width => "200px", :min_width => "100px" do
+    #         span "Column # 1
+    #       end
+    #       column do
+    #         span "Column # 2
+    #       end
+    #     end
+    #
+    # Now the first column will not grow bigger than 200px and will not shrink smaller
+    # than 100px.
     class Columns < ActiveAdmin::Component
       builder_method :columns
 
+
+      # For documentation, please take a look at Column#build
       def column(*args, &block)
         insert_tag Column, *args, &block
       end
@@ -14,34 +75,76 @@ module ActiveAdmin
         calculate_columns!
       end
 
-      def to_s
-        super.to_s + "<div style=\"clear:both;\"></div>".html_safe
-      end
-
       protected
 
+      # Override the closing tag to include a clear
+      def closing_tag
+        "<div style=\"clear:both;\"></div>" + super
+      end
+
       def margin_size
         2
       end
 
+      # Calculate our columns sizes and margins
       def calculate_columns!
-        # Calculate our columns sizes and margins
-        count = children.size
-        margins_width = margin_size * (count - 1)
-        column_width = (100.00 - margins_width) / count
+        span_count = columns_span_count
+        columns_count = children.size
 
-        # Convert to an integer if its not a float
-        column_width = column_width.to_i == column_width ? column_width.to_i : column_width
+        all_margins_width = margin_size * (span_count - 1)
+        column_width = (100.00 - all_margins_width) / span_count
 
         children.each_with_index do |col, i|
-          col.set_attribute :style, "width: #{column_width}%;"
-          col.attr(:style) << " margin-right: #{margin_size}%;" unless i == (count - 1)
+          is_last_column = i == (columns_count - 1)
+          col.set_column_styles(column_width, margin_size, is_last_column)
         end
       end
 
+      def columns_span_count
+        count = 0
+        children.each {|column| count += column.span_size }
+
+        count
+      end
+
     end
 
     class Column < ActiveAdmin::Component
+
+      attr_accessor :span_size, :max_width, :min_width
+
+      # @param [Hash] options An options hash for the column
+      #
+      # @options options [Integer] :span The columns this column should span
+      def build(options = {})
+        options = options.dup
+        @span_size = options.delete(:span) || 1
+        @max_width = options.delete(:max_width)
+        @min_width = options.delete(:min_width)
+
+        super(options)
+      end
+
+      def set_column_styles(column_width, margin_width, is_last_column = false)
+        column_with_span_width = (span_size * column_width) + ((span_size - 1) * margin_width)
+
+        styles = []
+
+        styles << "width: #{column_with_span_width}%;"
+
+        if max_width
+          styles << "max-width: #{max_width};"
+        end
+
+        if min_width
+          styles << "min-width: #{min_width};"
+        end
+
+        styles << "margin-right: #{margin_width}%;" unless is_last_column
+
+        set_attribute :style, styles.join(" ")
+      end
+
     end
   end
 end

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

@@ -16,17 +16,17 @@ module ActiveAdmin
         'ul'
       end
 
-      def build(scopes)
+      def build(scopes, options = {})
         unless current_filter_search_empty?
           scopes.each do |scope|
-            build_scope(scope) if call_method_or_proc_on(self, scope.display_if_block)
+            build_scope(scope, options) if call_method_or_proc_on(self, scope.display_if_block)
           end
         end
       end
 
       protected
 
-      def build_scope(scope)
+      def build_scope(scope, options)
         li :class => classes_for_scope(scope) do
           begin
             scope_name = I18n.t!("active_admin.scopes.#{scope.id}")
@@ -38,7 +38,7 @@ module ActiveAdmin
             text_node scope_name
             span :class => 'count' do
               "(" + get_scope_count(scope).to_s + ")"
-            end
+            end if options[:scope_count]
           end
         end
       end

data/lib/active_admin/views/index_as_table.rb

@@ -97,11 +97,13 @@ module ActiveAdmin
           :id => active_admin_config.plural_underscored_resource_name,
           :sortable => true,
           :class => "index_table",
-          :i18n => active_admin_config.resource_class
+          :i18n => active_admin_config.resource_class,
+          :paginator => page_presenter[:paginator] != false
         }
 
         table_for collection, table_options do |t|
-          instance_exec(t, &page_presenter.block)
+          table_config_block = page_presenter.block || default_table
+          instance_exec(t, &table_config_block)
         end
       end
 
@@ -109,6 +111,16 @@ module ActiveAdmin
         insert_tag IndexTableFor, *args, &block
       end
 
+      def default_table
+        proc do
+          id_column
+          resource_class.content_columns.each do |col|
+            column col.name.to_sym
+          end
+          default_actions
+        end
+      end
+
       #
       # Extend the default ActiveAdmin::Views::TableFor with some
       # methods for quickly displaying items on the index page

data/lib/active_admin/views/pages/base.rb

@@ -87,7 +87,7 @@ module ActiveAdmin
 
         def build_action_items
           if active_admin_config && active_admin_config.action_items?
-            items = active_admin_config.action_items_for(params[:action])
+            items = active_admin_config.action_items_for(params[:action], self)
             insert_tag view_factory.action_items, items
           end
         end
@@ -135,7 +135,7 @@ module ActiveAdmin
         # Returns the sidebar sections to render for the current action
         def sidebar_sections_for_action
           if active_admin_config && active_admin_config.sidebar_sections?
-            active_admin_config.sidebar_sections_for(params[:action])
+            active_admin_config.sidebar_sections_for(params[:action], self)
           else
             []
           end

data/lib/active_admin/views/pages/index.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
         def main_content
           build_scopes
 
-          if collection.any?
+          if items_in_collection?
             render_index
           else
             if params[:q]
@@ -29,8 +29,18 @@ module ActiveAdmin
         end
 
         protected
-        
-        
+
+        def items_in_collection?
+          # Remove the order clause before limiting to 1. This ensures that
+          # any referenced columns in the order will not try to be accessed.
+          #
+          # When we call #exists?, the query's select statement is changed to "1".
+          #
+          # If we don't reorder, there may be some columns referenced in the order
+          # clause that requires the original select.
+          collection.reorder("").limit(1).exists?
+        end
+
         # TODO: Refactor to new HTML DSL
         def build_download_format_links(formats = [:csv, :xml, :json])
           links = formats.collect do |format|
@@ -41,8 +51,12 @@ module ActiveAdmin
 
         def build_scopes
           if active_admin_config.scopes.any?
+            scope_options = {
+              :scope_count => config[:scope_count].nil? ? true : config[:scope_count]
+            }
+
             div :class => "table_tools" do
-              scopes_renderer active_admin_config.scopes
+              scopes_renderer active_admin_config.scopes, scope_options
             end
           end
         end
@@ -50,13 +64,7 @@ module ActiveAdmin
         # Creates a default configuration for the resource class. This is a table
         # with each column displayed as well as all the default actions
         def default_index_config
-          @default_index_config ||= ::ActiveAdmin::PagePresenter.new(:as => :table) do |display|
-            id_column
-            resource_class.content_columns.each do |col|
-              column col.name.to_sym
-            end
-            default_actions
-          end
+          @default_index_config ||= ::ActiveAdmin::PagePresenter.new(:as => :table)
         end
 
         # Returns the actual class for renderering the main content on the index
@@ -87,9 +95,13 @@ module ActiveAdmin
         
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
+          paginator      = config[:paginator].nil?      ? true : config[:paginator]
+          download_links = config[:download_links].nil? ? true : config[:download_links]
           
-          paginated_collection(collection, :entry_name   => active_admin_config.resource_name,
-                                           :entries_name => active_admin_config.plural_resource_name) do
+          paginated_collection(collection, :entry_name     => active_admin_config.resource_name,
+                                           :entries_name   => active_admin_config.plural_resource_name,
+                                           :download_links => download_links,
+                                           :paginator      => paginator) do
             div :class => 'index_content' do
               insert_tag(renderer_class, config, collection)
             end

data/lib/active_admin/views/tabbed_navigation.rb

@@ -42,17 +42,29 @@ module ActiveAdmin
       def build_menu_item(item)
         li :id => item.dom_id do |li_element|
           li_element.add_class "current" if current?(item)
+          link_path = url_for_menu_item(item)
 
           if item.children.any?
             li_element.add_class "has_nested"
-            text_node link_to(item.name, item.url || "#")
+            text_node link_to(item.name, link_path)
             render_nested_menu(item)
           else
-            link_to item.name, item.url
+            link_to item.name, link_path
           end
         end
       end
 
+      def url_for_menu_item(menu_item)
+        case menu_item.url
+        when Symbol
+          send(menu_item.url)
+        when nil
+          "#"
+        else
+          menu_item.url
+        end
+      end
+
       def render_nested_menu(item)
         ul do
           displayable_items(item.children).each do |child|

data/spec/unit/menu_item_spec.rb

@@ -35,20 +35,6 @@ module ActiveAdmin
       item.display_if_block.call(self).should == true
     end
 
-    describe "url generation and caching" do
-      it "should generate a url if it is a symbol" do
-        item = MenuItem.new("Posts", :admin_posts_path)
-        MenuItem.should_receive(:generate_url).with(:admin_posts_path).
-          and_return("/admin/posts")
-
-        item.url.should == "/admin/posts"
-      end
-
-      it "should generate a url if it is a string" do
-        MenuItem.new("Posts", "/admin/posts").url.should == "/admin/posts"
-      end
-    end
-
     context "with no children" do
       it "should be empty" do
         item = MenuItem.new("Blog", "/admin/blog")

data/spec/unit/namespace/register_resource_spec.rb

@@ -22,7 +22,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
     it "should create a menu item" do
       namespace.load_menu!
       namespace.menu["Categories"].should be_an_instance_of(ActiveAdmin::MenuItem)
-      namespace.menu["Categories"].url.should == "/admin/categories"
+      namespace.menu["Categories"].url.should == :admin_categories_path
     end
   end # context "with no configuration"
 

data/spec/unit/resource/pagination_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper' 
+
+module ActiveAdmin
+  describe Resource, "Pagination" do
+
+    before { load_defaults! }
+
+    let(:application){ ActiveAdmin::Application.new }
+    let(:namespace){ Namespace.new(application, :admin) }
+
+    def config(options = {})
+      @config ||= Resource.new(namespace, Category, options)
+    end
+
+    describe "#paginate" do
+      it "should default to true" do
+        config.paginate.should == true
+      end
+
+      it "should be settable to false" do
+        config.paginate = false
+        config.paginate.should == false
+      end
+    end
+
+    describe "#per_page" do
+      it "should default to namespace.default_per_page" do
+        namespace.should_receive(:default_per_page).and_return(5)
+        config.per_page.should == 5
+      end
+      
+      it "should be settable" do
+        config.per_page = 5
+        config.per_page.should == 5
+      end
+    end
+  end
+end