bullet 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d5793126ed37cd4f560144b157258999c0b318
-  data.tar.gz: 56e7d6b4a5d4a2fda7bcc9707523e4863159aa83
+  metadata.gz: e3badf3b077a980eaa5aff1923f4e73d702f5b91
+  data.tar.gz: f62fd9855dca76718f1abd484052e8b9ec841088
 SHA512:
-  metadata.gz: 817982d863e94c8fb85379b07006536e83c4ea97e0b92a9f7cc4a1444dcba2f4743202a25a9a6f68b9be2cad20985bd6fb5c0a45a4015a93e782ac4eaaa95da9
-  data.tar.gz: 14311a13bfd4b6bcd88f2f72271b3e39a681ee19c13d42aeba4318a7826e4e927792479b75f6d07357725699dd6d0a0d7b6c2545e3f37ed4d24fb86766d10b20
+  metadata.gz: cd79339a18313dd651739d819f59d33ceee240ec595ff53a49b27133010d8a83e9274292907ccd99bd9b894b7d975c54e4a65b49f0907b08f0b70a4a994dc9e1
+  data.tar.gz: 3dbb60cf0426b5cfb0d1fc5ac1bed620d139aafbf798eae0a7ebe94915a8b17fcc0a745b587313007a2922826f0b396f4be290dc353832f0c5e2618bedb29c50

data/.rspec

@@ -1,2 +1,2 @@
 --colour
---format nested
+--format progress

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.2
 gemfile:
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Next Release
 
+## 4.9.0 (04/30/2014)
+
+* Add Bullet.stacktrace_includes option
+* Applied keyword argument fixes on Ruby 2.2.0
+* Add bugsnag notifier
+* Support rails 4.1.0
+
 ## 4.8.0 (02/16/2014)
 
 * Support rails 4.1.0.beta1

data/Gemfile

@@ -5,8 +5,6 @@ gemspec
 gem 'rails', github: 'rails/rails'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
@@ -18,4 +16,4 @@ gem 'coveralls', require: false
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'
-end
+end

data/Gemfile.mongoid

