bullet_instructure 4.0.5 → 4.14.7

data/spec/integration/active_record3/association_spec.rb

@@ -39,7 +39,7 @@ if !mongoid? && active_record3?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it "should detect non preload comment => post with inverse_of" do
+      it "should not detect non preload comment => post with inverse_of" do
         Post.includes(:comments).each do |post|
           post.comments.each do |comment|
             comment.name
@@ -61,6 +61,17 @@ if !mongoid? && active_record3?
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
+
+      it "should detect non preload post => comments with include?" do
+        comment = Comment.last
+        Post.all.each do |post|
+          post.comments.include?(comment)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
     end
 
     context "category => posts => comments" do
@@ -324,6 +335,15 @@ if !mongoid? && active_record3?
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Comment, :post)
       end
 
+      it "should not detect non preload association with only one comment" do
+        Comment.first.post.category.name
+
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
       it "should detect non preload association with post => category" do
         Comment.includes(:post).each do |comment|
           comment.post.category.name
@@ -371,7 +391,7 @@ if !mongoid? && active_record3?
           comment.post.writer.newspaper.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
       end

data/spec/integration/active_record4/association_spec.rb

@@ -61,6 +61,17 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
+
+      it "should detect non preload post => comments with include?" do
+        comment = Comment.last
+        Post.all.each do |post|
+          post.comments.include?(comment)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
     end
 
     context "category => posts => comments" do
@@ -208,6 +219,20 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should not detect unused preload with category => posts" do
+        category = Category.first
+        category.draft_post.destroy!
+        post = category.draft_post
+        post.update_attributes!(link: true)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+
+        Support::SqliteSeed.setup_db
+        Support::SqliteSeed.seed_db
+      end
     end
 
     context "category => posts => writer" do
@@ -302,7 +327,7 @@ if !mongoid? && active_record4?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it "should detect unused preload with comments => post" do
+      it "should detect unused preload with comment => post" do
         Comment.includes(:post).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :post)
@@ -322,6 +347,15 @@ if !mongoid? && active_record4?
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Comment, :post)
       end
 
+      it "should not detect non preload association with only one comment" do
+        Comment.first.post.category.name
+
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
       it "should detect non preload association with post => category" do
         Comment.includes(:post).each do |comment|
           comment.post.category.name
@@ -369,7 +403,7 @@ if !mongoid? && active_record4?
           comment.post.writer.newspaper.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
       end
@@ -504,6 +538,17 @@ if !mongoid? && active_record4?
     end
   end
 
+  describe Bullet::Detector::Association, "has_one => has_many" do
+    it "should not detect preload association" do
+      user = User.first
+      user.submission.replies.map(&:name)
+      Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+      expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+      expect(Bullet::Detector::Association).to be_completely_preloading_associations
+    end
+  end
+
   describe Bullet::Detector::Association, "call one association that in possible objects" do
     it "should not detect preload association" do
       Post.all

data/spec/models/category.rb

@@ -1,7 +1,10 @@
 class Category < ActiveRecord::Base
-  has_many :posts
+  has_many :posts, inverse_of: :category
   has_many :entries
 
-  has_many :submissions
   has_many :users
+
+  def draft_post
+    posts.draft.first_or_create
+  end
 end

data/spec/models/comment.rb

@@ -1,4 +1,6 @@
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
   belongs_to :author, class_name: "BaseUser"
+
+  validates :post, presence: true
 end

data/spec/models/post.rb

@@ -1,10 +1,15 @@
 class Post < ActiveRecord::Base
-  extend Bullet::Dependency
-
-  belongs_to :category
+  belongs_to :category, inverse_of: :posts
   belongs_to :writer
   has_many :comments, inverse_of: :post
 
+  validates :category, presence: true
+
   scope :preload_comments, -> { includes(:comments) }
   scope :in_category_name, ->(name) { where(['categories.name = ?', name]).includes(:category) }
+  scope :draft, -> { where(active: false) }
+
+  def link=(*)
+    comments.new
+  end
 end

data/spec/models/reply.rb

@@ -0,0 +1,3 @@
+class Reply < ActiveRecord::Base
+  belongs_to :submission
+end

data/spec/models/submission.rb

@@ -1,4 +1,4 @@
 class Submission < ActiveRecord::Base
-  belongs_to :category
   belongs_to :user
+  has_many :replies
 end

data/spec/spec_helper.rb

@@ -56,16 +56,16 @@ if active_record?
       Support::SqliteSeed.seed_db
     end
 
