rails_admin 0.6.0 → 0.6.1

data/lib/tasks/rails_admin.rake

@@ -1,12 +1,4 @@
 namespace :rails_admin do
-  desc "Disable rails_admin initializer"
-  task :disable_initializer do
-    if ENV['SKIP_RAILS_ADMIN_INITIALIZER'].nil?
-      ENV['SKIP_RAILS_ADMIN_INITIALIZER'] = 'true'
-      puts "[RailsAdmin] RailsAdmin initialization disabled by default. Pass SKIP_RAILS_ADMIN_INITIALIZER=false if you need it."
-    end
-  end
-
   desc "Install rails_admin"
   task :install do
     system 'rails g rails_admin:install'
@@ -19,7 +11,6 @@ namespace :rails_admin do
 
   desc "CI env for Travis"
   task :prepare_ci_env do
-    ENV['SKIP_RAILS_ADMIN_INITIALIZER'] = 'true'
     adapter = ENV["CI_DB_ADAPTER"] || "sqlite3"
     database = ENV["CI_DB_DATABASE"] || ("sqlite3" == adapter ? "db/development.sqlite3" : "ci_rails_admin")
 
@@ -43,6 +34,3 @@ namespace :rails_admin do
     end
   end
 end
-
-task :environment => 'rails_admin:disable_initializer'
-

data/spec/controllers/rails_admin/application_controller_spec.rb

@@ -1,30 +1,30 @@
 require 'spec_helper'
 
 describe RailsAdmin::ApplicationController do
-  describe "#to_model_name" do
-    it "works with modules" do
-      expect(controller.to_model_name("conversations~conversation")).to eq("Conversations::Conversation")
+  describe '#to_model_name' do
+    it 'works with modules' do
+      expect(controller.to_model_name('conversations~conversation')).to eq('Conversations::Conversation')
     end
   end
 
-  describe "helper method _get_plugin_name" do
-    it "works by default" do
+  describe 'helper method _get_plugin_name' do
+    it 'works by default' do
       expect(controller.send(:_get_plugin_name)).to eq(['Dummy App', 'Admin'])
     end
 
-    it "works for static names" do
+    it 'works for static names' do
       RailsAdmin.config do |config|
-        config.main_app_name = ['static','value']
+        config.main_app_name = %w(static value)
       end
-      expect(controller.send(:_get_plugin_name)).to eq(['static', 'value'])
+      expect(controller.send(:_get_plugin_name)).to eq(%w(static value))
     end
 
-    it "works for dynamic names in the controller context" do
+    it 'works for dynamic names in the controller context' do
       RailsAdmin.config do |config|
-        config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.try(:titleize), controller.params[:action].titleize] }
+        config.main_app_name = proc { |controller| [Rails.application.engine_name.try(:titleize), controller.params[:action].titleize] }
       end
-      controller.params[:action] = "dashboard"
-      expect(controller.send(:_get_plugin_name)).to eq(["Dummy App Application", "Dashboard"])
+      controller.params[:action] = 'dashboard'
+      expect(controller.send(:_get_plugin_name)).to eq(['Dummy App Application', 'Dashboard'])
     end
   end
 end

data/spec/controllers/rails_admin/main_controller_spec.rb

@@ -3,18 +3,17 @@
 require 'spec_helper'
 
 describe RailsAdmin::MainController do
-
-  describe "#dashboard" do
+  describe '#dashboard' do
     before do
       allow(controller).to receive(:render).and_return(true) # no rendering
     end
 
-    it "shows statistics by default" do
+    it 'shows statistics by default' do
       expect(RailsAdmin.config(Player).abstract_model).to receive(:count).and_return(0)
       controller.dashboard
     end
 
-    it "does not show statistics if turned off" do
+    it 'does not show statistics if turned off' do
       RailsAdmin.config do |c|
         c.actions do
           dashboard do
@@ -28,17 +27,17 @@ describe RailsAdmin::MainController do
     end
   end
 
-  describe "#check_for_cancel" do
+  describe '#check_for_cancel' do
 