@@ -3,9 +3,8 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rails'
-gem 'sqlite3'
-gem 'mysql2'
-gem 'activerecord-import'
+gem 'sqlite3', platforms: [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', github: 'mongoid/mongoid'
 
 gem "rspec"

data/Gemfile.mongoid-2.4

@@ -5,9 +5,6 @@ gemspec
 gem 'rails', '~> 3.2.16'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
-gem 'activerecord-import'
 gem 'mongoid', '~> 2.4.12'
 
 gem "rspec"

data/Gemfile.mongoid-2.5

@@ -5,9 +5,6 @@ gemspec
 gem 'rails', '~> 3.2.16'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
-gem 'activerecord-import'
 gem 'mongoid', '~> 2.5.2'
 
 gem "rspec"

data/Gemfile.mongoid-2.6

@@ -5,9 +5,6 @@ gemspec
 gem 'rails', '~> 3.2.16'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
-gem 'activerecord-import'
 gem 'mongoid', '~> 2.6.0'
 
 gem "rspec"

data/Gemfile.mongoid-2.7

@@ -5,9 +5,6 @@ gemspec
 gem 'rails', '~> 3.2.16'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
-gem 'activerecord-import'
 gem 'mongoid', '~> 2.7.1'
 
 gem "rspec"

data/Gemfile.mongoid-2.8

@@ -5,9 +5,6 @@ gemspec
 gem 'rails', '~> 3.2'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
-gem 'activerecord-import'
 gem 'mongoid', '~> 2.8'
 
 gem "rspec"

data/Gemfile.mongoid-3.0

@@ -5,9 +5,6 @@ gemspec
 gem 'rails', '~> 3.2.16'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
-gem 'activerecord-import'
 gem 'mongoid', '~> 3.0.23'
 
 gem "rspec"

data/Gemfile.mongoid-3.1

@@ -5,9 +5,6 @@ gemspec
 gem 'rails', '~> 3.2.16'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
-gem 'activerecord-import'
 gem 'mongoid', '~> 3.1.6'
 
 gem "rspec"

data/Gemfile.mongoid-4.0

@@ -0,0 +1,19 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 4.0.5'
+gem 'sqlite3', platforms: [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'mongoid', '~> 4.0.0.beta2'
+
+gem "rspec"
+gem "guard"
+gem "guard-rspec"
+
+gem 'coveralls', require: false
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/Gemfile.rails-3.0

@@ -5,8 +5,6 @@ gemspec
 gem 'rails', '~> 3.0.20'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"

data/Gemfile.rails-3.1

@@ -5,8 +5,6 @@ gemspec
 gem 'rails', '~> 3.1.12'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
@@ -18,4 +16,4 @@ gem 'coveralls', require: false
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'
-end
+end

data/Gemfile.rails-3.2

@@ -2,11 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.17'
+gem 'rails', '~> 3.2.18'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"

data/Gemfile.rails-4.0

@@ -2,11 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.0.4'
+gem 'rails', '~> 4.0.5'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2', platforms: [:ruby]
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"

data/Gemfile.rails-4.1

@@ -2,11 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.1.0'
+gem 'rails', '~> 4.1.1'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mysql2'
-gem 'activerecord-jdbcmysql-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"

data/README.md

@@ -151,6 +151,18 @@ end
 warnings = Bullet.warnings
 ```
 
+### Work with sinatra
+
+Configure and use bullet rack
+
+```ruby
+configure :development do
+  Bullet.enable = true
+  Bullet.bullet_logger = true
+  use Bullet::Rack
+end
+```
+
 ### Run in tests
 
 First you need to enable bullet in test environment.
@@ -168,16 +180,21 @@ Then wrap each test in bullet api.
 
 ```ruby
 # spec/spec_helper.rb
-before(:each) do
+config.before(:each) do
   Bullet.start_request if Bullet.enable?
 end
 
-after(:each) do
+config.after(:each) do
   Bullet.perform_out_of_channel_notifications if Bullet.enable? && Bullet.notification?
   Bullet.end_request if Bullet.enable?
 end
 ```
 
+## Debug Mode
+
+Bullet outputs some details info, to enable debug mode, set DEBUG=true
+env.
+
 ## Contributors
 
 [https://github.com/flyerhzm/bullet/contributors](https://github.com/flyerhzm/bullet/contributors)

data/bullet.gemspec

@@ -13,10 +13,12 @@ Gem::Specification.new do |s|
   s.summary     = "help to kill N+1 queries and unused eager loading."
   s.description = "help to kill N+1 queries and unused eager loading."
 
+  s.license     = 'MIT'
+
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "activesupport"
-  s.add_dependency "uniform_notifier", "~> 1.6.0"
+  s.add_runtime_dependency "activesupport"
+  s.add_runtime_dependency "uniform_notifier", "~> 1.6.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bullet.rb

@@ -27,7 +27,7 @@ module Bullet
   class << self
     attr_writer :enable, :n_plus_one_query_enable, :unused_eager_loading_enable, :counter_cache_enable, :stacktrace_includes
     attr_reader :notification_collector, :whitelist
-    attr_accessor :add_footer
+    attr_accessor :add_footer, :orm_pathches_applied
 
     delegate :alert=, :console=, :growl=, :rails_logger=, :xmpp=, :airbrake=, :bugsnag=, :to => UniformNotifier
 
@@ -43,8 +43,11 @@ module Bullet
       @enable = @n_plus_one_query_enable = @unused_eager_loading_enable = @counter_cache_enable = enable
       if enable?
         reset_whitelist
-        Bullet::Mongoid.enable if mongoid?
-        Bullet::ActiveRecord.enable if active_record?
+        unless orm_pathches_applied
+          self.orm_pathches_applied = true
+          Bullet::Mongoid.enable if mongoid?
+          Bullet::ActiveRecord.enable if active_record?
+        end
       end
     end
 
@@ -83,27 +86,53 @@ module Bullet
 
     def bullet_logger=(active)
       if active
-        bullet_log_file = File.open("#{rails? ? Rails.root.to_s : Dir.pwd}/log/bullet.log", 'a+')
+        require 'fileutils'
+        root_path = "#{rails? ? Rails.root.to_s : Dir.pwd}"
+        FileUtils.mkdir_p(root_path + '/log')
+        bullet_log_file = File.open("#{root_path}/log/bullet.log", 'a+')
         bullet_log_file.sync = true
         UniformNotifier.customized_logger = bullet_log_file
       end
     end
 
+    def debug(title, message)
+      puts "[Bullet][#{title}] #{message}" if ENV['DEBUG'] == 'true'
+    end
+
     def start_request
-      notification_collector.reset
-      DETECTORS.each { |bullet| bullet.start_request }
+      Thread.current[:bullet_start] = true
+      Thread.current[:bullet_notification_collector] = Bullet::NotificationCollector.new
+
+      Thread.current[:bullet_object_associations] = Bullet::Registry::Base.new
+      Thread.current[:bullet_call_object_associations] = Bullet::Registry::Base.new
+      Thread.current[:bullet_possible_objects] = Bullet::Registry::Object.new
+      Thread.current[:bullet_impossible_objects] = Bullet::Registry::Object.new
+      Thread.current[:bullet_eager_loadings] = Bullet::Registry::Association.new
+
+      Thread.current[:bullet_counter_possible_objects] ||= Bullet::Registry::Object.new
+      Thread.current[:bullet_counter_impossible_objects] ||= Bullet::Registry::Object.new
     end
 
     def end_request
-      DETECTORS.each { |bullet| bullet.end_request }
+      Thread.current[:bullet_start] = nil
+      Thread.current[:bullet_notification_collector] = nil
+
+      Thread.current[:bullet_object_associations] = nil
+      Thread.current[:bullet_possible_objects] = nil
+      Thread.current[:bullet_impossible_objects] = nil
+      Thread.current[:bullet_call_object_associations] = nil
+      Thread.current[:bullet_eager_loadings] = nil
+
+      Thread.current[:bullet_counter_possible_objects] = nil
+      Thread.current[:bullet_counter_impossible_objects] = nil
     end
 
-    def clear
-      DETECTORS.each { |bullet| bullet.clear }
+    def start?
+      Thread.current[:bullet_start]
     end
 
     def notification_collector
-      @notification_collector ||= Bullet::NotificationCollector.new
+      Thread.current[:bullet_notification_collector]
     end
 
     def notification?

data/lib/bullet/active_record3.rb

@@ -42,7 +42,6 @@ module Bullet
           associations = (@eager_load_values + @includes_values).uniq
           records.each do |record|
             Bullet::Detector::Association.add_object_associations(record, associations)
-            Bullet::Detector::NPlusOneQuery.call_association(record, associations)
           end
           Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           records
@@ -50,13 +49,32 @@ module Bullet
       end
 
       ::ActiveRecord::Associations::ClassMethods::JoinDependency.class_eval do
+        alias_method :origin_instantiate, :instantiate
         alias_method :origin_construct_association, :construct_association
+
+        def instantiate(rows)
+          @bullet_eager_loadings = {}
+          records = origin_instantiate(rows)
+
+          @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
+            objects = eager_loadings_hash.keys
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+          end
+          records
+        end
+
         # call join associations
         def construct_association(record, join, row)
+          result = origin_construct_association(record, join, row)
+
           associations = join.reflection.name
           Bullet::Detector::Association.add_object_associations(record, associations)
           Bullet::Detector::NPlusOneQuery.call_association(record, associations)
-          origin_construct_association(record, join, row)
+          @bullet_eager_loadings[record.class] ||= {}
+          @bullet_eager_loadings[record.class][record] ||= Set.new
+          @bullet_eager_loadings[record.class][record] << associations
+
+          result
         end
       end
 

data/lib/bullet/active_record3x.rb

@@ -42,7 +42,6 @@ module Bullet
           associations = (eager_load_values + includes_values).uniq
           records.each do |record|
             Bullet::Detector::Association.add_object_associations(record, associations)
-            Bullet::Detector::NPlusOneQuery.call_association(record, associations)
           end
           Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           records
@@ -50,13 +49,32 @@ module Bullet
       end
 
       ::ActiveRecord::Associations::JoinDependency.class_eval do
+        alias_method :origin_instantiate, :instantiate
         alias_method :origin_construct_association, :construct_association
+
+        def instantiate(rows)
+          @bullet_eager_loadings = {}
+          records = origin_instantiate(rows)
+
+          @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
+            objects = eager_loadings_hash.keys
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+          end
+          records
+        end
+
         # call join associations
         def construct_association(record, join, row)
+          result = origin_construct_association(record, join, row)
+
           associations = join.reflection.name
           Bullet::Detector::Association.add_object_associations(record, associations)
           Bullet::Detector::NPlusOneQuery.call_association(record, associations)
-          origin_construct_association(record, join, row)
+          @bullet_eager_loadings[record.class] ||= {}
+          @bullet_eager_loadings[record.class][record] ||= Set.new
+          @bullet_eager_loadings[record.class][record] << associations
+
+          result
         end
       end