activeadmin 1.0.0.pre5 → 1.0.0

data/lib/generators/active_admin/resource/resource_generator.rb

@@ -12,7 +12,7 @@ module ActiveAdmin
 
       def generate_config_file
         @boilerplate = ActiveAdmin::Generators::Boilerplate.new(class_name)
-        template "admin.rb", "app/admin/#{file_path.tr('/', '_')}.rb"
+        template "admin.rb.erb", "app/admin/#{file_path.tr('/', '_')}.rb"
       end
 
     end

data/lib/generators/active_admin/resource/templates/{admin.rb → admin.rb.erb}

@@ -1,5 +1,4 @@
 ActiveAdmin.register <%= class_name %> do
-<% if ActiveAdmin::Dependency.rails.strong_parameters? %>
 # See permitted parameters documentation:
 # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
 #
@@ -12,7 +11,6 @@ ActiveAdmin.register <%= class_name %> do
 #   permitted << :other if params[:action] == 'create' && current_user.admin?
 #   permitted
 # end
-<% end %>
 <% if options.include_boilerplate? %>
 # Limit actions available to your users by adding them to the 'except' array
 # actions :all, except: []

data/lib/ransack_ext.rb

@@ -2,11 +2,11 @@
 # identically to the versions given in Ransack.
 #
 Ransack.configure do |config|
-  {'contains'=>'cont', 'starts_with'=>'start', 'ends_with'=>'end'}.each do |old,current|
+  {'contains'=>'cont', 'starts_with'=>'start', 'ends_with'=>'end'}.each do |old, current|
     config.add_predicate old, Ransack::Constants::DERIVED_PREDICATES.detect{ |q, _| q == current }[1]
   end
 
-  {'equals'=>'eq', 'greater_than'=>'gt', 'less_than'=>'lt'}.each do |old,current|
+  {'equals'=>'eq', 'greater_than'=>'gt', 'less_than'=>'lt'}.each do |old, current|
     config.add_predicate old, arel_predicate: current
   end
 

data/spec/rails_helper.rb

@@ -19,10 +19,6 @@ require ENV['RAILS_ROOT'] + '/config/environment'
 
 require 'rspec/rails'
 
-# Prevent Test::Unit's AutoRunner from executing during RSpec's rake task on
-# JRuby
-Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
-
 # Disabling authentication in specs so that we don't have to worry about
 # it allover the place
 ActiveAdmin.application.authentication_method = false
@@ -56,25 +52,11 @@ RSpec.configure do |config|
 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)
-  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 = Logger::FATAL
 
-# Improves performance by forcing the garbage collector to run less often.
-unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
-  require 'support/deferred_garbage_collection'
-  RSpec.configure do |config|
-    config.before(:all) { DeferredGarbageCollection.start }
-    config.after(:all)  { DeferredGarbageCollection.reconsider }
-  end
-end
-
 # Make input type=hidden visible
 Capybara.ignore_hidden_elements = false

data/spec/requests/default_namespace_spec.rb

@@ -4,15 +4,18 @@ RSpec.describe ActiveAdmin::Application, type: :request do
 
   include Rails.application.routes.url_helpers
 
+  let(:resource) { ActiveAdmin.register Category }
+
   [false, nil].each do |value|
 
     describe "with a #{value} default namespace" do
 
-      around(:all) do |example|
-        application = ActiveAdmin::Application.new
-        application.default_namespace = value
+      around do |example|
+        with_custom_default_namespace(value) { example.call }
+      end
 
-        with_temp_application(application) { example.call }
+      it "should generate resource paths" do
+        expect(resource.route_collection_path).to eq "/categories"
       end
 
       it "should generate a log out path" do
@@ -29,11 +32,12 @@ RSpec.describe ActiveAdmin::Application, type: :request do
 
   describe "with a test default namespace" do
 
-    around(:all) do |example|
-      application = ActiveAdmin::Application.new
-      application.default_namespace = :test
+    around do |example|
+      with_custom_default_namespace(:test) { example.call }
+    end
 
-      with_temp_application(application) { example.call }
+    it "should generate resource paths" do
+      expect(resource.route_collection_path).to eq "/test/categories"
     end
 
     it "should generate a log out path" do
@@ -46,4 +50,32 @@ RSpec.describe ActiveAdmin::Application, type: :request do
 
   end
 
