bullet 4.14.6 → 4.14.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6f638b646b9513031fb22f2e225286902ca056d5
4
- data.tar.gz: f9144079dd390c7f7c3bb5f584b9b7f5c9552ec7
3
+ metadata.gz: 383fdf528838afb5b7b3062473c4cee08afde2a6
4
+ data.tar.gz: 876d2f512122a2efc65966ae0ca79552a942e55b
5
5
  SHA512:
6
- metadata.gz: 646ba3c219617f31c8e0b2e0f31b106c9a6a17db3029241e1b0bd53341532d9982e4c8e01ffbba5094423edf337e86e56b45b923b9000ba151fd5370bcfbc8b7
7
- data.tar.gz: 9a75eb39b6bd37f8f14d343e90aea52ac7438771755374799f423890f7181454c3cc10c0bd0502c577be62e38ad2193867934a4fd36837d411ffe40077de562e
6
+ metadata.gz: be6b084a5b2a8a969b9c4de0f5d4edf6b45519bab43daac4a28e16bf2d91d4adcb709555b2b1b914187e37cdd4344606df26f2324bd3e578c1d553fd2d8ff079
7
+ data.tar.gz: cefcd37562b41f889399face565a9335b7ed47a5627c9a837b53c31803dc40c72f5f31adeaf619ad233b4e60927900b4b336877f2966d94ea19e66dffaf88dd5
@@ -1,5 +1,10 @@
1
1
  # Next Release
2
2
 
3
+ ## 4.14.7
4
+
5
+ * Fix AR 4.2 SingularAssociation#reader result can be nil
6
+ * `perform_out_of_channel_notifications` should always be triggered
7
+
3
8
  ## 4.14.6
4
9
 
5
10
  * Fix false positive with `belongs_to` -> `belongs_to` for active\_record 4.2
@@ -157,15 +157,11 @@ module Bullet
157
157
  if @owner.class.name !~ /^HABTM_/ && !@inversed
158
158
  Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
159
159
  if Bullet::Detector::NPlusOneQuery.impossible?(@owner)
160
- Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
160
+ Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
161
161
  else
162
- Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
162
+ Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
163
163
  end
164
164
  end
165
- if ::ActiveRecord::Reflection::HasOneReflection === @reflection && result
166
- Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
167
- Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
168
- end
169
165
  end
170
166
  result
171
167
  end
@@ -10,11 +10,11 @@ module Bullet
10
10
  return @app.call(env) unless Bullet.enable?
11
11
  Bullet.start_request
12
12
  status, headers, response = @app.call(env)
13
- return [status, headers, response] if file?(headers) || sse?(headers) || empty?(response)
14
13
 
15
14
  response_body = nil
16
15
  if Bullet.notification?
17
- if status == 200 && !response_body(response).frozen? && html_request?(headers, response)
16
+ if !file?(headers) && !sse?(headers) && !empty?(response) &&
17
+ status == 200 && !response_body(response).frozen? && html_request?(headers, response)
18
18
  response_body = response_body(response)
19
19
  append_to_html_body(response_body, footer_note) if Bullet.add_footer
20
20
  append_to_html_body(response_body, Bullet.gather_inline_notifications)
@@ -1,4 +1,4 @@
1
1
  # encoding: utf-8
2
2
  module Bullet
3
- VERSION = "4.14.6"
3
+ VERSION = "4.14.7"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bullet
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.14.6
4
+ version: 4.14.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Richard Huang
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-04 00:00:00.000000000 Z
11
+ date: 2015-05-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport