bullet 4.13.2 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f86ed6daca5c6d8250ec8a65e94ed03b0d598aa3
-  data.tar.gz: e8e5ed2f2a88d15ade728ac1b44679a65ad53fb0
+  metadata.gz: cb37955eb9271242e6c93d070639487d27c41cc4
+  data.tar.gz: 3dcfaee4517be454ae076b8707b479357aef4810
 SHA512:
-  metadata.gz: 286a823bc5003cad396122ca6905953c2e10349436bd61212c2c8437c4e518acf71bb13885e1d66bd01c17785fa16d9a1c201ce874357aad01ab64580064a82c
-  data.tar.gz: e7184a6dda78c58b6544f32eca6c917324ba6b9a05108f94755caebbaad4d5b63a51367f76fde1d8abc1b64e920c220772c3773f5be13f4167f56b9df1e12e09
+  metadata.gz: aad803335d34af96636af55b2db42e93770c1d989485bad7bcd6a5ac6b78c1cd95d5c133913d2fb606dd9cfedec078785a83d175dac42ebd408595866b791679
+  data.tar.gz: e53e36ef7782a6e94079b128eaebecde19501ce26c0204dd35dbc7df53b81313d0f8fa22c0a445c1f10f5f163cf23afcaa29c998279963667ca7b7f34cdc7c66

data/CHANGELOG.md

@@ -1,13 +1,10 @@
 # Next Release
 
-## 4.13.2
+## 4.14.0 (10/03/2014)
 
-* Fix warning: `*' interpreted as argument prefix
+* Support rails 4.2
 * Polish notification output
-
-## 4.13.1
-
-* Fix swallow exception issue
+* Fix warning: `*' interpreted as argument prefix
 
 ## 4.13.0 (07/19/2014)
 

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

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

data/lib/bullet/active_record42.rb

@@ -85,7 +85,18 @@ module Bullet
         alias_method :origin_load_target, :load_target
         def load_target
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
-          origin_load_target
+          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?
@@ -115,11 +126,21 @@ module Bullet
       end
 
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
-        alias_method :origin_has_cached_counter?, :has_cached_counter?
+        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)
-          Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name) unless result
+          if !result && !Thread.current[:bullet_collection_empty]
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          end
           result
         end
       end

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/rack.rb

@@ -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.2"
+  VERSION = "4.14.0"
 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

metadata

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