bullet 2.2.0 → 2.3.0

data/spec/{bullet → integration}/association_spec.rb

@@ -1,125 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+require 'spec_helper'
 
 describe Bullet::Detector::Association, 'has_many' do
-
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :categories do |t|
-        t.column :name, :string
-      end
-
-      create_table :posts do |t|
-        t.column :name, :string
-        t.column :category_id, :integer
-        t.column :writer_id, :integer
-      end
-
-      create_table :comments do |t|
-        t.column :name, :string
-        t.column :post_id, :integer
-        t.column :author_id, :integer
-      end
-
-      create_table :entries do |t|
-        t.column :name, :string
-        t.column :category_id, :integer
-      end
-
-      create_table :base_users do |t|
-        t.column :name, :string
-        t.column :type, :string
-        t.column :newspaper_id, :integer
-      end
-      create_table :newspapers do |t|
-        t.column :name, :string
-      end
-    end
-  end
-
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  class Category < ActiveRecord::Base
-    has_many :posts
-    has_many :entries
-  end
-
-  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
-
-  class Entry < ActiveRecord::Base
-    belongs_to :category
-  end
-
-  class Comment < ActiveRecord::Base
-    belongs_to :post
-    belongs_to :author, :class_name => "BaseUser"
-  end
-
-  class BaseUser < ActiveRecord::Base
-    has_many :comments
-    has_many :posts
-    belongs_to :newspaper
-  end
-
-  class Newspaper < ActiveRecord::Base
-    has_many :writers, :class_name => "BaseUser"
-  end
-
-  class Writer < BaseUser
-  end
-
-  before(:all) do
-    setup_db
-
-    newspaper1 = Newspaper.create(:name => "First Newspaper")
-    newspaper2 = Newspaper.create(:name => "Second Newspaper")
-
-    writer1 = Writer.create(:name => 'first', :newspaper => newspaper1)
-    writer2 = Writer.create(:name => 'second', :newspaper => newspaper2)
-    user1 = BaseUser.create(:name => 'third', :newspaper => newspaper1)
-    user2 = BaseUser.create(:name => 'fourth', :newspaper => newspaper2)
-
-
-    category1 = Category.create(:name => 'first')
-    category2 = Category.create(:name => 'second')
-
-    post1 = category1.posts.create(:name => 'first', :writer => writer1)
-    post1a = category1.posts.create(:name => 'like first', :writer => writer2)
-    post2 = category2.posts.create(:name => 'second', :writer => writer2)
-
-    comment1 = post1.comments.create(:name => 'first', :author => writer1)
-    comment2 = post1.comments.create(:name => 'first2', :author => writer1)
-    comment3 = post1.comments.create(:name => 'first3', :author => writer1)
-    comment4 = post1.comments.create(:name => 'second', :author => writer2)
-    comment8 = post1a.comments.create(:name => "like first 1", :author => writer1)
-    comment9 = post1a.comments.create(:name => "like first 2", :author => writer2)
-    comment5 = post2.comments.create(:name => 'third', :author => user1)
-    comment6 = post2.comments.create(:name => 'fourth', :author => user2)
-    comment7 = post2.comments.create(:name => 'fourth', :author => writer1)
-
-    entry1 = category1.entries.create(:name => 'first')
-    entry2 = category1.entries.create(:name => 'second')
-  end
-
-  after(:all) do
-    teardown_db
-  end
-
   before(:each) do
     Bullet.start_request
   end
@@ -482,54 +363,6 @@ describe Bullet::Detector::Association, 'has_many' do
 end
 
 describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
-
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :students do |t|
-        t.column :name, :string
-      end
-
-      create_table :teachers do |t|
-        t.column :name, :string
-      end
-
-      create_table :students_teachers, :id => false do |t|
-        t.column :student_id, :integer
-        t.column :teacher_id, :integer
-      end
-    end
-  end
-
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  class Student < ActiveRecord::Base
-    has_and_belongs_to_many :teachers
-  end
-
-  class Teacher < ActiveRecord::Base
-    has_and_belongs_to_many :students
-  end
-
-  before(:all) do
-    setup_db
-    student1 = Student.create(:name => 'first')
-    student2 = Student.create(:name => 'second')
-    teacher1 = Teacher.create(:name => 'first')
-    teacher2 = Teacher.create(:name => 'second')
-    student1.teachers = [teacher1, teacher2]
-    student2.teachers = [teacher1, teacher2]
-    teacher1.students << student1
-    teacher2.students << student2
-  end
-
-  after(:all) do
-    teardown_db
-  end
-
   before(:each) do
     Bullet.start_request
   end
