bullet 4.10.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3badf3b077a980eaa5aff1923f4e73d702f5b91
-  data.tar.gz: f62fd9855dca76718f1abd484052e8b9ec841088
+  metadata.gz: db6af7eda5d3f19441a8e60b5aae5bf09d4dd3f8
+  data.tar.gz: 94510322d9e3190c200e5b18351c9b11c255e19a
 SHA512:
-  metadata.gz: cd79339a18313dd651739d819f59d33ceee240ec595ff53a49b27133010d8a83e9274292907ccd99bd9b894b7d975c54e4a65b49f0907b08f0b70a4a994dc9e1
-  data.tar.gz: 3dbb60cf0426b5cfb0d1fc5ac1bed620d139aafbf798eae0a7ebe94915a8b17fcc0a745b587313007a2922826f0b396f4be290dc353832f0c5e2618bedb29c50
+  metadata.gz: 2f1be7c449021b691ba83e2ea42c39d0701ce5c89f6517c9218dc563eaac0d6a18e626025e113470d30a7d8ce9c77ab7da784b030f983b32784079dba3312bd1
+  data.tar.gz: 0306d0092a4c164e5b650f7c3e5b42b4e3b16d3359bd82ff20e9b5b1cd2414af1e236f91a07a147ed374d4d9bf6d98a1eedb50b1dd4bf09e9922a222568bdfb1

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Next Release
 
+## 4.11.0
+
+* Support empty? call on ar associations
+* Skip detecting if object is a new record
+
+## 4.10.0 (06/06/2014)
+
+* Handle join query smarter
+* Support mongoid 4.0
+* Thread safe
+* Add debug mode
+
 ## 4.9.0 (04/30/2014)
 
 * Add Bullet.stacktrace_includes option

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
@@ -7,9 +7,9 @@ gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
-gem "rspec"
-gem "guard"
-gem "guard-rspec"
+gem 'rspec'
+gem 'guard'
+gem 'guard-rspec'
 
 gem 'coveralls', require: false
 

data/lib/bullet/active_record3.rb

@@ -97,6 +97,12 @@ module Bullet
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           origin_last(*args)
         end
+
+        alias_method :origin_empty?, :empty?
+        def empty?
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_empty?
+        end
       end
 
       ::ActiveRecord::Associations::AssociationProxy.class_eval do

data/lib/bullet/active_record3x.rb

@@ -85,6 +85,12 @@ module Bullet
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           origin_load_target
         end
+
+        alias_method :origin_empty?, :empty?
+        def empty?
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_empty?
+        end
       end
 
       ::ActiveRecord::Associations::SingularAssociation.class_eval do

data/lib/bullet/active_record4.rb

@@ -85,6 +85,12 @@ module Bullet
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           origin_load_target
         end
+
+        alias_method :origin_empty?, :empty?
+        def empty?
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_empty?
+        end
       end
 
       ::ActiveRecord::Associations::SingularAssociation.class_eval do

data/lib/bullet/active_record41.rb

@@ -86,6 +86,12 @@ module Bullet
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
           origin_load_target
         end
+
+        alias_method :origin_empty?, :empty?
+        def empty?
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_empty?
+        end
       end
 
       ::ActiveRecord::Associations::SingularAssociation.class_eval do

data/lib/bullet/detector/association.rb

@@ -5,6 +5,7 @@ module Bullet
         def add_object_associations(object, associations)
           return unless Bullet.start?
           return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
+          return unless object.id
 
           Bullet.debug("Detector::Association#add_object_associations", "object: #{object.bullet_ar_key}, associations: #{associations}")
           object_associations.add(object.bullet_ar_key, associations)
@@ -13,6 +14,7 @@ module Bullet
         def add_call_object_associations(object, associations)
           return unless Bullet.start?
           return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
+          return unless object.id
 
           Bullet.debug("Detector::Association#add_call_object_associations", "object: #{object.bullet_ar_key}, associations: #{associations}")
           call_object_associations.add(object.bullet_ar_key, associations)

data/lib/bullet/detector/counter_cache.rb

@@ -5,6 +5,7 @@ module Bullet
         def add_counter_cache(object, associations)
           return unless Bullet.start?
           return unless Bullet.counter_cache_enable?
+          return unless object.id
 
           Bullet.debug("Detector::CounterCache#add_counter_cache", "object: #{object.bullet_ar_key}, associations: #{associations}")
           if conditions_met?(object.bullet_ar_key, associations)
@@ -15,8 +16,9 @@ module Bullet
         def add_possible_objects(object_or_objects)
           return unless Bullet.start?
           return unless Bullet.counter_cache_enable?
-
           objects = Array(object_or_objects)
+          return if objects.map(&:id).compact.empty?
+
           Bullet.debug("Detector::CounterCache#add_possible_objects", "objects: #{objects.map(&:bullet_ar_key).join(', ')}")
           objects.each { |object| possible_objects.add object.bullet_ar_key }
         end
@@ -24,6 +26,7 @@ module Bullet
         def add_impossible_object(object)
           return unless Bullet.start?
           return unless Bullet.counter_cache_enable?
