activeadmin 1.0.0.pre5 → 1.0.0

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 eq(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|

data/features/step_definitions/configuration_steps.rb

@@ -30,7 +30,7 @@ module ActiveAdminContentsRollback
   # Else, remove the file and its parent folder structure until Rails.root OR other files exist.
   def rollback_file(file, contents)
     if contents.present?
-      File.open(file,'w') { |f| f << contents }
+      File.open(file, 'w') { |f| f << contents }
     else
       File.delete(file)
       begin
@@ -87,7 +87,7 @@ Given /^"([^"]*)" contains:$/ do |filename, contents|
   FileUtils.mkdir_p File.dirname path
   record path
 
-  File.open(path,'w+'){ |f| f << contents }
+  File.open(path, 'w+'){ |f| f << contents }
 end
 
 Given /^I add "([^"]*)" to the "([^"]*)" model$/ do |code, model_name|

data/features/step_definitions/format_steps.rb

@@ -50,3 +50,7 @@ end
 Then /^the encoding of the CSV file should be "([^"]*)"$/ do |text|
   expect(page.driver.response.body.encoding).to be Encoding.find(Encoding.aliases[text] || text)
 end
+
+Then /^access denied$/ do
+  expect(page).to have_content(I18n.t("active_admin.access_denied.message"))
+end

data/features/step_definitions/index_scope_steps.rb

@@ -10,7 +10,7 @@ Then /^I should see the scope "([^"]*)" not selected$/ do |name|
 end
 
 Then /^I should see the scope "([^"]*)" with the count (\d+)$/ do |name, count|
-  name = name.tr(' ','').underscore.downcase
+  name = name.tr(' ', '').underscore.downcase
   step %{I should see "#{count}" within ".scopes .#{name} .count"}
 end
 

data/features/step_definitions/menu_steps.rb

@@ -1,9 +1,9 @@
 Then /^I should see a menu item for "([^"]*)"$/ do |name|
-  expect(page).to have_css '#tabs li a', text: name
+  expect(page).to have_css '#tabs > li > a', text: name
 end
 
 Then /^I should not see a menu item for "([^"]*)"$/ do |name|
-  expect(page).to_not have_css '#tabs li a', text: name
+  expect(page).to_not have_css '#tabs > li > a', text: name
 end
 
 Then /^I should see a nested menu item for "([^"]*)"$/ do |name|

data/features/step_definitions/user_steps.rb

@@ -42,7 +42,7 @@ end
 
 Given /^override locale "([^"]*)" with "([^"]*)"$/ do |path, value|
   keys_value  = path.split('.') + [value]
-  locale_hash = keys_value.reverse.inject{|a,n| {n=>a}}
+  locale_hash = keys_value.reverse.inject{|a, n| {n=>a}}
   I18n.available_locales
   I18n.backend.store_translations(I18n.locale, locale_hash)
 end

data/features/step_definitions/web_steps.rb

@@ -27,10 +27,6 @@ When /^(?:I )go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^(?:I )POST to "(.*?)" with params "(.*?)"$/ do |url, params|
-  post "#{url}#{params}"
-end
-
 When /^(?:I )press "([^"]*)"$/ do |button|
   click_button(button)
 end
@@ -72,7 +68,12 @@ end
 
 Then /^the "([^"]*)" checkbox(?: within (.*))? should( not)? be checked$/ do |label, parent, negate|
   with_scope(parent) do
-    expect(find_field(label)['checked']).to negate ? eq(false) : eq(true)
+    checkbox = find_field(label)
+    if negate
+      expect(checkbox).not_to be_checked
+    else
+      expect(checkbox).to be_checked
+    end
   end
 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
       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
       end
     """
 

data/features/strong_parameters.feature

@@ -1,10 +1,6 @@
-@rails4
 @silent_unpermitted_params_failure
 Feature: Strong Params
 
-  When I am using Rails 4
-  I want to use Strong Parameters
-
   Background:
     Given a category named "Music" exists
     And a user named "John Doe" exists

data/features/support/env.rb

@@ -103,33 +103,19 @@ Before do
 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
+ActiveSupport::Deprecation.behavior = :raise
 
 # 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
 
-# Improves performance by forcing the garbage collector to run less often.
-unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
-  require File.expand_path('../../../spec/support/deferred_garbage_collection', __FILE__)
-  Before { DeferredGarbageCollection.start }
-  After  { DeferredGarbageCollection.reconsider }
-end
-
-# Don't run @rails4 tagged features for versions before Rails 4.
-Before('@rails4') do |scenario|
-  scenario.skip_invoke! if Rails::VERSION::MAJOR < 4
-end
-
 Around '@silent_unpermitted_params_failure' do |scenario, block|
   original = ActionController::Parameters.action_on_unpermitted_parameters
   ActionController::Parameters.action_on_unpermitted_parameters = false
   block.call
   ActionController::Parameters.action_on_unpermitted_parameters = original
 end
+
+Around '@locale_manipulation' do |scenario, block|
+  I18n.with_locale(:en) { block.call }
+end

data/features/support/paths.rb

@@ -6,10 +6,7 @@ module NavigationHelpers
   # step definition in web_steps.rb
   #
   def path_to(page_name)
-    params = page_name.scan(/with params "(.*?)"/).flatten[0] || ''
-    page_name.sub! /\ with params.*/, ''
-
-    url = case page_name
+    case page_name
 
     when /the home\s?page/
       '/'
@@ -19,12 +16,10 @@ module NavigationHelpers
       "/admin/posts/new"
     when /the login page/
       "/admin/login"
-    when /the first post show page/
-      "/admin/posts/1"
     when /the first post custom status page/
       "/admin/posts/1/status"
-    when /the first post edit page/
-      "/admin/posts/1/edit"
+    when /the last posts page/
+      "/admin/last_posts"
     when /the admin password reset form with token "([^"]*)"/
       "/admin/password/edit?reset_password_token=#{$1}"
 
@@ -41,6 +36,9 @@ module NavigationHelpers
     when /^the index page for (.*)$/
       send "admin_#{$1}_path"
 
+    when /^the (.*) index page for (.*)$/
+      send "admin_#{$2}_path", format: $1
+
     when /^the last author's posts$/
       admin_user_posts_path(User.last)
 
@@ -69,7 +67,6 @@ module NavigationHelpers
           "Now, go and add a mapping in #{__FILE__}"
       end
     end
-    url + params
   end
 end
 

data/gemfiles/rails_42.gemfile

@@ -4,34 +4,33 @@ source "https://rubygems.org"
 
 gem "cancan"
 gem "pundit"
-gem "thor", "<= 0.19.1"
 gem "rake"
-gem "parallel_tests", "< 2.10"
+gem "parallel_tests"
 gem "pry"
-gem "rails", "4.2.8.rc1"
+gem "rubocop", "0.48.1"
+gem "rails", "4.2.8"
 gem "jquery-ui-rails", "~> 5.0"
 gem "devise", "~> 3.5"
-gem "inherited_resources"
 gem "draper", "~> 2.1"
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 
 group :development do
-  gem "better_errors", :platforms => [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
-  gem "binding_of_caller", :platforms => :mri
+  gem "better_errors"
+  gem "binding_of_caller", platforms: :mri
   gem "rack-mini-profiler"
   gem "yard"
-  gem "redcarpet", :platforms => :mri
-  gem "kramdown", :platforms => :jruby
-  gem "appraisal", :require => false
+  gem "redcarpet", platforms: :mri
+  gem "kramdown", platforms: :jruby
+  gem "appraisal", "~> 2.2", require: false
 end
 
 group :test do
   gem "capybara"
-  gem "simplecov", :require => false
-  gem "codecov", :require => false
-  gem "cucumber-rails", :require => false
+  gem "simplecov", require: false
+  gem "codecov", require: false
+  gem "cucumber-rails", require: false
   gem "cucumber", "1.3.20"
-  gem "database_cleaner"
+  gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
   gem "jasmine"
   gem "jslint_on_rails"
   gem "launchy"
@@ -39,15 +38,8 @@ group :test do
   gem "rspec-rails"
   gem "i18n-spec"
   gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", :platforms => :mri
+  gem "sqlite3", platforms: :mri
   gem "poltergeist"
 end
 
-platforms :ruby_19 do
-  gem "kaminari", "~> 0.15"
-  gem "mime-types", "< 3"
-  gem "nokogiri", "< 1.7"
-  gem "public_suffix", "< 1.5"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_50.gemfile

@@ -4,34 +4,33 @@ source "https://rubygems.org"
 
 gem "cancan"
 gem "pundit"
-gem "thor", "<= 0.19.1"
 gem "rake"
-gem "parallel_tests", "< 2.10"
+gem "parallel_tests"
 gem "pry"
-gem "rails", "5.0.1"
+gem "rubocop", "0.48.1"
+gem "rails", "5.0.2"
 gem "jquery-ui-rails", "~> 5.0"
 gem "devise", "> 4.x"
-gem "inherited_resources", :git => "https://github.com/activeadmin/inherited_resources"
 gem "draper", "> 3.x"
-gem "activerecord-jdbcsqlite3-adapter", :git => "https://github.com/jruby/activerecord-jdbc-adapter", :branch => "rails-5", :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
 
 group :development do
-  gem "better_errors", :platforms => [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
-  gem "binding_of_caller", :platforms => :mri
+  gem "better_errors"
+  gem "binding_of_caller", platforms: :mri
   gem "rack-mini-profiler"
   gem "yard"
-  gem "redcarpet", :platforms => :mri
-  gem "kramdown", :platforms => :jruby
-  gem "appraisal", :require => false
+  gem "redcarpet", platforms: :mri
+  gem "kramdown", platforms: :jruby
+  gem "appraisal", "~> 2.2", require: false
 end
 
 group :test do
   gem "capybara"
-  gem "simplecov", :require => false
-  gem "codecov", :require => false
-  gem "cucumber-rails", :require => false
+  gem "simplecov", require: false
+  gem "codecov", require: false
+  gem "cucumber-rails", require: false
   gem "cucumber", "1.3.20"
-  gem "database_cleaner"
+  gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
   gem "jasmine"
   gem "jslint_on_rails"
   gem "launchy"
@@ -39,8 +38,8 @@ group :test do
   gem "rspec-rails"
   gem "i18n-spec"
   gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", :platforms => :mri
+  gem "sqlite3", platforms: :mri
   gem "poltergeist"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_51.gemfile

@@ -0,0 +1,45 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "cancan"
+gem "pundit"
+gem "rake"
+gem "parallel_tests"
+gem "pry"
+gem "rubocop", "0.48.1"
+gem "rails", "~> 5.1.x"
+gem "jquery-ui-rails", "~> 5.0"
+gem "devise", "> 4.x"
+gem "draper", "> 3.x"
+gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
+
+group :development do
+  gem "better_errors"
+  gem "binding_of_caller", platforms: :mri
+  gem "rack-mini-profiler"
+  gem "yard"
+  gem "redcarpet", platforms: :mri
+  gem "kramdown", platforms: :jruby
+  gem "appraisal", "~> 2.2", require: false
+end
+
+group :test do
+  gem "capybara"
+  gem "simplecov", require: false
+  gem "codecov", require: false
+  gem "cucumber-rails", require: false
+  gem "cucumber", "1.3.20"
+  gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
+  gem "jasmine"
+  gem "jslint_on_rails"
+  gem "launchy"
+  gem "rails-i18n"
+  gem "rspec-rails"
+  gem "i18n-spec"
+  gem "shoulda-matchers", "<= 2.8.0"
+  gem "sqlite3", platforms: :mri
+  gem "poltergeist"
+end
+
+gemspec path: "../"

data/lib/active_admin/application.rb

@@ -89,6 +89,10 @@ module ActiveAdmin
     # Display breadcrumbs
     inheritable_setting :breadcrumb, true
 
+    # Display create another checkbox on a new page
+    # @return [Boolean] (true)
+    inheritable_setting :create_another, false
+
     # Default CSV options
     inheritable_setting :csv_options, { col_sep: ',', byte_order_mark: "\xEF\xBB\xBF" }
 

data/lib/active_admin/base_controller.rb

@@ -10,13 +10,8 @@ module ActiveAdmin
 
     layout :determine_active_admin_layout
 
-    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
+    before_action :only_render_implemented_actions
+    before_action :authenticate_active_admin_user
 
     class << self
       # Ensure that this method is available for the DSL

data/lib/active_admin/base_controller/menu.rb

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

data/lib/active_admin/csv_builder.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
     def self.default_for_resource(resource)
       new resource: resource do
         column :id
-        resource.content_columns.each { |c| column c.name.to_sym }
+        resource.content_columns.each { |c| column c }
       end
     end
 
@@ -105,7 +105,7 @@ module ActiveAdmin
 
       def humanize_name(name, resource, humanize_name_option)
         if humanize_name_option
-          name.is_a?(Symbol) && resource.present? ? resource.human_attribute_name(name) : name.to_s.humanize
+          name.is_a?(Symbol) && resource ? resource.resource_class.human_attribute_name(name) : name.to_s.humanize
         else
           name.to_s
         end

data/lib/active_admin/dependency.rb

@@ -21,11 +21,11 @@ module ActiveAdmin
     # ActiveAdmin::Dependency.draper? '~> 1.2.0'
     # => true
     #
-    # ActiveAdmin::Dependency.rails? '>= 4.1.0', '<= 4.1.1'
+    # ActiveAdmin::Dependency.rails? '>= 4.2.7', '<= 5.0.2'
     # => true
     #
-    # ActiveAdmin::Dependency.rails! '2'
-    # -> ActiveAdmin::DependencyError: You provided rails 3.2.18 but we need: 2.
+    # ActiveAdmin::Dependency.rails! '5'
+    # -> ActiveAdmin::DependencyError: You provided rails 4.2.7 but we need: 5.
     #
     # ActiveAdmin::Dependency.devise!
     # -> ActiveAdmin::DependencyError: To use devise you need to specify it in your Gemfile.
@@ -33,7 +33,7 @@ module ActiveAdmin
     #
     # All but the pessimistic operator (~>) can also be run using Ruby's comparison syntax.
     #
-    # ActiveAdmin::Dependency.rails >= '3.2.18'
+    # ActiveAdmin::Dependency.rails >= '4.2.7'
     # => true
     #
     # Which is especially useful if you're looking up a gem with dashes in the name.
@@ -134,10 +134,6 @@ module ActiveAdmin
       end
 
       class Rails < Base
-        def strong_parameters?
-          @version >= 4 || defined?(ActionController::StrongParameters)
-        end
-
         def parameterize(string)
           if Dependency.rails5?
             string.parameterize separator: '_'