activeadmin 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,49 @@
+## Master (unreleased)
+
+## 0.4.1
+
+### Enhancements
+
+* #865: Pages support the `#page_action` to add custom controller actions
+        to a page (@BoboFraggins)
+* Columns component now supports column spans, max and min widths ([@gregbell][])
+* #497: Custom pagination settings per resource (@pcreux)
+* #993: Login form now focuses on email (@mattvague)
+* #865: Add `:if` support to sidebar sections (@BoboFraggins)
+* #865: Added `:scope_count => false` to the index to hide scope counts
+        in generated scopes (@BoboFraggins)
+
+### Bug Fixes
+
+* #101: Global nav now works with RackBaseURI ([@gregbell][])
+* #960: Global nav works when scoped in rails routes ([@gregbell][])
+* #994: Fix index page check collection.limit(1).exists? causes exception when
+        ordering by virtual colum (@latortuga, @gregbell)
+* #971: Fix SQL when sorting tables with a column named "group" (@ggilder)
+
+### Dependencies
+
+* #978: Support for Inherited Resources 1.3.0 (@fabiormoura)
+
+### Contributors
+
+75 Commits by 12 authors
+
+* Bruno Bonamin
+* David Radcliffe
+* Dinesh Majrekar
+* Erik Michaels-Ober
+* Fábio Maia
+* Gabriel Gilder
+* Greg Bell
+* Kyle Macey
+* Matt Vague
+* Oldani Pablo
+* Peter Fry
+* Philippe Creux
+* Søren Houen
+
+
 ## 0.4.0
 
 ### Upgrade Notes

data/Gemfile

@@ -20,6 +20,7 @@ end
 
 group :development, :test do
   gem 'sqlite3-ruby',   :require => 'sqlite3'
+
   gem 'rake',           '~> 0.9.2.2', :require => false
   gem 'haml',           '~> 3.1.1', :require => false
   gem 'yard'

data/README.rdoc

@@ -4,7 +4,7 @@ Active Admin is a framework for creating administration style interfaces. It
 abstracts common business application patterns to make it simple for developers
 to implement beautiful and elegant interfaces with very little effort.
 
