activeadmin 1.0.0.pre2 → 1.0.0.pre3

data/features/development_reloading.feature

@@ -12,7 +12,7 @@ Feature: Development Reloading
     When "app/admin/posts.rb" contains:
     """
       ActiveAdmin.register Post do
-        if Rails::VERSION::MAJOR == 4
+        if Rails::VERSION::MAJOR >= 4
           permit_params :custom_category_id, :author_id, :title,
             :body, :position, :published_at, :starred
         end

data/features/edit_page.feature

@@ -10,7 +10,7 @@ Feature: Edit Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        if Rails::VERSION::MAJOR == 4
+        if Rails::VERSION::MAJOR >= 4
           permit_params :custom_category_id, :author_id, :title,
             :body, :position, :published_at, :starred
         end
@@ -34,7 +34,7 @@ Feature: Edit Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR == 4
+        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
 
         form do |f|
           f.inputs "Your Post" do
@@ -63,7 +63,7 @@ Feature: Edit Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR == 4
+        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
 
         form :html => {} do |f|
           f.inputs "Your Post" do
@@ -102,7 +102,7 @@ Feature: Edit Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR == 4
+        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
 
         form :partial => "form"
       end

data/features/index/batch_actions.feature

@@ -64,6 +64,19 @@ Feature: Batch Actions
     Then I should see a flash with "Successfully destroyed 2 posts"
     And I should see 3 posts in the table
 
+  Scenario: Disable display of batch action button if all nested buttons hide
+    Given 1 post exist
+    And an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        batch_action :destroy, false
+        batch_action(:flag, if: proc { false } ) do
+          render text: 42
+        end
+      end
+      """
+    Then I should not see the batch action selector
+
   Scenario: Using a custom batch action
     Given 10 posts exist
     And an index configuration of:

data/features/index/page_title.feature

@@ -34,7 +34,8 @@ Feature: Index - Page Title
     """
       ActiveAdmin.register Post do
         controller do
-          before_filter { @page_title = "List of #{resource_class.model_name.plural}" }
+          callback = ActiveAdmin::Dependency.rails >= 4 ? :before_action : :before_filter
+          send(callback) { @page_title = "List of #{resource_class.model_name.plural}" }
         end
       end
     """

data/features/new_page.feature

@@ -9,7 +9,7 @@ Feature: New Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        if Rails::VERSION::MAJOR == 4
+        if Rails::VERSION::MAJOR >= 4
           permit_params :custom_category_id, :author_id, :title,
             :body, :position, :published_at, :starred
         end
@@ -34,7 +34,7 @@ Feature: New Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR == 4
+        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
 
         form do |f|
           f.inputs "Your Post" do
@@ -70,7 +70,7 @@ Feature: New Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR == 4
+        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
 
         form :partial => "form"
       end
@@ -87,7 +87,7 @@ Feature: New Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR == 4
+        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
 
         form do |f|
           f.inputs "Your Post" do

data/features/renamed_resource.feature

@@ -9,7 +9,7 @@ Feature: Renamed Resource
     Given a configuration of:
     """
       ActiveAdmin.register Blog::Post, as: 'Post' do
-        if Rails::VERSION::MAJOR == 4
+        if Rails::VERSION::MAJOR >= 4
           permit_params :custom_category_id, :author_id, :title,
             :body, :position, :published_at, :starred
         end

data/features/show/default_content.feature

@@ -14,7 +14,7 @@ Feature: Show - Default Content
     And I should see the attribute "Body" with "Empty"
     And I should see the attribute "Created At" with a nicely formatted datetime
     And I should see the attribute "Author" with "Jane Doe"
-    And I should see the attribute "Starred" with "false"
+    And I should see the attribute "Starred" with "No"
     And I should see an action item button "Delete Post"
     And I should see an action item button "Edit Post"
 

data/features/show/page_title.feature

@@ -51,7 +51,8 @@ Feature: Show - Page Title
     """
       ActiveAdmin.register Post do
         controller do
