bullet 4.10.0 → 4.12.0

data/lib/bullet/detector/n_plus_one_query.rb

@@ -10,11 +10,13 @@ module Bullet
         #   if it is, keeps this unpreload associations and caller.
         def call_association(object, associations)
           return unless Bullet.start?
+          return unless object.primary_key_value
+          return if inversed_objects.include?(object.bullet_key, associations)
           add_call_object_associations(object, associations)
 
-          Bullet.debug("Detector::NPlusOneQuery#call_association", "object: #{object.bullet_ar_key}, associations: #{associations}")
-          if conditions_met?(object.bullet_ar_key, associations)
-            Bullet.debug("detect n + 1 query", "object: #{object.bullet_ar_key}, associations: #{associations}")
+          Bullet.debug("Detector::NPlusOneQuery#call_association", "object: #{object.bullet_key}, associations: #{associations}")
+          if conditions_met?(object.bullet_key, associations)
+            Bullet.debug("detect n + 1 query", "object: #{object.bullet_key}, associations: #{associations}")
             create_notification caller_in_project, object.class.to_s, associations
           end
         end
@@ -22,18 +24,29 @@ 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)
-          Bullet.debug("Detector::NPlusOneQuery#add_possible_objects", "objects: #{objects.map(&:bullet_ar_key).join(', ')}")
-          objects.each { |object| possible_objects.add object.bullet_ar_key }
+          return if objects.map(&:primary_key_value).compact.empty?
+
+          Bullet.debug("Detector::NPlusOneQuery#add_possible_objects", "objects: #{objects.map(&:bullet_key).join(', ')}")
+          objects.each { |object| possible_objects.add object.bullet_key }
         end
 
         def add_impossible_object(object)
           return unless Bullet.start?
           return unless Bullet.n_plus_one_query_enable?
+          return unless object.primary_key_value
+
+          Bullet.debug("Detector::NPlusOneQuery#add_impossible_object", "object: #{object.bullet_key}")
+          impossible_objects.add object.bullet_key
+        end
+
+        def add_inversed_object(object, association)
+          return unless Bullet.start?
+          return unless Bullet.n_plus_one_query_enable?
+          return unless object.primary_key_value
 
-          Bullet.debug("Detector::NPlusOneQuery#add_impossible_object", "object: #{object.bullet_ar_key}")
-          impossible_objects.add object.bullet_ar_key
+          Bullet.debug("Detector::NPlusOneQuery#add_inversed_object", "object: #{object.bullet_key}, association: #{association}")
+          inversed_objects.add object.bullet_key, association
         end
 
         private
@@ -47,8 +60,8 @@ module Bullet
           end
 
           # decide whether the object.associations is unpreloaded or not.
-          def conditions_met?(bullet_ar_key, associations)
-            possible?(bullet_ar_key) && !impossible?(bullet_ar_key) && !association?(bullet_ar_key, associations)
+          def conditions_met?(bullet_key, associations)
+            possible?(bullet_key) && !impossible?(bullet_key) && !association?(bullet_key, associations)
           end
 
           def caller_in_project
@@ -60,17 +73,17 @@ module Bullet
             end
           end
 
-          def possible?(bullet_ar_key)
-            possible_objects.include? bullet_ar_key
+          def possible?(bullet_key)
+            possible_objects.include? bullet_key
           end
 
-          def impossible?(bullet_ar_key)
-            impossible_objects.include? bullet_ar_key
+          def impossible?(bullet_key)
+            impossible_objects.include? bullet_key
           end
 
           # check if object => associations already exists in object_associations.
-          def association?(bullet_ar_key, associations)
-            value = object_associations[bullet_ar_key]
+          def association?(bullet_key, associations)
+            value = object_associations[bullet_key]
             if value
               value.each do |v|
                 result = v.is_a?(Hash) ? v.has_key?(associations) : v == associations

data/lib/bullet/detector/unused_eager_loading.rb

@@ -10,26 +10,27 @@ module Bullet
           return unless Bullet.start?
           return unless Bullet.unused_eager_loading_enable?
 
-          object_associations.each do |bullet_ar_key, associations|
-            object_association_diff = diff_object_associations bullet_ar_key, associations
+          object_associations.each do |bullet_key, associations|
+            object_association_diff = diff_object_associations bullet_key, associations
             next if object_association_diff.empty?
 
-            Bullet.debug("detect unused preload", "object: #{bullet_ar_key}, associations: #{object_association_diff}")
-            create_notification bullet_ar_key.bullet_class_name, object_association_diff
+            Bullet.debug("detect unused preload", "object: #{bullet_key}, associations: #{object_association_diff}")
+            create_notification bullet_key.bullet_class_name, object_association_diff
           end
         end
 
         def add_eager_loadings(objects, associations)
           return unless Bullet.start?
           return unless Bullet.unused_eager_loading_enable?
+          return if objects.map(&:primary_key_value).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)
+          Bullet.debug("Detector::UnusedEagerLoading#add_eager_loadings", "objects: #{objects.map(&:bullet_key).join(', ')}, associations: #{associations}")
+          bullet_keys = objects.map(&:bullet_key)
 
           to_add = nil
           to_merge, to_delete = [], []
           eager_loadings.each do |k, v|
-            key_objects_overlap = k & bullet_ar_keys
+            key_objects_overlap = k & bullet_keys
 
             next if key_objects_overlap.empty?
 
@@ -39,10 +40,10 @@ module Bullet
             else
               to_merge << [key_objects_overlap, ( eager_loadings[k].dup  << associations )]
 
-              keys_without_objects = k - bullet_ar_keys
+              keys_without_objects = k - bullet_keys
               to_merge << [keys_without_objects, eager_loadings[k]]
               to_delete << k
-              bullet_ar_keys = bullet_ar_keys - k
+              bullet_keys = bullet_keys - k
             end
           end
 
@@ -50,7 +51,7 @@ module Bullet
           to_merge.each { |k,val| eager_loadings.merge k, val }
           to_delete.each { |k| eager_loadings.delete k }
 
-          eager_loadings.add bullet_ar_keys, associations unless bullet_ar_keys.empty?
+          eager_loadings.add bullet_keys, associations unless bullet_keys.empty?
         end
 
         private
@@ -63,18 +64,18 @@ module Bullet
             end
           end
 
-          def call_associations(bullet_ar_key, associations)
+          def call_associations(bullet_key, associations)
             all = Set.new
-            eager_loadings.similarly_associated(bullet_ar_key, associations).each do |related_bullet_ar_key|
-              coa = call_object_associations[related_bullet_ar_key]
+            eager_loadings.similarly_associated(bullet_key, associations).each do |related_bullet_key|
+              coa = call_object_associations[related_bullet_key]
               next if coa.nil?
               all.merge coa
             end
             all.to_a
           end
 
-          def diff_object_associations(bullet_ar_key, associations)
-            potential_associations = associations - call_associations(bullet_ar_key, associations)
+          def diff_object_associations(bullet_key, associations)
+            potential_associations = associations - call_associations(bullet_key, associations)
             potential_associations.reject { |a| a.is_a?(Hash) }
           end
       end

data/lib/bullet/ext/object.rb

@@ -1,5 +1,13 @@
 class Object
-  def bullet_ar_key
-    "#{self.class}:#{self.id}"
+  def bullet_key
+    [self.class, self.primary_key_value].join(':')
+  end
+
+  def primary_key_value
+    if self.class.respond_to?(:primary_key) && self.class.primary_key
+      self.send self.class.primary_key
+    else
+      self.id
+    end
   end
 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/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) && response.stream.is_a?(ActionController::Live::Buffer)
+    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/registry/object.rb

@@ -1,12 +1,12 @@
 module Bullet
   module Registry
     class Object < Base
-      def add(bullet_ar_key)
-        super(bullet_ar_key.bullet_class_name, bullet_ar_key)
+      def add(bullet_key)
+        super(bullet_key.bullet_class_name, bullet_key)
       end
 
