bullet 2.0.1 → 2.1.0

data/spec/bullet/counter_spec.rb

@@ -0,0 +1,136 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+describe Bullet::Detector::Counter do
+  def setup_db
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :countries do |t|
+        t.string :name
+      end
+
+      create_table :cities do |t|
+        t.string :name
+        t.integer :country_id
+      end
+    end
+  end
+
+  def teardown_db
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
+  end
+
+  class Country < ActiveRecord::Base
+    has_many :cities
+  end
+
+  class City < ActiveRecord::Base
+    belongs_to :country
+  end
+
+  before(:all) do
+    setup_db
+
+    country1 = Country.create(:name => 'first')
+    country2 = Country.create(:name => 'second')
+    
+    country1.cities.create(:name => 'first')
+    country1.cities.create(:name => 'second')
+    country2.cities.create(:name => 'third')
+    country2.cities.create(:name => 'fourth')
+  end
+
+  after(:all) do
+    teardown_db
+  end
+
+  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 coounter 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
+
+describe Bullet::Detector::Counter do
+  def setup_db
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :people do |t|
+        t.string :name
+        t.integer :pets_count
+      end
+
+      create_table :pets do |t|
+        t.string :name
+        t.integer :person_id
+      end
+    end
+  end
+
+  def teardown_db
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
+  end
+
+  class Person < ActiveRecord::Base
+    has_many :pets
+  end
+
+  class Pet < ActiveRecord::Base
+    belongs_to :person, :counter_cache => true
+  end
+
+  before(:all) do
+    setup_db
+
+    person1 = Person.create(:name => 'first')
+    person2 = Person.create(:name => 'second')
+    
+    person1.pets.create(:name => 'first')
+    person1.pets.create(:name => 'second')
+    person2.pets.create(:name => 'third')
+    person2.pets.create(:name => 'fourth')
+  end
+
+  after(:all) do
+    teardown_db
+  end
+
+  before(:each) do
+    Bullet.start_request
+  end
+  
+  after(:each) do
+    Bullet.end_request
+  end
+
+  it "should not need counter cache" do
+    Person.all.each do |person|
+      person.pets.size
+    end
+    Bullet.collected_counter_cache_notifications.should be_empty
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,79 @@
+require 'rubygems'
+require 'rspec'
+require 'rspec/autorun'
+require 'rails'
+require 'active_record'
+require 'action_controller'
+
+module Rails
+  class <<self
+    def root
+      File.expand_path(__FILE__).split('/')[0..-3].join('/')
+    end
+  end
+end
+
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+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

data/tasks/bullet_tasks.rake

@@ -0,0 +1,9 @@
+namespace :bullet do
+  namespace :log do
+    desc "Truncates the bullet log file to zero bytes"
+    task :clear do
+      f = File.open("log/bullet.log", "w")
+      f.close
+    end
+  end
+end

metadata

@@ -1,111 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bullet
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+version: !ruby/object:Gem::Version
+  version: 2.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-19 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-12-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: uniform_notifier
+  requirement: &2156581180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id001
-  name: uniform_notifier
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *2156581180
 description: A rails plugin to kill N+1 queries and unused eager loading.
-email: 
+email:
 - flyerhzm@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- .rspec
+- .rvmrc
+- .rvmrc.example
+- .watchr
+- Gemfile
+- Gemfile.lock
+- Hacking.textile
 - MIT-LICENSE
 - README.textile
 - README_for_rails2.textile
-files: 
+- Rakefile
+- bullet.gemspec
+- lib/bullet.rb
 - lib/bullet/action_controller2.rb
 - lib/bullet/active_record2.rb
 - lib/bullet/active_record3.rb
+- lib/bullet/active_record31.rb
+- lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
 - lib/bullet/detector/base.rb
 - lib/bullet/detector/counter.rb
 - lib/bullet/detector/n_plus_one_query.rb
 - lib/bullet/detector/unused_eager_association.rb
-- lib/bullet/detector.rb
+- lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb
 - lib/bullet/notification/n_plus_one_query.rb
 - lib/bullet/notification/unused_eager_loading.rb
-- lib/bullet/notification.rb
 - lib/bullet/notification_collector.rb
 - lib/bullet/rack.rb
+- lib/bullet/registry.rb
 - lib/bullet/registry/association.rb
 - lib/bullet/registry/base.rb
 - lib/bullet/registry/object.rb
-- lib/bullet/registry.rb
 - lib/bullet/version.rb
-- lib/bullet.rb
-- MIT-LICENSE
-- README.textile
-- README_for_rails2.textile
-has_rdoc: true
+- perf/benchmark.rb
+- rails/init.rb
+- spec/bullet/association_for_chris_spec.rb
+- spec/bullet/association_for_peschkaj_spec.rb
+- spec/bullet/association_spec.rb
+- spec/bullet/counter_spec.rb
+- spec/spec_helper.rb
+- tasks/bullet_tasks.rake
 homepage: http://github.com/flyerhzm/bullet
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1237939251235315374
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A rails plugin to kill N+1 queries and unused eager loading.
-test_files: []
-
+test_files:
+- spec/bullet/association_for_chris_spec.rb
+- spec/bullet/association_for_peschkaj_spec.rb
+- spec/bullet/association_spec.rb
+- spec/bullet/counter_spec.rb
+- spec/spec_helper.rb