bullet 2.2.1 → 2.3.0

data/spec/integration/counter_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Bullet::Detector::Counter do
+  before(:each) do
+    Bullet.start_request
+  end
+
+  after(:each) do
+    Bullet.end_request
+  end
+
+  it "should need counter cache with all cities" do
+    Country.all.each do |country|
+      country.cities.size
+    end
+    Bullet.collected_counter_cache_notifications.should_not be_empty
+  end
+
+  it "should not need counter cache if already define counter_cache" do
+    Person.all.each do |person|
+      person.pets.size
+    end
+    Bullet.collected_counter_cache_notifications.should be_empty
+  end
+
+  it "should not need counter cache with only one object" do
+    Country.first.cities.size
+    Bullet.collected_counter_cache_notifications.should be_empty
+  end
+
+  it "should not need counter cache with part of cities" do
+    Country.all.each do |country|
+      country.cities.where(:name => 'first').size
+    end
+    Bullet.collected_counter_cache_notifications.should be_empty
+  end
+end

data/spec/models/address.rb

@@ -0,0 +1,3 @@
+class Address < ActiveRecord::Base
+  belongs_to :company
+end

data/spec/models/author.rb

@@ -0,0 +1,3 @@
+class Author < ActiveRecord::Base
+  has_many :documents
+end

data/spec/models/base_user.rb

@@ -0,0 +1,5 @@
+class BaseUser < ActiveRecord::Base
+  has_many :comments
+  has_many :posts
+  belongs_to :newspaper
+end

data/spec/models/category.rb

@@ -0,0 +1,7 @@
+class Category < ActiveRecord::Base
+  has_many :posts
+  has_many :entries
+
+  has_many :submissions
+  has_many :users
+end

data/spec/models/city.rb

@@ -0,0 +1,3 @@
+class City < ActiveRecord::Base
+  belongs_to :country
+end

data/spec/models/client.rb

@@ -0,0 +1,4 @@
+class Client < ActiveRecord::Base
+  has_many :relationships
+  has_many :firms, :through => :relationships
+end

data/spec/models/comment.rb

@@ -0,0 +1,4 @@
+class Comment < ActiveRecord::Base
+  belongs_to :post
+  belongs_to :author, :class_name => "BaseUser"
+end

data/spec/models/company.rb

@@ -0,0 +1,3 @@
+class Company < ActiveRecord::Base
+  has_one :address
+end

data/spec/models/contact.rb

@@ -0,0 +1,3 @@
+class Contact < ActiveRecord::Base
+  has_many :emails
+end

data/spec/models/country.rb

@@ -0,0 +1,3 @@
+class Country < ActiveRecord::Base
+  has_many :cities
+end

data/spec/models/deal.rb

@@ -0,0 +1,4 @@
+class Deal < ActiveRecord::Base
+  belongs_to :hotel
+  has_one :location, :through => :hotel
+end

data/spec/models/document.rb

@@ -0,0 +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'
+  belongs_to :author
+end

data/spec/models/email.rb

@@ -0,0 +1,3 @@
+class Email < ActiveRecord::Base
+  belongs_to :contact
+end

data/spec/models/entry.rb

@@ -0,0 +1,3 @@
+class Entry < ActiveRecord::Base
+  belongs_to :category
+end

data/spec/models/firm.rb

@@ -0,0 +1,4 @@
+class Firm < ActiveRecord::Base
+  has_many :relationships
+  has_many :clients, :through => :relationships
+end

data/spec/models/folder.rb

@@ -0,0 +1,2 @@
+class Folder < Document
+end

data/spec/models/hotel.rb

@@ -0,0 +1,4 @@
+class Hotel < ActiveRecord::Base
+  belongs_to :location
+  has_many :deals
+end

data/spec/models/location.rb

@@ -0,0 +1,3 @@
+class Location < ActiveRecord::Base
+  has_many :hotels
+end

data/spec/models/newspaper.rb

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

data/spec/models/page.rb

@@ -0,0 +1,2 @@
+class Page < Document
+end

data/spec/models/person.rb

@@ -0,0 +1,3 @@
+class Person < ActiveRecord::Base
+  has_many :pets
+end

data/spec/models/pet.rb

@@ -0,0 +1,3 @@
+class Pet < ActiveRecord::Base
+  belongs_to :person, :counter_cache => true
+end

data/spec/models/post.rb

@@ -0,0 +1,11 @@
+class Post < ActiveRecord::Base
+  belongs_to :category
+  has_many :comments
+  belongs_to :writer
+
+
+  scope :preload_posts, lambda { includes(:comments) }
+  scope :in_category_name, lambda { |name|
+    where(['categories.name = ?', name]).includes(:category)
+  }
+end

data/spec/models/relationship.rb

@@ -0,0 +1,4 @@
+class Relationship < ActiveRecord::Base
+  belongs_to :firm
+  belongs_to :client
+end

data/spec/models/student.rb

@@ -0,0 +1,3 @@
+class Student < ActiveRecord::Base
+  has_and_belongs_to_many :teachers
+end

data/spec/models/submission.rb

@@ -0,0 +1,4 @@
+class Submission < ActiveRecord::Base
+  belongs_to :category
+  belongs_to :user
+end

data/spec/models/teacher.rb

@@ -0,0 +1,3 @@
+class Teacher < ActiveRecord::Base
+  has_and_belongs_to_many :students
+end

data/spec/models/user.rb

@@ -0,0 +1,4 @@
+class User < ActiveRecord::Base
+  has_one :submission
+  belongs_to :category
+end

data/spec/models/writer.rb

@@ -0,0 +1,2 @@
+class Writer < BaseUser
+end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-#require 'pry'
-require 'rubygems'
 require 'rspec'
 require 'rspec/autorun'
 require 'rails'
