bullet 4.6.0 → 4.7.0

data/spec/integration/mongoid/association_spec.rb

@@ -212,14 +212,17 @@ if mongoid?
 
     context "has_one" do
       context "company => address" do
-        it "should detect non preload association" do
-          Mongoid::Company.all.each do |company|
-            company.address.name
+        if Mongoid::VERSION !~ /\A3.0/
+          # mongodid 3.0.x doesn't set relation properly, it will query company for each address which causes n+1 query.
+          it "should detect non preload association" do
+            Mongoid::Company.all.each do |company|
+              company.address.name
+            end
+            Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+            Bullet::Detector::Association.should_not be_has_unused_preload_associations
+
+            Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Company, :address)
           end
-          Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
-
-          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Company, :address)
         end
 
         it "should detect preload association" do

data/spec/models/client.rb

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

data/spec/models/comment.rb

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

data/spec/models/document.rb

@@ -1,5 +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'
+  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/firm.rb

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

data/spec/models/mongoid/address.rb

@@ -1,5 +1,7 @@
 class Mongoid::Address
   include Mongoid::Document
 
+  field :name
+
   belongs_to :company, :class_name => "Mongoid::Company"
 end

data/spec/models/mongoid/category.rb

@@ -1,6 +1,8 @@
 class Mongoid::Category
   include Mongoid::Document
 
+  field :name
+
   has_many :posts, :class_name => "Mongoid::Post"
   has_many :entries, :class_name => "Mongoid::Entry"
 end

data/spec/models/mongoid/comment.rb

@@ -1,5 +1,7 @@
 class Mongoid::Comment
   include Mongoid::Document
 
+  field :name
+
   belongs_to :post, :class_name => "Mongoid::Post"
 end

data/spec/models/mongoid/company.rb

@@ -1,5 +1,7 @@
 class Mongoid::Company
   include Mongoid::Document
 
+  field :name
+
   has_one :address, :class_name => "Mongoid::Address"
 end

data/spec/models/mongoid/entry.rb

@@ -1,5 +1,7 @@
 class Mongoid::Entry
   include Mongoid::Document
 
+  field :name
+
   belongs_to :category, :class_name => "Mongoid::Category"
 end

data/spec/models/mongoid/post.rb

@@ -1,6 +1,8 @@
 class Mongoid::Post
   include Mongoid::Document
 
+  field :name
+
   has_many :comments, :class_name => "Mongoid::Comment"
   belongs_to :category, :class_name => "Mongoid::Category"
 

data/spec/models/mongoid/user.rb

@@ -1,3 +1,5 @@
 class Mongoid::User
   include Mongoid::Document
+
+  field :name
 end

data/spec/models/newspaper.rb

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

data/spec/models/pet.rb

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

data/spec/models/post.rb

@@ -3,10 +3,8 @@ class Post < ActiveRecord::Base
 
   belongs_to :category
   belongs_to :writer
-  has_many :comments, :inverse_of => :post
+  has_many :comments, inverse_of: :post
 
-  scope :preload_comments, lambda { includes(:comments) }
-  scope :in_category_name, lambda { |name|
-    where(['categories.name = ?', name]).includes(:category)
-  }
+  scope :preload_comments, -> { includes(:comments) }
+  scope :in_category_name, ->(name) { where(['categories.name = ?', name]).includes(:category) }
 end

data/spec/spec_helper.rb

@@ -1,5 +1,13 @@
 require 'rspec'
 require 'rails'
+begin
+  require 'active_record'
+rescue LoadError
+end
+begin
+  require 'mongoid'
+rescue LoadError
+end
 
 module Rails
   class <<self
@@ -19,6 +27,9 @@ $LOAD_PATH.unshift(MODELS)
 SUPPORT = File.join(File.dirname(__FILE__), "support")
 Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
 
+require 'coveralls'
+Coveralls.wear!
+
 RSpec.configure do |config|
   config.extend Bullet::Dependency
 
@@ -46,6 +57,10 @@ if active_record?
       Support::SqliteSeed.teardown_db
     end
   end
+
+  if ENV["LOG"]
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+  end
 end
 
 if mongoid?
@@ -60,7 +75,13 @@ if mongoid?
     end
 
     config.after(:suite) do
+      Support::MongoSeed.setup_db
       Support::MongoSeed.teardown_db
     end
   end
+
+  if ENV["LOG"]
+    Mongoid.logger = Logger.new(STDOUT)
+    Moped.logger = Logger.new(STDOUT)
+  end
 end

data/spec/support/mongo_seed.rb

@@ -33,7 +33,7 @@ module Support
     end
 
     def setup_db
-      if Mongoid::VERSION =~ /\A2\.[4|5]/
+      if Mongoid::VERSION =~ /\A2\.[4-8]/
         Mongoid.configure do |config|
           config.master = Mongo::Connection.new.db("bullet")
         end
@@ -41,11 +41,23 @@ module Support
         Mongoid.configure do |config|
           config.connect_to("bullet")
         end
