bullet 5.5.0 → 6.1.5

data/spec/models/post.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 class Post < ActiveRecord::Base
   belongs_to :category, inverse_of: :posts
   belongs_to :writer
   has_many :comments, inverse_of: :post
+  has_and_belongs_to_many :deals
 
   validates :category, presence: true
 
@@ -12,4 +15,20 @@ class Post < ActiveRecord::Base
   def link=(*)
     comments.new
   end
+
+  # see association_spec.rb 'should not detect newly assigned object in an after_save'
+  attr_accessor :trigger_after_save
+  after_save do
+    next unless trigger_after_save
+
+    temp_comment = Comment.new(post: self)
+
+    # this triggers self to be "possible", even though it's
+    # not saved yet
+    temp_comment.post
+
+    # category should NOT whine about not being pre-loaded, because
+    # it's obviously attached to a new object
+    category
+  end
 end

data/spec/models/relationship.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Relationship < ActiveRecord::Base
   belongs_to :firm
   belongs_to :client

data/spec/models/reply.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Reply < ActiveRecord::Base
   belongs_to :submission
 end

data/spec/models/student.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Student < ActiveRecord::Base
   has_and_belongs_to_many :teachers
 end

data/spec/models/submission.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class Submission < ActiveRecord::Base
   belongs_to :user
   has_many :replies
+  has_one :attachment
 end

data/spec/models/teacher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Teacher < ActiveRecord::Base
   has_and_belongs_to_many :students
 end

data/spec/models/user.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_one :submission
+  has_one :submission_attachment, through: :submission, source: :attachment, class_name: 'Attachment'
   belongs_to :category
 end

data/spec/models/writer.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Writer < BaseUser
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 begin
   require 'active_record'
@@ -9,31 +11,31 @@ rescue LoadError
 end
 
 module Rails
-  class <<self
+  class << self
     def root
       File.expand_path(__FILE__).split('/')[0..-3].join('/')
     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
 
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 end
 
@@ -41,11 +43,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
@@ -58,12 +60,10 @@ if active_record?
       Bullet.enable = true
     end
 
-    config.after(:example) do
-      Bullet.end_request
-    end
+    config.after(:example) { Bullet.end_request }
   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
@@ -85,16 +85,12 @@ if mongoid?
       Support::MongoSeed.teardown_db
     end
 
-    config.before(:each) do
-      Bullet.start_request
-    end
+    config.before(:each) { Bullet.start_request }
 
-    config.after(:each) do
-      Bullet.end_request
-    end
+    config.after(:each) { Bullet.end_request }
   end
 
-  if ENV["BULLET_LOG"]
+  if ENV['BULLET_LOG']
     Mongoid.logger = Logger.new(STDOUT)
     Moped.logger = Logger.new(STDOUT)
   end

data/spec/support/bullet_ext.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Bullet
   def self.collected_notifications_of_class(notification_class)
-    Bullet.notification_collector.collection.select do |notification|
-      notification.is_a? notification_class
-    end
+    Bullet.notification_collector.collection.select { |notification| notification.is_a? notification_class }
   end
 
   def self.collected_counter_cache_notifications
@@ -21,7 +21,7 @@ end
 module Bullet
   module Detector
     class Association
-      class <<self
+      class << self
         # returns true if all associations are preloaded
         def completely_preloading_associations?
           Bullet.collected_n_plus_one_query_notifications.empty?
@@ -33,21 +33,22 @@ module Bullet
 
         # returns true if a given object has a specific association
         def creating_object_association_for?(object, association)
-          object_associations[object.bullet_key].present? && object_associations[object.bullet_key].include?(association)
+          object_associations[object.bullet_key].present? &&
+            object_associations[object.bullet_key].include?(association)
         end
 
         # returns true if a given class includes the specific unpreloaded association
         def detecting_unpreloaded_association_for?(klass, association)
-          Bullet.collected_n_plus_one_query_notifications.select { |notification|
+          Bullet.collected_n_plus_one_query_notifications.select do |notification|
             notification.base_class == klass.to_s && notification.associations.include?(association)
-          }.present?
+          end.present?
         end
 
         # returns true if the given class includes the specific unused preloaded association
         def unused_preload_associations_for?(klass, association)
-          Bullet.collected_unused_eager_association_notifications.select { |notification|
+          Bullet.collected_unused_eager_association_notifications.select do |notification|
             notification.base_class == klass.to_s && notification.associations.include?(association)
-          }.present?
+          end.present?
         end
       end
     end

data/spec/support/mongo_seed.rb

@@ -1,68 +1,51 @@
+# frozen_string_literal: true
+
 module Support
   module MongoSeed
