bullet 5.7.0 → 5.7.1

data/lib/bullet/detector/association.rb

@@ -43,31 +43,31 @@ module Bullet
           # e.g. { "Post:1" => [:comments] }
           # the object_associations keep all associations that may be or may no be
           # unpreload associations or unused preload associations.
-          def object_associations
-            Thread.current[:bullet_object_associations]
-          end
+        def object_associations
+          Thread.current[:bullet_object_associations]
+        end
 
           # call_object_associations keep the object relationships
           # that object.associations is called.
           # e.g. { "Post:1" => [:comments] }
           # they are used to detect unused preload associations.
-          def call_object_associations
-            Thread.current[:bullet_call_object_associations]
-          end
+        def call_object_associations
+          Thread.current[:bullet_call_object_associations]
+        end
 
           # inversed_objects keeps object relationships
           # that association is inversed.
           # e.g. { "Comment:1" => ["post"] }
-          def inversed_objects
-            Thread.current[:bullet_inversed_objects]
-          end
+        def inversed_objects
+          Thread.current[:bullet_inversed_objects]
+        end
 
           # eager_loadings keep the object relationships
           # that the associations are preloaded by find :include.
           # e.g. { ["Post:1", "Post:2"] => [:comments, :user] }
-          def eager_loadings
-            Thread.current[:bullet_eager_loadings]
-          end
+        def eager_loadings
+          Thread.current[:bullet_eager_loadings]
+        end
       end
     end
   end

data/lib/bullet/detector/counter_cache.rb

@@ -32,7 +32,7 @@ module Bullet
           impossible_objects.add object.bullet_key
         end
 
-        def conditions_met?(object, associations)
+        def conditions_met?(object, _associations)
           possible_objects.include?(object.bullet_key) && !impossible_objects.include?(object.bullet_key)
         end
 
@@ -46,14 +46,14 @@ module Bullet
 
         private
 
-          def create_notification(klazz, associations)
-            notify_associations = Array(associations) - Bullet.get_whitelist_associations(:counter_cache, klazz)
+        def create_notification(klazz, associations)
+          notify_associations = Array(associations) - Bullet.get_whitelist_associations(:counter_cache, klazz)
 
-            if notify_associations.present?
-              notice = Bullet::Notification::CounterCache.new klazz, notify_associations
-              Bullet.notification_collector.add notice
-            end
+          if notify_associations.present?
+            notice = Bullet::Notification::CounterCache.new klazz, notify_associations
+            Bullet.notification_collector.add notice
           end
+        end
       end
     end
   end

data/lib/bullet/detector/n_plus_one_query.rb

@@ -82,14 +82,14 @@ module Bullet
 
         private
 
-          def create_notification(callers, klazz, associations)
-            notify_associations = Array(associations) - Bullet.get_whitelist_associations(:n_plus_one_query, klazz)
+        def create_notification(callers, klazz, associations)
+          notify_associations = Array(associations) - Bullet.get_whitelist_associations(:n_plus_one_query, klazz)
 
-            if notify_associations.present?
-              notice = Bullet::Notification::NPlusOneQuery.new(callers, klazz, notify_associations)
-              Bullet.notification_collector.add(notice)
-            end
+          if notify_associations.present?
+            notice = Bullet::Notification::NPlusOneQuery.new(callers, klazz, notify_associations)
+            Bullet.notification_collector.add(notice)
           end
+        end
       end
     end
   end

data/lib/bullet/detector/unused_eager_loading.rb

@@ -30,13 +30,15 @@ module Bullet
           Bullet.debug('Detector::UnusedEagerLoading#add_eager_loadings', "objects: #{objects.map(&:bullet_key).join(', ')}, associations: #{associations}")
           bullet_keys = objects.map(&:bullet_key)
 
-          to_add, to_merge, to_delete = [], [], []
-          eager_loadings.each do |k, v|
+          to_add = []
+          to_merge = []
+          to_delete = []
+          eager_loadings.each do |k, _v|
             key_objects_overlap = k & bullet_keys
 
             next if key_objects_overlap.empty?
 
-            bullet_keys = bullet_keys - k
+            bullet_keys -= k
             if key_objects_overlap == k
               to_add << [k, associations]
             else
@@ -57,29 +59,29 @@ module Bullet
 
         private
 
-          def create_notification(callers, klazz, associations)
-            notify_associations = Array(associations) - Bullet.get_whitelist_associations(:unused_eager_loading, klazz)
+        def create_notification(callers, klazz, associations)
+          notify_associations = Array(associations) - Bullet.get_whitelist_associations(:unused_eager_loading, klazz)
 
-            if notify_associations.present?
-              notice = Bullet::Notification::UnusedEagerLoading.new(callers, klazz, notify_associations)
-              Bullet.notification_collector.add(notice)
-            end
+          if notify_associations.present?
+            notice = Bullet::Notification::UnusedEagerLoading.new(callers, klazz, notify_associations)
+            Bullet.notification_collector.add(notice)
           end
+        end
 
-          def call_associations(bullet_key, associations)
-            all = Set.new
-            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
+        def call_associations(bullet_key, associations)
+          all = Set.new
+          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_key, associations)
-            potential_associations = associations - call_associations(bullet_key, associations)
-            potential_associations.reject { |a| a.is_a?(Hash) }
-          end
+        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
     end
   end

data/lib/bullet/ext/object.rb

@@ -1,15 +1,15 @@
 class Object
   def bullet_key
-    "#{self.class}:#{self.primary_key_value}"
+    "#{self.class}:#{primary_key_value}"
   end
 
   def primary_key_value
     if self.class.respond_to?(:primary_keys) && self.class.primary_keys
-      self.class.primary_keys.map { |primary_key| self.send primary_key }.join(','.freeze)
+      self.class.primary_keys.map { |primary_key| send primary_key }.join(','.freeze)
     elsif self.class.respond_to?(:primary_key) && self.class.primary_key
-      self.send self.class.primary_key
+      send self.class.primary_key
     else
-      self.id
+      id
     end
   end
 end

data/lib/bullet/ext/string.rb

@@ -1,5 +1,5 @@
 class String
   def bullet_class_name
-    self.sub(/:[^:]*?$/, ''.freeze)
+    sub(/:[^:]*?$/, ''.freeze)
   end
 end

data/lib/bullet/notification/base.rb

@@ -11,11 +11,11 @@ module Bullet
       end
 
       def title
-        raise NoMethodError.new('no method title defined')
+        raise NoMethodError, 'no method title defined'
       end
 
       def body
-        raise NoMethodError.new('no method body defined')
+        raise NoMethodError, 'no method body defined'
       end
 
       def call_stack_messages
@@ -36,11 +36,11 @@ module Bullet
       end
 
       def notify_inline
-        self.notifier.inline_notify(notification_data)
+        notifier.inline_notify(notification_data)
       end
 
       def notify_out_of_channel
-        self.notifier.out_of_channel_notify(notification_data)
+        notifier.out_of_channel_notify(notification_data)
       end
 
       def short_notice
@@ -49,10 +49,10 @@ module Bullet
 
       def notification_data
         {
-          :user => whoami,
-          :url => url,
-          :title => title,
-          :body => body_with_caller,
+          user: whoami,
+          url: url,
+          title: title,
+          body: body_with_caller
         }
       end
 
@@ -66,13 +66,13 @@ module Bullet
 
       protected
 
-        def klazz_associations_str
-          "  #{@base_class} => [#{@associations.map(&:inspect).join(', '.freeze)}]"
-        end
+      def klazz_associations_str
+        "  #{@base_class} => [#{@associations.map(&:inspect).join(', '.freeze)}]"
+      end
 
-        def associations_str
-          ":includes => #{@associations.map { |a| a.to_s.to_sym unless a.is_a? Hash }.inspect}"
-        end
+      def associations_str
+        ":includes => #{@associations.map { |a| a.to_s.to_sym unless a.is_a? Hash }.inspect}"
+      end
     end
   end
 end

data/lib/bullet/notification/n_plus_one_query.rb

@@ -17,15 +17,15 @@ module Bullet
 
       def notification_data
         super.merge(
-          :backtrace => []
+          backtrace: []
         )
       end
 
       protected
 
-        def call_stack_messages
-          (['Call stack'] + @callers).join("\n  ")
-        end
+      def call_stack_messages
+        (['Call stack'] + @callers).join("\n  ")
+      end
     end
   end
 end

data/lib/bullet/notification/unused_eager_loading.rb

@@ -17,15 +17,15 @@ module Bullet
 
       def notification_data
         super.merge(
-            :backtrace => []
+            backtrace: []
         )
       end
 
       protected
 
-        def call_stack_messages
-          (['Call stack'] + @callers).join("\n  ")
-        end
+      def call_stack_messages
+        (['Call stack'] + @callers).join("\n  ")
+      end
     end
   end
 end

data/lib/bullet/notification_collector.rb

@@ -21,4 +21,3 @@ module Bullet
     end
   end
 end
-

data/lib/bullet/version.rb

@@ -1,4 +1,3 @@
-
 module Bullet
-  VERSION = '5.7.0'.freeze
+  VERSION = '5.7.1'.freeze
 end

data/perf/benchmark.rb

@@ -1,4 +1,4 @@
-$: << 'lib'
+$LOAD_PATH << 'lib'
 require 'benchmark'
 require 'rails'
 require 'active_record'
@@ -27,13 +27,13 @@ class User < ActiveRecord::Base
 end
 
 # create database bullet_benchmark;
-ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'bullet_benchmark', :server => '/tmp/mysql.socket', :username => 'root')
+ActiveRecord::Base.establish_connection(adapter: 'mysql2', database: 'bullet_benchmark', server: '/tmp/mysql.socket', username: 'root')
 
 ActiveRecord::Base.connection.tables.each do |table|
   ActiveRecord::Base.connection.drop_table(table)
 end
 
-ActiveRecord::Schema.define(:version => 1) do
+ActiveRecord::Schema.define(version: 1) do
   create_table :posts do |t|
     t.column :title, :string
     t.column :body, :string
@@ -56,21 +56,21 @@ posts_size = 1000
 comments_size = 10_000
 users = []
 users_size.times do |i|
-  users << User.new(:name => "user#{i}")
+  users << User.new(name: "user#{i}")
 end
 User.import users
 users = User.all
 
 posts = []
 posts_size.times do |i|
-  posts << Post.new(:title => "Title #{i}", :body => "Body #{i}", :user => users[i % 100])
+  posts << Post.new(title: "Title #{i}", body: "Body #{i}", user: users[i % 100])
 end
 Post.import posts
 posts = Post.all
 
 comments = []
 comments_size.times do |i|
-  comments << Comment.new(:body => "Comment #{i}", :post => posts[i % 1000], :user => users[i % 100])
+  comments << Comment.new(body: "Comment #{i}", post: posts[i % 1000], user: users[i % 100])
 end
 Comment.import comments
 
@@ -82,7 +82,7 @@ Benchmark.bm(70) do |bm|
   bm.report("Querying & Iterating #{posts_size} Posts with #{comments_size} Comments and #{users_size} Users") do
     10.times do
       Bullet.start_request
-      Post.select('SQL_NO_CACHE *').includes(:user, :comments => :user).each do |p|
+      Post.select('SQL_NO_CACHE *').includes(:user, comments: :user).each do |p|
         p.title
         p.user.name
         p.comments.each do |c|

data/spec/bullet/detector/n_plus_one_query_spec.rb

@@ -91,9 +91,9 @@ module Bullet
           after { Bullet.stacktrace_excludes = nil }
 
           it 'should not create notification when stacktrace contains paths that are in the exclude list' do
-            in_project = OpenStruct.new(:absolute_path => File.join(Dir.pwd, 'abc', 'abc.rb'))
-            included_path = OpenStruct.new(:absolute_path => '/ghi/ghi.rb')
-            excluded_path = OpenStruct.new(:absolute_path => '/def/def.rb')
+            in_project = OpenStruct.new(absolute_path: File.join(Dir.pwd, 'abc', 'abc.rb'))
+            included_path = OpenStruct.new(absolute_path: '/ghi/ghi.rb')
+            excluded_path = OpenStruct.new(absolute_path: '/def/def.rb')
 
             expect(NPlusOneQuery).to receive(:caller_locations).and_return([in_project, included_path, excluded_path])
             expect(NPlusOneQuery).to_not receive(:create_notification)