-      def include?(bullet_ar_key)
-        super(bullet_ar_key.bullet_class_name, bullet_ar_key)
+      def include?(bullet_key)
+        super(bullet_key.bullet_class_name, bullet_key)
       end
     end
   end

data/lib/bullet/version.rb

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

data/lib/bullet.rb

@@ -96,7 +96,7 @@ module Bullet
     end
 
     def debug(title, message)
-      puts "[Bullet][#{title}] #{message}" if ENV['DEBUG'] == 'true'
+      puts "[Bullet][#{title}] #{message}" if ENV['BULLET_DEBUG'] == 'true'
     end
 
     def start_request
@@ -107,6 +107,7 @@ module Bullet
       Thread.current[:bullet_call_object_associations] = Bullet::Registry::Base.new
       Thread.current[:bullet_possible_objects] = Bullet::Registry::Object.new
       Thread.current[:bullet_impossible_objects] = Bullet::Registry::Object.new
+      Thread.current[:bullet_inversed_objects] = Bullet::Registry::Base.new
       Thread.current[:bullet_eager_loadings] = Bullet::Registry::Association.new
 
       Thread.current[:bullet_counter_possible_objects] ||= Bullet::Registry::Object.new
@@ -118,9 +119,10 @@ module Bullet
       Thread.current[:bullet_notification_collector] = nil
 
       Thread.current[:bullet_object_associations] = nil
+      Thread.current[:bullet_call_object_associations] = nil
       Thread.current[:bullet_possible_objects] = nil
       Thread.current[:bullet_impossible_objects] = nil
-      Thread.current[:bullet_call_object_associations] = nil
+      Thread.current[:bullet_inversed_objects] = nil
       Thread.current[:bullet_eager_loadings] = nil
 
       Thread.current[:bullet_counter_possible_objects] = nil
@@ -136,6 +138,7 @@ module Bullet
     end
 
     def notification?
+      return unless start?
       Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
       notification_collector.notifications_present?
     end

data/spec/bullet/detector/association_spec.rb

@@ -11,14 +11,14 @@ module Bullet
       context ".add_object_association" do
         it "should add object, associations pair" do
           Association.add_object_associations(@post1, :associations)
-          expect(Association.send(:object_associations)).to be_include(@post1.bullet_ar_key, :associations)
+          expect(Association.send(:object_associations)).to be_include(@post1.bullet_key, :associations)
         end
       end
 
       context ".add_call_object_associations" do
         it "should add call object, associations pair" do
           Association.add_call_object_associations(@post1, :associations)
-          expect(Association.send(:call_object_associations)).to be_include(@post1.bullet_ar_key, :associations)
+          expect(Association.send(:call_object_associations)).to be_include(@post1.bullet_key, :associations)
         end
       end
     end

data/spec/bullet/detector/counter_cache_spec.rb

@@ -10,13 +10,13 @@ module Bullet
 
       context ".add_counter_cache" do
         it "should create notification if conditions met" do
-          expect(CounterCache).to receive(:conditions_met?).with(@post1.bullet_ar_key, [:comments]).and_return(true)
+          expect(CounterCache).to receive(:conditions_met?).with(@post1.bullet_key, [:comments]).and_return(true)
           expect(CounterCache).to receive(:create_notification).with("Post", [:comments])
           CounterCache.add_counter_cache(@post1, [:comments])
         end
 
         it "should not create notification if conditions not met" do
-          expect(CounterCache).to receive(:conditions_met?).with(@post1.bullet_ar_key, [:comments]).and_return(false)
+          expect(CounterCache).to receive(:conditions_met?).with(@post1.bullet_key, [:comments]).and_return(false)
           expect(CounterCache).to receive(:create_notification).never
           CounterCache.add_counter_cache(@post1, [:comments])
         end
@@ -25,30 +25,30 @@ module Bullet
       context ".add_possible_objects" do
         it "should add possible objects" do
           CounterCache.add_possible_objects([@post1, @post2])
-          expect(CounterCache.send(:possible_objects)).to be_include(@post1.bullet_ar_key)
-          expect(CounterCache.send(:possible_objects)).to be_include(@post2.bullet_ar_key)
+          expect(CounterCache.send(:possible_objects)).to be_include(@post1.bullet_key)
+          expect(CounterCache.send(:possible_objects)).to be_include(@post2.bullet_key)
         end
 
         it "should add impossible object" do
           CounterCache.add_impossible_object(@post1)
-          expect(CounterCache.send(:impossible_objects)).to be_include(@post1.bullet_ar_key)
+          expect(CounterCache.send(:impossible_objects)).to be_include(@post1.bullet_key)
         end
       end
 
       context ".conditions_met?" do
         it "should be true when object is possible, not impossible" do
           CounterCache.add_possible_objects(@post1)
-          expect(CounterCache.send(:conditions_met?, @post1.bullet_ar_key, :associations)).to eq true
+          expect(CounterCache.send(:conditions_met?, @post1.bullet_key, :associations)).to eq true
         end
 
         it "should be false when object is not possible" do
-          expect(CounterCache.send(:conditions_met?, @post1.bullet_ar_key, :associations)).to eq false
+          expect(CounterCache.send(:conditions_met?, @post1.bullet_key, :associations)).to eq false
         end
 
         it "should be true when object is possible, and impossible" do
           CounterCache.add_possible_objects(@post1)
           CounterCache.add_impossible_object(@post1)
-          expect(CounterCache.send(:conditions_met?, @post1.bullet_ar_key, :associations)).to eq false
+          expect(CounterCache.send(:conditions_met?, @post1.bullet_key, :associations)).to eq false
         end
       end
     end

data/spec/bullet/detector/n_plus_one_query_spec.rb

@@ -18,69 +18,69 @@ module Bullet
       context ".possible?" do
         it "should be true if possible_objects contain" do
           NPlusOneQuery.add_possible_objects(@post)
-          expect(NPlusOneQuery.send(:possible?, @post.bullet_ar_key)).to eq true
+          expect(NPlusOneQuery.send(:possible?, @post.bullet_key)).to eq true
         end
       end
 
       context ".impossible?" do
         it "should be true if impossible_objects contain" do
           NPlusOneQuery.add_impossible_object(@post)
-          expect(NPlusOneQuery.send(:impossible?, @post.bullet_ar_key)).to eq true
+          expect(NPlusOneQuery.send(:impossible?, @post.bullet_key)).to eq true
         end
       end
 
       context ".association?" do
         it "should be true if object, associations pair is already existed" do
           NPlusOneQuery.add_object_associations(@post, :association)
-          expect(NPlusOneQuery.send(:association?, @post.bullet_ar_key, :association)).to eq true
+          expect(NPlusOneQuery.send(:association?, @post.bullet_key, :association)).to eq true
         end
 
         it "should be false if object, association pair is not existed" do
           NPlusOneQuery.add_object_associations(@post, :association1)
-          expect(NPlusOneQuery.send(:association?, @post.bullet_ar_key, :associatio2)).to eq false
+          expect(NPlusOneQuery.send(:association?, @post.bullet_key, :associatio2)).to eq false
         end
       end
 
       context ".conditions_met?" do
         it "should be true if object is possible, not impossible and object, associations pair is not already existed" do
-          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_ar_key).and_return(true)
-          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_ar_key).and_return(false)
-          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_ar_key, :associations).and_return(false)
-          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_ar_key, :associations)).to eq true
+          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_key).and_return(true)
+          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_key).and_return(false)
+          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_key, :associations).and_return(false)
+          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_key, :associations)).to eq true
         end
 
         it "should be false if object is not possible, not impossible and object, associations pair is not already existed" do
-          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_ar_key).and_return(false)
-          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_ar_key).and_return(false)
-          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_ar_key, :associations).and_return(false)
-          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_ar_key, :associations)).to eq false
+          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_key).and_return(false)
+          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_key).and_return(false)
+          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_key, :associations).and_return(false)
+          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_key, :associations)).to eq false
         end
 
         it "should be false if object is possible, but impossible and object, associations pair is not already existed" do
-          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_ar_key).and_return(true)
-          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_ar_key).and_return(true)
-          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_ar_key, :associations).and_return(false)
-          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_ar_key, :associations)).to eq false
+          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_key).and_return(true)
+          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_key).and_return(true)
+          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_key, :associations).and_return(false)
+          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_key, :associations)).to eq false
         end
 
         it "should be false if object is possible, not impossible and object, associations pair is already existed" do
-          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_ar_key).and_return(true)
-          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_ar_key).and_return(false)
-          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_ar_key, :associations).and_return(true)
-          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_ar_key, :associations)).to eq false
+          allow(NPlusOneQuery).to receive(:possible?).with(@post.bullet_key).and_return(true)
+          allow(NPlusOneQuery).to receive(:impossible?).with(@post.bullet_key).and_return(false)
+          allow(NPlusOneQuery).to receive(:association?).with(@post.bullet_key, :associations).and_return(true)
+          expect(NPlusOneQuery.send(:conditions_met?, @post.bullet_key, :associations)).to eq false
         end
       end
 
       context ".call_association" do
         it "should create notification if conditions met" do
-          expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_ar_key, :association).and_return(true)
+          expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_key, :association).and_return(true)
           expect(NPlusOneQuery).to receive(:caller_in_project).and_return(["caller"])
           expect(NPlusOneQuery).to receive(:create_notification).with(["caller"], "Post", :association)
           NPlusOneQuery.call_association(@post, :association)
         end
 
         it "should not create notification if conditions not met" do
-          expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_ar_key, :association).and_return(false)
+          expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_key, :association).and_return(false)
           expect(NPlusOneQuery).not_to receive(:caller_in_project!)
           expect(NPlusOneQuery).not_to receive(:create_notification).with("Post", :association)
           NPlusOneQuery.call_association(@post, :association)
@@ -93,7 +93,7 @@ module Bullet
           not_in_project = '/def/def.rb'
 
           expect(NPlusOneQuery).to receive(:caller).and_return([in_project, not_in_project])
-          expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_ar_key, :association).and_return(true)
+          expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_key, :association).and_return(true)
           expect(NPlusOneQuery).to receive(:create_notification).with([in_project], "Post", :association)
           NPlusOneQuery.call_association(@post, :association)
         end
@@ -108,7 +108,7 @@ module Bullet
             excluded_gem = '/ghi/ghi.rb'
 
             expect(NPlusOneQuery).to receive(:caller).and_return([in_project, included_gem, excluded_gem])
-            expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_ar_key, :association).and_return(true)
+            expect(NPlusOneQuery).to receive(:conditions_met?).with(@post.bullet_key, :association).and_return(true)
             expect(NPlusOneQuery).to receive(:create_notification).with([in_project, included_gem], "Post", :association)
             NPlusOneQuery.call_association(@post, :association)
           end
@@ -118,8 +118,8 @@ module Bullet
       context ".add_possible_objects" do
         it "should add possible objects" do
           NPlusOneQuery.add_possible_objects([@post, @post2])
-          expect(NPlusOneQuery.send(:possible_objects)).to be_include(@post.bullet_ar_key)
-          expect(NPlusOneQuery.send(:possible_objects)).to be_include(@post2.bullet_ar_key)
+          expect(NPlusOneQuery.send(:possible_objects)).to be_include(@post.bullet_key)
+          expect(NPlusOneQuery.send(:possible_objects)).to be_include(@post2.bullet_key)
         end
 
         it "should not raise error if object is nil" do
@@ -130,7 +130,7 @@ module Bullet
       context ".add_impossible_object" do
         it "should add impossible object" do
           NPlusOneQuery.add_impossible_object(@post)
-          expect(NPlusOneQuery.send(:impossible_objects)).to be_include(@post.bullet_ar_key)
+          expect(NPlusOneQuery.send(:impossible_objects)).to be_include(@post.bullet_key)
         end
       end
     end

data/spec/bullet/detector/unused_eager_loading_spec.rb

@@ -10,30 +10,30 @@ module Bullet
 
       context ".call_associations" do
         it "should get empty array if eager_loadings" do
-          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_ar_key, Set.new([:association]))).to be_empty
+          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new([:association]))).to be_empty
         end
 
         it "should get call associations if object and association are both in eager_loadings and call_object_associations" do
           UnusedEagerLoading.add_eager_loadings([@post], :association)
           UnusedEagerLoading.add_call_object_associations(@post, :association)
-          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_ar_key, Set.new([:association]))).to eq([:association])
+          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new([:association]))).to eq([:association])
         end
 
         it "should not get call associations if not exist in call_object_associations" do
           UnusedEagerLoading.add_eager_loadings([@post], :association)
-          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_ar_key, Set.new([:association]))).to be_empty
+          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new([:association]))).to be_empty
         end
       end
 
       context ".diff_object_associations" do
         it "should return associations not exist in call_association" do
-          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association]))).to eq([:association])
+          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new([:association]))).to eq([:association])
         end
 
         it "should return empty if associations exist in call_association" do
           UnusedEagerLoading.add_eager_loadings([@post], :association)
           UnusedEagerLoading.add_call_object_associations(@post, :association)
-          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association]))).to be_empty
+          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new([:association]))).to be_empty
         end
       end
 
@@ -48,7 +48,7 @@ module Bullet
           UnusedEagerLoading.add_object_associations(@post, :association)
           UnusedEagerLoading.add_eager_loadings([@post], :association)
           UnusedEagerLoading.add_call_object_associations(@post, :association)
-          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association]))).to be_empty
+          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new([:association]))).to be_empty
           expect(UnusedEagerLoading).not_to receive(:create_notification).with("Post", [:association])
           UnusedEagerLoading.check_unused_preload_associations
         end
@@ -57,30 +57,30 @@ module Bullet
       context ".add_eager_loadings" do
         it "should add objects, associations pair when eager_loadings are empty" do
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :associations)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :associations)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :associations)
         end
 
         it "should add objects, associations pair for existing eager_loadings" do
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :association1)
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :association2)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :association1)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :association1)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :association2)
         end
 
         it "should merge objects, associations pair for existing eager_loadings" do
           UnusedEagerLoading.add_eager_loadings([@post], :association1)
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :association2)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key], :association1)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key], :association2)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association1)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :association2)
         end
 
         it "should delete objects, associations pair for existing eager_loadings" do
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :association1)
           UnusedEagerLoading.add_eager_loadings([@post], :association2)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key], :association1)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_ar_key], :association2)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post2.bullet_ar_key], :association1)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association1)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post2.bullet_key], :association1)
         end
       end
     end

data/spec/bullet/ext/object_spec.rb

@@ -1,17 +1,31 @@
 require 'spec_helper'
 
 describe Object do
-  context "bullet_ar_key" do
+  context "bullet_key" do
     it "should return class and id composition" do
       post = Post.first
-      expect(post.bullet_ar_key).to eq("Post:#{post.id}")
+      expect(post.bullet_key).to eq("Post:#{post.id}")
     end
 
     if mongoid?
       it "should return class with namesapce and id composition" do
         post = Mongoid::Post.first
-        expect(post.bullet_ar_key).to eq("Mongoid::Post:#{post.id}")
+        expect(post.bullet_key).to eq("Mongoid::Post:#{post.id}")
       end
     end
   end
+
+  context "primary_key_value" do
+    it "should return id" do
+      post = Post.first
+      expect(post.primary_key_value).to eq(post.id)
+    end
+
+    it "should return primary key value" do
+      post = Post.first
+      Post.primary_key = 'name'
+      expect(post.primary_key_value).to eq(post.name)
+      Post.primary_key = 'id'
+    end
+  end
 end