bullet 5.6.0 → 5.6.1

data/spec/integration/counter_cache_spec.rb

@@ -10,26 +10,26 @@ if !mongoid? && active_record?
       Bullet.end_request
     end
 
-    it "should need counter cache with all cities" do
+    it 'should need counter cache with all cities' do
       Country.all.each do |country|
         country.cities.size
       end
       expect(Bullet.collected_counter_cache_notifications).not_to be_empty
     end
 
-    it "should not need counter cache if already define counter_cache" do
+    it 'should not need counter cache if already define counter_cache' do
       Person.all.each do |person|
         person.pets.size
       end
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    it "should not need counter cache with only one object" do
+    it 'should not need counter cache with only one object' do
       Country.first.cities.size
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    it "should not need counter cache without size" do
+    it 'should not need counter cache without size' do
       Country.includes(:cities).each do |country|
         country.cities.empty?
       end
@@ -37,14 +37,14 @@ if !mongoid? && active_record?
     end
 
     if active_record5?
-      it "should not need counter cache for has_many through" do
+      it 'should not need counter cache for has_many through' do
         Client.all.each do |client|
           client.firms.size
         end
         expect(Bullet.collected_counter_cache_notifications).to be_empty
       end
     else
-      it "should need counter cache for has_many through" do
+      it 'should need counter cache for has_many through' do
         Client.all.each do |client|
           client.firms.size
         end
@@ -52,18 +52,18 @@ if !mongoid? && active_record?
       end
     end
 
-    it "should not need counter cache with part of cities" do
+    it 'should not need counter cache with part of cities' do
       Country.all.each do |country|
         country.cities.where(:name => 'first').size
       end
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    context "disable" do
+    context 'disable' do
       before { Bullet.counter_cache_enable = false }
       after { Bullet.counter_cache_enable = true }
 
-      it "should not detect counter cache" do
+      it 'should not detect counter cache' do
         Country.all.each do |country|
           country.cities.size
         end
@@ -71,11 +71,11 @@ if !mongoid? && active_record?
       end
     end
 
-    context "whitelist" do
-      before { Bullet.add_whitelist :type => :counter_cache, :class_name => "Country", :association => :cities }
+    context 'whitelist' do
+      before { Bullet.add_whitelist :type => :counter_cache, :class_name => 'Country', :association => :cities }
       after { Bullet.clear_whitelist }
 
-      it "should not detect counter cache" do
+      it 'should not detect counter cache' do
         Country.all.each do |country|
           country.cities.size
         end

data/spec/integration/mongoid/association_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 if mongoid?
   describe Bullet::Detector::Association do
     context 'embeds_many' do
-      context "posts => users" do
-        it "should detect nothing" do
+      context 'posts => users' do
+        it 'should detect nothing' do
           Mongoid::Post.all.each do |post|
             post.users.map(&:name)
           end
@@ -17,8 +17,8 @@ if mongoid?
     end
 
     context 'has_many' do
-      context "posts => comments" do
-        it "should detect non preload posts => comments" do
+      context 'posts => comments' do
+        it 'should detect non preload posts => comments' do
           Mongoid::Post.all.each do |post|
             post.comments.map(&:name)
           end
@@ -28,7 +28,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Post, :comments)
         end
 
-        it "should detect preload post => comments" do
+        it 'should detect preload post => comments' do
           Mongoid::Post.includes(:comments).each do |post|
             post.comments.map(&:name)
           end
@@ -38,7 +38,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload post => comments" do
+        it 'should detect unused preload post => comments' do
           Mongoid::Post.includes(:comments).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Post, :comments)
@@ -46,7 +46,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should not detect unused preload post => comments" do
+        it 'should not detect unused preload post => comments' do
           Mongoid::Post.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -55,8 +55,8 @@ if mongoid?
         end
       end
 
-      context "category => posts, category => entries" do
-        it "should detect non preload with category => [posts, entries]" do
+      context 'category => posts, category => entries' do
+        it 'should detect non preload with category => [posts, entries]' do
           Mongoid::Category.all.each do |category|
             category.posts.map(&:name)
             category.entries.map(&:name)
@@ -68,7 +68,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
 
-        it "should detect preload with category => posts, but not with category => entries" do
+        it 'should detect preload with category => posts, but not with category => entries' do
           Mongoid::Category.includes(:posts).each do |category|
             category.posts.map(&:name)
             category.entries.map(&:name)
@@ -80,7 +80,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
 
-        it "should detect preload with category => [posts, entries]" do
+        it 'should detect preload with category => [posts, entries]' do
           Mongoid::Category.includes(:posts, :entries).each do |category|
             category.posts.map(&:name)
             category.entries.map(&:name)
@@ -91,7 +91,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with category => [posts, entries]" do
+        it 'should detect unused preload with category => [posts, entries]' do
           Mongoid::Category.includes(:posts, :entries).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Category, :posts)
@@ -100,7 +100,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with category => entries, but not with category => posts" do
+        it 'should detect unused preload with category => entries, but not with category => posts' do
           Mongoid::Category.includes(:posts, :entries).each do |category|
             category.posts.map(&:name)
           end
@@ -112,8 +112,8 @@ if mongoid?
         end
       end
 
-      context "post => comment" do
-        it "should detect unused preload with post => comments" do
+      context 'post => comment' do
+        it 'should detect unused preload with post => comments' do
           Mongoid::Post.includes(:comments).each do |post|
             post.comments.first.name
           end
@@ -123,7 +123,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect preload with post => commnets" do
+        it 'should detect preload with post => commnets' do
           Mongoid::Post.first.comments.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -132,8 +132,8 @@ if mongoid?
         end
       end
 
-      context "scope preload_comments" do
-        it "should detect preload post => comments with scope" do
+      context 'scope preload_comments' do
+        it 'should detect preload post => comments with scope' do
           Mongoid::Post.preload_comments.each do |post|
             post.comments.map(&:name)
           end
@@ -143,7 +143,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with scope" do
+        it 'should detect unused preload with scope' do
           Mongoid::Post.preload_comments.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Post, :comments)
@@ -154,8 +154,8 @@ if mongoid?
     end
 
     context 'belongs_to' do
-      context "comment => post" do
-        it "should detect non preload with comment => post" do
+      context 'comment => post' do
+        it 'should detect non preload with comment => post' do
           Mongoid::Comment.all.each do |comment|
             comment.post.name
           end
@@ -165,7 +165,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Comment, :post)
         end
 
-        it "should detect preload with one comment => post" do
+        it 'should detect preload with one comment => post' do
           Mongoid::Comment.first.post.name
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -173,7 +173,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect preload with comment => post" do
+        it 'should detect preload with comment => post' do
           Mongoid::Comment.includes(:post).each do |comment|
             comment.post.name
           end
@@ -183,7 +183,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should not detect preload with comment => post" do
+        it 'should not detect preload with comment => post' do
           Mongoid::Comment.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -191,7 +191,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with comments => post" do
+        it 'should detect unused preload with comments => post' do
           Mongoid::Comment.includes(:post).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Comment, :post)
@@ -201,10 +201,10 @@ if mongoid?
       end
     end
 
-    context "has_one" do
-      context "company => address" do
+    context 'has_one' do
+      context 'company => address' do
         if Mongoid::VERSION !~ /\A3.0/
-          it "should detect non preload association" do
+          it 'should detect non preload association' do
             Mongoid::Company.all.each do |company|
               company.address.name
             end
@@ -215,7 +215,7 @@ if mongoid?
           end
         end
 
-        it "should detect preload association" do
+        it 'should detect preload association' do
           Mongoid::Company.includes(:address).each do |company|
             company.address.name
           end
@@ -225,7 +225,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should not detect preload association" do
+        it 'should not detect preload association' do
           Mongoid::Company.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -233,7 +233,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload association" do
+        it 'should detect unused preload association' do
           criteria = Mongoid::Company.includes(:address)
           criteria.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -244,8 +244,8 @@ if mongoid?
       end
     end
 
-    context "call one association that in possible objects" do
-      it "should not detect preload association" do
+    context 'call one association that in possible objects' do
+      it 'should not detect preload association' do
         Mongoid::Post.all
         Mongoid::Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations

data/spec/models/comment.rb

@@ -1,6 +1,6 @@
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
-  belongs_to :author, class_name: "BaseUser"
+  belongs_to :author, class_name: 'BaseUser'
 
   validates :post, presence: true
 end

data/spec/models/document.rb

@@ -1,5 +1,5 @@
 class Document < ActiveRecord::Base
-  has_many :children, class_name: "Document", foreign_key: 'parent_id'
-  belongs_to :parent, class_name: "Document", foreign_key: 'parent_id'
+  has_many :children, class_name: 'Document', foreign_key: 'parent_id'
+  belongs_to :parent, class_name: 'Document', foreign_key: 'parent_id'
   belongs_to :author
 end

data/spec/models/mongoid/address.rb

@@ -3,5 +3,5 @@ class Mongoid::Address
 
   field :name
 
-  belongs_to :company, :class_name => "Mongoid::Company"
+  belongs_to :company, :class_name => 'Mongoid::Company'
 end

