Merge pull request #709 from amatsuda/refine

Make core extensions cleaner with refinements

lib/bullet/detector/association.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using Bullet::Ext::Object
+
 module Bullet
   module Detector
     class Association < Base

lib/bullet/detector/counter_cache.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using Bullet::Ext::Object
+
 module Bullet
   module Detector
     class CounterCache < Base

lib/bullet/detector/n_plus_one_query.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using Bullet::Ext::Object
+
 module Bullet
   module Detector
     class NPlusOneQuery < Association

lib/bullet/detector/unused_eager_loading.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+using Bullet::Ext::Object
+using Bullet::Ext::String
+
 module Bullet
   module Detector
     class UnusedEagerLoading < Association

lib/bullet/ext/object.rb

@@ -1,30 +1,36 @@
 # frozen_string_literal: true
 
-class Object
-  def bullet_key
-    "#{self.class}:#{bullet_primary_key_value}"
-  end
+module Bullet
+  module Ext
+    module Object
+      refine ::Object do
+        def bullet_key
+          "#{self.class}:#{bullet_primary_key_value}"
+        end
 
-  def bullet_primary_key_value
-    return if respond_to?(:persisted?) && !persisted?
+        def bullet_primary_key_value
+          return if respond_to?(:persisted?) && !persisted?
 
-    if self.class.respond_to?(:primary_keys) && self.class.primary_keys
-      primary_key = self.class.primary_keys
-    elsif self.class.respond_to?(:primary_key) && self.class.primary_key
-      primary_key = self.class.primary_key
-    else
-      primary_key = :id
-    end
+          if self.class.respond_to?(:primary_keys) && self.class.primary_keys
+            primary_key = self.class.primary_keys
+          elsif self.class.respond_to?(:primary_key) && self.class.primary_key
+            primary_key = self.class.primary_key
+          else
+            primary_key = :id
+          end
 
-    bullet_join_potential_composite_primary_key(primary_key)
-  end
+          bullet_join_potential_composite_primary_key(primary_key)
+        end
 
-  private
+        private
 
-  def bullet_join_potential_composite_primary_key(primary_keys)
-    return send(primary_keys) unless primary_keys.is_a?(Enumerable)
+        def bullet_join_potential_composite_primary_key(primary_keys)
+          return send(primary_keys) unless primary_keys.is_a?(Enumerable)
 
-    primary_keys.map { |primary_key| send primary_key }
-                .join(',')
+          primary_keys.map { |primary_key| send primary_key }
+                      .join(',')
+        end
+      end
+    end
   end
 end

lib/bullet/ext/string.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
-class String
-  def bullet_class_name
-    sub(/:[^:]*?$/, '')
+module Bullet
+  module Ext
+    module String
+      refine ::String do
+        def bullet_class_name
+          sub(/:[^:]*?$/, '')
+        end
+      end
+    end
   end
 end

lib/bullet/registry/object.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+using Bullet::Ext::Object
+using Bullet::Ext::String
+
 module Bullet
   module Registry
     class Object < Base

lib/bullet/stack_trace_filter.rb

@@ -2,6 +2,8 @@
 
 require "bundler"
 
+using Bullet::Ext::Object
+
 module Bullet
   module StackTraceFilter
     VENDOR_PATH = '/vendor'

spec/bullet/detector/association_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+using Bullet::Ext::Object
+
 module Bullet
   module Detector
     describe Association do

spec/bullet/detector/counter_cache_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+using Bullet::Ext::Object
+
 module Bullet
   module Detector
     describe CounterCache do

spec/bullet/detector/n_plus_one_query_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+using Bullet::Ext::Object
+
 module Bullet
   module Detector
     describe NPlusOneQuery do

spec/bullet/detector/unused_eager_loading_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+using Bullet::Ext::Object
+
 module Bullet
   module Detector
     describe UnusedEagerLoading do

spec/bullet/ext/object_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+using Bullet::Ext::Object
+
 describe Object do
   context 'bullet_key' do
     it 'should return class and id composition' do

spec/bullet/ext/string_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+using Bullet::Ext::String
+
 describe String do
   context 'bullet_class_name' do
     it 'should only return class name' do

spec/bullet/registry/object_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+using Bullet::Ext::Object
+
 module Bullet
   module Registry
     describe Object do

spec/support/bullet_ext.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using Bullet::Ext::Object
+
 module Bullet
   def self.collected_notifications_of_class(notification_class)
     Bullet.notification_collector.collection.select { |notification| notification.is_a? notification_class }