@@ -104,8 +104,8 @@ module Bullet
 
       context '.caller_in_project' do
         it 'should include only paths that are in the project' do
-          in_project = OpenStruct.new(:absolute_path => File.join(Dir.pwd, 'abc', 'abc.rb'))
-          not_in_project = OpenStruct.new(:absolute_path => '/def/def.rb')
+          in_project = OpenStruct.new(absolute_path: File.join(Dir.pwd, 'abc', 'abc.rb'))
+          not_in_project = OpenStruct.new(absolute_path: '/def/def.rb')
 
           expect(NPlusOneQuery).to receive(:caller_locations).and_return([in_project, not_in_project])
           expect(NPlusOneQuery).to receive(:conditions_met?).with(@post, :association).and_return(true)
@@ -118,9 +118,9 @@ module Bullet
           after { Bullet.stacktrace_includes = nil }
 
           it 'should include paths that are in the stacktrace_include list' do
-            in_project = OpenStruct.new(:absolute_path => File.join(Dir.pwd, 'abc', 'abc.rb'))
-            included_gems = [OpenStruct.new(:absolute_path => '/def/def.rb'), OpenStruct.new(:absolute_path => 'xyz/xyz.rb')]
-            excluded_gem = OpenStruct.new(:absolute_path => '/ghi/ghi.rb')
+            in_project = OpenStruct.new(absolute_path: File.join(Dir.pwd, 'abc', 'abc.rb'))
+            included_gems = [OpenStruct.new(absolute_path: '/def/def.rb'), OpenStruct.new(absolute_path: 'xyz/xyz.rb')]
+            excluded_gem = OpenStruct.new(absolute_path: '/ghi/ghi.rb')
 
             expect(NPlusOneQuery).to receive(:caller_locations).and_return([in_project, *included_gems, excluded_gem])
             expect(NPlusOneQuery).to receive(:conditions_met?).with(@post, :association).and_return(true)

data/spec/bullet/ext/object_spec.rb

@@ -30,7 +30,7 @@ describe Object do
 
     it 'should return value for multiple primary keys' do
       post = Post.first
-      allow(Post).to receive(:primary_keys).and_return([:category_id, :writer_id])
+      allow(Post).to receive(:primary_keys).and_return(%i[category_id writer_id])
       expect(post.primary_key_value).to eq("#{post.category_id},#{post.writer_id}")
     end
   end

data/spec/bullet/notification/base_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Bullet
   module Notification
     describe Base do
-      subject { Base.new(Post, [:comments, :votes]) }
+      subject { Base.new(Post, %i[comments votes]) }
 
       context '#title' do
         it 'should raise NoMethodError' do
@@ -66,7 +66,7 @@ module Bullet
           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.notification_data).to eq(:user => 'whoami', :url => 'url', :title => 'title', :body => 'body_with_caller')
+          expect(subject.notification_data).to eq(user: 'whoami', url: 'url', title: 'title', body: 'body_with_caller')
         end
       end
 
@@ -74,8 +74,8 @@ module Bullet
         it 'should send full_notice to notifier' do
           notifier = double
           allow(subject).to receive(:notifier).and_return(notifier)
-          allow(subject).to receive(:notification_data).and_return(:foo => :bar)
-          expect(notifier).to receive(:inline_notify).with(:foo => :bar)
+          allow(subject).to receive(:notification_data).and_return(foo: :bar)
+          expect(notifier).to receive(:inline_notify).with(foo: :bar)
           subject.notify_inline
         end
       end
@@ -84,8 +84,8 @@ module Bullet
         it 'should send full_out_of_channel to notifier' do
           notifier = double
           allow(subject).to receive(:notifier).and_return(notifier)
-          allow(subject).to receive(:notification_data).and_return(:foo => :bar)
-          expect(notifier).to receive(:out_of_channel_notify).with(:foo => :bar)
+          allow(subject).to receive(:notification_data).and_return(foo: :bar)
+          expect(notifier).to receive(:out_of_channel_notify).with(foo: :bar)
           subject.notify_out_of_channel
         end
       end