Merge branch 'release/v5.2.1' into master

CHANGELOG.markdown

@@ -2,6 +2,14 @@
 
 All notable changes to this project (at least, from v3.0.0 onwards) are documented in this file.
 
+## 5.2.1 - 2021-08-09
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.2.1)
+
+### Fixed
+
+* Ensure ActiveRecord components are loaded for rake tasks, but only after the Rails application has initialised. More details in [#1199](https://github.com/pat/thinking-sphinx/issues/1199).
+
 ## 5.2.0 - 2021-06-12
 
 [Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.2.0)

README.textile

@@ -1,6 +1,6 @@
 h1. Thinking Sphinx
 
-Thinking Sphinx is a library for connecting ActiveRecord to the Sphinx full-text search tool, and integrates closely with Rails (but also works with other Ruby web frameworks). The current release is v5.2.0.
+Thinking Sphinx is a library for connecting ActiveRecord to the Sphinx full-text search tool, and integrates closely with Rails (but also works with other Ruby web frameworks). The current release is v5.2.1.
 
 h2. Upgrading
 

lib/thinking_sphinx/railtie.rb

@@ -5,12 +5,12 @@ class ThinkingSphinx::Railtie < Rails::Railtie
     ThinkingSphinx::Configuration.reset
   end
 
-  initializer 'thinking_sphinx.initialisation' do
-    ActiveSupport.on_load(:active_record) do
-      require 'thinking_sphinx/active_record'
-      ActiveRecord::Base.include ThinkingSphinx::ActiveRecord::Base
-    end
+  config.after_initialize do
+    require 'thinking_sphinx/active_record'
+    ActiveRecord::Base.include ThinkingSphinx::ActiveRecord::Base
+  end
 
+  initializer 'thinking_sphinx.initialisation' do
     if ActiveSupport::VERSION::MAJOR > 5
       if Rails.application.config.autoloader == :zeitwerk
         ActiveSupport::Dependencies.autoload_paths.delete(

thinking-sphinx.gemspec

@@ -5,7 +5,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '5.2.0'
+  s.version     = '5.2.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["[email protected]"]