bullet 5.5.0 → 6.1.5

data/spec/support/sqlite_seed.rb

@@ -1,101 +1,116 @@
+# frozen_string_literal: true
+
 module Support
   module SqliteSeed
+    module_function
+
     def seed_db
-      newspaper1 = Newspaper.create(:name => "First Newspaper")
-      newspaper2 = Newspaper.create(:name => "Second Newspaper")
-
-      writer1 = Writer.create(:name => 'first', :newspaper => newspaper1)
-      writer2 = Writer.create(:name => 'second', :newspaper => newspaper2)
-      user1 = BaseUser.create(:name => 'third', :newspaper => newspaper1)
-      user2 = BaseUser.create(:name => 'fourth', :newspaper => newspaper2)
-
-
-      category1 = Category.create(:name => 'first')
-      category2 = Category.create(:name => 'second')
-
-      post1 = category1.posts.create(:name => 'first', :writer => writer1)
-      post1a = category1.posts.create(:name => 'like first', :writer => writer2, active: false)
-      post2 = category2.posts.create(:name => 'second', :writer => writer2)
-      post3 = category2.posts.create(:name => 'third', :writer => writer2)
-
-      comment1 = post1.comments.create(:name => 'first', :author => writer1)
-      comment2 = post1.comments.create(:name => 'first2', :author => writer1)
-      comment3 = post1.comments.create(:name => 'first3', :author => writer1)
-      comment4 = post1.comments.create(:name => 'second', :author => writer2)
-      comment8 = post1a.comments.create(:name => "like first 1", :author => writer1)
-      comment9 = post1a.comments.create(:name => "like first 2", :author => writer2)
-      comment5 = post2.comments.create(:name => 'third', :author => user1)
-      comment6 = post2.comments.create(:name => 'fourth', :author => user2)
-      comment7 = post2.comments.create(:name => 'fourth', :author => writer1)
-
-      entry1 = category1.entries.create(:name => 'first')
-      entry2 = category1.entries.create(:name => 'second')
-
-      student1 = Student.create(:name => 'first')
-      student2 = Student.create(:name => 'second')
-      teacher1 = Teacher.create(:name => 'first')
-      teacher2 = Teacher.create(:name => 'second')
+      newspaper1 = Newspaper.create(name: 'First Newspaper')
+      newspaper2 = Newspaper.create(name: 'Second Newspaper')
+
+      writer1 = Writer.create(name: 'first', newspaper: newspaper1)
+      writer2 = Writer.create(name: 'second', newspaper: newspaper2)
+      user1 = BaseUser.create(name: 'third', newspaper: newspaper1)
+      user2 = BaseUser.create(name: 'fourth', newspaper: newspaper2)
+
+      category1 = Category.create(name: 'first')
+      category2 = Category.create(name: 'second')
+
+      post1 = category1.posts.create(name: 'first', writer: writer1)
+      post1a = category1.posts.create(name: 'like first', writer: writer2, active: false)
+      post2 = category2.posts.create(name: 'second', writer: writer2)
+      post3 = category2.posts.create(name: 'third', writer: writer2)
+
+      deal1 = Deal.new(name: 'Deal 1')
+      deal1.posts << post1
+      deal1.posts << post2
+      deal2 = Deal.new(name: 'Deal 2')
+      post1.deals << deal1
+      post1.deals << deal2
+
+      comment1 = post1.comments.create(name: 'first', author: writer1)
+      comment2 = post1.comments.create(name: 'first2', author: writer1)
+      comment3 = post1.comments.create(name: 'first3', author: writer1)
+      comment4 = post1.comments.create(name: 'second', author: writer2)
+      comment8 = post1a.comments.create(name: 'like first 1', author: writer1)
+      comment9 = post1a.comments.create(name: 'like first 2', author: writer2)
+      comment5 = post2.comments.create(name: 'third', author: user1)
+      comment6 = post2.comments.create(name: 'fourth', author: user2)
+      comment7 = post2.comments.create(name: 'fourth', author: writer1)
+
+      entry1 = category1.entries.create(name: 'first')
+      entry2 = category1.entries.create(name: 'second')
+
+      student1 = Student.create(name: 'first')
+      student2 = Student.create(name: 'second')
+      teacher1 = Teacher.create(name: 'first')
+      teacher2 = Teacher.create(name: 'second')
       student1.teachers = [teacher1, teacher2]
       student2.teachers = [teacher1, teacher2]
       teacher1.students << student1
       teacher2.students << student2
 
-      firm1 = Firm.create(:name => 'first')
-      firm2 = Firm.create(:name => 'second')
-      client1 = Client.create(:name => 'first')
-      client2 = Client.create(:name => 'second')
+      firm1 = Firm.create(name: 'first')
+      firm2 = Firm.create(name: 'second')
+      group1 = Group.create(name: 'first')
+      group2 = Group.create(name: 'second')
+      client1 = Client.create(name: 'first', group: group1)
+      client2 = Client.create(name: 'second', group: group2)
       firm1.clients = [client1, client2]
       firm2.clients = [client1, client2]
       client1.firms << firm1
       client2.firms << firm2
 
