lib/bullet.rb in bullet-4.1.0 vs lib/bullet.rb in bullet-4.1.1

@@ -1,27 +1,20 @@
 require 'set'
 require 'uniform_notifier'
 require 'bullet/ext/object'
 require 'bullet/ext/string'
+require 'bullet/dependency'
 
 module Bullet
-  if Rails.version =~ /\A3\.0/
-    autoload :ActiveRecord, 'bullet/active_record3'
-  elsif Rails.version =~ /\A3\.[12]/
-    autoload :ActiveRecord, 'bullet/active_record31'
-  else
-    autoload :ActiveRecord, 'bullet/active_record2'
-    autoload :ActionController, 'bullet/action_controller2'
+  extend Dependency
+
+  if active_record?
+    autoload :ActiveRecord, "bullet/#{active_record_version}"
+    autoload :ActionController, 'bullet/action_controller2' if active_record2?
   end
-  begin
-    require 'mongoid'
-    if Mongoid::VERSION =~ /\A2\.4/
-      autoload :Mongoid, 'bullet/mongoid24'
-    elsif Mongoid::VERSION =~ /\A3/
-      autoload :Mongoid, 'bullet/mongoid3'
-    end
-  rescue LoadError
+  if mongoid?
+    autoload :Mongoid, "bullet/#{mongoid_version}"
   end
   autoload :Rack, 'bullet/rack'
   autoload :BulletLogger, 'bullet/logger'
   autoload :Notification, 'bullet/notification'
   autoload :Detector, 'bullet/detector'
@@ -47,21 +40,15 @@
                   Bullet::Detector::Counter ]
 
     def enable=(enable)
       @enable = enable
       if enable?
-        begin
-          require 'mongoid'
+        if mongoid?
           Bullet::Mongoid.enable
-        rescue LoadError
         end
-        begin
-          require 'active_record'
+        if active_record?
           Bullet::ActiveRecord.enable
-          if Rails.version =~ /\A2./
-            Bullet::ActionController.enable
-          end
-        rescue LoadError
+          Bullet::ActionController.enable if active_record2?
         end
       end
     end
 
     def enable?