lib/slugs/railtie.rb in slugs-4.0.0.2 vs lib/slugs/railtie.rb in slugs-4.0.0.3

@@ -1,23 +1,28 @@
 module Slugs
   class Railtie < Rails::Railtie
 
-    initializer 'slugs.extensions' do
+    initializer 'slugs.action_dispatch' do
       ::ActionDispatch::Routing::RouteSet::Generator.prepend(
         Slugs::Extensions::ActionDispatch::Generator
       )
       ::ActionDispatch::Routing::RouteSet::NamedRouteCollection::UrlHelper::OptimizedUrlHelper.prepend(
         Slugs::Extensions::ActionDispatch::OptimizedUrlHelper
       )
-      ::ActiveRecord::Base.include(
-        Slugs::Extensions::ActiveRecord::Base
-      )
-      ::ActiveRecord::Base.extend(
-        Slugs::Extensions::ActiveRecord::Finders
-      )
-      ::ActiveRecord::Relation.include(
-        Slugs::Extensions::ActiveRecord::Finders
-      )
+    end
+
+    initializer 'slugs.active_record' do
+      ActiveSupport.on_load :active_record do
+        ::ActiveRecord::Base.include(
+          Slugs::Extensions::ActiveRecord::Base
+        )
+        ::ActiveRecord::Base.extend(
+          Slugs::Extensions::ActiveRecord::Finders
+        )
+        ::ActiveRecord::Relation.include(
+          Slugs::Extensions::ActiveRecord::Finders
+        )
+      end
     end
 
     rake_tasks do
       load 'tasks/slugs.rake'
     end