-      company1 = Company.create(:name => 'first')
-      company2 = Company.create(:name => 'second')
+      company1 = Company.create(name: 'first')
+      company2 = Company.create(name: 'second')
 
-      Address.create(:name => 'first', :company => company1)
-      Address.create(:name => 'second', :company => company2)
+      Address.create(name: 'first', company: company1)
+      Address.create(name: 'second', company: company2)
 
-      country1 = Country.create(:name => 'first')
-      country2 = Country.create(:name => 'second')
+      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')
+      country1.cities.create(name: 'first')
+      country1.cities.create(name: 'second')
+      country2.cities.create(name: 'third')
+      country2.cities.create(name: 'fourth')
 
-      person1 = Person.create(:name => 'first')
-      person2 = Person.create(:name => 'second')
+      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')
+      person1.pets.create(name: 'first')
+      person1.pets.create(name: 'second')
+      person2.pets.create(name: 'third')
+      person2.pets.create(name: 'fourth')
 
-      author1 = Author.create(:name => 'author1')
-      author2 = Author.create(:name => 'author2')
-      folder1 = Folder.create(:name => 'folder1', :author_id => author1.id)
-      folder2 = Folder.create(:name => 'folder2', :author_id => author2.id)
-      page1 = Page.create(:name => 'page1', :parent_id => folder1.id, :author_id => author1.id)
-      page2 = Page.create(:name => 'page2', :parent_id => folder1.id, :author_id => author1.id)
-      page3 = Page.create(:name => 'page3', :parent_id => folder2.id, :author_id => author2.id)
-      page4 = Page.create(:name => 'page4', :parent_id => folder2.id, :author_id => author2.id)
+      author1 = Author.create(name: 'author1')
+      author2 = Author.create(name: 'author2')
+      folder1 = Folder.create(name: 'folder1', author_id: author1.id)
+      folder2 = Folder.create(name: 'folder2', author_id: author2.id)
+      page1 = Page.create(name: 'page1', parent_id: folder1.id, author_id: author1.id)
+      page2 = Page.create(name: 'page2', parent_id: folder1.id, author_id: author1.id)
+      page3 = Page.create(name: 'page3', parent_id: folder2.id, author_id: author2.id)
+      page4 = Page.create(name: 'page4', parent_id: folder2.id, author_id: author2.id)
 
-      user1 = User.create(:name => 'user1', :category => category1)
-      user2 = User.create(:name => 'user2', :category => category1)
+      user1 = User.create(name: 'user1', category: category1)
+      user2 = User.create(name: 'user2', category: category1)
 
-      submission1 = user1.create_submission(:name => "submission1")
-      submission2 = user2.create_submission(:name => "submission2")
+      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')
+      submission1.replies.create(name: 'reply1')
+      submission1.replies.create(name: 'reply2')
+      submission2.replies.create(name: 'reply3')
+      submission2.replies.create(name: 'reply4')
+
+      submission1.create_attachment(file_name: 'submission1 file')
+      submission2.create_attachment(file_name: 'submission2 file')
     end
 
     def setup_db
-      ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+      ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
-      ActiveRecord::Schema.define(:version => 1) do
+      ActiveRecord::Schema.define(version: 1) do
         create_table :addresses do |t|
           t.column :name, :string
           t.column :company_id, :integer
@@ -122,6 +137,7 @@ module Support
 
         create_table :clients do |t|
           t.column :name, :string
+          t.column :group_id, :integer
         end
 
         create_table :comments do |t|
@@ -147,6 +163,11 @@ module Support
           t.column :hotel_id, :integer
         end
 
+        create_table :deals_posts do |t|
+          t.column :deal_id, :integer
+          t.column :post_id, :integer
+        end
+
         create_table :documents do |t|
           t.string :name
           t.string :type
@@ -168,6 +189,10 @@ module Support
           t.column :name, :string
         end
 
+        create_table :groups do |t|
+          t.column :name, :string
+        end
+
         create_table :hotels do |t|
           t.column :name, :string
           t.column :location_id, :integer
@@ -195,7 +220,7 @@ module Support
           t.column :name, :string
           t.column :category_id, :integer
           t.column :writer_id, :integer
-          t.column :active, :boolean, :default => true
+          t.column :active, :boolean, default: true
         end
 
         create_table :relationships do |t|
@@ -207,7 +232,7 @@ module Support
           t.column :name, :string
         end
 
-        create_table :students_teachers, :id => false do |t|
+        create_table :students_teachers, id: false do |t|
           t.column :student_id, :integer
           t.column :teacher_id, :integer
         end
@@ -230,9 +255,12 @@ module Support
           t.column :name, :string
           t.column :category_id, :integer
         end
