bullet 4.0.0 → 4.1.4

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

@@ -29,11 +29,19 @@ module Support
     end
 
     def setup_db
-      Mongoid.database = Mongo::Connection.new("localhost", 27017).db("bullet")
+      if Mongoid::VERSION =~ /\A2\.4/
+        Mongoid.configure do |config|
+          config.master = Mongo::Connection.new.db("bullet")
+        end
+      elsif Mongoid::VERSION =~ /\A3/
+        Mongoid.configure do |config|
+          config.connect_to("bullet")
+        end
+      end
     end
 
     def teardown_db
-      Mongoid.database.collections.select {|c| c.name !~ /system/ }.map(&:drop)
+      Mongoid.purge!
     end
 
     extend self

data/test.sh

@@ -0,0 +1,4 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &70311383422560 !ruby/object:Gem::Requirement
+  requirement: &70278160365200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70311383422560
+  version_requirements: *70278160365200
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -38,10 +38,10 @@ files:
 - 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.0.13.lock
+- Gemfile.rails-3.1.5
+- Gemfile.rails-3.1.5.lock
 - Guardfile
 - Hacking.textile
 - MIT-LICENSE
@@ -54,6 +54,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
@@ -62,7 +63,8 @@ files:
 - lib/bullet/detector/unused_eager_association.rb
 - lib/bullet/ext/object.rb
 - lib/bullet/ext/string.rb
-- lib/bullet/mongoid.rb
+- lib/bullet/mongoid24.rb
+- lib/bullet/mongoid3.rb
 - lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb
@@ -134,7 +136,7 @@ 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: []
 post_install_message: 
@@ -149,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3387566190207483190
+      hash: 107640970782381372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A rails plugin to kill N+1 queries and unused eager loading.