+  describe "with a namespace with underscores in the name" do
+
+    around do |example|
+      with_custom_default_namespace(:abc_123) { example.call }
+    end
+
+    it "should generate resource paths" do
+      expect(resource.route_collection_path).to eq "/abc_123/categories"
+    end
+
+    it "should generate a log out path" do
+      expect(destroy_admin_user_session_path).to eq "/abc_123/logout"
+    end
+
+    it "should generate a log in path" do
+      expect(new_admin_user_session_path).to eq "/abc_123/login"
+    end
+
+  end
+
+  private
+
+  def with_custom_default_namespace(namespace)
+    application = ActiveAdmin::Application.new
+    application.default_namespace = namespace
+
+    with_temp_application(application) { yield }
+  end
 end

data/spec/support/active_admin_integration_spec_helper.rb

@@ -46,19 +46,26 @@ module ActiveAdminIntegrationSpecHelper
   # Returns a fake action view instance to use with our renderers
   def mock_action_view(assigns = {})
     controller = ActionView::TestCase::TestController.new
+    #this line needed because of rails bug https://github.com/rails/rails/commit/d8e98897b5703ac49bf0764da71a06d64ecda9b0
+    controller.params = ActionController::Parameters.new
     MockActionView.new(ActionController::Base.view_paths, assigns, controller)
   end
   alias_method :action_view, :mock_action_view
 
   # A mock action view to test view helpers
   class MockActionView < ::ActionView::Base
-    include ActionView::Helpers
     include ActiveAdmin::ViewHelpers
     include Rails.application.routes.url_helpers
   end
 
   def with_translation(translation)
-    I18n.backend.store_translations :en, translation
+    # If no translations have been loaded, any later calls to `I18n.t` will
+    # cause the full translation hash to be loaded, possibly overwritting what
+    # we've loaded via `store_translations`. We use this hack to prevent that.
+    # @todo Might not be necessary anymore once
+    # https://github.com/svenfuchs/i18n/pull/353 lands.
+    I18n.backend.send(:init_translations)
+    I18n.backend.store_translations I18n.locale, translation
     yield
   ensure
     I18n.backend.reload!

data/spec/support/rails_template.rb

@@ -1,8 +1,10 @@
 # Rails template to build the sample app for specs
 
-if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
-  copy_file File.expand_path('../templates/manifest.js', __FILE__), 'app/assets/config/manifest.js', force: true
-end
+copy_file File.expand_path('../templates/manifest.js', __FILE__), 'app/assets/config/manifest.js', force: true
+
+create_file 'app/assets/stylesheets/some-random-css.css'
+create_file 'app/assets/javascripts/some-random-js.js'
+create_file 'app/assets/images/a/favicon.ico'
 
 generate :model, 'post title:string body:text published_date:date author_id:integer ' +
   'position:integer custom_category_id:integer starred:boolean foo_id:integer'
@@ -26,7 +28,7 @@ create_file 'app/models/post.rb', <<-RUBY.strip_heredoc, force: true
       # nothing to see here
     end
 
-    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+    if defined? ProtectedAttributes
       attr_accessible :id, :title, :body, :starred, :author, :position, :published_date, :author_id, :custom_category_id, :category
     end
   end
@@ -43,7 +45,7 @@ create_file 'app/models/blog/post.rb', <<-RUBY.strip_heredoc, force: true
     accepts_nested_attributes_for :author
     accepts_nested_attributes_for :taggings
 
-    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+    if defined? ProtectedAttributes
       attr_accessible :title, :body, :starred, :author, :position, :published_date, :author_id, :custom_category_id, :category
     end
   end
@@ -62,7 +64,7 @@ create_file 'app/models/user.rb', <<-RUBY.strip_heredoc, force: true
       parent.table[:age]
     end
 
-    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+    if defined? ProtectedAttributes
       attr_accessible :first_name, :last_name, :username,  :age
     end
 
@@ -76,7 +78,7 @@ create_file 'app/models/profile.rb', <<-RUBY.strip_heredoc, force: true
   class Profile < ActiveRecord::Base
     belongs_to :user
 
-    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+    if defined? ProtectedAttributes
       attr_accessible :bio
     end
   end
@@ -91,7 +93,7 @@ create_file 'app/models/category.rb', <<-RUBY.strip_heredoc, force: true
     has_many :authors, through: :posts
     accepts_nested_attributes_for :posts
 
-    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+    if defined? ProtectedAttributes
       attr_accessible :name, :description
     end
   end
@@ -115,7 +117,7 @@ create_file 'app/models/tag.rb', <<-RUBY.strip_heredoc, force: true
       self.id = SecureRandom.uuid
     end
 
-    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+    if defined? ProtectedAttributes
       attr_accessible :name
     end
   end
@@ -133,17 +135,18 @@ gsub_file 'config/environments/test.rb', /  config.cache_classes = true/, <<-RUB
 
   config.cache_classes = !ENV['CLASS_RELOADING']
   config.action_mailer.default_url_options = {host: 'example.com'}
-  config.assets.digest = false
+  config.assets.precompile += %w( some-random-css.css some-random-js.js a/favicon.ico )
+
+  config.active_record.maintain_test_schema = false
 
-  if Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1
-    config.active_record.maintain_test_schema = false
+  if Rails::VERSION::MAJOR >= 5
+    config.active_record.belongs_to_required_by_default = false
   end
 
 RUBY
 
 # Add our local Active Admin to the application
 gem 'activeadmin', path: '../..'
-gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources'
 gem 'devise'
 
 run 'bundle install'
@@ -154,7 +157,7 @@ generate 'active_admin:install'
 # Force strong parameters to raise exceptions
 inject_into_file 'config/application.rb', <<-RUBY, after: 'class Application < Rails::Application'
 
-    config.action_controller.action_on_unpermitted_parameters = :raise if Rails::VERSION::MAJOR >= 4
+    config.action_controller.action_on_unpermitted_parameters = :raise
 
 RUBY
 
@@ -171,12 +174,6 @@ if ENV['RAILS_ENV'] != 'test'
   inject_into_file 'config/routes.rb', "\n  root to: redirect('admin')", after: /.*routes.draw do/
 end
 
-remove_file 'public/index.html' if File.exists? 'public/index.html' # remove once Rails 3.2 support is dropped
-
-# Devise master doesn't set up its secret key on Rails 4.1
-# https://github.com/plataformatec/devise/issues/2554
-gsub_file 'config/initializers/devise.rb', /# config.secret_key =/, 'config.secret_key ='
-
 rake "db:drop db:create db:migrate", env: 'development'
 rake "db:drop db:create db:migrate", env: 'test'
 

data/spec/support/rails_template_with_data.rb

@@ -6,23 +6,17 @@ end
 
 inject_into_file 'app/admin/category.rb', <<-RUBY, after: "ActiveAdmin.register Category do\n"
 
-  if Rails::VERSION::MAJOR >= 4
-    permit_params [:name, :description]
-  end
+  permit_params [:name, :description]
 RUBY
 
 inject_into_file 'app/admin/user.rb', <<-RUBY, after: "ActiveAdmin.register User do\n"
 
-  if Rails::VERSION::MAJOR >= 4
-    permit_params [:first_name, :last_name, :username, :age]
-  end
+  permit_params [:first_name, :last_name, :username, :age]
 RUBY
 
 inject_into_file 'app/admin/post.rb', <<-RUBY, after: "ActiveAdmin.register Post do\n"
 
-  if Rails::VERSION::MAJOR >= 4
-    permit_params [:custom_category_id, :author_id, :title, :body, :published_date, :position, :starred]
-  end
+  permit_params [:custom_category_id, :author_id, :title, :body, :published_date, :position, :starred]
 
   scope :all, default: true
 

data/spec/support/templates/admin/stores.rb

@@ -1,8 +1,6 @@
 ActiveAdmin.register Store do
 
-  if Rails::VERSION::MAJOR >= 4
-    permit_params :name
-  end
+  permit_params :name
 
   index pagination_total: false
 

data/spec/unit/application_spec.rb

@@ -3,11 +3,16 @@ require 'fileutils'
 
 RSpec.describe ActiveAdmin::Application do
 
-  let(:application) do
-    ActiveAdmin::Application.new.tap do |app|
-      # Manually override the load paths becuase RSpec messes these up
-      app.load_paths = [File.expand_path('app/admin', Rails.root)]
-    end
+  let(:application) { ActiveAdmin::Application.new }
+
+  around do |example|
+    old_load_paths = application.load_paths
+    # TODO: Figure out why load paths need to be overriden
+    application.load_paths = [File.expand_path('app/admin', Rails.root)]
+
+    example.call
+
+    application.load_paths = old_load_paths
   end
 
   it "should have a default load path of ['app/admin']" do
@@ -120,10 +125,16 @@ RSpec.describe ActiveAdmin::Application do
     end
 
     it "should load files from subdirectories" do
-      FileUtils.mkdir_p(File.expand_path("app/admin/public", Rails.root))
+      test_dir = File.expand_path("app/admin/public", Rails.root)
       test_file = File.expand_path("app/admin/public/posts.rb", Rails.root)
-      FileUtils.touch(test_file)
-      expect(application.files).to include(test_file)
+
+      begin
+        FileUtils.mkdir_p(test_dir)
+        FileUtils.touch(test_file)
+        expect(application.files).to include(test_file)
+      ensure
+        FileUtils.remove_entry_secure(test_dir, force: true)
+      end
     end
   end
 

data/spec/unit/belongs_to_spec.rb