+      elsif Mongoid::VERSION =~ /\A4/
+        Mongoid.configure do |config|
+          config.load_configuration(
+            sessions: {
+              default: {
+                database: "bullet",
+                hosts: [ "localhost:27017" ]
+              }
+            }
+          )
+        end
       end
     end
 
     def teardown_db
       Mongoid.purge!
+      Mongoid::IdentityMap.clear
     end
 
     extend self

data/test.sh

@@ -1,5 +1,13 @@
-bundle && bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.2.12 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2.12 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.1.11 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.1.11 bundle exec rspec spec
+#bundle update rails && bundle exec rspec spec
+#BUNDLE_GEMFILE=Gemfile.mongoid bundle update mongoid && BUNDLE_GEMFILE=Gemfile.mongoid bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-4.0.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0.1 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.2.15 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2.15 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.1.12 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.1.12 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-3.0.20 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.0.20 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-4-beta bundle && BUNDLE_GEMFILE=Gemfile.rails-4-beta bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-3.1.5 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.1.5 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-3.0.23 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.0.23 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.8.1 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.8.1 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.7.1 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.7.1 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.6.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.6.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.5.2 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.5.2 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.4.12 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.4.12 bundle exec rspec spec

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uniform_notifier
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uniform_notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: help to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -33,15 +47,36 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
-- .rvmrc.example
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
+- Gemfile.mongoid
+- Gemfile.mongoid-2.4.12
+- Gemfile.mongoid-2.4.12.lock
+- Gemfile.mongoid-2.5.2
+- Gemfile.mongoid-2.5.2.lock
+- Gemfile.mongoid-2.6.0
+- Gemfile.mongoid-2.6.0.lock
+- Gemfile.mongoid-2.7.1
+- Gemfile.mongoid-2.7.1.lock
+- Gemfile.mongoid-2.8.1
+- Gemfile.mongoid-2.8.1.lock
+- Gemfile.mongoid-3.0.23
+- Gemfile.mongoid-3.0.23.lock
+- Gemfile.mongoid-3.1.5
+- Gemfile.mongoid-3.1.5.lock
+- Gemfile.mongoid.lock
 - Gemfile.rails-3.0.20
-- Gemfile.rails-3.1.11
-- Gemfile.rails-3.2.12
-- Gemfile.rails-4-beta
+- Gemfile.rails-3.0.20.lock
+- Gemfile.rails-3.1.12
+- Gemfile.rails-3.1.12.lock
+- Gemfile.rails-3.2.15
+- Gemfile.rails-3.2.15.lock
+- Gemfile.rails-4.0.1
+- Gemfile.rails-4.0.1.lock
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -63,6 +98,7 @@ files:
 - lib/bullet/ext/string.rb
 - lib/bullet/mongoid2x.rb
 - lib/bullet/mongoid3x.rb
+- lib/bullet/mongoid4x.rb
 - lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb
@@ -93,7 +129,8 @@ files:
 - spec/bullet/registry/association_spec.rb
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
-- spec/integration/association_spec.rb
+- spec/integration/active_record3/association_spec.rb
+- spec/integration/active_record4/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb
@@ -153,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
@@ -174,7 +211,8 @@ test_files:
 - spec/bullet/registry/association_spec.rb
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
-- spec/integration/association_spec.rb
+- spec/integration/active_record3/association_spec.rb
+- spec/integration/active_record4/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm_gemset_create_on_use_flag=1
-rvm gemset use bullet

data/.rvmrc.example

@@ -1,2 +0,0 @@
-rvm_gemset_create_on_use_flag=1
-rvm gemset use bullet

data/Gemfile.rails-3.1.11

@@ -1,16 +0,0 @@
-# Use `bundle install` in order to install these gems
-# Use `bundle exec rake` in order to run the specs using the bundle
-source "http://rubygems.org"
-
-gemspec
-
-gem 'rails', '3.1.11'
-gem 'sqlite3'
-gem 'mysql2'
-gem 'activerecord-import'
-gem 'mongoid', '2.4.12'
-gem 'bson_ext'
-
-gem "rspec"
-gem "guard"
-gem "guard-rspec"

data/Gemfile.rails-3.2.12

@@ -1,16 +0,0 @@
-# Use `bundle install` in order to install these gems
-# Use `bundle exec rake` in order to run the specs using the bundle
-source "http://rubygems.org"
-
-gemspec
-
-gem 'rails', '3.2.12'
-gem 'sqlite3'
-gem 'mysql2'
-gem 'activerecord-import'
-gem 'mongoid', '2.5.1'
-gem 'bson_ext'
-
-gem "rspec"
-gem "guard"
-gem "guard-rspec"

data/Gemfile.rails-4-beta

@@ -1,14 +0,0 @@
-# Use `bundle install` in order to install these gems
-# Use `bundle exec rake` in order to run the specs using the bundle
-source "http://rubygems.org"
-
-gemspec
-
-gem 'rails', '4.0.0.beta1'
-gem 'sqlite3'
-gem 'mysql2'
-gem 'activerecord-import'
-
-gem "rspec"
-gem "guard"
-gem "guard-rspec"