-    def seed_db
-      category1 = Mongoid::Category.create(:name => 'first')
-      category2 = Mongoid::Category.create(:name => 'second')
-
-      post1 = category1.posts.create(:name => 'first')
-      post1a = category1.posts.create(:name => 'like first')
-      post2 = category2.posts.create(:name => 'second')
-
-      post1.users << Mongoid::User.create(:name => 'first')
-      post1.users << Mongoid::User.create(:name => 'another')
-      post2.users << Mongoid::User.create(:name => 'second')
-
-      comment1 = post1.comments.create(:name => 'first')
-      comment2 = post1.comments.create(:name => 'first2')
-      comment3 = post1.comments.create(:name => 'first3')
-      comment4 = post1.comments.create(:name => 'second')
-      comment8 = post1a.comments.create(:name => "like first 1")
-      comment9 = post1a.comments.create(:name => "like first 2")
-      comment5 = post2.comments.create(:name => 'third')
-      comment6 = post2.comments.create(:name => 'fourth')
-      comment7 = post2.comments.create(:name => 'fourth')
-
-      entry1 = category1.entries.create(:name => 'first')
-      entry2 = category1.entries.create(:name => 'second')
-
-      company1 = Mongoid::Company.create(:name => 'first')
-      company2 = Mongoid::Company.create(:name => 'second')
+    module_function
 
-      Mongoid::Address.create(:name => 'first', :company => company1)
-      Mongoid::Address.create(:name => 'second', :company => company2)
+    def seed_db
+      category1 = Mongoid::Category.create(name: 'first')
+      category2 = Mongoid::Category.create(name: 'second')
+
+      post1 = category1.posts.create(name: 'first')
+      post1a = category1.posts.create(name: 'like first')
+      post2 = category2.posts.create(name: 'second')
+
+      post1.users << Mongoid::User.create(name: 'first')
+      post1.users << Mongoid::User.create(name: 'another')
+      post2.users << Mongoid::User.create(name: 'second')
+
+      comment1 = post1.comments.create(name: 'first')
+      comment2 = post1.comments.create(name: 'first2')
+      comment3 = post1.comments.create(name: 'first3')
+      comment4 = post1.comments.create(name: 'second')
+      comment8 = post1a.comments.create(name: 'like first 1')
+      comment9 = post1a.comments.create(name: 'like first 2')
+      comment5 = post2.comments.create(name: 'third')
+      comment6 = post2.comments.create(name: 'fourth')
+      comment7 = post2.comments.create(name: 'fourth')
+
+      entry1 = category1.entries.create(name: 'first')
+      entry2 = category1.entries.create(name: 'second')
+
+      company1 = Mongoid::Company.create(name: 'first')
+      company2 = Mongoid::Company.create(name: 'second')
+
+      Mongoid::Address.create(name: 'first', company: company1)
+      Mongoid::Address.create(name: 'second', company: company2)
     end
 
     def setup_db
-      if Mongoid::VERSION =~ /\A2\.[4-8]/
-        Mongoid.configure do |config|
-          config.master = Mongo::Connection.new.db("bullet")
-        end
-      elsif Mongoid::VERSION =~ /\A3/
+      if Mongoid::VERSION =~ /\A4/
         Mongoid.configure do |config|
-          config.connect_to("bullet")
+          config.load_configuration(sessions: { default: { database: 'bullet', hosts: %w[localhost:27017] } })
         end
-      elsif Mongoid::VERSION =~ /\A4/
+      else
         Mongoid.configure do |config|
-          config.load_configuration(
-            sessions: {
-              default: {
-                database: "bullet",
-                hosts: [ "localhost:27017" ]
-              }
-            }
-          )
-        end
-      elsif Mongoid::VERSION =~ /\A5/
-        Mongoid.configure do |config|
-          config.load_configuration(
-              clients: {
-                  default: {
-                      database: "bullet",
-                      hosts: [ "localhost:27017" ]
-                  }
-              }
-          )
+          config.load_configuration(clients: { default: { database: 'bullet', hosts: %w[localhost:27017] } })
         end
+
         # Increase the level from DEBUG in order to avoid excessive logging to the screen
         Mongo::Logger.logger.level = Logger::WARN
       end
@@ -72,7 +55,5 @@ module Support
       Mongoid.purge!
       Mongoid::IdentityMap.clear if Mongoid.const_defined?(:IdentityMap)
     end
-
-    extend self
   end
 end

data/spec/support/rack_double.rb

@@ -1,28 +1,25 @@
+# frozen_string_literal: true
+
 module Support
   class AppDouble
-    def call env
+    def call(_env)
       env = @env
-      [ status, headers, response ]
+      [status, headers, response]
     end
 
-    def status= status
-      @status = status
-    end
+    attr_writer :status
 
-    def headers= headers
-      @headers = headers
-    end
+    attr_writer :headers
 
     def headers
-      @headers ||= {"Content-Type" => "text/html"}
+      @headers ||= { 'Content-Type' => 'text/html' }
       @headers
     end
 
-    def response= response
-      @response = response
-    end
+    attr_writer :response
 
     private
+
     def status
       @status || 200
     end
@@ -33,23 +30,20 @@ module Support
   end
 
   class ResponseDouble
-    def initialize actual_body = nil
+    def initialize(actual_body = nil)
       @actual_body = actual_body
     end
 
     def body
-      @body ||= "<html><head></head><body></body></html>"
+      @body ||= '<html><head></head><body></body></html>'
     end
 
-    def body= body
-      @body = body
-    end
+    attr_writer :body
 
     def each
       yield body
     end
 
-    def close
-    end
+    def close; end
   end
 end