-{<img src="http://travis-ci.org/gregbell/active_admin.png" />}[http://travis-ci.org/gregbell/active_admin]
+{<img src="https://secure.travis-ci.org/gregbell/active_admin.png" />}[http://travis-ci.org/gregbell/active_admin]
 
 == Documentation & Support
 

data/activeadmin.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("meta_search", ">= 0.9.2")
   s.add_dependency("devise", ">= 1.1.2")
   s.add_dependency("formtastic", ">= 2.0.0")
-  s.add_dependency("inherited_resources", "< 1.3.0")
+  s.add_dependency("inherited_resources", "> 0")
   s.add_dependency("kaminari", ">= 0.13.0")
   s.add_dependency("sass", ">= 3.1.0")
   s.add_dependency("fastercsv", ">= 0")

data/app/assets/stylesheets/active_admin/_base.css.scss

@@ -18,6 +18,7 @@
 @import "active_admin/components/links";
 @import "active_admin/components/pagination";
 @import "active_admin/components/panels";
+@import "active_admin/components/columns";
 @import "active_admin/components/scopes";
 @import "active_admin/components/status_tags";
 @import "active_admin/components/table_tools";
@@ -35,4 +36,4 @@ body {
   margin: 0;
   padding: 0;
   color: $text-color;
-}
+}

data/app/assets/stylesheets/active_admin/components/_columns.scss

@@ -0,0 +1,3 @@
+.columns {
+  margin-bottom: 10px;
+}

data/app/assets/stylesheets/active_admin/mixins/_sections.css.scss

@@ -25,7 +25,7 @@
   @include section-background;
   margin-bottom: 20px;
   
-  h3 { @include section-header; }
+  > h3 { @include section-header; }
   
   > div { padding: 3px $section-padding $section-padding $section-padding; }
   

data/app/views/active_admin/devise/sessions/new.html.erb

@@ -4,7 +4,7 @@
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
   <%= active_admin_form_for(resource, :as => resource_name, :url => send(:"#{scope}_session_path"), :html => { :id => "session_new" }) do |f| 
     f.inputs do
-      Devise.authentication_keys.each { |key| f.input key }
+      Devise.authentication_keys.each { |key| f.input key, :input_html => {:autofocus => true}}
       f.input :password
       f.input :remember_me, :as => :boolean, :if =>  false  #devise_mapping.rememberable? }
     end

data/docs/2-resource-customization.md

@@ -10,6 +10,19 @@ the <tt>:as</tt> option.
 
 The resource will then be available as /admin/articles
 
+## Customize the Namespace
+
+By default, resources live in the "admin" namespace.
+
+You can register resources in different namespaces:
+
+    # Available at /today/posts
+    ActiveAdmin.register Post, :namespace => "today"
+
+    # Available at /posts
+    ActiveAdmin.register Post, :namespace => false
+
+
 ## Customize the Menu
 
 The resource will be displayed in the global navigation by default. To disable

data/docs/3-index-pages.md

@@ -53,3 +53,26 @@ You can change the filter label by passing a label option:
     filter :author, :label => 'Author'
 
 By default, Active Admin will try to use ActiveModel I18n to determine the label.
+
+## Index default sort order
+
+You can define the default sort order for index pages:
+
+    ActiveAdmin.register Post do
+      config.sort_order = "name_asc"
+    end
+
+## Index pagination
+
+
+You can set the number of records per page per resources:
+
+    ActiveAdmin.register Post do
+      config.per_page = 10
+    end
+
+You can also disable pagination:
+
+    ActiveAdmin.register Post do
+      config.paginate = false
+    end

data/docs/3-index-pages/index-as-grid.md

@@ -7,7 +7,7 @@ Sometimes you want to display the index screen for a set of resources as a grid
 index block.
 
     index :as => :grid do |product|
-      link_to(image_tag(product.image_path), admin_products_path(product))
+      link_to(image_tag(product.image_path), admin_product_path(product))
     end
 
 The block is rendered within a cell in the grid once for each resource in the
@@ -17,5 +17,5 @@ You can customize the number of colums that are rendered using the columns
 option:
 
     index :as => :grid, :columns => 5 do |product|
-      link_to(image_tag(product.image_path), admin_products_path(product))
+      link_to(image_tag(product.image_path), admin_product_path(product))
     end

data/docs/7-sidebars.md

@@ -25,6 +25,13 @@ options.
       "Need help? Email us at help@example.com"
     end
 
+If you want to conditionally display a sidebar section, use the :if option and
+pass it a proc which will be rendered within the context of the view.
+
+    sidebar :help, :if => proc{ current_admin_user.super_admin? }
+      "Only for super admins!"
+    end
+
 If you only pass a symbol, Active Admin will attempt to locate a partial to render.
 
     # Will render app/views/admin/posts/_help_sidebar.html.erb

data/docs/8-custom-actions.md

@@ -92,6 +92,12 @@ post:
       link_to('View on site', post_path(post)) if post.published?
     end
 
+Actions items also accept the :if option to conditionally display them:
+
+    action_item :only => :show, :if => proc{ current_admin_user.super_admin? } do
+      "Only display this to super admins on the show screen"
+    end
+
 ### Page Titles
 
 The page title for the custom action will be the internationalized version of

data/features/action_item.feature

@@ -0,0 +1,73 @@
+Feature: Action Item
+
+  Creating and Configuring action items
+
+  Background:
+    Given I am logged in
+    And a post with the title "Hello World" exists
+
+  Scenario: Create an member action
+    Given a configuration of:
+    """
+    ActiveAdmin.register Post do
+      action_item do 
+        link_to "Embiggen", '/'
+      end  
+    end
+    """
+    When I am on the index page for posts
+    Then I should not see a member link to "Embiggen"
+
+    When I follow "View"
+    Then I should see an action item link to "Embiggen"
+
+    When I follow "Edit Post"
+    Then I should see an action item link to "Embiggen"
+
+    When I am on the index page for posts
+    When I follow "New Post"
+    Then I should see an action item link to "Embiggen"
+
+  Scenario: Create an member action with if clause that returns true
+    Given a configuration of:
+    """
+    ActiveAdmin.register Post do
+      action_item :if => proc{ !current_active_admin_user.nil? } do 
+        link_to "Embiggen", '/'
+      end  
+    end
+    """
+    When I am on the index page for posts
+    Then I should not see a member link to "Embiggen"
+
+    When I follow "View"
+    Then I should see an action item link to "Embiggen"
+
+    When I follow "Edit Post"
+    Then I should see an action item link to "Embiggen"
+
+    When I am on the index page for posts
+    When I follow "New Post"
+    Then I should see an action item link to "Embiggen"
+
+  Scenario: Create an member action with if clause that returns false
+    Given a configuration of:
+    """
+    ActiveAdmin.register Post do
+      action_item :if => proc{ current_active_admin_user.nil? } do 
+        link_to "Embiggen", '/'
+      end  
+    end
+    """
+    When I am on the index page for posts
+    Then I should not see a member link to "Embiggen"
+
+    When I follow "View"
+    Then I should not see an action item link to "Embiggen"
+
+    When I follow "Edit Post"
+    Then I should not see an action item link to "Embiggen"
+
+    When I am on the index page for posts
+    When I follow "New Post"
+    Then I should not see an action item link to "Embiggen"

data/features/index/filters.feature

@@ -1,35 +1,68 @@
-Feature: Index Pagination
+Feature: Index Filtering
 
-  Background:
-    Given an index configuration of:
+  Scenario: Default Resources Filters
+    Given 3 posts exist
+    And an index configuration of:
     """
       ActiveAdmin.register Post
     """
-  Scenario: Filtering posts
-    Given 20 posts exist
     When I am on the index page for posts
-    Then I should see "Displaying all 20 Posts"
-    And I should see "Author" within ".filter_form"
-    And I should see "Category" within ".filter_form"
-    And I should see "Search Title" within ".filter_form"
-    And I should see "Search Body" within ".filter_form"
-    And I should see "Published at" within ".filter_form"
-    And I should see "Created at" within ".filter_form"
-    And I should see "Updated at" within ".filter_form"
-    
-    When I fill in "Search Title" with "Hello World 17"
+    Then I should see "Displaying all 3 Posts"
+    And I should see the following filters:
+     | Author       | select     |
+     | Category     | select     |
+     | Title        | string     |
+     | Body         | string     |
+     | Published at | date range |
+     | Created at   | date range |
+     | Updated at   | date range |
+
+    When I fill in "Search Title" with "Hello World 2"
     And I press "Filter"
     And I should see 1 posts in the table
-    And I should see "Hello World 17" within ".index_table"
-    
+    And I should see "Hello World 2" within ".index_table"
+
   Scenario: Filtering posts with no results
-    Given 20 posts exist
+    Given 3 posts exist
+    And an index configuration of:
+    """
+      ActiveAdmin.register Post
+    """
     When I am on the index page for posts
-    Then I should see "Displaying all 20 Posts"
+    Then I should see "Displaying all 3 Posts"
+
     When I fill in "Search Title" with "THIS IS NOT AN EXISTING TITLE!!"
     And I press "Filter"
-    
-    And I should not see ".index_table"
-    Then I should not see a sortable table header
+    Then I should not see ".index_table"
+    And I should not see a sortable table header
     And I should not see pagination
     And I should see "No Posts found"
+
+  Scenario: Checkboxes - Filtering posts written by anyone
+    Given 1 post exists
+    And a post with the title "Hello World" written by "Jane Doe" exists
+    And an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        filter :author, :as => :check_boxes
+      end
+    """
+    When I press "Filter"
+    Then I should see 2 posts in the table
+    And I should see "Hello World" within ".index_table"
+    And the "jane_doe" checkbox should not be checked
+
+  Scenario: Checkboxes - Filtering posts written by Jane Doe
+    Given 1 post exists
+    And a post with the title "Hello World" written by "Jane Doe" exists
+    And an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        filter :author, :as => :check_boxes
+      end
+    """
+    When I check "jane_doe"
+    And I press "Filter"
+    Then I should see 1 posts in the table
+    And I should see "Hello World" within ".index_table"
+    And the "jane_doe" checkbox should be checked

data/features/index/index_parameters.feature

@@ -0,0 +1,12 @@
+Feature: Index Parameters
+
+  Scenario: Viewing index when download_links disabled
+    Given an index configuration of:
+    """
+    ActiveAdmin.register Post do
+      index :as => :table, :download_links => false
+    end
+    """
+    Given 31 posts exist
+    When I am on the index page for posts
+    Then I should not see a link to download "CSV"

data/features/index/index_scope_to.feature

@@ -0,0 +1,29 @@
+Feature: Index Scope To
+
+  Viewing resource configs scoped to another object
+
+  Background:
+	Given 10 posts exist
+	And a post with the title "Hello World" written by "John Doe" exists
+	And a published post with the title "Hello World" written by "John Doe" exists
+	Given an index configuration of:
+	  """
+	  ActiveAdmin.register Post do
+		# Scope section to a specific author
+		scope_to do
+		  User.find_by_first_name_and_last_name("John", "Doe")
+		end
+
+		# Setup some scopes
+        scope :all, :default => true
+        scope :published do |posts|
+          posts.where("published_at IS NOT NULL")
+        end
+	  end
+	  """
+
+  Scenario: Viewing the default scope counts
+	When I am on the index page for posts
+    Then I should see the scope "All" selected
+    And I should see the scope "All" with the count 2
+    And I should see 2 posts in the table

data/features/index/index_scopes.feature

@@ -43,6 +43,19 @@ Feature: Index Scoping
     When I am on the index page for posts
     Then I should see the scope "All" selected
 
+  Scenario: Viewing resources with a scope but scope_count turned off
+    Given 10 posts exist
+    And an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        scope :all, :default => true
+        index :as => :table, :scope_count => false
+      end
+      """
+    Then I should see the scope "All" selected
+    And I should see the scope "All" with no count
+    And I should see 10 posts in the table
+
   Scenario: Viewing resources when scoping
     Given 6 posts exist
     And 4 published posts exist

data/features/index/pagination.feature

@@ -24,12 +24,21 @@ Feature: Index Pagination
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        before_filter :only => :index do |controller|
-          @per_page = 10
-        end
+        config.per_page = 2
       end
     """
-    Given 11 posts exist
+    Given 3 posts exist
     When I am on the index page for posts
     Then I should see pagination with 2 pages
-    And I should see "Displaying Posts 1 - 10 of 11 in total"
+    And I should see "Displaying Posts 1 - 2 of 3 in total"
+
+  Scenario: Viewing index with pagination disabled
+    Given an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        config.paginate = false
+      end
+    """
+    Given 31 posts exist
+    When I am on the index page for posts
+    Then I should not see pagination