-    it "redirects to back if params[:bulk_ids] is nil when params[:bulk_action] is present" do
-      allow(controller).to receive(:back_or_index) { raise StandardError.new('redirected back') }
-      expect { get :bulk_delete, { :model_name => "player", :bulk_action =>"bulk_delete" } }.to raise_error('redirected back')
-      expect { get :bulk_delete, { :model_name => "player", :bulk_action =>"bulk_delete", :bulk_ids => [] } }.not_to raise_error
+    it 'redirects to back if params[:bulk_ids] is nil when params[:bulk_action] is present' do
+      allow(controller).to receive(:back_or_index) { fail(StandardError.new('redirected back')) }
+      expect { get :bulk_delete, model_name: 'player', bulk_action: 'bulk_delete' }.to raise_error('redirected back')
+      expect { get :bulk_delete, model_name: 'player', bulk_action: 'bulk_delete', bulk_ids: [] }.not_to raise_error
     end
   end
 
-  describe "#get_sort_hash" do
-    context "options sortable is a hash" do
+  describe '#get_sort_hash' do
+    context 'options sortable is a hash' do
       before do
         RailsAdmin.config('Player') do
           configure :team do
@@ -49,49 +48,48 @@ describe RailsAdmin::MainController do
         end
       end
 
-      it "returns the option with no changes" do
-        controller.params = { :sort => "team", :model_name =>"players" }
-        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq({:sort=>:"team.name", :sort_reverse=>true})
+      it 'returns the option with no changes' do
+        controller.params = {sort: 'team', model_name: 'players'}
+        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq(sort: :"team.name", sort_reverse: true)
       end
     end
 
-
-    it "works with belongs_to associations with label method virtual" do
-      controller.params = { :sort => "parent_category", :model_name =>"categories" }
-      expect(controller.send(:get_sort_hash, RailsAdmin.config(Category))).to eq({:sort=>"categories.parent_category_id", :sort_reverse=>true})
+    it 'works with belongs_to associations with label method virtual' do
+      controller.params = {sort: 'parent_category', model_name: 'categories'}
+      expect(controller.send(:get_sort_hash, RailsAdmin.config(Category))).to eq(sort: 'categories.parent_category_id', sort_reverse: true)
     end
 
-    context "using mongoid, not supporting joins", :mongoid => true do
-      it "gives back the remote table with label name" do
-        controller.params = { :sort => "team", :model_name =>"players" }
-        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq({:sort=>"players.team_id", :sort_reverse=>true})
+    context 'using mongoid, not supporting joins', mongoid: true do
+      it 'gives back the remote table with label name' do
+        controller.params = {sort: 'team', model_name: 'players'}
+        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq(sort: 'players.team_id', sort_reverse: true)
       end
     end
 
-    context "using active_record, supporting joins", :active_record => true do
-      it "gives back the local column"  do
-        controller.params = { :sort => "team", :model_name =>"players" }
-        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq({:sort=>"teams.name", :sort_reverse=>true})
+    context 'using active_record, supporting joins', active_record: true do
+      it 'gives back the local column'  do
+        controller.params = {sort: 'team', model_name: 'players'}
+        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq(sort: 'teams.name', sort_reverse: true)
       end
     end
   end
 
-  describe "#list_entries called from view" do
+  describe '#list_entries called from view' do
     before do
-      @teams = 21.times.map { FactoryGirl.create :team }
-      controller.params = { :model_name => "teams" }
+      @teams = 21.times.collect { FactoryGirl.create :team }
+      controller.params = {model_name: 'teams'}
     end
 
-    it "paginates" do
+    it 'paginates' do
       expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, false).to_a.length).to eq(21)
       expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, true).to_a.length).to eq(20)
     end
   end
 
-  describe "#list_entries called from view with kaminari custom param_name" do
+  describe '#list_entries called from view with kaminari custom param_name' do
     before do
-      @teams = 21.times.map { FactoryGirl.create :team }
-      controller.params = { :model_name => "teams" }
+      @teams = 21.times.collect { FactoryGirl.create :team }
+      controller.params = {model_name: 'teams'}
       Kaminari.config.param_name = :pagina
     end
 
@@ -99,32 +97,32 @@ describe RailsAdmin::MainController do
       Kaminari.config.param_name = :page
     end
 
-    it "paginates" do
+    it 'paginates' do
       expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, false).to_a.length).to eq(21)
       expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, true).to_a.length).to eq(20)
     end
   end
 
-  describe "#list_entries called with bulk_ids" do
+  describe '#list_entries called with bulk_ids' do
     before do
-      @teams = 21.times.map { FactoryGirl.create :team }
-      controller.params = { :model_name => "teams", :bulk_action => "bulk_delete", :bulk_ids => @teams.map(&:id) }
+      @teams = 21.times.collect { FactoryGirl.create :team }
+      controller.params = {model_name: 'teams', bulk_action: 'bulk_delete', bulk_ids: @teams.collect(&:id)}
     end
 
-    it "does not paginate" do
+    it 'does not paginate' do
       expect(controller.list_entries(RailsAdmin.config(Team), :bulk_delete).to_a.length).to eq(21)
     end
   end
 
-  describe "#list_entries for associated_collection" do
+  describe '#list_entries for associated_collection' do
     before do
       @team = FactoryGirl.create :team
-      controller.params = { :associated_collection => "players", :current_action => "update", :source_abstract_model => 'team', :source_object_id => @team.id, :model_name => "player", :action => 'index' }
+      controller.params = {associated_collection: 'players', current_action: 'update', source_abstract_model: 'team', source_object_id: @team.id, model_name: 'player', action: 'index'}
       controller.get_model # set @model_config for Team
     end
 
     it "doesn't scope associated collection records when associated_collection_scope is nil" do
-      @players = 2.times.map do
+      @players = 2.times.collect do
         FactoryGirl.create :player
       end
 
@@ -137,15 +135,15 @@ describe RailsAdmin::MainController do
       expect(controller.list_entries.to_a.length).to eq(@players.size)
     end
 
-    it "scopes associated collection records according to associated_collection_scope" do
-      @players = 4.times.map do
+    it 'scopes associated collection records according to associated_collection_scope' do
+      @players = 4.times.collect do
         FactoryGirl.create :player
       end
 
       RailsAdmin.config Team do
         field :players do
           associated_collection_scope do
-            Proc.new { |scope| scope.limit(3) }
+            proc { |scope| scope.limit(3) }
           end
         end
       end
@@ -153,11 +151,11 @@ describe RailsAdmin::MainController do
       expect(controller.list_entries.to_a.length).to eq(3)
     end
 
-    it "scopes associated collection records according to bindings" do
+    it 'scopes associated collection records according to bindings' do
       @team.revenue = BigDecimal.new('3')
       @team.save
 
-      @players = 5.times.map do
+      @players = 5.times.collect do
         FactoryGirl.create :player
       end
 
@@ -165,9 +163,9 @@ describe RailsAdmin::MainController do
         field :players do
           associated_collection_scope do
             team = bindings[:object]
-            Proc.new { |scope|
+            proc do |scope|
               scope.limit(team.revenue)
-            }
+            end
           end
         end
       end
@@ -175,9 +173,8 @@ describe RailsAdmin::MainController do
       expect(controller.list_entries.to_a.length).to eq(@team.revenue.to_i)
     end
 
-
-    it "limits associated collection records number to 30 if cache_all is false" do
-      @players = 40.times.map do
+    it 'limits associated collection records number to 30 if cache_all is false' do
+      @players = 40.times.collect do
         FactoryGirl.create :player
       end
 
@@ -190,7 +187,7 @@ describe RailsAdmin::MainController do
     end
 
     it "doesn't limit associated collection records number to 30 if cache_all is true" do
-      @players = 40.times.map do
+      @players = 40.times.collect do
         FactoryGirl.create :player
       end
 
@@ -202,8 +199,8 @@ describe RailsAdmin::MainController do
       expect(controller.list_entries.length).to eq(@players.size)
     end
 
-    it "orders associated collection records by desc" do
-      @players = 3.times.map do
+    it 'orders associated collection records by desc' do
+      @players = 3.times.collect do
         FactoryGirl.create :player
       end
 
@@ -211,28 +208,28 @@ describe RailsAdmin::MainController do
     end
   end
 
-  describe "index" do
-    it "uses source association's primary key with :compact, not target model's default primary key", :skip_mongoid => true do
+  describe 'index' do
+    it "uses source association's primary key with :compact, not target model's default primary key", skip_mongoid: true do
       class TeamWithNumberedPlayers < Team
-        has_many :numbered_players, :class_name => 'Player', :primary_key => :number, :foreign_key => 'team_id'
+        has_many :numbered_players, class_name: 'Player', primary_key: :number, foreign_key: 'team_id'
       end
       FactoryGirl.create :team
-      TeamWithNumberedPlayers.first.numbered_players = [FactoryGirl.create(:player, :number => 123)]
-      get :index, {:model_name => 'player', :source_object_id => Team.first.id, :source_abstract_model => 'team_with_numbered_players', :associated_collection => 'numbered_players', :current_action => :create, :compact => true, :format => :json}
-      expect(response.body).to match /\"id\":\"123\"/
+      TeamWithNumberedPlayers.first.numbered_players = [FactoryGirl.create(:player, number: 123)]
+      get :index, model_name: 'player', source_object_id: Team.first.id, source_abstract_model: 'team_with_numbered_players', associated_collection: 'numbered_players', current_action: :create, compact: true, format: :json
+      expect(response.body).to match(/\"id\":\"123\"/)
     end
 
-    context "as JSON" do
-      it "returns strings" do
-        FactoryGirl.create :player, :team => (FactoryGirl.create :team)
-        get :index, {:model_name => 'player', :source_object_id => Team.first.id, :source_abstract_model => 'team', :associated_collection => 'players', :current_action => :create, :compact => true, :format => :json}
-        expect(JSON.parse(response.body).first["id"]).to be_a_kind_of String
+    context 'as JSON' do
+      it 'returns strings' do
+        FactoryGirl.create :player, team: (FactoryGirl.create :team)
+        get :index, model_name: 'player', source_object_id: Team.first.id, source_abstract_model: 'team', associated_collection: 'players', current_action: :create, compact: true, format: :json
+        expect(JSON.parse(response.body).first['id']).to be_a_kind_of String
       end
     end
   end
 
-  describe "sanitize_params_for!" do
-    context "in France" do
+  describe 'sanitize_params_for!' do
+    context 'in France' do
       before do
         I18n.locale = :fr
       end
@@ -240,7 +237,7 @@ describe RailsAdmin::MainController do
         I18n.locale = :en
       end
 
-      it "sanitize params recursively in nested forms" do
+      it 'sanitize params recursively in nested forms' do
         RailsAdmin.config Comment do
           configure :created_at do
             show
@@ -253,48 +250,48 @@ describe RailsAdmin::MainController do
           end
         end
 
-        controller.params = HashWithIndifferentAccess.new({
-          "field_test"=>{
-            "unallowed_field" => "I shouldn't be here",
-            "datetime_field"=>"1 août 2010",
-            "nested_field_tests_attributes"=>{
-              "new_1330520162002"=>{
-                "comment_attributes"=>{
-                  "unallowed_field" => "I shouldn't be here",
-                  "created_at"=>"2 août 2010"
+        controller.params = HashWithIndifferentAccess.new(
+          'field_test' => {
+            'unallowed_field' => "I shouldn't be here",
+            'datetime_field' => '1 août 2010',
+            'nested_field_tests_attributes' => {
+              'new_1330520162002' => {
+                'comment_attributes' => {
+                  'unallowed_field' => "I shouldn't be here",
+                  'created_at' => '2 août 2010'
                 },
-                "created_at"=>"3 août 2010"
+                'created_at' => '3 août 2010'
               }
             },
-            "comment_attributes"=>{
-              "unallowed_field" => "I shouldn't be here",
-              "created_at"=>"4 août 2010"
+            'comment_attributes' => {
+              'unallowed_field' => "I shouldn't be here",
+              'created_at' => '4 août 2010'
             }
           }
-        })
+        )
 
         controller.send(:sanitize_params_for!, :create, RailsAdmin.config(FieldTest), controller.params['field_test'])
 
-        expect(controller.params).to eq({
-          "field_test"=>{
-            "datetime_field"=>'Sun, 01 Aug 2010 00:00:00 UTC +00:00',
-            "nested_field_tests_attributes"=>{
-              "new_1330520162002"=>{
-                "comment_attributes"=>{
-                  "created_at"=>'Mon, 02 Aug 2010 00:00:00 UTC +00:00'
+        expect(controller.params).to eq(
+          'field_test' => {
+            'datetime_field' => 'Sun, 01 Aug 2010 00:00:00 UTC +00:00',
+            'nested_field_tests_attributes' => {
+              'new_1330520162002' => {
+                'comment_attributes' => {
+                  'created_at' => 'Mon, 02 Aug 2010 00:00:00 UTC +00:00'
                 },
-                "created_at"=>'Tue, 03 Aug 2010 00:00:00 UTC +00:00'
+                'created_at' => 'Tue, 03 Aug 2010 00:00:00 UTC +00:00'
               }
             },
-            "comment_attributes"=>{
-              "created_at"=>'Wed, 04 Aug 2010 00:00:00 UTC +00:00'
+            'comment_attributes' => {
+              'created_at' => 'Wed, 04 Aug 2010 00:00:00 UTC +00:00'
             }
           }
-        })
+        )
       end
     end
 
-    describe "satisfy_strong_params!" do
+    describe 'satisfy_strong_params!' do
       before do
         ActionController::Parameters.permit_all_parameters = false
       end
@@ -303,11 +300,11 @@ describe RailsAdmin::MainController do
         ActionController::Parameters.permit_all_parameters = true
       end
 
-      it "enforces permit!" do
-        controller.params = HashWithIndifferentAccess.new({
-          "model_name"=>"player",
-          "player"=>{ "name" => "foo" }
-        })
+      it 'enforces permit!' do
+        controller.params = HashWithIndifferentAccess.new(
+          'model_name' => 'player',
+          'player' => {'name' => 'foo'}
+        )
         controller.send(:get_model)
         expect(controller.params['player'].permitted?).to be_false
         controller.send(:satisfy_strong_params!)
@@ -315,7 +312,7 @@ describe RailsAdmin::MainController do
       end
     end
 
-    it "allows for delete method with Carrierwave" do
+    it 'allows for delete method with Carrierwave' do
 
       RailsAdmin.config FieldTest do
         field :carrierwave_asset
@@ -324,53 +321,52 @@ describe RailsAdmin::MainController do
           delete_method :delete_paperclip_asset
         end
       end
-      controller.params = HashWithIndifferentAccess.new({
-        "field_test"=>{
-          "carrierwave_asset" => "test",
-          "carrierwave_asset_cache" => "test",
-          "remove_carrierwave_asset" => "test",
-          "dragonfly_asset" => "test",
-          "remove_dragonfly_asset" => "test",
-          "retained_dragonfly_asset" => "test",
-          "paperclip_asset" => "test",
-          "delete_paperclip_asset" => "test",
-          "should_not_be_here" => "test"
+      controller.params = HashWithIndifferentAccess.new(
+        'field_test' => {
+          'carrierwave_asset' => 'test',
+          'carrierwave_asset_cache' => 'test',
+          'remove_carrierwave_asset' => 'test',
+          'dragonfly_asset' => 'test',
+          'remove_dragonfly_asset' => 'test',
+          'retained_dragonfly_asset' => 'test',
+          'paperclip_asset' => 'test',
+          'delete_paperclip_asset' => 'test',
+          'should_not_be_here' => 'test'
         }
-      })
+      )
 
       controller.send(:sanitize_params_for!, :create, RailsAdmin.config(FieldTest), controller.params['field_test'])
       expect(controller.params).to eq(
-        "field_test"=>{
-          "carrierwave_asset"=>"test",
-          "remove_carrierwave_asset"=>"test",
-          "carrierwave_asset_cache"=>"test",
-          "dragonfly_asset"=>"test",
-          "remove_dragonfly_asset"=>"test",
-          "retained_dragonfly_asset"=>"test",
-          "paperclip_asset"=>"test",
-          "delete_paperclip_asset"=>"test"
+        'field_test' => {
+          'carrierwave_asset' => 'test',
+          'remove_carrierwave_asset' => 'test',
+          'carrierwave_asset_cache' => 'test',
+          'dragonfly_asset' => 'test',
+          'remove_dragonfly_asset' => 'test',
+          'retained_dragonfly_asset' => 'test',
+          'paperclip_asset' => 'test',
+          'delete_paperclip_asset' => 'test'
         })
     end
 
-    it "allows for polymorphic associations parameters" do
+    it 'allows for polymorphic associations parameters' do
       RailsAdmin.config Comment do
         field :commentable
       end
 
-      controller.params = HashWithIndifferentAccess.new({
-        "comment"=>{
-          "commentable_id" => "test",
-          "commentable_type" => "test"
+      controller.params = HashWithIndifferentAccess.new(
+        'comment' => {
+          'commentable_id' => 'test',
+          'commentable_type' => 'test'
         }
-      })
+      )
       controller.send(:sanitize_params_for!, :create, RailsAdmin.config(Comment), controller.params['comment'])
       expect(controller.params).to eq(
-        "comment"=>{
-          "commentable_id" => "test",
-          "commentable_type" => "test"
+        'comment' => {
+          'commentable_id' => 'test',
+          'commentable_type' => 'test'
         })
     end
   end
 
-
 end