+
+        create_table :attachments do |t|
+          t.column :file_name, :string
+          t.column :submission_id, :integer
+        end
       end
     end
-
-    extend self
   end
 end

data/tasks/bullet_tasks.rake

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 namespace :bullet do
   namespace :log do
-    desc "Truncates the bullet log file to zero bytes"
+    desc 'Truncates the bullet log file to zero bytes'
     task :clear do
-      f = File.open("log/bullet.log", "w")
+      f = File.open('log/bullet.log', 'w')
       f.close
     end
   end

data/test.sh

@@ -1,9 +1,14 @@
 #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-6.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-6.1 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-6.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-6.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.0 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.mongoid-7.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-7.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle exec rspec spec

data/update.sh

@@ -1,7 +1,10 @@
+BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle update
 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.mongoid-7.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 6.1.5
 platform: ruby
 authors:
 - Richard Huang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.11'
 description: help to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -45,19 +45,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.mongoid
 - Gemfile.mongoid-4.0
 - Gemfile.mongoid-5.0
 - Gemfile.mongoid-6.0
+- Gemfile.mongoid-7.0
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
 - Gemfile.rails-4.2
 - Gemfile.rails-5.0
+- Gemfile.rails-5.1
+- Gemfile.rails-5.2
+- Gemfile.rails-6.0
+- Gemfile.rails-6.1
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -65,10 +70,15 @@ files:
 - Rakefile
 - bullet.gemspec
 - lib/bullet.rb
+- lib/bullet/active_job.rb
 - lib/bullet/active_record4.rb
 - lib/bullet/active_record41.rb
 - lib/bullet/active_record42.rb
 - lib/bullet/active_record5.rb
+- lib/bullet/active_record52.rb
+- lib/bullet/active_record60.rb
+- lib/bullet/active_record61.rb
+- lib/bullet/bullet_xhr.js
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -81,6 +91,7 @@ files:
 - lib/bullet/mongoid4x.rb
 - lib/bullet/mongoid5x.rb
 - lib/bullet/mongoid6x.rb
+- lib/bullet/mongoid7x.rb
 - lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb
@@ -94,6 +105,7 @@ files:
 - lib/bullet/registry/object.rb
 - lib/bullet/stack_trace_filter.rb
 - lib/bullet/version.rb
+- lib/generators/bullet/install_generator.rb
 - perf/benchmark.rb
 - rails/init.rb
 - spec/bullet/detector/association_spec.rb
@@ -113,11 +125,11 @@ files:
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
 - spec/bullet_spec.rb
-- spec/integration/active_record4/association_spec.rb
-- spec/integration/active_record5/association_spec.rb
+- spec/integration/active_record/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb
+- spec/models/attachment.rb
 - spec/models/author.rb
 - spec/models/base_user.rb
 - spec/models/category.rb
@@ -126,10 +138,12 @@ files:
 - spec/models/comment.rb
 - spec/models/company.rb
 - spec/models/country.rb
+- spec/models/deal.rb
 - spec/models/document.rb
 - spec/models/entry.rb
 - spec/models/firm.rb
 - spec/models/folder.rb
+- spec/models/group.rb
 - spec/models/mongoid/address.rb
 - spec/models/mongoid/category.rb
 - spec/models/mongoid/comment.rb
@@ -157,11 +171,13 @@ files:
 - tasks/bullet_tasks.rake
 - test.sh
 - update.sh
-homepage: http://github.com/flyerhzm/bullet
+homepage: https://github.com/flyerhzm/bullet
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/flyerhzm/bullet
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,16 +185,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
 test_files:
@@ -199,11 +214,11 @@ test_files:
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
 - spec/bullet_spec.rb
-- spec/integration/active_record4/association_spec.rb
-- spec/integration/active_record5/association_spec.rb
+- spec/integration/active_record/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb
+- spec/models/attachment.rb
 - spec/models/author.rb
 - spec/models/base_user.rb
 - spec/models/category.rb
@@ -212,10 +227,12 @@ test_files:
 - spec/models/comment.rb
 - spec/models/company.rb
 - spec/models/country.rb
+- spec/models/deal.rb
 - spec/models/document.rb
 - spec/models/entry.rb
 - spec/models/firm.rb
 - spec/models/folder.rb
+- spec/models/group.rb
 - spec/models/mongoid/address.rb
 - spec/models/mongoid/category.rb
 - spec/models/mongoid/comment.rb

data/.travis.yml

@@ -1,16 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.0
-gemfile:
-  - Gemfile.rails-5.0
-  - Gemfile.rails-4.2
-  - Gemfile.rails-4.1
-  - Gemfile.rails-4.0
-  - Gemfile.mongoid-6.0
-  - Gemfile.mongoid-5.0
-  - Gemfile.mongoid-4.0
-env:
-  - DB=sqlite
-services:
-  - mongodb