bullet 4.14.6 → 4.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f638b646b9513031fb22f2e225286902ca056d5
-  data.tar.gz: f9144079dd390c7f7c3bb5f584b9b7f5c9552ec7
+  metadata.gz: 383fdf528838afb5b7b3062473c4cee08afde2a6
+  data.tar.gz: 876d2f512122a2efc65966ae0ca79552a942e55b
 SHA512:
-  metadata.gz: 646ba3c219617f31c8e0b2e0f31b106c9a6a17db3029241e1b0bd53341532d9982e4c8e01ffbba5094423edf337e86e56b45b923b9000ba151fd5370bcfbc8b7
-  data.tar.gz: 9a75eb39b6bd37f8f14d343e90aea52ac7438771755374799f423890f7181454c3cc10c0bd0502c577be62e38ad2193867934a4fd36837d411ffe40077de562e
+  metadata.gz: be6b084a5b2a8a969b9c4de0f5d4edf6b45519bab43daac4a28e16bf2d91d4adcb709555b2b1b914187e37cdd4344606df26f2324bd3e578c1d553fd2d8ff079
+  data.tar.gz: cefcd37562b41f889399face565a9335b7ed47a5627c9a837b53c31803dc40c72f5f31adeaf619ad233b4e60927900b4b336877f2966d94ea19e66dffaf88dd5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Next Release
 
+## 4.14.7
+
+* Fix AR 4.2 SingularAssociation#reader result can be nil
+* `perform_out_of_channel_notifications` should always be triggered
+
 ## 4.14.6
 
 * Fix false positive with `belongs_to` -> `belongs_to` for active\_record 4.2

data/lib/bullet/active_record42.rb

@@ -157,15 +157,11 @@ module Bullet
             if @owner.class.name !~ /^HABTM_/ && !@inversed
               Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
               if Bullet::Detector::NPlusOneQuery.impossible?(@owner)
-                Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
               else
-                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
               end
             end
-            if ::ActiveRecord::Reflection::HasOneReflection === @reflection && result
-              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-              Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
-            end
           end
           result
         end

data/lib/bullet/rack.rb

@@ -10,11 +10,11 @@ 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) || sse?(headers) || empty?(response)
 
       response_body = nil
       if Bullet.notification?
-        if status == 200 && !response_body(response).frozen? && html_request?(headers, response)
+        if !file?(headers) && !sse?(headers) && !empty?(response) &&
+            status == 200 && !response_body(response).frozen? && html_request?(headers, response)
           response_body = response_body(response)
           append_to_html_body(response_body, footer_note) if Bullet.add_footer
           append_to_html_body(response_body, Bullet.gather_inline_notifications)

data/lib/bullet/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.14.6
+  version: 4.14.7
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport