bullet 4.11.2 → 4.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67ea00382954d79e17b7f06299ff2f7654d7ffb
-  data.tar.gz: d7dee9d6ec4ef9903727cce82e1dec6785c9b9ac
+  metadata.gz: 2ca96bf9ce0ec1f8610db4044ca48bc25ebf8ded
+  data.tar.gz: b2f6067c61713e0c0bb5c868d7f8e5464e09476c
 SHA512:
-  metadata.gz: f30d55932e43fdec7d0c101a9bbb63a55e4661abe8a141f36ef3e702a242790a0e24145ed3e936ecfe47c7d8f7a2ddde94d820dd1da3a594a05e0bfd1946e877
-  data.tar.gz: d893f7f72c0d728bc0475067ef4618c87eb181165eef53939c8e37f4da8c8b2be3d41a17bbc3b2c88dcce4bda1521b52c24102602b9768e5cee9ef7b9f9b9253
+  metadata.gz: 4d6ceb5f5ad0c7357a741bbd04b42bd188e38802a7a448aca7e289166570947a9941a224a306634ccd7e4ad99279c2e9dd1692935526dc0ef6b16fbdee26a0c3
+  data.tar.gz: fd48101ec26800797c4cd834905b3f8b1666631a39ac3f42f088430b82611d2b144daefc307fcc0cfffb07d788971b5e4d155269df642e7f2b2b83edde10128b

data/CHANGELOG.md

@@ -5,6 +5,8 @@
 * Use primary_key rather than id for bullet_ar_key
 * Rename bullet_ar_key to bullet_key
 * Fix rails sse detect
+* Fix bullet in rails test
+* Memoize whoami
 
 ## 4.11.0 (06/24/2014)
 

data/lib/bullet.rb

@@ -136,6 +136,7 @@ module Bullet
     end
 
     def notification?
+      return unless start?
       Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
       notification_collector.notifications_present?
     end

data/lib/bullet/notification/base.rb

@@ -19,9 +19,9 @@ module Bullet
       end
 
       def whoami
-        user = `whoami`
-        if user
-          "user: #{user.chomp}"
+        @user ||= ENV['USER'].presence || (`whoami`.chomp rescue "")
+        if @user.present?
+          "user: #{@user}"
         else
           ""
         end
@@ -36,7 +36,7 @@ module Bullet
       end
 
       def full_notice
-        [whoami, url, title, body_with_caller].compact.join("\n")
+        [whoami.presence, url, title, body_with_caller].compact.join("\n")
       end
 
       def notify_inline
@@ -48,7 +48,7 @@ module Bullet
       end
 
       def short_notice
-        [whoami, url, title, body].compact.join("\n")
+        [whoami.presence, url, title, body].compact.join("\n")
       end
 
       def notification_data

data/lib/bullet/version.rb

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

data/spec/bullet/notification/base_spec.rb

@@ -22,6 +22,35 @@ module Bullet
           user = `whoami`.chomp
           expect(subject.whoami).to eq("user: #{user}")
         end
+
+        it "should leverage ENV parameter" do
+          temp_env_variable("USER", "bogus") do
+            expect(subject.whoami).to eq("user: bogus")
+          end
+        end
+
+        it "should return blank if no user available" do
+          temp_env_variable("USER","") do
+            expect(subject).to receive(:`).with("whoami").and_return("")
+            expect(subject.whoami).to eq("")
+          end
+        end
+
+        it "should return blank if whoami is not available" do
+          temp_env_variable("USER","") do
+            expect(subject).to receive(:`).with("whoami").and_raise(Errno::ENOENT)
+            expect(subject.whoami).to eq("")
+          end
+        end
+
+        def temp_env_variable(name, value)
+          old_value = ENV[name]
+          ENV[name] = value
+          yield
+        ensure
+          ENV[name] = old_value
+        end
+
       end
 
       context "#body_with_caller" do
@@ -47,6 +76,14 @@ module Bullet
           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")
+        end
       end
 
       context "#notification_data" do

data/spec/bullet_spec.rb

@@ -26,8 +26,8 @@ describe Bullet, focused: true do
 
         context 'enable Bullet again without patching again the orms' do
           before do
-            Bullet::Mongoid.should_not_receive(:enable) if defined? Bullet::Mongoid
-            Bullet::ActiveRecord.should_not_receive(:enable) if defined? Bullet::ActiveRecord
+            expect(Bullet::Mongoid).not_to receive(:enable) if defined? Bullet::Mongoid
+            expect(Bullet::ActiveRecord).not_to receive(:enable) if defined? Bullet::ActiveRecord
             Bullet.enable = true
           end
 

data/spec/integration/active_record3/association_spec.rb

@@ -371,7 +371,7 @@ if !mongoid? && active_record3?
           comment.post.writer.newspaper.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
       end

data/spec/integration/active_record4/association_spec.rb

@@ -369,7 +369,7 @@ if !mongoid? && active_record4?
           comment.post.writer.newspaper.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
       end

metadata

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