bullet 4.13.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e90d569b3150f0988aeb2f614513e4603f231a92
-  data.tar.gz: 8106c975d3aa193772e6146757c2f55144f8205e
+  metadata.gz: cb37955eb9271242e6c93d070639487d27c41cc4
+  data.tar.gz: 3dcfaee4517be454ae076b8707b479357aef4810
 SHA512:
-  metadata.gz: d7fdb81048632cf1c99bf42680ce5c78ef8f605be770088d2d7f623f25663fb1a00e8f860775175791b54245f1a610430372d7402b35e29b4a636148052ef0e6
-  data.tar.gz: 12518c2cafae4fa1db72215e3d6430c1781f82601176db91edf5b7246f52305a9991f37f522517e71af3d4435b5159589efbc25379694e38c76726cedd85ffc0
+  metadata.gz: aad803335d34af96636af55b2db42e93770c1d989485bad7bcd6a5ac6b78c1cd95d5c133913d2fb606dd9cfedec078785a83d175dac42ebd408595866b791679
+  data.tar.gz: e53e36ef7782a6e94079b128eaebecde19501ce26c0204dd35dbc7df53b81313d0f8fa22c0a445c1f10f5f163cf23afcaa29c998279963667ca7b7f34cdc7c66

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.1.2
 gemfile:
+  - Gemfile.rails-4.2
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0
   - Gemfile.rails-3.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Next Release
 
