rails_admin 0.6.0 → 0.6.1

data/spec/rails_admin/config/proxyable/proxy_spec.rb

@@ -2,24 +2,21 @@ require 'spec_helper'
 
 describe RailsAdmin::Config::Proxyable::Proxy do
   class ProxyTest
+    attr_reader :bindings
     def initialize
-      @bindings = {:foo => 'bar'}
-    end
-
-    def get_bindings
-      @bindings
+      @bindings = {foo: 'bar'}
     end
   end
 
-  let(:proxy_test){ ProxyTest.new }
-  subject{ RailsAdmin::Config::Proxyable::Proxy.new proxy_test, :foo => 'baz' }
+  let(:proxy_test) { ProxyTest.new }
+  subject { RailsAdmin::Config::Proxyable::Proxy.new proxy_test, foo: 'baz' }
 
   it 'proxies method calls to @object' do
-    expect(subject.get_bindings).to eq :foo => 'baz'
+    expect(subject.bindings).to eq foo: 'baz'
   end
 
   it 'preserves initially set @bindings' do
-    subject.get_bindings
-    expect(proxy_test.get_bindings).to eq :foo => 'bar'
+    subject.bindings
+    expect(proxy_test.bindings).to eq foo: 'bar'
   end
 end

data/spec/rails_admin/config/sections_spec.rb

@@ -2,26 +2,26 @@ require 'spec_helper'
 
 describe RailsAdmin::Config::Sections do
 
-  describe "configure" do
-    it "configures without changing the section default list" do
+  describe 'configure' do
+    it 'configures without changing the section default list' do
       RailsAdmin.config Team do
         edit do
           configure :name do
-            label "Renamed"
+            label 'Renamed'
           end
         end
       end
       fields = RailsAdmin.config(Team).edit.fields
-      expect(fields.find{|f| f.name == :name }.label).to eq("Renamed")
+      expect(fields.detect { |f| f.name == :name }.label).to eq('Renamed')
       expect(fields.count).to be >= 19 # not 1
     end
 
-    it "does not change the section list if set" do
+    it 'does not change the section list if set' do
       RailsAdmin.config Team do
         edit do
           field :manager
           configure :name do
-            label "Renamed"
+            label 'Renamed'
           end
         end
       end
@@ -31,8 +31,8 @@ describe RailsAdmin::Config::Sections do
     end
   end
 
-  describe "DSL field inheritance" do
-    it "is tested" do
+  describe 'DSL field inheritance' do
+    it 'is tested' do
       RailsAdmin.config do |config|
         config.model Fan do
           field :name do
@@ -74,50 +74,50 @@ describe RailsAdmin::Config::Sections do
     end
   end
 
-  describe "DSL group inheritance" do
-    it "is tested" do
+  describe 'DSL group inheritance' do
+    it 'is tested' do
       RailsAdmin.config do |config|
         config.model Team do
           list do
-            group "a" do
+            group 'a' do
               field :founded
             end
 
-            group "b" do
+            group 'b' do
               field :name
               field :wins
             end
           end
 
           edit do
-            group "a" do
+            group 'a' do
               field :name
             end
 
-            group "c" do
+            group 'c' do
               field :founded
               field :wins
             end
           end
 
           update do
-            group "d" do
+            group 'd' do
               field :wins
             end
 
-            group "e" do
+            group 'e' do
               field :losses
             end
           end
         end
       end
 
-      expect(RailsAdmin.config(Team).list.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:founded], [:name, :wins]])
-      expect(RailsAdmin.config(Team).edit.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:name], [:founded, :wins]])
-      expect(RailsAdmin.config(Team).create.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:name], [:founded, :wins]])
-      expect(RailsAdmin.config(Team).update.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:name], [:founded], [:wins], [:losses]])
-      expect(RailsAdmin.config(Team).visible_groups.map{|g| g.visible_fields.map(&:name) }.flatten.count).to eq(19)
-      expect(RailsAdmin.config(Team).export.visible_groups.map{|g| g.visible_fields.map(&:name) }.flatten.count).to eq(19)
+      expect(RailsAdmin.config(Team).list.visible_groups.collect { |g| g.visible_fields.collect(&:name) }).to eq([[:founded], [:name, :wins]])
+      expect(RailsAdmin.config(Team).edit.visible_groups.collect { |g| g.visible_fields.collect(&:name) }).to eq([[:name], [:founded, :wins]])
+      expect(RailsAdmin.config(Team).create.visible_groups.collect { |g| g.visible_fields.collect(&:name) }).to eq([[:name], [:founded, :wins]])
+      expect(RailsAdmin.config(Team).update.visible_groups.collect { |g| g.visible_fields.collect(&:name) }).to eq([[:name], [:founded], [:wins], [:losses]])
+      expect(RailsAdmin.config(Team).visible_groups.collect { |g| g.visible_fields.collect(&:name) }.flatten.count).to eq(19)
+      expect(RailsAdmin.config(Team).export.visible_groups.collect { |g| g.visible_fields.collect(&:name) }.flatten.count).to eq(19)
     end
   end
 end

data/spec/rails_admin/config_spec.rb

@@ -2,29 +2,29 @@ require 'spec_helper'
 
 describe RailsAdmin::Config do
 
-  describe ".included_models" do
+  describe '.included_models' do
 
-    it "only uses included models" do
+    it 'only uses included models' do
       RailsAdmin.config.included_models = [Team, League]
-      expect(RailsAdmin::AbstractModel.all.map(&:model)).to eq([League, Team]) # it gets sorted
+      expect(RailsAdmin::AbstractModel.all.collect(&:model)).to eq([League, Team]) # it gets sorted
     end
 
-    it "does not restrict models if included_models is left empty" do
+    it 'does not restrict models if included_models is left empty' do
       RailsAdmin.config.included_models = []
-      expect(RailsAdmin::AbstractModel.all.map(&:model)).to include(Team, League)
+      expect(RailsAdmin::AbstractModel.all.collect(&:model)).to include(Team, League)
     end
 
-    it "removes excluded models (whitelist - blacklist)" do
+    it 'removes excluded models (whitelist - blacklist)' do
       RailsAdmin.config.excluded_models = [Team]
       RailsAdmin.config.included_models = [Team, League]
-      expect(RailsAdmin::AbstractModel.all.map(&:model)).to eq([League])
+      expect(RailsAdmin::AbstractModel.all.collect(&:model)).to eq([League])
     end
 
-    it "always excludes history", :active_record => true do
-      expect(RailsAdmin::AbstractModel.all.map(&:model)).not_to include(RailsAdmin::History)
+    it 'always excludes history', active_record: true do
+      expect(RailsAdmin::AbstractModel.all.collect(&:model)).not_to include(RailsAdmin::History)
     end
 
-    it "excluded? returns true for any model not on the list" do
+    it 'excluded? returns true for any model not on the list' do
       RailsAdmin.config.included_models = [Team, League]
 
       team_config = RailsAdmin::AbstractModel.new('Team').config
@@ -35,69 +35,69 @@ describe RailsAdmin::Config do
     end
   end
 
-  describe ".add_extension" do
+  describe '.add_extension' do
     before do
       silence_warnings do
         RailsAdmin::EXTENSIONS = []
       end
     end
 
-    it "registers the extension with RailsAdmin" do
+    it 'registers the extension with RailsAdmin' do
       RailsAdmin.add_extension(:example, ExampleModule)
       expect(RailsAdmin::EXTENSIONS.select { |name| name == :example }.length).to eq(1)
     end
 
-    context "given an extension with an authorization adapter" do
-      it "registers the adapter" do
-        RailsAdmin.add_extension(:example, ExampleModule, {
-          :authorization => true
-        })
+    context 'given an extension with an authorization adapter' do
+      it 'registers the adapter' do
+        RailsAdmin.add_extension(:example, ExampleModule,
+                                 authorization: true
+        )
         expect(RailsAdmin::AUTHORIZATION_ADAPTERS[:example]).to eq(ExampleModule::AuthorizationAdapter)
       end
     end
 
-    context "given an extension with an auditing adapter" do
-      it "registers the adapter" do
-        RailsAdmin.add_extension(:example, ExampleModule, {
-          :auditing => true
-        })
+    context 'given an extension with an auditing adapter' do
+      it 'registers the adapter' do
+        RailsAdmin.add_extension(:example, ExampleModule,
+                                 auditing: true
+        )
         expect(RailsAdmin::AUDITING_ADAPTERS[:example]).to eq(ExampleModule::AuditingAdapter)
       end
     end
 
-    context "given an extension with a configuration adapter" do
-      it "registers the adapter" do
-        RailsAdmin.add_extension(:example, ExampleModule, {
-          :configuration => true
-        })
+    context 'given an extension with a configuration adapter' do
+      it 'registers the adapter' do
+        RailsAdmin.add_extension(:example, ExampleModule,
+                                 configuration: true
+        )
         expect(RailsAdmin::CONFIGURATION_ADAPTERS[:example]).to eq(ExampleModule::ConfigurationAdapter)
       end
     end
   end
 
-  describe ".main_app_name" do
+  describe '.main_app_name' do
 
-    it "as a default meaningful dynamic value" do
+    it 'as a default meaningful dynamic value' do
       expect(RailsAdmin.config.main_app_name.call).to eq(['Dummy App', 'Admin'])
     end
 
-    it "can be configured" do
+    it 'can be configured' do
       RailsAdmin.config do |config|
-        config.main_app_name = ['static','value']
+        config.main_app_name = %w(stati c value)
       end
-      expect(RailsAdmin.config.main_app_name).to eq(['static','value'])
+      expect(RailsAdmin.config.main_app_name).to eq(%w(stati c value))
     end
   end
 
-  describe ".authorize_with" do
-    context "given a key for a extension with authorization" do
+  describe '.authorize_with' do
+    context 'given a key for a extension with authorization' do
       before do
-        RailsAdmin.add_extension(:example, ExampleModule, {
-          :authorization => true
-        })
+        RailsAdmin.add_extension(:example, ExampleModule,
+                                 authorization: true
+        )
       end
 
-      it "initializes the authorization adapter" do
+      it 'initializes the authorization adapter' do
         expect(ExampleModule::AuthorizationAdapter).to receive(:new).with(RailsAdmin::Config)
         RailsAdmin.config do |config|
           config.authorize_with(:example)
@@ -105,8 +105,8 @@ describe RailsAdmin::Config do
         RailsAdmin.config.authorize_with.call
       end
 
-      it "passes through any additional arguments to the initializer" do
-        options = { :option => true }
+      it 'passes through any additional arguments to the initializer' do
+        options = {option: true}
         expect(ExampleModule::AuthorizationAdapter).to receive(:new).with(RailsAdmin::Config, options)
         RailsAdmin.config do |config|
           config.authorize_with(:example, options)
@@ -116,15 +116,15 @@ describe RailsAdmin::Config do
     end
   end
 
-  describe ".audit_with" do
-    context "given a key for a extension with auditing" do
+  describe '.audit_with' do
+    context 'given a key for a extension with auditing' do
       before do
-        RailsAdmin.add_extension(:example, ExampleModule, {
-          :auditing => true
-        })
+        RailsAdmin.add_extension(:example, ExampleModule,
+                                 auditing: true
+        )
       end
 
-      it "initializes the auditing adapter" do
+      it 'initializes the auditing adapter' do
         expect(ExampleModule::AuditingAdapter).to receive(:new).with(RailsAdmin::Config)
         RailsAdmin.config do |config|
           config.audit_with(:example)
@@ -132,8 +132,8 @@ describe RailsAdmin::Config do
         RailsAdmin.config.audit_with.call
       end
 
-      it "passes through any additional arguments to the initializer" do
-        options = { :option => true }
+      it 'passes through any additional arguments to the initializer' do
+        options = {option: true}
         expect(ExampleModule::AuditingAdapter).to receive(:new).with(RailsAdmin::Config, options)
         RailsAdmin.config do |config|
           config.audit_with(:example, options)
@@ -142,39 +142,40 @@ describe RailsAdmin::Config do
       end
     end
 
-    context "given paper_trail as the extension for auditing" do
+    context 'given paper_trail as the extension for auditing', active_record: true do
       before do
-        RailsAdmin.add_extension(:example, RailsAdmin::Extensions::PaperTrail, {
-          :auditing => true
-        })
+        module PaperTrail; end
+        class Version; end
+        RailsAdmin.add_extension(:example, RailsAdmin::Extensions::PaperTrail,
+                                 auditing: true
+        )
       end
 
-      it "initializes the auditing adapter" do
+      it 'initializes the auditing adapter' do
         RailsAdmin.config do |config|
           config.audit_with(:example)
         end
-        expect{ RailsAdmin.config.audit_with.call }.not_to raise_error
+        expect { RailsAdmin.config.audit_with.call }.not_to raise_error
       end
     end
   end
 
-
-  describe ".configure_with" do
-    context "given a key for a extension with configuration" do
+  describe '.configure_with' do
+    context 'given a key for a extension with configuration' do
       before do
-        RailsAdmin.add_extension(:example, ExampleModule, {
-          :configuration => true
-        })
+        RailsAdmin.add_extension(:example, ExampleModule,
+                                 configuration: true
+        )
       end
 
-      it "initializes configuration adapter" do
+      it 'initializes configuration adapter' do
         expect(ExampleModule::ConfigurationAdapter).to receive(:new)
         RailsAdmin.config do |config|
           config.configure_with(:example)
         end
       end
 
-      it "yields the (optionally) provided block, passing the initialized adapter" do
+      it 'yields the (optionally) provided block, passing the initialized adapter' do
         configurator = nil
         RailsAdmin.config do |config|
           config.configure_with(:example) do |configuration_adapter|
@@ -186,16 +187,16 @@ describe RailsAdmin::Config do
     end
   end
 
-  describe ".config" do
-    context ".default_search_operator" do
-      it "sets the default_search_operator" do
+  describe '.config' do
+    context '.default_search_operator' do
+      it 'sets the default_search_operator' do
         RailsAdmin.config do |config|
           config.default_search_operator = 'starts_with'
         end
         expect(RailsAdmin::Config.default_search_operator).to eq('starts_with')
       end
 
-      it "errors on unrecognized search operator" do
+      it 'errors on unrecognized search operator' do
         expect do
           RailsAdmin.config do |config|
             config.default_search_operator = 'random'
@@ -209,8 +210,8 @@ describe RailsAdmin::Config do
     end
   end
 
-  describe ".visible_models" do
-    it "passes controller bindings, find visible models, order them" do
+  describe '.visible_models' do
+    it 'passes controller bindings, find visible models, order them' do
       RailsAdmin.config do |config|
         config.included_models = [Player, Fan, Comment, Team]
 
@@ -218,7 +219,7 @@ describe RailsAdmin::Config do
           hide
         end
         config.model Fan do
-          weight -1
+          weight(-1)
           show
         end
         config.model Comment do
@@ -233,26 +234,26 @@ describe RailsAdmin::Config do
         end
       end
 
-      expect(RailsAdmin.config.visible_models(:controller => double(:_current_user => double(:role => :admin), :authorized? => true)).map(&:abstract_model).map(&:model)).to match_array [Fan, Comment]
+      expect(RailsAdmin.config.visible_models(controller: double(:_current_user => double(role: :admin), :authorized? => true)).collect(&:abstract_model).collect(&:model)).to match_array [Fan, Comment]
     end
 
-    it "hides unallowed models" do
+    it 'hides unallowed models' do
       RailsAdmin.config do |config|
         config.included_models = [Comment]
       end
-      expect(RailsAdmin.config.visible_models(:controller => double(:authorized? => true)).map(&:abstract_model).map(&:model)).to eq([Comment])
-      expect(RailsAdmin.config.visible_models(:controller => double(:authorized? => false)).map(&:abstract_model).map(&:model)).to eq([])
+      expect(RailsAdmin.config.visible_models(controller: double(:authorized? => true)).collect(&:abstract_model).collect(&:model)).to eq([Comment])
+      expect(RailsAdmin.config.visible_models(controller: double(:authorized? => false)).collect(&:abstract_model).collect(&:model)).to eq([])
     end
 
-    it "does not contain embedded model", :mongoid => true do
+    it 'does not contain embedded model', mongoid: true do
       RailsAdmin.config do |config|
         config.included_models = [FieldTest, Comment, Embed]
       end
 
-      expect(RailsAdmin.config.visible_models(:controller => double(:_current_user => double(:role => :admin), :authorized? => true)).map(&:abstract_model).map(&:model)).to match_array [FieldTest, Comment]
-     end
+      expect(RailsAdmin.config.visible_models(controller: double(:_current_user => double(role: :admin), :authorized? => true)).collect(&:abstract_model).collect(&:model)).to match_array [FieldTest, Comment]
+    end
 
-    it "basically does not contain embedded model except model using recursively_embeds_many or recursively_embeds_one", :mongoid => true do
+    it 'basically does not contain embedded model except model using recursively_embeds_many or recursively_embeds_one', mongoid: true do
       class RecursivelyEmbedsOne
         include Mongoid::Document
         recursively_embeds_one
@@ -264,13 +265,13 @@ describe RailsAdmin::Config do
       RailsAdmin.config do |config|
         config.included_models = [FieldTest, Comment, Embed, RecursivelyEmbedsMany, RecursivelyEmbedsOne]
       end
-      expect(RailsAdmin.config.visible_models(:controller => double(:_current_user => double(:role => :admin), :authorized? => true)).map(&:abstract_model).map(&:model)).to match_array [FieldTest, Comment, RecursivelyEmbedsMany, RecursivelyEmbedsOne]
+      expect(RailsAdmin.config.visible_models(controller: double(:_current_user => double(role: :admin), :authorized? => true)).collect(&:abstract_model).collect(&:model)).to match_array [FieldTest, Comment, RecursivelyEmbedsMany, RecursivelyEmbedsOne]
     end
   end
 
   describe '.models_pool' do
-    it "should not include classnames start with Concerns::" do
-      expect(RailsAdmin::Config.models_pool.select{|m| m.match(/^Concerns::/)}).to be_empty
+    it 'should not include classnames start with Concerns::' do
+      expect(RailsAdmin::Config.models_pool.select { |m| m.match(/^Concerns::/) }).to be_empty
     end
   end
 end