bullet 4.1.0 → 4.2.0

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ rescue LoadError
   # rails 2.3
   require 'initializer'
 end
-require 'active_record'
 require 'action_controller'
 
 module Rails
@@ -18,39 +17,45 @@ end
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'bullet'
+extend Bullet::Dependency
 Bullet.enable = true
-ActiveRecord::Migration.verbose = false
 
 MODELS = File.join(File.dirname(__FILE__), "models")
 $LOAD_PATH.unshift(MODELS)
-
-# Autoload every model for the test suite that sits in spec/models.
-Dir[ File.join(MODELS, "*.rb") ].sort.each do |filename|
-  name = File.basename(filename, ".rb")
-  autoload name.camelize.to_sym, name
-end
-
 SUPPORT = File.join(File.dirname(__FILE__), "support")
-Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /mongo_seed.rb$/ }.sort.each { |file| require file }
+Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
 
 RSpec.configure do |config|
-  config.before(:suite) do
-    Support::SqliteSeed.setup_db
-    Support::SqliteSeed.seed_db
-  end
-
-  config.after(:suite) do
-    Support::SqliteSeed.teardown_db
-  end
+  config.extend Bullet::Dependency
 
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end
 
-begin
-  require 'mongoid'
+if active_record?
+  ActiveRecord::Migration.verbose = false
 
-  # Autoload every model for the test suite that sits in spec/models.
+  # 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")
+    autoload name.camelize.to_sym, name
+  end
+  require File.join(SUPPORT, "sqlite_seed.rb")
+
+  RSpec.configure do |config|
+    config.before(:suite) do
+      Support::SqliteSeed.setup_db
+      Support::SqliteSeed.seed_db
+    end
+
+    config.after(:suite) do
+      Support::SqliteSeed.teardown_db
+    end
+  end
+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")
 
@@ -64,5 +69,4 @@ begin
       Support::MongoSeed.teardown_db
     end
   end
-rescue LoadError
 end

data/spec/support/mongo_seed.rb

@@ -8,6 +8,10 @@ module Support
       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')

data/test.sh

@@ -1,4 +1,5 @@
 bundle && bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.1.4 bundle && bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.0.12 bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.1.5 bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.0.13 bundle && bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-2.3.14 bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-4-beta bundle && bundle exec rspec spec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &70161212330380 !ruby/object:Gem::Requirement
+  requirement: &70294547787940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161212330380
+  version_requirements: *70294547787940
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -35,13 +35,10 @@ files:
 - .rvmrc.example
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - Gemfile.rails-2.3.14
-- Gemfile.rails-2.3.14.lock
-- Gemfile.rails-3.0.12
-- Gemfile.rails-3.0.12.lock
-- Gemfile.rails-3.1.4
-- Gemfile.rails-3.1.4.lock
+- Gemfile.rails-3.0.13
+- Gemfile.rails-3.1.5
+- Gemfile.rails-4-beta
 - Guardfile
 - Hacking.textile
 - MIT-LICENSE
@@ -54,6 +51,7 @@ files:
 - lib/bullet/active_record2.rb
 - lib/bullet/active_record3.rb
 - lib/bullet/active_record31.rb
+- lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
 - lib/bullet/detector/base.rb
@@ -118,6 +116,7 @@ files:
 - spec/models/mongoid/company.rb
 - spec/models/mongoid/entry.rb
 - spec/models/mongoid/post.rb
+- spec/models/mongoid/user.rb
 - spec/models/newspaper.rb
 - spec/models/page.rb
 - spec/models/person.rb
@@ -135,7 +134,6 @@ files:
 - spec/support/rack_double.rb
 - spec/support/sqlite_seed.rb
 - tasks/bullet_tasks.rake
-- test.result
 - test.sh
 homepage: http://github.com/flyerhzm/bullet
 licenses: []
@@ -151,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2670779275443337107
+      hash: -1372591245763188534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,6 +203,7 @@ test_files:
 - spec/models/mongoid/company.rb
 - spec/models/mongoid/entry.rb
 - spec/models/mongoid/post.rb
+- spec/models/mongoid/user.rb
 - spec/models/newspaper.rb
 - spec/models/page.rb
 - spec/models/person.rb