@@ -19,116 +17,28 @@ require 'bullet'
 Bullet.enable = true
 ActiveRecord::Migration.verbose = false
 
-module Bullet
-  def self.collected_notifications_of_class( notification_class )
-    Bullet.notification_collector.collection.select do |notification|
-      notification.is_a? notification_class
-    end
-  end
-
-  def self.collected_counter_cache_notifications
-    collected_notifications_of_class Bullet::Notification::CounterCache
-  end
-
-  def self.collected_n_plus_one_query_notifications
-    collected_notifications_of_class Bullet::Notification::NPlusOneQuery
-  end
-
-  def self.collected_unused_eager_association_notifications
-    collected_notifications_of_class Bullet::Notification::UnusedEagerLoading
-  end
-end
-
-module Bullet
-  module Detector
-    class Association
-      class <<self
-        # returns true if all associations are preloaded
-        def completely_preloading_associations?
-          Bullet.collected_n_plus_one_query_notifications.empty?
-        end
-
-        def has_unused_preload_associations?
-          Bullet.collected_unused_eager_association_notifications.present?
-        end
-
-        # returns true if a given object has a specific association
-        def creating_object_association_for?(object, association)
-          object_associations[object].present? && object_associations[object].include?(association)
-        end
-
-        # returns true if a given class includes the specific unpreloaded association
-        def detecting_unpreloaded_association_for?(klass, association)
-          for_class_and_assoc = Bullet.collected_n_plus_one_query_notifications.select do |notification|
-            notification.base_class == klass and
-            notification.associations.include?( association )
-          end
-          for_class_and_assoc.present?
-        end
-
-        # returns true if the given class includes the specific unused preloaded association
-        def unused_preload_associations_for?(klass, association)
-          for_class_and_assoc = Bullet.collected_unused_eager_association_notifications.select do |notification|
-            notification.base_class == klass and
-            notification.associations.include?( association )
-          end
-          for_class_and_assoc.present?
-        end
-      end
-    end
-  end
-end
+MODELS = File.join(File.dirname(__FILE__), "models")
+$LOAD_PATH.unshift(MODELS)
 
-class AppDouble
-  def call env
-    env = @env
-    [ status, headers, response ]
-  end
-
-  def status= status
-    @status = status
-  end
-
-  def headers= headers
-    @headers = headers
-  end
-
-  def headers
-    @headers ||= {}
-    @headers
-  end
-
-  def response= response
-    @response = response
-  end
-
-  private
-  def status
-    @status || 200
-  end
-
-  def response
-    @response || ResponseDouble.new
-  end
+# Autoload every model for the test suite that sits in spec/models.
+Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
+  name = File.basename(file, ".rb")
+  autoload name.camelize.to_sym, name
 end
 
-class ResponseDouble
-  def initialize actual_body = nil
-    @actual_body = actual_body
-  end
-
-  def body
-    @body ||= "Hello world!"
-  end
+SUPPORT = File.join(File.dirname(__FILE__), "support")
+Dir[ File.join(SUPPORT, "*.rb") ].sort.each { |file| require file }
 
-  def body= body
-    @body = body
+RSpec.configure do |config|
+  config.before(:suite) do
+    Support::Seed.setup_db
+    Support::Seed.seed_db
   end
 
-  def each
-    yield body
+  config.after(:suite) do
+    Support::Seed.teardown_db
   end
 
-  def close
-  end
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end

data/spec/support/bullet_ext.rb

@@ -0,0 +1,55 @@
+module Bullet
+  def self.collected_notifications_of_class(notification_class)
+    Bullet.notification_collector.collection.select do |notification|
+      notification.is_a? notification_class
+    end
+  end
+
+  def self.collected_counter_cache_notifications
+    collected_notifications_of_class Bullet::Notification::CounterCache
+  end
+
+  def self.collected_n_plus_one_query_notifications
+    collected_notifications_of_class Bullet::Notification::NPlusOneQuery
+  end
+
+  def self.collected_unused_eager_association_notifications
+    collected_notifications_of_class Bullet::Notification::UnusedEagerLoading
+  end
+end
+
+module Bullet
+  module Detector
+    class Association
+      class <<self
+        # returns true if all associations are preloaded
+        def completely_preloading_associations?
+          Bullet.collected_n_plus_one_query_notifications.empty?
+        end
+
+        def has_unused_preload_associations?
+          Bullet.collected_unused_eager_association_notifications.present?
+        end
+
+        # returns true if a given object has a specific association
+        def creating_object_association_for?(object, association)
+          object_associations[object.ar_key].present? && object_associations[object.ar_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|
+            notification.base_class == klass.to_s && notification.associations.include?(association)
+          }.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|
+            notification.base_class == klass.to_s && notification.associations.include?(association)
+          }.present?
+        end
+      end
+    end
+  end
+end

data/spec/support/rack_double.rb

@@ -0,0 +1,55 @@
+module Support
+  class AppDouble
+    def call env
+      env = @env
+      [ status, headers, response ]
+    end
+
+    def status= status
+      @status = status
+    end
+
+    def headers= headers
+      @headers = headers
+    end
+
+    def headers
+      @headers ||= {"Content-Type" => "text/html"}
+      @headers
+    end
+
+    def response= response
+      @response = response
+    end
+
+    private
+    def status
+      @status || 200
+    end
+
+    def response
+      @response || ResponseDouble.new
+    end
+  end
+
+  class ResponseDouble
+    def initialize actual_body = nil
+      @actual_body = actual_body
+    end
+
+    def body
+      @body ||= "<html><head></head><body></body></html>"
+    end
+
+    def body= body
+      @body = body
+    end
+
+    def each
+      yield body
+    end
+
+    def close
+    end
+  end
+end