activeadmin 0.5.0 → 0.5.1

data/docs/2-resource-customization.md

@@ -90,7 +90,7 @@ This would ensure that the Post menu item, is at the beginning of the menu.
 
 ### Conditionally Showing / Hiding Menu Items
 
-Menu items can be shown or hidden at runtime using the `:if` option. 
+Menu items can be shown or hidden at runtime using the `:if` option.
 
     ActiveAdmin.register Post do
       menu :if => proc{ current_admin_user.can_edit_posts? }
@@ -101,8 +101,8 @@ your helpers and current user session information.
 
 ## Scoping the queries
 
-If your administrators have different access levels, you may sometimes want to 
-scope what they have access to. Assuming your User model has the proper 
+If your administrators have different access levels, you may sometimes want to
+scope what they have access to. Assuming your User model has the proper
 has_many relationships, you can simply scope the listings and finders like so:
 
     ActiveAdmin.register Post do
@@ -114,8 +114,8 @@ has_many relationships, you can simply scope the listings and finders like so:
 
 That approach limits the posts an admin can access to ```current_user.posts```.
 
-If you want to do something fancier, for example override a default scope, you can 
-also use :association_method parameter with a normal method on your User model. 
+If you want to do something fancier, for example override a default scope, you can
+also use :association_method parameter with a normal method on your User model.
 The only requirement is that your method returns an instance of ActiveRecord::Relation.
 
     class Ad < ActiveRecord::Base
@@ -133,7 +133,7 @@ The only requirement is that your method returns an instance of ActiveRecord::Re
       scope_to :current_user, :association_method => :managed_ads
     end
 
-In case you just need to customize the query independently of the current user, you can 
+In case you just need to customize the query independently of the current user, you can
 override the `scoped_collection` method on the controller:
 
     ActiveAdmin.register Post do
@@ -143,3 +143,20 @@ override the `scoped_collection` method on the controller:
         end
       end
     end
+
+## Customizing resource retrieval
+
+If you need to completely replace the record retrieving code (e.g., you have a custom
+`to_param` implementation in your models), override the `resource` method on the controller:
+
+    ActiveAdmin.register Post do
+      controller do
+        def resource
+          Post.where(id: params[:id]).first!
+        end
+      end
+    end
+
+In fact, the controllers use [Inherited Resource](https://github.com/josevalim/inherited_resources),
+so you can use all the
+[customization features in Inherited Resource](https://github.com/josevalim/inherited_resources#overwriting-defaults).

data/docs/3-index-pages.md

@@ -77,6 +77,11 @@ Or to disable for the entire application:
       config.filters = false
     end
 
+You can also add a filter and still preserve the default filters:
+
+    preserve_default_filters!
+    filter :author
+
 ## Index default sort order
 
 You can define the default sort order for index pages:

data/docs/4-csv-format.md

@@ -13,11 +13,20 @@ Customizing the CSV format is as simple as customizing the index page.
       end
     end
 
-You can choose custom separator
+You can set custom csv options:
 
     ActiveAdmin.register Post do
-      csv :separator => ';' do
+      csv :options => { :force_quotes => true } do
         column :title
         column("Author") { |post| post.author.full_name }
       end
     end
+
+You can set options for the CSV format system-wide:
+
+    # config/initializers/active_admin.rb
+    # Set the CSV builder separator (default is ",")
+    config.csv_column_separator = ';'
+
+    # Set the CSV builder options (default is {})
+    config.csv_options = { :force_quotes => true }

data/docs/8-custom-actions.md

@@ -17,7 +17,7 @@ To add a collection action, use the collection_action method:
 
       collection_action :import_csv, :method => :post do
         # Do some CSV importing work here...
-        redirect_to {:action => :index}, :notice => "CSV imported successfully!"
+        redirect_to {:action => :index}, {:notice => "CSV imported successfully!"}
       end
 
     end
@@ -37,7 +37,7 @@ following:
       member_action :lock, :method => :put do
         user = User.find(params[:id])
         user.lock!
-        redirect_to {:action => :show}, :notice => "Locked!"
+        redirect_to {:action => :show}, {:notice => "Locked!"}
       end
 
     end

data/features/breadcrumb.feature

@@ -0,0 +1,27 @@
+Feature: Breadcrumb
+
+  Background:
+    Given I am logged in
+
+  Scenario: Default breadcrumb links
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+      end
+    """
+    When I am on the new post page
+    Then I should see a link to "Post" in the breadcrumb
+    
+  Scenario: Rewritten breadcrumb links
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        breadcrumb do
+          [
+            link_to('test', '/admin/test/url')
+          ]
+        end
+      end
+    """
+    When I am on the new post page
+    Then I should see a link to "test" in the breadcrumb

data/features/decorators.feature

@@ -0,0 +1,41 @@
+Feature: Decorators
+
+  Using decorators for index and show sections
+
+  Background:
+    Given a user named "John Doe" exists
+    Given a post with the title "A very unique post" exists
+    And I am logged in
+
+  Scenario: Index page with decorator
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        decorate_with PostDecorator
+
+        index do
+          column(:id)
+          column(:title)
+          column(:decorator_method)
+        end
+      end
+    """
+    When I am on the index page for posts
+    Then I should see "A method only available on the decorator"
+    And I should see "A very unique post"
+
+  Scenario: Show page with decorator
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        decorate_with PostDecorator
+
+        show do
+          attributes_table :title, :decorator_method
+        end
+      end
+    """
+    When I am on the index page for posts
+    And I follow "View"
+    And I should see the attribute "Decorator Method" with "A method only available on the decorator"
+    And I should see the attribute "Title" with "A very unique post"

data/features/i18n.feature

@@ -33,3 +33,10 @@ Feature: Internationalization
     And I go to the dashboard
     Then I should see "Bookstore"
     Then I should see "Logout"
+
+  Scenario: Overriding translations
+    Given I am logged in
+    And a store named "Hello words" exists
+    When I go to the dashboard
+    When I follow "Bookstores"
+    Then I should see "Download this:"

data/features/index/format_as_csv.feature

@@ -12,8 +12,8 @@ Feature: Format as CSV
     When I am on the index page for posts
     And I follow "CSV"
     And I should download a CSV file for "posts" containing:
-    | Id  | Title       | Body | Published At | Created At | Updated At |
-    | \d+ | Hello World |      |              | (.*)       | (.*)       |
+    | Id  | Title       | Body | Published At | Starred | Created At | Updated At |
+    | \d+ | Hello World |      |              |         | (.*)       | (.*)       |
 
   Scenario: Default with alias
     Given a configuration of:
@@ -24,7 +24,7 @@ Feature: Format as CSV
     When I am on the index page for my_articles
     And I follow "CSV"
     And I should download a CSV file for "my-articles" containing:
-    | Id  | Title       | Body | Published At | Created At | Updated At |
+    | Id  | Title       | Body | Published At | Starred | Created At | Updated At |
 
   Scenario: With CSV format customization
     Given a configuration of:
@@ -61,6 +61,24 @@ Feature: Format as CSV
       | Title        | Body |
       | Hello, World | (.*) |
 
+  Scenario: With CSV option customization
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        csv :options => {:force_quotes => true} do
+          column :title
+          column :body
+        end
+      end
+    """
+    And a post with the title "012345" exists
+    When I am on the index page for posts
+    And I follow "CSV"
+    And I should download a CSV file with "," separator for "posts" containing:
+      | Title  | Body |
+      | 012345 | (.*) |
+    And the CSV file should contain "012345" in quotes
+
   Scenario: With default CSV separator option
     Given a configuration of:
     """
@@ -79,3 +97,22 @@ Feature: Format as CSV
       | Title | Body |
       | Hello, World | (.*) |
 
+  Scenario: With default CSV options
+    Given a configuration of:
+    """
+      ActiveAdmin.application.csv_options = {:force_quotes => true}
+      ActiveAdmin.application.csv_column_separator = ','
+      ActiveAdmin.register Post do
+        csv do
+          column :title
+          column :body
+        end
+      end
+    """
+    And a post with the title "012345" exists
+    When I am on the index page for posts
+    And I follow "CSV"
+    And I should download a CSV file with "," separator for "posts" containing:
+      | Title  | Body |
+      | 012345 | (.*) |
+    And the CSV file should contain "012345" in quotes

data/features/index/index_as_table.feature

@@ -113,11 +113,11 @@ Feature: Index as Table
       """
     When I am on the index page for posts
     Then I should see the "posts" table:
-      | [ ] | Id | Title        | Body | Published At | Created At | Updated At | |
-      | [ ] | 2 | Bye bye world | Move your...  |  | /.*/ | /.*/ | ViewEditDelete |
-      | [ ] | 1 | Hello World   | From the body |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | Id | Title        | Body | Published At | Starred | Created At | Updated At | |
+      | [ ] | 2 | Bye bye world | Move your...  |  |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | 1 | Hello World   | From the body |  |  | /.*/ | /.*/ | ViewEditDelete |
     When I follow "Id"
     Then I should see the "posts" table:
-      | [ ] | Id | Title        | Body | Published At | Created At | Updated At | |
-      | [ ] | 1 | Hello World   | From the body |  | /.*/ | /.*/ | ViewEditDelete |
-      | [ ] | 2 | Bye bye world | Move your...  |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | Id | Title        | Body | Published At | Starred | Created At | Updated At | |
+      | [ ] | 1 | Hello World   | From the body |  |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | 2 | Bye bye world | Move your...  |  |  | /.*/ | /.*/ | ViewEditDelete |

data/features/step_definitions/format_steps.rb

@@ -48,4 +48,9 @@ end
 
 Then /^I should download a CSV file for "([^"]*)" containing:$/ do |resource_name, table|
   step "I should download a CSV file with \",\" separator for \"#{resource_name}\" containing:", table
-end
+end
+
+Then /^the CSV file should contain "([^"]*)" in quotes$/ do |text|
+  body = page.driver.response.body
+  body.should match(/\"#{text}\"/)
+end

data/lib/active_admin.rb

@@ -53,7 +53,7 @@ module ActiveAdmin
     config.after_initialize do
       # Add load paths straight to I18n, so engines and application can overwrite it.
       require 'active_support/i18n'
-      I18n.load_path += Dir[File.expand_path('../active_admin/locales/*.yml', __FILE__)]
+      I18n.load_path.unshift *Dir[File.expand_path('../active_admin/locales/*.yml', __FILE__)]
     end
   end
 

data/lib/active_admin/application.rb

@@ -12,6 +12,11 @@ module ActiveAdmin
       setting name, default
     end
 
+    def self.deprecated_inheritable_setting(name, default)
+      Namespace.deprecated_setting name, nil
+      deprecated_setting name, default
+    end
+
     # The default namespace to put controllers and routes inside. Set this
     # in config/initializers/active_admin.rb using:
     #
@@ -66,8 +71,8 @@ module ActiveAdmin
     # The namespace root.
     inheritable_setting :root_to, 'dashboard#index'
 
-    # Default CSV separator
-    inheritable_setting :csv_column_separator, ','
+    # Default CSV options
+    inheritable_setting :csv_options, {}
 
     # Active Admin makes educated guesses when displaying objects, this is
     # the list of methods it tries calling in order
@@ -82,6 +87,9 @@ module ActiveAdmin
 
     # == Deprecated Settings
 
+    # @deprecated Default CSV separator will be removed in 0.6.0. Use `csv_options = { :col_sep => ',' }` instead.
+    deprecated_inheritable_setting :csv_column_separator, ','
+
     # @deprecated The default sort order for index pages
     deprecated_setting :default_sort_order, 'id_desc'
 
@@ -212,26 +220,26 @@ module ActiveAdmin
     end
 
     #
-    # Add before, around and after filters to each registered resource.
+    # Add before, around and after filters to each registered resource and pages.
     #
     # eg:
     #
     #   ActiveAdmin.before_filter :authenticate_admin!
     #
     def before_filter(*args, &block)
-      ResourceController.before_filter(*args, &block)
+      BaseController.before_filter(*args, &block)
     end
 
     def skip_before_filter(*args, &block)
-      ResourceController.skip_before_filter(*args, &block)
+      BaseController.skip_before_filter(*args, &block)
     end
 
     def after_filter(*args, &block)
-      ResourceController.after_filter(*args, &block)
+      BaseController.after_filter(*args, &block)
     end
 
     def around_filter(*args, &block)
-      ResourceController.around_filter(*args, &block)
+      BaseController.around_filter(*args, &block)
     end
 
     # Helper method to add a dashboard section

data/lib/active_admin/comments/comment.rb

@@ -6,8 +6,6 @@ module ActiveAdmin
   ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
 
   class Comment < ActiveRecord::Base
-    self.table_name = "active_admin_comments"
-
     belongs_to :resource, :polymorphic => true
     belongs_to :author, :polymorphic => true
 
@@ -41,6 +39,10 @@ module ActiveAdmin
       columns.select { |i| i.name == "resource_id" }.first.type
     end
 
+    def self.table_name
+      @table_name ||= ActiveRecord::Migrator.proper_table_name("active_admin_comments")
+    end
+
   end
 
 end

data/lib/active_admin/csv_builder.rb

@@ -25,11 +25,12 @@ module ActiveAdmin
       end
     end
 
-    attr_reader :columns, :column_separator
+    attr_reader :columns, :column_separator, :options
 
     def initialize(options={}, &block)
       @columns          = []
       @column_separator = options.delete(:separator)
+      @options          = options.delete(:options)
       instance_eval &block if block_given?
     end
 

data/lib/active_admin/devise.rb

@@ -34,6 +34,7 @@ module ActiveAdmin
 
       # Redirect to the default namespace on logout
       def root_path
+        (Rails.configuration.action_controller[:relative_url_root] || '') +
         if ActiveAdmin.application.default_namespace
           "/#{ActiveAdmin.application.default_namespace}"
         else

data/lib/active_admin/dsl.rb

@@ -120,9 +120,34 @@ module ActiveAdmin
     def menu(options = {})
       config.menu(options)
     end
+    
+    # Rewrite breadcrumb links.
+    # Block will be executed inside controller.
+    # Block must return an array if you want to rewrite breadcrumb links.
+    #
+    # Example:
+    #   ActiveAdmin.register Post do
+    #
+    #     breadcrumb do
+    #       [
+    #         link_to('my piece', '/my/link/to/piece')
+    #       ]
+    #     end
+    #   end
+    #
+    def breadcrumb(&block)
+      config.breadcrumb = block
+    end
 
     def sidebar(name, options = {}, &block)
       config.sidebar_sections << ActiveAdmin::SidebarSection.new(name, options, &block)
     end
+
+    def decorate_with(decorator_class)
+      # Force storage as a string. This will help us with reloading issues.
+      # Assuming decorator_class.to_s will return the name of the class allows
+      # us to handle a string or a class.
+      config.decorator_class_name = "::#{ decorator_class }"
+    end
   end
 end