data/Gemfile.lock

@@ -1,129 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.0)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
-      mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activerecord-import (0.2.9)
-      activerecord (~> 3.0)
-      activerecord (~> 3.0)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    guard (1.0.1)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.6.0)
-      guard (>= 0.10.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    mongoid (3.0.0.rc)
-      activemodel (~> 3.1)
-      moped (~> 1.0.0.rc)
-      origin (~> 1.0.0.rc)
-      tzinfo (~> 0.3.22)
-    moped (1.0.0.rc)
-    multi_json (1.3.6)
-    mysql (2.8.1)
-    origin (1.0.0.rc)
-    perftools.rb (2.0.0)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
-      bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-import
-  bullet!
-  guard
-  guard-rspec
-  mongoid (= 3.0.0.rc)
-  mysql
-  perftools.rb
-  rails (= 3.2.3)
-  rspec
-  sqlite3

data/Gemfile.rails-2.3.14.lock

@@ -1,65 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.0)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    guard (1.0.2)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.7.0)
-      guard (>= 0.10.0)
-    mysql (2.8.1)
-    perftools.rb (2.0.0)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sqlite3 (1.3.6)
-    thor (0.14.6)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bson_ext
-  bullet!
-  guard
-  guard-rspec
-  mysql
-  perftools.rb
-  rails (= 2.3.14)
-  rspec
-  sqlite3

data/Gemfile.rails-3.0.12.lock

@@ -1,116 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.0)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.12)
-      actionpack (= 3.0.12)
-      mail (~> 2.2.19)
-    actionpack (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.12)
-      activesupport (= 3.0.12)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activerecord-import (0.2.9)
-      activerecord (~> 3.0)
-      activerecord (~> 3.0)
-    activeresource (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-    activesupport (3.0.12)
-    arel (2.0.10)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
-    builder (2.1.2)
-    diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (1.0.11)
-    guard (1.0.2)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.7.0)
-      guard (>= 0.10.0)
-    i18n (0.5.0)
-    json (1.7.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    mysql (2.8.1)
-    perftools.rb (2.0.0)
-    polyglot (0.3.3)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.12)
-      actionmailer (= 3.0.12)
-      actionpack (= 3.0.12)
-      activerecord (= 3.0.12)
-      activeresource (= 3.0.12)
-      activesupport (= 3.0.12)
-      bundler (~> 1.0)
-      railties (= 3.0.12)
-    railties (3.0.12)
-      actionpack (= 3.0.12)
-      activesupport (= 3.0.12)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sqlite3 (1.3.6)
-    thor (0.14.6)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-import
-  bson_ext
-  bullet!
-  guard
-  guard-rspec
-  mysql
-  perftools.rb
-  rails (= 3.0.12)
-  rspec
-  sqlite3

data/Gemfile.rails-3.1.4.lock

@@ -1,134 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.0)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.4)
-      actionpack (= 3.1.4)
-      mail (~> 2.3.0)
-    actionpack (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.4)
-      activesupport (= 3.1.4)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activerecord-import (0.2.9)
-      activerecord (~> 3.0)
-      activerecord (~> 3.0)
-    activeresource (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-    activesupport (3.1.4)
-      multi_json (~> 1.0)
-    arel (2.2.3)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    guard (1.0.2)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.7.0)
-      guard (>= 0.10.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    json (1.7.1)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.10)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.3.6)
-    mysql (2.8.1)
-    perftools.rb (2.0.0)
-    polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.4)
-      actionmailer (= 3.1.4)
-      actionpack (= 3.1.4)
-      activerecord (= 3.1.4)
-      activeresource (= 3.1.4)
-      activesupport (= 3.1.4)
-      bundler (~> 1.0)
-      railties (= 3.1.4)
-    railties (3.1.4)
-      actionpack (= 3.1.4)
-      activesupport (= 3.1.4)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-import
-  bson_ext
-  bullet!
-  guard
-  guard-rspec
-  mongoid (= 2.4.10)
-  mysql
-  perftools.rb
-  rails (= 3.1.4)
-  rspec
-  sqlite3