-          before_filter { @page_title = "List of #{resource_class.model_name.plural}" }
+          callback = ActiveAdmin::Dependency.rails >= 4 ? :before_action : :before_filter
+          send(callback) { @page_title = "List of #{resource_class.model_name.plural}" }
         end
       end
     """

data/features/step_definitions/attribute_steps.rb

@@ -1,6 +1,6 @@
 Then /^I should see the attribute "([^"]*)" with "([^"]*)"$/ do |title, value|
   elems = all ".attributes_table th:contains('#{title}') ~ td:contains('#{value}')"
-  expect(elems.first).to_not be_nil, 'attribute missing'
+  expect(elems.first).to_not eq(nil), 'attribute missing'
 end
 
 Then /^I should see the attribute "([^"]*)" with a nicely formatted datetime$/ do |title|
@@ -10,7 +10,7 @@ end
 
 Then /^the attribute "([^"]*)" should be empty$/ do |title|
   elems = all ".attributes_table th:contains('#{title}') ~ td > span.empty"
-  expect(elems.first).to_not be_nil, 'attribute not empty'
+  expect(elems.first).to_not eq(nil), 'attribute not empty'
 end
 
 Then /^I should not see the attribute "([^"]*)"$/ do |title|

data/features/step_definitions/factory_steps.rb

@@ -5,9 +5,9 @@ end
 
 Given /^(a|\d+)( published)?( unstarred|starred)? posts?(?: with the title "([^"]*)")?(?: and body "([^"]*)")?(?: written by "([^"]*)")?(?: in category "([^"]*)")? exists?$/ do |count, published, starred, title, body, user, category_name|
   count     = count == 'a' ? 1 : count.to_i
-  published = Time.now          if published
+  published = Time.now              if published
   starred   = starred == " starred" if starred
-  author    = create_user(user) if user
+  author    = create_user(user)     if user
   category  = Category.where(name: category_name).first_or_create if category_name
   title   ||= "Hello World %i"
   count.times do |i|

data/features/step_definitions/filter_steps.rb

@@ -25,14 +25,14 @@ end
 Then(/^I should( not)? have parameter "([^"]*)"( with value "([^"]*)")?$/) do |negative, key, compare_val, value|
   query = URI(page.current_url).query
   if query.nil?
-    expect(negative).to be_truthy
+    expect(negative).to eq true
   else
     params = Rack::Utils.parse_query query
     if compare_val
       expect(params[key]).to_not eq value if negative
       expect(params[key]).to eq value unless negative
     else
-      expect(params[key]).to be_nil if negative
+      expect(params[key]).to eq nil if negative
       expect(params[key]).to be_present unless negative
     end
   end

data/features/step_definitions/format_steps.rb

@@ -24,7 +24,7 @@ Then /^I should download a CSV file with "([^"]*)" separator for "([^"]*)" conta
       expected_row.each_with_index do |expected_cell, col_index|
         cell = csv.try(:[], row_index).try(:[], col_index)
         if expected_cell.blank?
-          expect(cell).to be_nil
+          expect(cell).to eq nil
         else
           expect(cell || '').to match /#{expected_cell}/
         end

data/features/sti_resource.feature

@@ -7,10 +7,10 @@ Feature: STI Resource
     And a configuration of:
     """
       ActiveAdmin.register Publisher do
-        permit_params :first_name, :last_name, :username, :age if Rails::VERSION::MAJOR == 4
+        permit_params :first_name, :last_name, :username, :age if Rails::VERSION::MAJOR >= 4
       end
       ActiveAdmin.register User do
-        permit_params :first_name, :last_name, :username, :age if Rails::VERSION::MAJOR == 4
+        permit_params :first_name, :last_name, :username, :age if Rails::VERSION::MAJOR >= 4
       end
     """
 

data/features/strong_parameters.feature

@@ -32,7 +32,7 @@ Feature: Strong Params
     Then I should see "Post was successfully updated."
     And I should see the attribute "Title" with "Hello World from update"
     And I should see the attribute "Author" with "John Doe"
-    And I should see the attribute "Starred" with "true"
+    And I should see the attribute "Starred" with "Yes"
 
   Scenario: Dynamic permitted parameters
     Given a configuration of:
@@ -53,7 +53,7 @@ Feature: Strong Params
     Then I should see "Post was successfully updated."
     And I should see the attribute "Title" with "Hello World from update"
     And I should see the attribute "Author" with "John Doe"
-    And I should see the attribute "Starred" with "true"
+    And I should see the attribute "Starred" with "Yes"
 
   Scenario: Should not update parameters that are not declared as permitted
     Given a configuration of:
@@ -70,4 +70,4 @@ Feature: Strong Params
     Then I should see "Post was successfully updated."
     And I should see the attribute "Title" with "Hello World from update"
     And I should see the attribute "Author" with "John Doe"
-    And the attribute "Starred" should be empty
+    And I should see the attribute "Starred" with "No"

data/features/support/env.rb

@@ -4,7 +4,7 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-ENV["RAILS_ENV"] ||= "cucumber"
+ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path('../../../spec/spec_helper', __FILE__)
 
@@ -58,6 +58,9 @@ Capybara.javascript_driver = :poltergeist
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
 
+# Make input type=hidden visible
+Capybara.ignore_hidden_elements = false
+
 # If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a
@@ -81,7 +84,12 @@ ActionController::Base.allow_rescue = false
 # after each scenario, which can lead to hard-to-debug failures in
 # subsequent scenarios. If you do this, we recommend you create a Before
 # block that will explicitly put your database in a known state.
-Cucumber::Rails::World.use_transactional_fixtures = false
+if ActiveAdmin::Dependency.rails5?
+  Cucumber::Rails::World.use_transactional_tests = true
+else
+  Cucumber::Rails::World.use_transactional_fixtures = true
+end
+
 # How to clean your database when transactions are turned off. See
 # http://github.com/bmabey/database_cleaner for more info.
 if defined?(ActiveRecord::Base)
@@ -89,7 +97,8 @@ if defined?(ActiveRecord::Base)
     require 'database_cleaner'
     require 'database_cleaner/cucumber'
     DatabaseCleaner.strategy = :truncation
-  rescue LoadError => ignore_if_database_cleaner_not_present
+  rescue LoadError
+    # ignore if database_cleaner isn't present
   end
 end
 
@@ -106,7 +115,6 @@ After do
 end
 
 Before do
-
   begin
     # We are caching classes, but need to manually clear references to
     # the controllers. If they aren't clear, the router stores references
@@ -121,6 +129,15 @@ Before do
   end
 end
 
+# Force deprecations to raise an exception.
+# This would set `behavior = :raise`, but that wasn't added until Rails 4.
+ActiveSupport::Deprecation.behavior = -> message, callstack do
+  e = StandardError.new message
+  e.set_backtrace callstack.map(&:to_s)
+  puts e # sometimes Cucumber otherwise won't show the error message
+  raise e
+end
+
 # improve the performance of the specs suite by not logging anything
 # see http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
 Rails.logger.level = 4

data/lib/active_admin/application.rb

@@ -1,4 +1,5 @@
 require 'active_admin/router'
+require 'active_admin/reloader'
 require 'active_admin/helpers/settings'
 
 module ActiveAdmin
@@ -109,7 +110,10 @@ module ActiveAdmin
     inheritable_setting :flash_keys_to_except, ['timedout']
 
     # Set default localize format for Date/Time values
-    inheritable_setting :localize_format, :long
+    setting :localize_format, :long
+
+    # Include association filters by default
+    inheritable_setting :include_default_association_filters, true
 
     # Active Admin makes educated guesses when displaying objects, this is
     # the list of methods it tries calling in order
@@ -122,6 +126,9 @@ module ActiveAdmin
                                       :email,
                                       :to_s ]
 
+    # To make debugging easier, by default don't stream in development
+    setting :disable_streaming_in, ['development']
+
     # == Deprecated Settings
 
     def allow_comments=(*)
@@ -276,11 +283,11 @@ module ActiveAdmin
           # Rails is about to unload all the app files (e.g. models), so we
           # should first unload the classes generated by Active Admin, otherwise
           # they will contain references to the stale (unloaded) classes.
-          ActionDispatch::Reloader.to_prepare(prepend: true, &unload_active_admin)
+          Reloader.to_prepare(prepend: true, &unload_active_admin)
         else
           # If the user has configured the app to always reload app files after
           # each request, so we should unload the generated classes too.
-          ActionDispatch::Reloader.to_cleanup(&unload_active_admin)
+          Reloader.to_complete(&unload_active_admin)
         end
 
         admin_dirs = {}
@@ -295,7 +302,7 @@ module ActiveAdmin
 
         app.reloaders << routes_reloader
 
-        ActionDispatch::Reloader.to_prepare do
+        Reloader.to_prepare do
           # Rails might have reloaded the routes for other reasons (e.g.
           # routes.rb has changed), in which case Active Admin would have been
           # loaded via the `ActiveAdmin.routes` call in `routes.rb`.

data/lib/active_admin/authorization_adapter.rb

@@ -47,7 +47,7 @@ module ActiveAdmin
     #        the class of the subject also. For example, Active Admin uses the class
     #        of the resource to decide if the resource should be displayed in the
     #        global navigation. To deal with this nicely in a case statement, take
-    #        a look at `#normalized(klasss)`
+    #        a look at `#normalized(klass)`
     #
     # @return [Boolean]
     def authorized?(action, subject = nil)

data/lib/active_admin/base_controller.rb

@@ -10,8 +10,13 @@ module ActiveAdmin
 
     layout :determine_active_admin_layout
 
-    before_filter :only_render_implemented_actions
-    before_filter :authenticate_active_admin_user
+    if ActiveAdmin::Dependency.rails >= 4
+      before_action :only_render_implemented_actions
+      before_action :authenticate_active_admin_user
+    else
+      before_filter :only_render_implemented_actions
+      before_filter :authenticate_active_admin_user
+    end
 
     class << self
       # Ensure that this method is available for the DSL
@@ -73,5 +78,10 @@ module ActiveAdmin
       ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false : 'active_admin'
     end
 
+    def active_admin_root
+      controller, action = active_admin_namespace.root_to.split '#'
+      {controller: controller, action: action}
+    end
+
   end
 end

data/lib/active_admin/base_controller/authorization.rb

@@ -113,19 +113,16 @@ module ActiveAdmin
             redirect_backwards_or_to_root
           end
 
-          format.csv  { render text:          error,           status: :unauthorized }
+          body = ActiveAdmin::Dependency.rails.render_key
+
+          format.csv  { render body =>        error,           status: :unauthorized }
           format.json { render json: { error: error },         status: :unauthorized }
           format.xml  { render xml: "<error>#{error}</error>", status: :unauthorized }
         end
       end
 
       def redirect_backwards_or_to_root
-        if request.headers.key? "HTTP_REFERER"
-          redirect_to :back
-        else
-          controller, action = active_admin_namespace.root_to.split '#'
-          redirect_to controller: controller, action: action
-        end
+        ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
       end
 
     end

data/lib/active_admin/base_controller/menu.rb

@@ -4,7 +4,11 @@ module ActiveAdmin
       extend ActiveSupport::Concern
 
       included do
-        before_filter :set_current_tab
+        if ActiveAdmin::Dependency.rails >= 4
+          before_action :set_current_tab
+        else
+          before_filter :set_current_tab
+        end
         helper_method :current_menu
       end
 

data/lib/active_admin/batch_actions/controller.rb

@@ -30,7 +30,6 @@ module ActiveAdmin
         :filtering,
         :scoping,
         :includes,
-        :collection_decorator
       ].freeze
 
       def batch_action_collection(only = COLLECTION_APPLIES)

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -54,8 +54,9 @@ module ActiveAdmin
       # Path to the batch action itself
       def batch_action_path(params = {})
         path = [route_collection_path(params), "batch_action"].join("/")
-        query = params.slice(:q, :scope).to_param
-        [path, query].reject(&:blank?).join("?")
+        query = params.slice(:q, :scope)
+        query = query.permit!.to_h if query.respond_to? :permit!
+        [path, query.to_param].reject(&:blank?).join("?")
       end
 
       private