+## 4.14.0 (10/03/2014)
+
+* Support rails 4.2
+* Polish notification output
+* Fix warning: `*' interpreted as argument prefix
+
 ## 4.13.0 (07/19/2014)
 
 * Support include? call on ar associations

data/Gemfile.rails-4.0

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.0.8'
+gem 'rails', '~> 4.0.9'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'

data/Gemfile.rails-4.1

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.1.4'
+gem 'rails', '~> 4.1.6'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'

data/Gemfile.rails-4.2

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

data/README.md

@@ -12,7 +12,7 @@ Best practice is to use Bullet in development mode or custom mode (staging, prof
 
 Bullet gem now supports **activerecord** >= 3.0 and **mongoid** >= 2.4.1.
 
-If you use activercord 2.x, please use bullet <= 4.5.0
+If you use activerecord 2.x, please use bullet <= 4.5.0
 
 ## External Introduction
 

data/lib/bullet/active_record41.rb

@@ -25,9 +25,9 @@ module Bullet
         alias_method :origin_preloaders_on, :preloaders_on
 
         def preloaders_on(association, records, scope)
+          records.compact!
           if records.first.class.name !~ /^HABTM_/
             records.each do |record|
-              next unless record
               Bullet::Detector::Association.add_object_associations(record, association)
             end
             Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)

data/lib/bullet/active_record42.rb

@@ -0,0 +1,149 @@
+module Bullet
+  module ActiveRecord
+    def self.enable
+      require 'active_record'
+      ::ActiveRecord::Relation.class_eval do
+        alias_method :origin_to_a, :to_a
+        # if select a collection of objects, then these objects have possible to cause N+1 query.
+        # if select only one object, then the only one object has impossible to cause N+1 query.
+        def to_a
+          records = origin_to_a
+          if records.first.class.name !~ /^HABTM_/
+            if records.size > 1
+              Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+              Bullet::Detector::CounterCache.add_possible_objects(records)
+            elsif records.size == 1
+              Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+              Bullet::Detector::CounterCache.add_impossible_object(records.first)
+            end
+          end
+          records
+        end
+      end
+
+      ::ActiveRecord::Associations::Preloader.class_eval do
+        alias_method :origin_preloaders_on, :preloaders_on
+
+        def preloaders_on(association, records, scope)
+          records.compact!
+          if records.first.class.name !~ /^HABTM_/
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, association)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
+          end
+          origin_preloaders_on(association, records, scope)
+        end
+      end
+
+      ::ActiveRecord::FinderMethods.class_eval do
+        # add includes in scope
+        alias_method :origin_find_with_associations, :find_with_associations
+        def find_with_associations
+          records = origin_find_with_associations
+          associations = (eager_load_values + includes_values).uniq
+          records.each do |record|
+            Bullet::Detector::Association.add_object_associations(record, associations)
+          end
+          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
+          records
+        end
+      end
+
+      ::ActiveRecord::Associations::JoinDependency.class_eval do
+        alias_method :origin_instantiate, :instantiate
+        alias_method :origin_construct_model, :construct_model
+
+        def instantiate(result_set, aliases)
+          @bullet_eager_loadings = {}
+          records = origin_instantiate(result_set, aliases)
+
+          @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_model(record, node, row, model_cache, id, aliases)
+          result = origin_construct_model(record, node, row, model_cache, id, aliases)
+
+          associations = node.reflection.name
+          Bullet::Detector::Association.add_object_associations(record, associations)
+          Bullet::Detector::NPlusOneQuery.call_association(record, associations)
+          @bullet_eager_loadings[record.class] ||= {}
+          @bullet_eager_loadings[record.class][record] ||= Set.new
+          @bullet_eager_loadings[record.class][record] << associations
+
+          result
+        end
+      end
+
+      ::ActiveRecord::Associations::CollectionAssociation.class_eval do
+        # call one to many associations
+        alias_method :origin_load_target, :load_target
+        def load_target
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+          records = origin_load_target
+
+          if records.first.class.name !~ /^HABTM_/
+            if records.size > 1
+              Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+              Bullet::Detector::CounterCache.add_possible_objects(records)
+            elsif records.size == 1
+              Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+              Bullet::Detector::CounterCache.add_impossible_object(records.first)
+            end
+          end
+          records
+        end
+
+        alias_method :origin_empty?, :empty?
+        def empty?
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_empty?
+        end
+
+        alias_method :origin_include?, :include?
+        def include?(object)
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_include?(object)
+        end
+      end
+
+      ::ActiveRecord::Associations::SingularAssociation.class_eval do
+        # call has_one and belongs_to associations
+        alias_method :origin_reader, :reader
+        def reader(force_reload = false)
+          result = origin_reader(force_reload)
+          if @owner.class.name !~ /^HABTM_/
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          end
+          result
+        end
+      end
+
+      ::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
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          result
+        end
+
+        alias_method :origin_has_cached_counter?, :has_cached_counter?
+        def has_cached_counter?(reflection = reflection())
+          result = origin_has_cached_counter?(reflection)
+          if !result && !Thread.current[:bullet_collection_empty]
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/bullet/dependency.rb

@@ -22,6 +22,8 @@ module Bullet
                                      'active_record4'
                                    elsif active_record41?
                                      'active_record41'
+                                   elsif active_record42?
+                                     'active_record42'
                                    end
                                  end
     end
@@ -66,6 +68,10 @@ module Bullet
       active_record4? && ::ActiveRecord::VERSION::MINOR == 1
     end
 
+    def active_record42?
+      active_record4? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
     def mongoid2x?
       mongoid? && ::Mongoid::VERSION =~ /\A2\.[4-8]/
     end

data/lib/bullet/detector/unused_eager_loading.rb

@@ -47,7 +47,7 @@ module Bullet
             end
           end
 
-          eager_loadings.add *to_add if to_add
+          eager_loadings.add(*to_add) if to_add
           to_merge.each { |k,val| eager_loadings.merge k, val }
           to_delete.each { |k| eager_loadings.delete k }
 

data/lib/bullet/ext/object.rb

@@ -1,6 +1,6 @@
 class Object
   def bullet_key
-    [self.class, self.primary_key_value].join(':')
+    "#{self.class}:#{self.primary_key_value}"
   end
 
   def primary_key_value

data/lib/bullet/notification/base.rb

@@ -18,6 +18,10 @@ module Bullet
         raise NoMethodError.new("no method body defined")
       end
 
+      def call_stack_messages
+        ""
+      end
+
       def whoami
         @user ||= ENV['USER'].presence || (`whoami`.chomp rescue "")
         if @user.present?
@@ -28,15 +32,7 @@ module Bullet
       end
 
       def body_with_caller
-        body
-      end
-
-      def standard_notice
-        @standard_notifice ||= title + "\n" + body
-      end
-
-      def full_notice
-        [whoami.presence, url, title, body_with_caller].compact.join("\n")
+        "#{body}\n#{call_stack_messages}\n"
       end
 
       def notify_inline
@@ -48,7 +44,7 @@ module Bullet
       end
 
       def short_notice
-        [whoami.presence, url, title, body].compact.join("\n")
+        [whoami.presence, url, title, body].compact.join("  ")
       end
 
       def notification_data

data/lib/bullet/notification/n_plus_one_query.rb

@@ -7,10 +7,6 @@ module Bullet
         @callers = callers
       end
 
-      def body_with_caller
-        "#{body}\n#{call_stack_messages}"
-      end
-
       def body
         "#{klazz_associations_str}\n  Add to your finder: #{associations_str}"
       end

data/lib/bullet/rack.rb

@@ -20,11 +20,11 @@ module Bullet
           headers['Content-Length'] = response_body.bytesize.to_s
         end
       end
-      [status, headers, response_body ? [response_body] : response]
-    ensure
       if Bullet.enable? && Bullet.notification?
         Bullet.perform_out_of_channel_notifications(env)
       end
+      [status, headers, response_body ? [response_body] : response]
+    ensure
       Bullet.end_request
     end
 
@@ -43,7 +43,7 @@ module Bullet
     end
 
     def add_footer_note(response_body)
-      response_body << "<div #{footer_div_style}>" + Bullet.footer_info.uniq.join("<br>") + "</div>"
+      response_body << "<div #{footer_div_attributes}>" + Bullet.footer_info.uniq.join("<br>") + "</div>"
     end
 
     def file?(headers)
@@ -67,9 +67,9 @@ module Bullet
     end
 
     private
-    def footer_div_style
+    def footer_div_attributes
 <<EOF
-style="position: fixed; bottom: 0pt; left: 0pt; cursor: pointer; border-style: solid; border-color: rgb(153, 153, 153);
+data-is-bullet-footer style="position: fixed; bottom: 0pt; left: 0pt; cursor: pointer; border-style: solid; border-color: rgb(153, 153, 153);
  -moz-border-top-colors: none; -moz-border-right-colors: none; -moz-border-bottom-colors: none;
  -moz-border-left-colors: none; -moz-border-image: none; border-width: 2pt 2pt 0px 0px;
  padding: 5px; border-radius: 0pt 10pt 0pt 0px; background: none repeat scroll 0% 0% rgba(200, 200, 200, 0.8);
@@ -78,4 +78,3 @@ EOF
     end
   end
 end
-

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.13.0"
+  VERSION = "4.14.0"
 end

data/lib/bullet.rb

@@ -153,7 +153,7 @@ module Bullet
 
     def perform_out_of_channel_notifications(env = {})
       for_each_active_notifier_with_notification do |notification|
-        notification.url = [env['HTTP_HOST'], env['REQUEST_URI']].compact.join
+        notification.url = env['REQUEST_URI']
         notification.notify_out_of_channel
       end
     end

data/spec/bullet/notification/base_spec.rb

@@ -56,33 +56,8 @@ module Bullet
       context "#body_with_caller" do
         it "should return body" do
           allow(subject).to receive(:body).and_return("body")
-          expect(subject.body_with_caller).to eq("body")
-        end
-      end
-
-      context "#standard_notice" do
-        it "should return title + body" do
-          allow(subject).to receive(:title).and_return("title")
-          allow(subject).to receive(:body).and_return("body")
-          expect(subject.standard_notice).to eq("title\nbody")
-        end
-      end
-
-      context "#full_notice" do
-        it "should return whoami + url + title + body_with_caller" do
-          allow(subject).to receive(:whoami).and_return("whoami")
-          allow(subject).to receive(:url).and_return("url")
-          allow(subject).to receive(:title).and_return("title")
-          allow(subject).to receive(:body_with_caller).and_return("body_with_caller")
-          expect(subject.full_notice).to eq("whoami\nurl\ntitle\nbody_with_caller")
-        end
-
-        it "should return url + title + body_with_caller" do
-          allow(subject).to receive(:whoami).and_return("")
-          allow(subject).to receive(:url).and_return("url")
-          allow(subject).to receive(:title).and_return("title")
-          allow(subject).to receive(:body_with_caller).and_return("body_with_caller")
-          expect(subject.full_notice).to eq("url\ntitle\nbody_with_caller")
+          allow(subject).to receive(:call_stack_messages).and_return("call_stack_messages")
+          expect(subject.body_with_caller).to eq("body\ncall_stack_messages\n")
         end
       end
 

data/spec/bullet/notification/n_plus_one_query_spec.rb

@@ -5,8 +5,8 @@ module Bullet
     describe NPlusOneQuery do
       subject { NPlusOneQuery.new([["caller1", "caller2"]], Post, [:comments, :votes], "path") }
 
-      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2") }
-      it { expect([ subject.body_with_caller, subject.body_with_caller]).to eq([ "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2", "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2" ]) }
+      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n") }
+      it { expect([ subject.body_with_caller, subject.body_with_caller]).to eq([ "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n" ]) }
       it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]") }
       it { expect(subject.title).to eq("N+1 Query in path") }
     end

data/test.sh

@@ -1,5 +1,6 @@
 #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-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.rails-3.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle exec rspec spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.13.0
+  version: 4.14.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,6 +64,7 @@ files:
 - Gemfile.rails-3.2
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
+- Gemfile.rails-4.2
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -75,6 +76,7 @@ files:
 - lib/bullet/active_record3x.rb
 - lib/bullet/active_record4.rb
 - lib/bullet/active_record41.rb
+- lib/bullet/active_record42.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb