Initialize against ActiveRecord even without Rails

This fixes build errors under Rails 4.0 and 4.1. We always want to perform this callback, even if ActiveRecord is being used standalone without the rest of Rails.
norman · Apr 23, 2018 · 26b4343 · 26b4343
1 parent 7cf27d5
commit 26b4343
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/lib/friendly_id.rb b/lib/friendly_id.rb
@@ -4,7 +4,6 @@
 require "friendly_id/object_utils"
 require "friendly_id/configuration"
 require "friendly_id/finder_methods"
-require 'friendly_id/railtie' if defined?(Rails)
 
 =begin
 

diff --git a/lib/friendly_id/object_utils.rb b/lib/friendly_id/object_utils.rb
@@ -70,3 +70,7 @@ def self.mark_as_unfriendly(klass)
 # one of its descendants.
 
 FriendlyId::UNFRIENDLY_CLASSES.each { |klass| FriendlyId.mark_as_unfriendly(klass) }
+
+ActiveSupport.on_load(:active_record) do
+  FriendlyId.mark_as_unfriendly(ActiveRecord::Base)
+end
diff --git a/lib/friendly_id/railtie.rb b/lib/friendly_id/railtie.rb