@@ -566,61 +399,6 @@ describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
 end
 
 describe Bullet::Detector::Association, 'has_many :through' do
-
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :firms do |t|
-        t.column :name, :string
-      end
-
-      create_table :clients do |t|
-        t.column :name, :string
-      end
-
-      create_table :relationships do |t|
-        t.column :firm_id, :integer
-        t.column :client_id, :integer
-      end
-    end
-  end
-
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  class Firm < ActiveRecord::Base
-    has_many :relationships
-    has_many :clients, :through => :relationships
-  end
-
-  class Client < ActiveRecord::Base
-    has_many :relationships
-    has_many :firms, :through => :relationships
-  end
-
-  class Relationship < ActiveRecord::Base
-    belongs_to :firm
-    belongs_to :client
-  end
-
-  before(:all) do
-    setup_db
-    firm1 = Firm.create(:name => 'first')
-    firm2 = Firm.create(:name => 'second')
-    client1 = Client.create(:name => 'first')
-    client2 = Client.create(:name => 'second')
-    firm1.clients = [client1, client2]
-    firm2.clients = [client1, client2]
-    client1.firms << firm1
-    client2.firms << firm2
-  end
-
-  after(:all) do
-    teardown_db
-  end
-
   before(:each) do
     Bullet.start_request
   end
@@ -659,48 +437,6 @@ end
 
 
 describe Bullet::Detector::Association, "has_one" do
-
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :companies do |t|
-        t.column :name, :string
-      end
-
-      create_table :addresses do |t|
-        t.column :name, :string
-        t.column :company_id, :integer
-      end
-    end
-  end
-
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  class Company < ActiveRecord::Base
-    has_one :address
-  end
-
-  class Address < ActiveRecord::Base
-    belongs_to :company
-  end
-
-  before(:all) do
-    setup_db
-
-    company1 = Company.create(:name => 'first')
-    company2 = Company.create(:name => 'second')
-
-    Address.create(:name => 'first', :company => company1)
-    Address.create(:name => 'second', :company => company2)
-  end
-
-  after(:all) do
-    teardown_db
-  end
-
   before(:each) do
     Bullet.start_request
   end
@@ -737,50 +473,6 @@ describe Bullet::Detector::Association, "has_one" do
 end
 
 describe Bullet::Detector::Association, "call one association that in possible objects" do
-
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :contacts do |t|
-        t.column :name, :string
-      end
-
-      create_table :emails do |t|
-        t.column :name, :string
-        t.column :contact_id, :integer
-      end
-    end
-  end
-
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  class Contact < ActiveRecord::Base
-    has_many :emails
-  end
-
-  class Email < ActiveRecord::Base
-    belongs_to :contact
-  end
-
-  before(:all) do
-    setup_db
-
-    contact1 = Contact.create(:name => 'first')
-    contact2 = Contact.create(:name => 'second')
-
-    email1 = contact1.emails.create(:name => 'first')
-    email2 = contact1.emails.create(:name => 'second')
-    email3 = contact2.emails.create(:name => 'third')
-    email4 = contact2.emails.create(:name => 'fourth')
-  end
-
-  after(:all) do
-    teardown_db
-  end
-
   before(:each) do
     Bullet.start_request
   end
@@ -797,56 +489,6 @@ describe Bullet::Detector::Association, "call one association that in possible o
 end
 
 describe Bullet::Detector::Association, "STI" do
-
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :documents do |t|
-        t.string :name
-        t.string :type
-        t.integer :parent_id
-        t.integer :author_id
-      end
-
-      create_table :authors do |t|
-        t.string :name
-      end
-    end
-  end
-
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  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
-
-  class Page < Document
-  end
-
-  class Folder < Document
-  end
-
-  class Author < ActiveRecord::Base
-    has_many :documents
-  end
-
-  before(:all) do
-    setup_db
-    author1 = Author.create(:name => 'author1')
-    author2 = Author.create(:name => 'author2')
-    folder1 = Folder.create(:name => 'folder1', :author_id => author1.id)
-    folder2 = Folder.create(:name => 'folder2', :author_id => author2.id)
-    page1 = Page.create(:name => 'page1', :parent_id => folder1.id, :author_id => author1.id)
-    page2 = Page.create(:name => 'page2', :parent_id => folder1.id, :author_id => author1.id)
-    page3 = Page.create(:name => 'page3', :parent_id => folder2.id, :author_id => author2.id)
-    page4 = Page.create(:name => 'page4', :parent_id => folder2.id, :author_id => author2.id)
-  end
-
   before(:each) do
     Bullet.start_request
   end

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