Merge branch 'release/v4.3.2'

pat · Jul 10, 2019 · 2083f03 · 2083f03
2 parents 3bd06ec + def0042
commit 2083f03
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.markdown b/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.3.2 - 2019-07-10
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v4.3.2)
+
+### Fixed
+
+* Reverted loading change behaviour from v4.3.1 for Rails v5 ([Eduardo J.](https://github.com/eduardoj) in [#1138](https://github.com/pat/thinking-sphinx/pull/1138)).
+
 ## 4.3.1 - 2019-06-27
 
 [Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v4.3.1)

diff --git a/README.textile b/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.3.1.
+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.3.2.
 
 h2. Upgrading
 

diff --git a/lib/thinking_sphinx/configuration.rb b/lib/thinking_sphinx/configuration.rb
@@ -98,7 +98,7 @@ def preload_indices
   end
 
   def preload_index(file)
-    if ActiveRecord::VERSION::MAJOR < 5
+    if ActiveRecord::VERSION::MAJOR <= 5
       ActiveSupport::Dependencies.require_or_load file
     else
       load file

diff --git a/spec/thinking_sphinx/configuration_spec.rb b/spec/thinking_sphinx/configuration_spec.rb
@@ -4,7 +4,7 @@
 
 describe ThinkingSphinx::Configuration do
   let(:config) { ThinkingSphinx::Configuration.instance }
-  let(:use_load?) { ActiveRecord::VERSION::MAJOR >= 5 }
+  let(:use_load?) { ActiveRecord::VERSION::MAJOR > 5 }
   let(:loading_object) { use_load? ? config : ActiveSupport::Dependencies }
   let(:loading_method) { use_load? ? :load : :require_or_load }
 

diff --git a/thinking-sphinx.gemspec b/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.3.1'
+  s.version     = '4.3.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["[email protected]"]