bullet 5.7.0 → 6.0.0

data/spec/support/mongo_seed.rb

@@ -1,35 +1,39 @@
+# frozen_string_literal: true
+
 module Support
   module MongoSeed
+    module_function
+
     def seed_db
-      category1 = Mongoid::Category.create(:name => 'first')
-      category2 = Mongoid::Category.create(:name => 'second')
+      category1 = Mongoid::Category.create(name: 'first')
+      category2 = Mongoid::Category.create(name: 'second')
 
-      post1 = category1.posts.create(:name => 'first')
-      post1a = category1.posts.create(:name => 'like first')
-      post2 = category2.posts.create(:name => 'second')
+      post1 = category1.posts.create(name: 'first')
+      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')
+      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')
-      comment4 = post1.comments.create(:name => 'second')
-      comment8 = post1a.comments.create(:name => 'like first 1')
-      comment9 = post1a.comments.create(:name => 'like first 2')
-      comment5 = post2.comments.create(:name => 'third')
-      comment6 = post2.comments.create(:name => 'fourth')
-      comment7 = post2.comments.create(:name => 'fourth')
+      comment1 = post1.comments.create(name: 'first')
+      comment2 = post1.comments.create(name: 'first2')
+      comment3 = post1.comments.create(name: 'first3')
+      comment4 = post1.comments.create(name: 'second')
+      comment8 = post1a.comments.create(name: 'like first 1')
+      comment9 = post1a.comments.create(name: 'like first 2')
+      comment5 = post2.comments.create(name: 'third')
+      comment6 = post2.comments.create(name: 'fourth')
+      comment7 = post2.comments.create(name: 'fourth')
 
-      entry1 = category1.entries.create(:name => 'first')
-      entry2 = category1.entries.create(:name => 'second')
+      entry1 = category1.entries.create(name: 'first')
+      entry2 = category1.entries.create(name: 'second')
 
-      company1 = Mongoid::Company.create(:name => 'first')
-      company2 = Mongoid::Company.create(:name => 'second')
+      company1 = Mongoid::Company.create(name: 'first')
+      company2 = Mongoid::Company.create(name: 'second')
 
-      Mongoid::Address.create(:name => 'first', :company => company1)
-      Mongoid::Address.create(:name => 'second', :company => company2)
+      Mongoid::Address.create(name: 'first', company: company1)
+      Mongoid::Address.create(name: 'second', company: company2)
     end
 
     def setup_db
@@ -47,12 +51,12 @@ module Support
       else
         Mongoid.configure do |config|
           config.load_configuration(
-              clients: {
-                  default: {
-                      database: 'bullet',
-                      hosts: ['localhost:27017']
-                  }
+            clients: {
+              default: {
+                database: 'bullet',
+                hosts: ['localhost:27017']
               }
+            }
           )
         end
         # Increase the level from DEBUG in order to avoid excessive logging to the screen
@@ -64,7 +68,5 @@ module Support
       Mongoid.purge!
       Mongoid::IdentityMap.clear if Mongoid.const_defined?(:IdentityMap)
     end
-
-    extend self
   end
 end

data/spec/support/rack_double.rb

@@ -1,26 +1,22 @@
+# frozen_string_literal: true
+
 module Support
   class AppDouble
-    def call env
+    def call(_env)
       env = @env
       [status, headers, response]
     end
 
-    def status= status
-      @status = status
-    end
+    attr_writer :status
 
-    def headers= headers
-      @headers = headers
-    end
+    attr_writer :headers
 
     def headers
       @headers ||= { 'Content-Type' => 'text/html' }
       @headers
     end
 
-    def response= response
-      @response = response
-    end
+    attr_writer :response
 
     private
 
@@ -34,7 +30,7 @@ module Support
   end
 
   class ResponseDouble
-    def initialize actual_body = nil
+    def initialize(actual_body = nil)
       @actual_body = actual_body
     end
 
@@ -42,15 +38,12 @@ module Support
       @body ||= '<html><head></head><body></body></html>'
     end
 
-    def body= body
-      @body = body
-    end
+    attr_writer :body
 
     def each
       yield body
     end
 
-    def close
-    end
+    def close; end
   end
 end

data/spec/support/sqlite_seed.rb

@@ -1,100 +1,106 @@
+# 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)
+
+      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')
     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
@@ -121,6 +127,7 @@ module Support
 
         create_table :clients do |t|
           t.column :name, :string
+          t.column :group_id, :integer
         end
 
         create_table :comments do |t|
@@ -167,6 +174,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
@@ -194,7 +205,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|
@@ -206,7 +217,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
@@ -231,7 +242,5 @@ module Support
         end
       end
     end
-
-    extend self
   end
 end

data/tasks/bullet_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :bullet do
   namespace :log do
     desc 'Truncates the bullet log file to zero bytes'

data/test.sh

@@ -1,11 +1,13 @@
 #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.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

@@ -4,6 +4,7 @@ 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.7.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2019-04-25 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
@@ -54,12 +54,14 @@ files:
 - 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
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -72,6 +74,8 @@ files:
 - lib/bullet/active_record42.rb
 - lib/bullet/active_record5.rb
 - lib/bullet/active_record52.rb
+- lib/bullet/active_record60.rb
+- lib/bullet/bullet_xhr.js
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -84,6 +88,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
@@ -133,6 +138,7 @@ files:
 - 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
@@ -160,10 +166,12 @@ files:
 - tasks/bullet_tasks.rake
 - test.sh
 - update.sh
-homepage: http://github.com/flyerhzm/bullet
+homepage: https://github.com/flyerhzm/bullet
 licenses:
 - MIT
-metadata: {}
+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:
@@ -172,15 +180,14 @@ 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.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
@@ -218,6 +225,7 @@ test_files:
 - 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