+          return unless object.id
 
           Bullet.debug("Detector::CounterCache#add_impossible_object", "object: #{object.bullet_ar_key}")
           impossible_objects.add object.bullet_ar_key

data/lib/bullet/detector/n_plus_one_query.rb

@@ -10,6 +10,7 @@ module Bullet
         #   if it is, keeps this unpreload associations and caller.
         def call_association(object, associations)
           return unless Bullet.start?
+          return unless object.id
           add_call_object_associations(object, associations)
 
           Bullet.debug("Detector::NPlusOneQuery#call_association", "object: #{object.bullet_ar_key}, associations: #{associations}")
@@ -22,8 +23,9 @@ module Bullet
         def add_possible_objects(object_or_objects)
           return unless Bullet.start?
           return unless Bullet.n_plus_one_query_enable?
-
           objects = Array(object_or_objects)
+          return if objects.map(&:id).compact.empty?
+
           Bullet.debug("Detector::NPlusOneQuery#add_possible_objects", "objects: #{objects.map(&:bullet_ar_key).join(', ')}")
           objects.each { |object| possible_objects.add object.bullet_ar_key }
         end
@@ -31,6 +33,7 @@ module Bullet
         def add_impossible_object(object)
           return unless Bullet.start?
           return unless Bullet.n_plus_one_query_enable?
+          return unless object.id
 
           Bullet.debug("Detector::NPlusOneQuery#add_impossible_object", "object: #{object.bullet_ar_key}")
           impossible_objects.add object.bullet_ar_key

data/lib/bullet/detector/unused_eager_loading.rb

@@ -22,6 +22,7 @@ module Bullet
         def add_eager_loadings(objects, associations)
           return unless Bullet.start?
           return unless Bullet.unused_eager_loading_enable?
+          return if objects.map(&:id).compact.empty?
 
           Bullet.debug("Detector::UnusedEagerLoading#add_eager_loadings", "objects: #{objects.map(&:bullet_ar_key).join(', ')}, associations: #{associations}")
           bullet_ar_keys = objects.map(&:bullet_ar_key)

data/lib/bullet/ext/object.rb

@@ -1,5 +1,9 @@
 class Object
   def bullet_ar_key
-    "#{self.class}:#{self.id}"
+    if self.is_a? ActiveRecord::Base
+      "#{self.class}:#{self.send self.class.primary_key}"
+    else
+      "#{self.class}:#{self.id}"
+    end
   end
 end

data/lib/bullet/rack.rb

@@ -10,7 +10,7 @@ module Bullet
       return @app.call(env) unless Bullet.enable?
       Bullet.start_request
       status, headers, response = @app.call(env)
-      return [status, headers, response] if file?(headers) || empty?(response)
+      return [status, headers, response] if file?(headers) || sse?(response) || empty?(response)
 
       response_body = nil
       if Bullet.notification?
@@ -19,10 +19,13 @@ module Bullet
           add_footer_note(response_body) if Bullet.add_footer
           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
       Bullet.end_request
-      [status, headers, response_body ? [response_body] : response]
     end
 
     # fix issue if response's body is a Proc
@@ -43,11 +46,14 @@ module Bullet
       response_body << "<div #{footer_div_style}>" + Bullet.footer_info.uniq.join("<br>") + "</div>"
     end
 
-    # if send file?
     def file?(headers)
       headers["Content-Transfer-Encoding"] == "binary"
     end
 
+    def sse?(response)
+      response.respond_to? :stream
+    end
+
     def html_request?(headers, response)
       headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response_body(response).include?("<html")
     end
@@ -67,7 +73,7 @@ style="position: fixed; bottom: 0pt; left: 0pt; cursor: pointer; border-style: s
  -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);
- color: rgb(119, 119, 119); font-size: 18px;"
+ color: rgb(119, 119, 119); font-size: 18px; font-family: 'Arial', sans-serif; z-index:9999;"
 EOF
     end
   end

data/lib/bullet/version.rb

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

data/spec/bullet/rack_spec.rb

@@ -65,7 +65,7 @@ module Bullet
         end
 
         it "should change response body if notification is active" do
-          expect(Bullet).to receive(:notification?).and_return(true)
+          expect(Bullet).to receive(:notification?).and_return(true).twice
           expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
           expect(Bullet).to receive(:perform_out_of_channel_notifications)
           status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
@@ -77,7 +77,7 @@ module Bullet
           response = Support::ResponseDouble.new
           response.body = "<html><head></head><body>é</body></html>"
           app.response = response
-          expect(Bullet).to receive(:notification?).and_return(true)
+          expect(Bullet).to receive(:notification?).and_return(true).twice
           expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
           status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
           expect(headers["Content-Length"]).to eq("58")

data/spec/integration/active_record3/association_spec.rb

@@ -51,6 +51,16 @@ if !mongoid? && active_record3?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should detect non preload post => comments with empty?" do
+        Post.all.each do |post|
+          post.comments.empty?
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
     end
 
     context "category => posts => comments" do

data/spec/integration/active_record4/association_spec.rb

@@ -51,6 +51,16 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should detect non preload post => comments with empty?" do
+        Post.all.each do |post|
+          post.comments.empty?
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
     end
 
     context "category => posts => comments" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport