bullet 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749d1d92dc0373b1f2521c85825dfea656e985c438cdfafe774242b31f25c2d5
-  data.tar.gz: 4e76a9da65613f2b9cf3802f4969f84c1e5bb9849c5892898fa9d999fde3900c
+  metadata.gz: 7f255102db3ae1250632db2b30a9e6f1bce87dab49b4dabee73709ffde82a4e0
+  data.tar.gz: 025ab0e3513546a56e984aa83a0b925d27e631bdfe61feb694b3e21ecfb6ffda
 SHA512:
-  metadata.gz: 72f8f18edecb79d8631a215229afb71bb94050c0fcc65794a88dc3adf21545acf4ae38eb59bd6bdfa0e34609854ab149d02f47e761fba00452e28f2575306376
-  data.tar.gz: 94058fcb502d63ce470b6dfa06d05dd367c8a7e251948040b91c22164d6583d8a82ab120bb2a42d109c121170042573c9964aaa55ebc0093c07adc1fb8f23fd5
+  metadata.gz: 23d701691dc1f2286ec11ffb26f548878bfa7ddd2ea8f20d97bb4c64df4e3a7a10f54adb16fa7cacd8bb8807dd1804e349c1b889e32530cbb7c57432ceec17da
+  data.tar.gz: 281a4a6619695a7db4098f1ed62066cd4e81cf9c2c3bf33fa83f87a205a5c4779e9c8125143a78ca482247ed2a271465b3011af84a5dfc67753cbad2357ee2ae

data/.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.0
+  - 2.6.0
 gemfile:
   - Gemfile.rails-6.0
   - Gemfile.rails-5.2
@@ -10,5 +11,21 @@ gemfile:
   - Gemfile.rails-4.2
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0
+matrix:
+  exclude:
+    - rvm: 2.3.0
+      gemfile: Gemfile.rails-6.0
+    - rvm: 2.6.0
+      gemfile: Gemfile.rails-5.2
+    - rvm: 2.6.0
+      gemfile: Gemfile.rails-5.1
+    - rvm: 2.6.0
+      gemfile: Gemfile.rails-5.0
+    - rvm: 2.6.0
+      gemfile: Gemfile.rails-4.2
+    - rvm: 2.6.0
+      gemfile: Gemfile.rails-4.1
+    - rvm: 2.6.0
+      gemfile: Gemfile.rails-4.0
 env:
   - DB=sqlite

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## Next Release
 
-## 6.0.0 (02/22/2019)
+## 6.0.1 (06/26/2019)
+
+* Add Bullet::ActiveJob
+* Prevent "Maximum call stack exceeded" errors when used with Turbolinks
+
+## 6.0.0 (04/25/2019)
 
 * Add XHR support to Bullet
 * Support Rails 6.0

data/README.md

@@ -181,15 +181,27 @@ If you find Bullet does not work for you, *please disable your browser's cache*.
 
 ## Advanced
 
-### Profile a job
+### Work with ActiveJob
 
-The Bullet gem uses rack middleware to profile requests. If you want to use Bullet without an http server, like to profile a job, you can use the profile method and fetch warnings
+Include `Bullet::ActiveJob` in your `ApplicationJob`.
 
 ```ruby
-Bullet.profile do
-  # do anything
+class ApplicationJob < ActiveJob::Base
+  include Bullet::ActiveJob if Rails.env.development?
+end
+```
+
+### Work with other background job solution
 
-  warnings = Bullet.warnings
+Use the Bullet.profile method.
+
+```ruby
+class ApplicationJob < ActiveJob::Base
+  around_perform do |_job, block|
+    Bullet.profile do
+      block.call
+    end
+  end
 end
 ```
 
@@ -458,4 +470,4 @@ Meanwhile, there's a line appended to `log/bullet.log`
   Post => [:comments]
 ```
 
-Copyright (c) 2009 - 2016 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2019 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/lib/bullet.rb

@@ -14,6 +14,7 @@ module Bullet
   autoload :ActiveRecord, "bullet/#{active_record_version}" if active_record?
   autoload :Mongoid, "bullet/#{mongoid_version}" if mongoid?
   autoload :Rack, 'bullet/rack'
+  autoload :ActiveJob, 'bullet/active_job'
   autoload :Notification, 'bullet/notification'
   autoload :Detector, 'bullet/detector'
   autoload :Registry, 'bullet/registry'

data/lib/bullet/active_job.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Bullet
+  module ActiveJob
+    def self.included(base)
+      base.class_eval do
+        around_perform do |_job, block|
+          Bullet.profile do
+            block.call
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bullet/active_record4.rb

@@ -181,7 +181,6 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_has_cached_counter?, :has_cached_counter?
 
-        # rubocop:disable Style/MethodCallWithoutArgsParentheses
         def has_cached_counter?(reflection = reflection())
           result = origin_has_cached_counter?(reflection)
           if Bullet.start? && !result
@@ -189,7 +188,7 @@ module Bullet
           end
           result
         end
-        # rubocop:enable Style/MethodCallWithoutArgsParentheses
+        
       end
     end
   end

data/lib/bullet/bullet_xhr.js

@@ -1,21 +1,32 @@
 (function() {
   var oldOpen = window.XMLHttpRequest.prototype.open;
   var oldSend = window.XMLHttpRequest.prototype.send;
-  function newOpen(method, url, async, user, password) {
+
+  /**
+   * Return early if we've already extended prototype. This prevents
+   * "maximum call stack exceeded" errors when used with Turbolinks.
+   * See https://github.com/flyerhzm/bullet/issues/454
+   */
+  if (isBulletInitiated()) return;
+
+  function isBulletInitiated() {
+    return oldOpen.name == 'bulletXHROpen' && oldSend.name == 'bulletXHRSend';
+  }
+  function bulletXHROpen(_, url) {
     this._storedUrl = url;
     return oldOpen.apply(this, arguments);
   }
-  function newSend(data) {
+  function bulletXHRSend() {
     if (this.onload) {
       this._storedOnload = this.onload;
     }
-    this.onload = newOnload;
+    this.addEventListener('load', bulletXHROnload);
     return oldSend.apply(this, arguments);
   }
-  function newOnload() {
+  function bulletXHROnload() {
     if (
       this._storedUrl.startsWith(
-        window.location.protocol + '//' + window.location.host,
+        window.location.protocol + '//' + window.location.host
       ) ||
       !this._storedUrl.startsWith('http') // For relative paths
     ) {
@@ -30,7 +41,7 @@
           var newHtml = oldHtml.concat(JSON.parse(bulletFooterText));
           newHtml = newHtml.slice(newHtml.length - 10, newHtml.length); // rotate through 10 most recent
           document.getElementById(
-            'bullet-footer',
+            'bullet-footer'
           ).innerHTML = `${header}<br>${newHtml.join('<br>')}`;
         }, 0);
       }
@@ -53,6 +64,6 @@
       return this._storedOnload.apply(this, arguments);
     }
   }
-  window.XMLHttpRequest.prototype.open = newOpen;
-  window.XMLHttpRequest.prototype.send = newSend;
+  window.XMLHttpRequest.prototype.open = bulletXHROpen;
+  window.XMLHttpRequest.prototype.send = bulletXHRSend;
 })();

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bullet
-  VERSION = '6.0.0'
+  VERSION = '6.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,6 +69,7 @@ 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