bullet 5.7.4 → 5.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc58f03ac00764a73d88e5687a32895d94abcac
-  data.tar.gz: bd8d3b6215063a5536489aeaab2ffbdc72cb85e3
+  metadata.gz: fb27c10f2796dc6cc38899be2b88943f6c124d80
+  data.tar.gz: c89d95e08212b3bf8da49f2ce4c542ec2aa3021d
 SHA512:
-  metadata.gz: c19ffb78e51f2307ce792759149e67a8f354db648b1aa0a0a746c5153c2337596ca067bbec8ed12df536bb455502438df50fc23dce1c05c1595e31b488ff1c33
-  data.tar.gz: 784d901307fbd9ba2286d6281e25229ea11e580a81b2dd7d5514a20b713faa72902d2c79ab6804d0ed93c61859cd1bb36955374b16e4101353329b318a8fa8d3
+  metadata.gz: 8f4d67bebf52a6730fa623bb150717e56c052605fc339f37d89d915af0981e442200e2bfee5c3405e6269d0907dc4e4f89fd2965000e637555aa8614580837c0
+  data.tar.gz: 3fbfc65e37e50444107e153050b33f66fe51037fd9d325438015d51c71f4a5ccb387e9b76ba28a2c753c9f9227653686535c857f457c80d62213cdda070b9c18

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Next Release
 
+## 5.7.5 (12/03/2018)
+
+* Fix duplicate logs in mongoid 4.x and 5.x version
+* Add magic comment frozen_string_literal: true
+
 ## 5.7.4 (10/03/2018)
 
 * Avoid Bullet from making extra queries in mongoid6

data/bullet.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib/', __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 

data/lib/bullet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/module/delegation'
 require 'set'
 require 'uniform_notifier'

data/lib/bullet/active_record4.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module ActiveRecord
     def self.enable

data/lib/bullet/active_record41.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module ActiveRecord
     def self.enable

data/lib/bullet/active_record42.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module ActiveRecord
     def self.enable

data/lib/bullet/active_record5.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module SaveWithBulletSupport
     def save(*args)

data/lib/bullet/active_record52.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module SaveWithBulletSupport
     def save(*args)

data/lib/bullet/dependency.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Dependency
     def mongoid?

data/lib/bullet/detector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     autoload :Base, 'bullet/detector/base'

data/lib/bullet/detector/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     class Association < Base

data/lib/bullet/detector/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     class Base

data/lib/bullet/detector/counter_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     class CounterCache < Base

data/lib/bullet/detector/n_plus_one_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     class NPlusOneQuery < Association

data/lib/bullet/detector/unused_eager_loading.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     class UnusedEagerLoading < Association

data/lib/bullet/ext/object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Object
   def bullet_key
     "#{self.class}:#{primary_key_value}"

data/lib/bullet/ext/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class String
   def bullet_class_name
     sub(/:[^:]*?$/, ''.freeze)

data/lib/bullet/mongoid4x.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Mongoid
     def self.enable
@@ -21,13 +23,15 @@ module Bullet
         end
 
         def each(&block)
-          records = query.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          return to_enum unless block_given?
+          records = []
+          origin_each { |record| records << record }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1
             Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
           end
-          origin_each(&block)
+          records.each(&block)
         end
 
         def eager_load(docs)

data/lib/bullet/mongoid5x.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Mongoid
     def self.enable
@@ -21,13 +23,15 @@ module Bullet
         end
 
         def each(&block)
-          records = view.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          return to_enum unless block_given?
+          records = []
+          origin_each { |record| records << record }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1
             Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
           end
-          origin_each(&block)
+          records.each(&block)
         end
 
         def eager_load(docs)

data/lib/bullet/mongoid6x.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Mongoid
     def self.enable

data/lib/bullet/notification.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Notification
     autoload :Base, 'bullet/notification/base'

data/lib/bullet/notification/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Notification
     class Base

data/lib/bullet/notification/counter_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Notification
     class CounterCache < Base

data/lib/bullet/notification/n_plus_one_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Notification
     class NPlusOneQuery < Base

data/lib/bullet/notification/unused_eager_loading.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Notification
     class UnusedEagerLoading < Base

data/lib/bullet/notification_collector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module Bullet

data/lib/bullet/rack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   class Rack
     include Dependency
@@ -14,10 +16,10 @@ module Bullet
       response_body = nil
       if Bullet.notification?
         if !file?(headers) && !sse?(headers) && !empty?(response) &&
-           status == 200 && !response_body(response).frozen? && html_request?(headers, response)
+           status == 200 && html_request?(headers, response)
           response_body = response_body(response)
-          append_to_html_body(response_body, footer_note) if Bullet.add_footer
-          append_to_html_body(response_body, Bullet.gather_inline_notifications)
+          response_body = append_to_html_body(response_body, footer_note) if Bullet.add_footer
+          response_body = append_to_html_body(response_body, Bullet.gather_inline_notifications)
           headers['Content-Length'] = response_body.bytesize.to_s
         end
         Bullet.perform_out_of_channel_notifications(env)
@@ -42,11 +44,12 @@ module Bullet
     end
 
     def append_to_html_body(response_body, content)
-      if response_body.include?('</body>')
-        position = response_body.rindex('</body>')
-        response_body.insert(position, content)
+      body = response_body.dup
+      if body.include?('</body>')
+        position = body.rindex('</body>')
+        body.insert(position, content)
       else
-        response_body << content
+        body << content
       end
     end
 

data/lib/bullet/registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Registry
     autoload :Base, 'bullet/registry/base'

data/lib/bullet/registry/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Registry
     class Association < Base

data/lib/bullet/registry/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Registry
     class Base

data/lib/bullet/registry/object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Registry
     class Object < Base

data/lib/bullet/stack_trace_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module StackTraceFilter
     VENDOR_PATH = '/vendor'.freeze

data/lib/bullet/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
-  VERSION = '5.7.4'.freeze
+  VERSION = '5.7.5'.freeze
 end

data/lib/generators/bullet/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Generators
     class InstallGenerator < ::Rails::Generators::Base

data/perf/benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << 'lib'
 require 'benchmark'
 require 'rails'

data/rails/init.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'bullet'

data/spec/bullet/detector/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/detector/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/detector/counter_cache_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/detector/n_plus_one_query_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/detector/unused_eager_loading_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/ext/object_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Object do

data/spec/bullet/ext/string_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe String do

data/spec/bullet/notification/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/notification/counter_cache_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/notification/n_plus_one_query_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/notification/unused_eager_loading_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/notification_collector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/rack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/registry/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/registry/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet/registry/object_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Bullet

data/spec/bullet_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Bullet, focused: true do

data/spec/integration/active_record/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if active_record?

data/spec/integration/counter_cache_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if !mongoid? && active_record?

data/spec/integration/mongoid/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if mongoid?

data/spec/models/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Address < ActiveRecord::Base
   belongs_to :company
 end

data/spec/models/author.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Author < ActiveRecord::Base
   has_many :documents
 end

data/spec/models/base_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BaseUser < ActiveRecord::Base
   has_many :comments
   has_many :posts

data/spec/models/category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Category < ActiveRecord::Base
   has_many :posts, inverse_of: :category
   has_many :entries

data/spec/models/city.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class City < ActiveRecord::Base
   belongs_to :country
 end

data/spec/models/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Client < ActiveRecord::Base
   has_many :relationships
   has_many :firms, through: :relationships

data/spec/models/comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
   belongs_to :author, class_name: 'BaseUser'

data/spec/models/company.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Company < ActiveRecord::Base
   has_one :address
 end

data/spec/models/country.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Country < ActiveRecord::Base
   has_many :cities
 end

data/spec/models/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Document < ActiveRecord::Base
   has_many :children, class_name: 'Document', foreign_key: 'parent_id'
   belongs_to :parent, class_name: 'Document', foreign_key: 'parent_id'

data/spec/models/entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Entry < ActiveRecord::Base
   belongs_to :category
 end

data/spec/models/firm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Firm < ActiveRecord::Base
   has_many :relationships
   has_many :clients, through: :relationships

data/spec/models/folder.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Folder < Document
 end

data/spec/models/mongoid/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::Address
   include Mongoid::Document
 

data/spec/models/mongoid/category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::Category
   include Mongoid::Document
 

data/spec/models/mongoid/comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::Comment
   include Mongoid::Document
 

data/spec/models/mongoid/company.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::Company
   include Mongoid::Document
 

data/spec/models/mongoid/entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::Entry
   include Mongoid::Document
 

data/spec/models/mongoid/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::Post
   include Mongoid::Document
 

data/spec/models/mongoid/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::User
   include Mongoid::Document
 

data/spec/models/newspaper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Newspaper < ActiveRecord::Base
   has_many :writers, class_name: 'BaseUser'
 end

data/spec/models/page.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Page < Document
 end

data/spec/models/person.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Person < ActiveRecord::Base
   has_many :pets
 end

data/spec/models/pet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Pet < ActiveRecord::Base
   belongs_to :person, counter_cache: true
 end

data/spec/models/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Post < ActiveRecord::Base
   belongs_to :category, inverse_of: :posts
   belongs_to :writer

data/spec/models/relationship.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Relationship < ActiveRecord::Base
   belongs_to :firm
   belongs_to :client

data/spec/models/reply.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Reply < ActiveRecord::Base
   belongs_to :submission
 end

data/spec/models/student.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Student < ActiveRecord::Base
   has_and_belongs_to_many :teachers
 end

data/spec/models/submission.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Submission < ActiveRecord::Base
   belongs_to :user
   has_many :replies

data/spec/models/teacher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Teacher < ActiveRecord::Base
   has_and_belongs_to_many :students
 end

data/spec/models/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_one :submission
   belongs_to :category

data/spec/models/writer.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Writer < BaseUser
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 begin
   require 'active_record'

data/spec/support/bullet_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   def self.collected_notifications_of_class(notification_class)
     Bullet.notification_collector.collection.select do |notification|

data/spec/support/mongo_seed.rb

@@ -1,5 +1,9 @@
+# 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')
@@ -64,7 +68,5 @@ module Support
       Mongoid.purge!
       Mongoid::IdentityMap.clear if Mongoid.const_defined?(:IdentityMap)
     end
-
-    module_function
   end
 end

data/spec/support/rack_double.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Support
   class AppDouble
     def call(_env)

data/spec/support/sqlite_seed.rb

@@ -1,5 +1,9 @@
+# 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')
@@ -231,7 +235,5 @@ module Support
         end
       end
     end
-
-    module_function
   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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.7.4
+  version: 5.7.5
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport