bullet 5.4.3 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db91b963b462abea2bcc844e823be6844b6e9619
-  data.tar.gz: 53743afe0b49e9cb886ab14f1fd486c1545aa9fb
+  metadata.gz: 7f8cac0418ea4a1bb9f8abc6c12e84022f2f118d
+  data.tar.gz: ebdf99115037dec22a5480a63d3bed5f15956dda
 SHA512:
-  metadata.gz: 3b5d3790ae95fd828af2bd4ce1c4b964ec906e1d2caf8a4220e9757f8e0a192af2078a1a2f4e2704b3700eed8f43f4fcb1d0e7638a3a47aa81dfeaf42f535384
-  data.tar.gz: 048266edcde0343713b05d3b726ecb318340c9d2e382877b1e697549b185f164933ba3761c10b2b2f991c1d9638b1f5a119e6bb8738f4da6034b6ed949e2a565
+  metadata.gz: 0904f996964a403a495af310bab8a0612e614eb72a71d08646948508c25d4bf36d2b939da65156a5fc81595477820e0f123aa2a88d618fe97e28e81a6b6f8ada
+  data.tar.gz: d491e12ccce38a26a5e3d27d3f6b84acafe34bb7b6aff56b78a8e22a73a5a3abf88443110587de0080e50b32ef70d8ca387eab5faac0b1bec16efed04bf3acc1

data/.gitignore

@@ -12,3 +12,4 @@ benchmark_profile*
 coverage/
 .coveralls.yml
 Gemfile*.lock
+.idea/

data/.travis.yml

@@ -1,107 +1,16 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
   - 2.3.0
 gemfile:
   - Gemfile.rails-5.0
   - Gemfile.rails-4.2
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0
-  - Gemfile.rails-3.2
-  - Gemfile.rails-3.1
-  - Gemfile.rails-3.0
+  - Gemfile.mongoid-6.0
   - Gemfile.mongoid-5.0
   - Gemfile.mongoid-4.0
-  - Gemfile.mongoid-3.1
-  - Gemfile.mongoid-3.0
-  - Gemfile.mongoid-2.8
-  - Gemfile.mongoid-2.7
-  - Gemfile.mongoid-2.6
-  - Gemfile.mongoid-2.5
-  - Gemfile.mongoid-2.4
 env:
   - DB=sqlite
 services:
   - mongodb
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile.rails-4.0
-    - rvm: 1.9.3
-      gemfile: Gemfile.rails-4.1
-    - rvm: 1.9.3
-      gemfile: Gemfile.rails-4.2
-    - rvm: 1.9.3
-      gemfile: Gemfile.rails-5.0
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-2.4
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-2.5
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-2.6
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-2.7
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-2.8
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-3.0
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-3.1
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-4.0
-    - rvm: 1.9.3
-      gemfile: Gemfile.mongoid-5.0
-    - rvm: 2.0
-      gemfile: Gemfile.rails-3.0
-    - rvm: 2.0
-      gemfile: Gemfile.rails-5.0
-    - rvm: 2.1
-      gemfile: Gemfile.rails-3.0
-    - rvm: 2.1
-      gemfile: Gemfile.rails-5.0
-    - rvm: 2.2
-      gemfile: Gemfile.rails-3.0
-    - rvm: 2.2
-      gemfile: Gemfile.rails-3.1
-    - rvm: 2.2
-      gemfile: Gemfile.rails-3.2
-    - rvm: 2.2
-      gemfile: Gemfile.rails-5.0
-    - rvm: 2.2
-      gemfile: Gemfile.mongoid-3.1
-    - rvm: 2.2
-      gemfile: Gemfile.mongoid-3.0
-    - rvm: 2.2
-      gemfile: Gemfile.mongoid-2.8
-    - rvm: 2.2
-      gemfile: Gemfile.mongoid-2.7
-    - rvm: 2.2
-      gemfile: Gemfile.mongoid-2.6
-    - rvm: 2.2
-      gemfile: Gemfile.mongoid-2.5
-    - rvm: 2.2
-      gemfile: Gemfile.mongoid-2.4
-    - rvm: 2.3.0
-      gemfile: Gemfile.rails-3.0
-    - rvm: 2.3.0
-      gemfile: Gemfile.rails-3.1
-    - rvm: 2.3.0
-      gemfile: Gemfile.rails-3.2
-    - rvm: 2.3.0
-      gemfile: Gemfile.mongoid-3.1
-    - rvm: 2.3.0
-      gemfile: Gemfile.mongoid-3.0
-    - rvm: 2.3.0
-      gemfile: Gemfile.mongoid-2.8
-    - rvm: 2.3.0
-      gemfile: Gemfile.mongoid-2.7
-    - rvm: 2.3.0
-      gemfile: Gemfile.mongoid-2.6
-    - rvm: 2.3.0
-      gemfile: Gemfile.mongoid-2.5
-    - rvm: 2.3.0
-      gemfile: Gemfile.mongoid-2.4

