Merge branch 'release/v4.4.1'

CHANGELOG.markdown

@@ -2,6 +2,14 @@
 
 All notable changes to this project (at least, from v3.0.0 onwards) are documented in this file.
 
+## 4.4.1 - 2019-08-23
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v4.4.1)
+
+### Changed
+
+* Automatically remove `app/indices` from Zeitwerk's autoload paths in Rails 6.0 onwards (if using Zeitwerk as the autoloader).
+
 ## 4.4.0 - 2019-08-21
 
 [Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v4.4.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 v4.4.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 v4.4.1.
 
 h2. Upgrading
 
@@ -14,7 +14,7 @@ It's a gem, so install it like you would any other gem. You will also need to sp
 
 <pre><code>gem 'mysql2',          '~> 0.3',    :platform => :ruby
 gem 'jdbc-mysql',      '~> 5.1.35', :platform => :jruby
-gem 'thinking-sphinx', '~> 4.3'</code></pre>
+gem 'thinking-sphinx', '~> 4.4'</code></pre>
 
 The MySQL gems mentioned are required for connecting to Sphinx, so please include it even when you're using PostgreSQL for your database. If you're using JRuby with a version of Sphinx prior to 2.2.11, there is "currently an issue with Sphinx and jdbc-mysql 5.1.36 or newer":http://sphinxsearch.com/forum/view.html?id=13939, so you'll need to stick to nothing more recent than 5.1.35, or upgrade Sphinx.
 

lib/thinking_sphinx/railtie.rb

@@ -9,6 +9,14 @@ class ThinkingSphinx::Railtie < Rails::Railtie
     ActiveSupport.on_load(:active_record) do
       ActiveRecord::Base.send :include, ThinkingSphinx::ActiveRecord::Base
     end
+
+    if ActiveSupport::VERSION::MAJOR > 5
+      if Rails.application.config.autoloader == :zeitwerk
+        ActiveSupport::Dependencies.autoload_paths.delete(
+          Rails.root.join("app", "indices").to_s
+        )
+      end
+    end
   end
 
   rake_tasks do

thinking-sphinx.gemspec

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