data/spec/models/mongoid/category.rb

@@ -3,6 +3,6 @@ class Mongoid::Category
 
   field :name
 
-  has_many :posts, :class_name => "Mongoid::Post"
-  has_many :entries, :class_name => "Mongoid::Entry"
+  has_many :posts, :class_name => 'Mongoid::Post'
+  has_many :entries, :class_name => 'Mongoid::Entry'
 end

data/spec/models/mongoid/comment.rb

@@ -3,5 +3,5 @@ class Mongoid::Comment
 
   field :name
 
-  belongs_to :post, :class_name => "Mongoid::Post"
+  belongs_to :post, :class_name => 'Mongoid::Post'
 end

data/spec/models/mongoid/company.rb

@@ -3,5 +3,5 @@ class Mongoid::Company
 
   field :name
 
-  has_one :address, :class_name => "Mongoid::Address"
+  has_one :address, :class_name => 'Mongoid::Address'
 end

data/spec/models/mongoid/entry.rb

@@ -3,5 +3,5 @@ class Mongoid::Entry
 
   field :name
 
-  belongs_to :category, :class_name => "Mongoid::Category"
+  belongs_to :category, :class_name => 'Mongoid::Category'
 end

data/spec/models/mongoid/post.rb

@@ -3,10 +3,10 @@ class Mongoid::Post
 
   field :name
 
-  has_many :comments, :class_name => "Mongoid::Comment"
-  belongs_to :category, :class_name => "Mongoid::Category"
+  has_many :comments, :class_name => 'Mongoid::Comment'
+  belongs_to :category, :class_name => 'Mongoid::Category'
 
-  embeds_many :users, :class_name => "Mongoid::User"
+  embeds_many :users, :class_name => 'Mongoid::User'
 
   scope :preload_comments, lambda { includes(:comments) }
 end

data/spec/models/newspaper.rb

@@ -1,3 +1,3 @@
 class Newspaper < ActiveRecord::Base
-  has_many :writers, class_name: "BaseUser"
+  has_many :writers, class_name: 'BaseUser'
 end

data/spec/spec_helper.rb

@@ -15,20 +15,20 @@ module Rails
     end
 
     def env
-      "test"
+      'test'
     end
   end
 end
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'bullet'
 extend Bullet::Dependency
 Bullet.enable = true
 
-MODELS = File.join(File.dirname(__FILE__), "models")
+MODELS = File.join(File.dirname(__FILE__), 'models')
 $LOAD_PATH.unshift(MODELS)
-SUPPORT = File.join(File.dirname(__FILE__), "support")
-Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
+SUPPORT = File.join(File.dirname(__FILE__), 'support')
+Dir[ File.join(SUPPORT, '*.rb') ].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
 
 RSpec.configure do |config|
   config.extend Bullet::Dependency
@@ -41,11 +41,11 @@ if active_record?
   ActiveRecord::Migration.verbose = false
 
   # Autoload every active_record model for the test suite that sits in spec/models.
-  Dir[ File.join(MODELS, "*.rb") ].sort.each do |filename|
-    name = File.basename(filename, ".rb")
+  Dir[ File.join(MODELS, '*.rb') ].sort.each do |filename|
+    name = File.basename(filename, '.rb')
     autoload name.camelize.to_sym, name
   end
-  require File.join(SUPPORT, "sqlite_seed.rb")
+  require File.join(SUPPORT, 'sqlite_seed.rb')
 
   RSpec.configure do |config|
     config.before(:suite) do
@@ -63,7 +63,7 @@ if active_record?
     end
   end
 
-  if ENV["BULLET_LOG"]
+  if ENV['BULLET_LOG']
     require 'logger'
     ActiveRecord::Base.logger = Logger.new(STDOUT)
   end
@@ -71,8 +71,8 @@ end
 
 if mongoid?
   # Autoload every mongoid model for the test suite that sits in spec/models.
-  Dir[ File.join(MODELS, "mongoid", "*.rb") ].sort.each { |file| require file }
-  require File.join(SUPPORT, "mongo_seed.rb")
+  Dir[ File.join(MODELS, 'mongoid', '*.rb') ].sort.each { |file| require file }
+  require File.join(SUPPORT, 'mongo_seed.rb')
 
   RSpec.configure do |config|
     config.before(:suite) do
@@ -94,7 +94,7 @@ if mongoid?
     end
   end
 
-  if ENV["BULLET_LOG"]
+  if ENV['BULLET_LOG']
     Mongoid.logger = Logger.new(STDOUT)
     Moped.logger = Logger.new(STDOUT)
   end