@@ -57,14 +57,18 @@ RSpec.describe ActiveAdmin::Resource::BelongsTo do
 
   describe "controller" do
     let(:controller) { post_config.controller.new }
+    let(:http_params) { {user_id: user.id}  }
+    let(:user) { User.create! }
+
     before do
-      user = User.create!
       request = double 'Request', format: 'application/json'
-      allow(controller).to receive(:params) { {user_id: user.id} }
+      allow(controller).to receive(:params) { ActionController::Parameters.new(http_params) }
       allow(controller).to receive(:request){ request }
     end
+
     it 'should be able to access the collection' do
       expect(controller.send :collection).to be_a ActiveRecord::Relation
+
     end
     it 'should be able to build a new resource' do
       expect(controller.send :build_resource).to be_a Post

data/spec/unit/comments_spec.rb

@@ -40,7 +40,6 @@ RSpec.describe "Comments" do
       end
 
       it "should return the most recent comment first by default" do
-        ActiveAdmin::Comment.class_eval { attr_accessible :created_at } if Rails::VERSION::MAJOR == 3
         another_comment = ActiveAdmin::Comment.create! resource: post,
                                                        body: "Another Comment",
                                                        namespace: namespace_name,
@@ -86,18 +85,6 @@ RSpec.describe "Comments" do
       end
     end
 
-    describe ".resource_id_cast" do
-      let(:post) { Post.create!(title: "Testing.") }
-      let(:namespace_name) { "admin" }
-
-      it "should cast resource_id as string" do
-        comment = ActiveAdmin::Comment.create! resource: post,
-                                                body: "Another Comment",
-                                                namespace: namespace_name
-        expect(ActiveAdmin::Comment.resource_id_cast(comment).class).to eql String
-      end
-    end
-
     describe ".resource_type" do
       let(:post) { Post.create!(title: "Testing.") }
       let(:post_decorator) { double 'PostDecorator' }
@@ -124,12 +111,6 @@ RSpec.describe "Comments" do
       end
     end
 
-    describe ".resource_id_type" do
-      it "should be :string" do
-        expect(ActiveAdmin::Comment.resource_id_type).to eql :string
-      end
-    end
-
     describe "Commenting on resource with string id" do
       let(:tag) { Tag.create!(name: "cooltags") }
       let(:namespace_name) { "admin" }

data/spec/unit/controller_filters_spec.rb

@@ -15,11 +15,11 @@ RSpec.describe ActiveAdmin::Application do
   expected_actions = (
     prefixes = %w(skip append prepend) << nil
     positions = %w(before around after)
-    suffixes = %w(filter)
-    base = %w(skip_filter)
-    if Rails::VERSION::MAJOR >= 4
-      suffixes += %w(action)
-      base += %w(skip_action_callback)
+    suffixes = %w(action)
+    base = %w()
+    if ActiveAdmin::Dependency.rails? '< 5.1.x'
+      suffixes += %w(filter)
+      base += %w(skip_filter skip_action_callback)
     end
 
     prefixes.each_with_object(base) do |prefix, stack|

data/spec/unit/csv_builder_spec.rb

@@ -5,7 +5,10 @@ require 'rails_helper'
 RSpec.describe ActiveAdmin::CSVBuilder do
 
   describe '.default_for_resource using Post' do
-    let(:csv_builder) { ActiveAdmin::CSVBuilder.default_for_resource(Post).tap(&:exec_columns) }
+    let(:application){ ActiveAdmin::Application.new }
+    let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
+    let(:resource){ ActiveAdmin::Resource.new(namespace, Post, {}) }
+    let(:csv_builder) { ActiveAdmin::CSVBuilder.default_for_resource(resource).tap(&:exec_columns) }
 
     it 'returns a default csv_builder for Post' do
       expect(csv_builder).to be_a(ActiveAdmin::CSVBuilder)
@@ -18,8 +21,8 @@ RSpec.describe ActiveAdmin::CSVBuilder do
 
     it "has Post's content_columns" do
       csv_builder.columns[1..-1].each_with_index do |column, index|
-        expect(column.name).to eq Post.content_columns[index].name.humanize
-        expect(column.data).to eq Post.content_columns[index].name.to_sym
+        expect(column.name).to eq resource.content_columns[index].to_s.humanize
+        expect(column.data).to eq resource.content_columns[index]
       end
     end
 
@@ -32,7 +35,7 @@ RSpec.describe ActiveAdmin::CSVBuilder do
       end
 
       it 'gets name from I18n' do
-        title_index = Post.content_columns.map(&:name).index('title') + 1 # First col is always id
+        title_index =  resource.content_columns.index(:title) + 1 # First col is always id
         expect(csv_builder.columns[title_index].name).to eq localized_name
       end
     end