-    config.before(:each) do
+    config.before(:example) do
       Bullet.start_request
     end
 
-    config.after(:each) do
+    config.after(:example) do
       Bullet.end_request
     end
   end
 
-  if ENV["LOG"]
+  if ENV["BULLET_LOG"]
     require 'logger'
     ActiveRecord::Base.logger = Logger.new(STDOUT)
   end
@@ -96,7 +96,7 @@ if mongoid?
     end
   end
 
-  if ENV["LOG"]
+  if ENV["BULLET_LOG"]
     Mongoid.logger = Logger.new(STDOUT)
     Moped.logger = Logger.new(STDOUT)
   end

data/spec/support/sqlite_seed.rb

@@ -14,7 +14,7 @@ module Support
       category2 = Category.create(:name => 'second')
 
       post1 = category1.posts.create(:name => 'first', :writer => writer1)
-      post1a = category1.posts.create(:name => 'like first', :writer => writer2)
+      post1a = category1.posts.create(:name => 'like first', :writer => writer2, active: false)
       post2 = category2.posts.create(:name => 'second', :writer => writer2)
 
       comment1 = post1.comments.create(:name => 'first', :author => writer1)
@@ -82,10 +82,13 @@ module Support
       user1 = User.create(:name => 'user1', :category => category1)
       user2 = User.create(:name => 'user2', :category => category1)
 
-      submission1 = category1.submissions.create(:name => "submission1", :user => user1)
-      submission2 = category1.submissions.create(:name => "submission2", :user => user2)
-      submission3 = category2.submissions.create(:name => "submission3", :user => user1)
-      submission4 = category2.submissions.create(:name => "submission4", :user => user2)
+      submission1 = user1.create_submission(:name => "submission1")
+      submission2 = user2.create_submission(:name => "submission2")
+
+      submission1.replies.create(:name => 'reply1')
+      submission1.replies.create(:name => 'reply2')
+      submission2.replies.create(:name => 'reply3')
+      submission2.replies.create(:name => 'reply4')
     end
 
     def setup_db
@@ -191,6 +194,7 @@ module Support
           t.column :name, :string
           t.column :category_id, :integer
           t.column :writer_id, :integer
+          t.column :active, :boolean, :default => true
         end
 
         create_table :relationships do |t|
@@ -211,9 +215,13 @@ module Support
           t.column :name, :string
         end
 
+        create_table :replies do |t|
+          t.column :name, :string
+          t.column :submission_id, :integer
+        end
+
         create_table :submissions do |t|
           t.column :name, :string
-          t.column :category_id, :integer
           t.column :user_id, :integer
         end
 

data/test.sh

@@ -1,5 +1,6 @@
 #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.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle exec rspec spec

data/update.sh

@@ -0,0 +1,14 @@
+BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.8 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.7 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.6 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.5 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.4 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_instructure
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.14.7
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,30 @@ dependencies:
   name: uniform_notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: help to kill N+1 queries and unused eager loading, pretty formatter for
   Instructure.
 email:
@@ -48,7 +62,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -66,6 +79,7 @@ files:
 - Gemfile.rails-3.2
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
+- Gemfile.rails-4.2
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -77,6 +91,7 @@ files:
 - lib/bullet/active_record3x.rb
 - lib/bullet/active_record4.rb
 - lib/bullet/active_record41.rb
+- lib/bullet/active_record42.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -150,6 +165,7 @@ files:
 - spec/models/pet.rb
 - spec/models/post.rb
 - spec/models/relationship.rb
+- spec/models/reply.rb
 - spec/models/student.rb
 - spec/models/submission.rb
 - spec/models/teacher.rb
@@ -162,6 +178,7 @@ files:
 - spec/support/sqlite_seed.rb
 - tasks/bullet_tasks.rake
 - test.sh
+- update.sh
 homepage: http://github.com/flyerhzm/bullet
 licenses:
 - MIT
@@ -182,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading, pretty formatter for Instructure.
@@ -234,6 +251,7 @@ test_files:
 - spec/models/pet.rb
 - spec/models/post.rb
 - spec/models/relationship.rb
+- spec/models/reply.rb
 - spec/models/student.rb
 - spec/models/submission.rb
 - spec/models/teacher.rb
@@ -244,4 +262,3 @@ test_files:
 - spec/support/mongo_seed.rb
 - spec/support/rack_double.rb
 - spec/support/sqlite_seed.rb
-has_rdoc: 

data/.ruby-version

@@ -1 +0,0 @@
-2.1.5