data/CHANGELOG.md

@@ -1,17 +1,14 @@
 # Next Release
 
-## 5.4.3
-
-* Fix "false alert" in rails 5 #239
-
-## 5.4.2
-
-* Fix "display http request method" #311
-
-## 5.4.1
+## 5.5.0 (12/30/2016)
 
 * Display http request method #311
+* Add close button to footer
 * Raise an error if bullet does not support AR or Mongoid
+* Avoid double backtrace
+* Fix false alert on counter cache when associations are already loaded #288
+* Fix "false alert" in rails 5 #239
+* Do not support ActiveRecord 3.x and Mongoid 3.x / 4.x anymore
 
 ## 5.4.0 (10/09/2016)
 

data/Gemfile.mongoid-5.0

@@ -5,7 +5,7 @@ gemspec
 gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 5.0.0'
+gem 'mongoid', '~> 5.1.0'
 
 gem "rspec"
 

data/{Gemfile.mongoid-2.4 → Gemfile.mongoid-6.0}

@@ -2,10 +2,10 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 5.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.4.0'
+gem 'mongoid', '~> 6.0.0'
 
 gem "rspec"
 

data/README.md

@@ -9,10 +9,12 @@ The Bullet gem is designed to help you increase your application's performance b
 
 Best practice is to use Bullet in development mode or custom mode (staging, profile, etc.). The last thing you want is your clients getting alerts about how lazy you are.
 
-Bullet gem now supports **activerecord** >= 3.0 and **mongoid** >= 2.4.1.
+Bullet gem now supports **activerecord** >= 4.0 and **mongoid** >= 4.0.
 
 If you use activerecord 2.x, please use bullet <= 4.5.0
 
+If you use activerecord 3.x, plesae use bullet < 5.5.0
+
 ## External Introduction
 
 * [http://railscasts.com/episodes/372-bullet](http://railscasts.com/episodes/372-bullet)
@@ -81,7 +83,7 @@ The code above will enable all seven of the Bullet notification systems:
 * `Bullet.growl`: pop up Growl warnings if your system has Growl installed. Requires a little bit of configuration
 * `Bullet.xmpp`: send XMPP/Jabber notifications to the receiver indicated. Note that the code will currently not handle the adding of contacts, so you will need to make both accounts indicated know each other manually before you will receive any notifications. If you restart the development server frequently, the 'coming online' sound for the Bullet account may start to annoy - in this case set :show_online_status to false; you will still get notifications, but the Bullet account won't announce it's online status anymore.
 * `Bullet.raise`: raise errors, useful for making your specs fail unless they have optimized queries
-* `Bullet.add_footer`: adds the details in the bottom left corner of the page
+* `Bullet.add_footer`: adds the details in the bottom left corner of the page. Double click the footer or use close button to hide footer.
 * `Bullet.stacktrace_includes`: include paths with any of these substrings in the stack trace, even if they are not in your main app
 * `Bullet.stacktrace_excludes`: ignore paths with any of these substrings in the stack trace, even if they are not in your main app.
 * `Bullet.slack`: add notifications to slack

data/lib/bullet/active_record4.rb

@@ -152,7 +152,7 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start? && !has_cached_counter?(@reflection)
+          if Bullet.start? && !loaded? && !has_cached_counter?(@reflection)
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?
@@ -162,7 +162,7 @@ module Bullet
       ::ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start?
+          if Bullet.start? && !loaded?
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?

data/lib/bullet/active_record41.rb

@@ -176,14 +176,13 @@ module Bullet
       end
 
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
-        alias_method :origin_has_cached_counter?, :has_cached_counter?
-
-        def has_cached_counter?(reflection = reflection())
-          result = origin_has_cached_counter?(reflection)
+        alias_method :origin_count_records, :count_records
+        def count_records
+          result = has_cached_counter?
           if Bullet.start? && !result
-            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
           end
-          result
+          origin_count_records
         end
       end
     end

data/lib/bullet/active_record42.rb

@@ -230,33 +230,20 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_many_empty?, :empty?
         def empty?
-          Thread.current[:bullet_collection_empty] = true
           result = origin_many_empty?
-          Thread.current[:bullet_collection_empty] = nil
           if Bullet.start? && !has_cached_counter?(@reflection)
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           result
         end
 
-        alias_method :origin_has_cached_counter?, :has_cached_counter?
-        def has_cached_counter?(reflection = reflection())
-          result = origin_has_cached_counter?(reflection)
-          if Bullet.start? && !result && !Thread.current[:bullet_collection_empty]
-            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+        alias_method :origin_count_records, :count_records
+        def count_records
+          result = has_cached_counter?
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
           end
-          result
-        end
-      end
-
-      ::ActiveRecord::Associations::HasManyThroughAssociation.class_eval do
-        alias_method :origin_hmt_has_cached_counter?, :has_cached_counter?
-        def has_cached_counter?(reflection = reflection())
-          result = origin_hmt_has_cached_counter?(reflection)
-          if Bullet.start? && !result && !Thread.current[:bullet_collection_empty]
-            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
-          end
-          result
+          origin_count_records
         end
       end
     end

data/lib/bullet/dependency.rb

@@ -14,11 +14,7 @@ module Bullet
 
     def active_record_version
       @active_record_version ||= begin
-                                   if active_record30?
-                                     'active_record3'
-                                   elsif active_record31? || active_record32?
-                                     'active_record3x'
-                                   elsif active_record40?
+                                   if active_record40?
                                      'active_record4'
                                    elsif active_record41?
                                      'active_record41'
@@ -36,24 +32,18 @@ module Bullet
 
     def mongoid_version
       @mongoid_version ||= begin
-                             if mongoid2x?
-                               'mongoid2x'
-                             elsif mongoid3x?
-                               'mongoid3x'
-                             elsif mongoid4x?
+                             if mongoid4x?
                                'mongoid4x'
                              elsif mongoid5x?
                                'mongoid5x'
+                             elsif mongoid6x?
+                               'mongoid6x'
                              else
                                raise "Bullet does not support mongoid #{::Mongoid::VERSION} yet"
                              end
                            end
     end
 
-    def active_record3?
-      active_record? && ::ActiveRecord::VERSION::MAJOR == 3
-    end
-
     def active_record4?
       active_record? && ::ActiveRecord::VERSION::MAJOR == 4
     end
@@ -62,18 +52,6 @@ module Bullet
       active_record? && ::ActiveRecord::VERSION::MAJOR == 5
     end
 
-    def active_record30?
-      active_record3? && ::ActiveRecord::VERSION::MINOR == 0
-    end
-
-    def active_record31?
-      active_record3? && ::ActiveRecord::VERSION::MINOR == 1
-    end
-
-    def active_record32?
-      active_record3? && ::ActiveRecord::VERSION::MINOR == 2
-    end
-
     def active_record40?
       active_record4? && ::ActiveRecord::VERSION::MINOR == 0
     end
@@ -94,14 +72,6 @@ module Bullet
       active_record5? && ::ActiveRecord::VERSION::MINOR == 1
     end
 
-    def mongoid2x?
-      mongoid? && ::Mongoid::VERSION =~ /\A2\.[4-9]/
-    end
-
-    def mongoid3x?
-      mongoid? && ::Mongoid::VERSION =~ /\A3/
-    end
-
     def mongoid4x?
       mongoid? && ::Mongoid::VERSION =~ /\A4/
     end
@@ -109,5 +79,9 @@ module Bullet
     def mongoid5x?
       mongoid? && ::Mongoid::VERSION =~ /\A5/
     end
+
+    def mongoid6x?
+      mongoid? && ::Mongoid::VERSION =~ /\A6/
+    end
   end
 end

data/lib/bullet/{mongoid3x.rb → mongoid6x.rb}

@@ -21,7 +21,7 @@ module Bullet
         end
 
         def each(&block)
-          records = query.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          records = view.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1
@@ -43,8 +43,8 @@ module Bullet
       ::Mongoid::Relations::Accessors.class_eval do
         alias_method :origin_get_relation, :get_relation
 
-        def get_relation(name, metadata, reload = false)
-          result = origin_get_relation(name, metadata, reload)
+        def get_relation(name, metadata, object, reload = false)
+          result = origin_get_relation(name, metadata, object, reload)
           if metadata.macro !~ /embed/
             Bullet::Detector::NPlusOneQuery.call_association(self, name)
           end

data/lib/bullet/notification/n_plus_one_query.rb

@@ -12,18 +12,18 @@ module Bullet
       end
 
       def title
-        "N+1 Query #{@path ? "in #{@path}" : 'detected'}"
+        "USE eager loading #{@path ? "in #{@path}" : 'detected'}"
       end
 
       def notification_data
         super.merge(
-          :backtrace => @callers
+          :backtrace => []
         )
       end
 
       protected
         def call_stack_messages
-          (['N+1 Query method call stack'] + @callers).join( "\n  " )
+          (['Call stack'] + @callers).join( "\n  " )
         end
     end
   end

data/lib/bullet/notification/unused_eager_loading.rb

@@ -7,19 +7,24 @@ module Bullet
         @callers = callers
       end
 
-      def notification_data
-        super.merge(
-          :backtrace => @callers
-        )
-      end
-
       def body
         "#{klazz_associations_str}\n  Remove from your finder: #{associations_str}"
       end
 
       def title
-        "Unused Eager Loading #{@path ? "in #{@path}" : 'detected'}"
+        "AVOID eager loading #{@path ? "in #{@path}" : 'detected'}"
       end
+
+      def notification_data
+        super.merge(
+            :backtrace => []
+        )
+      end
+
+      protected
+        def call_stack_messages
+          (['Call stack'] + @callers).join( "\n  " )
+        end
     end
   end
 end

data/lib/bullet/rack.rb

@@ -51,7 +51,7 @@ module Bullet
     end
 
     def footer_note
-      "<div #{footer_div_attributes}>" + Bullet.footer_info.uniq.join("<br>") + "</div>"
+      "<div #{footer_div_attributes}>" + footer_close_button + Bullet.footer_info.uniq.join("<br>") + "</div>"
     end
 
     def file?(headers)
@@ -75,6 +75,7 @@ module Bullet
     end
 
     private
+
     def footer_div_attributes
 <<EOF
 data-is-bullet-footer ondblclick="this.parentNode.removeChild(this);" style="position: fixed; bottom: 0pt; left: 0pt; cursor: pointer; border-style: solid; border-color: rgb(153, 153, 153);
@@ -84,5 +85,9 @@ data-is-bullet-footer ondblclick="this.parentNode.removeChild(this);" style="pos
  color: rgb(119, 119, 119); font-size: 16px; font-family: 'Arial', sans-serif; z-index:9999;"
 EOF
     end
+
+    def footer_close_button
+      "<span onclick='this.parentNode.remove()' style='position:absolute; right: 10px; top: 0px; font-weight: bold; color: #333;'>&times;</span>"
+    end
   end
 end