flying-sphinx 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727f92b2356f83883fab5b51f106d39c43b8e89c57811a33fb5ea8541f21c09b
-  data.tar.gz: 81451cc912cf38baad334a63f5e996bcb561da3bc94a6422da19c3b074f02ca0
+  metadata.gz: becb4d73c43a31cfec2fd25215d08bf1739a3e65992abb8dfdc986f23858ef7d
+  data.tar.gz: 7bc358f2990194925946c2c28ad7cbd49b88dc46d16d0485ebadcb82a794f830
 SHA512:
-  metadata.gz: 2add3250b48d68914f9bdaddbcb0f502f3b1f6a503a7ada15989df33788fde8e8eeecdef9d16bc9acdb4ae501cb8b5df4118ed45121d913bc4733d60678fff4b
-  data.tar.gz: 315fec177d81494362eecfcb4bb368fc9ab6ae096b9027fdb1f26b75528b8300bfe6b1c74bfeb844f6cc8184310fa69a62aa17ca56dbf515f6cbc007728c6daf
+  metadata.gz: 2962c39d42f25d92382887b0400027b16536e33ca8ce24cbbf739fcc61429ff4e34367dcb4a674d0459f5b4c44e0374de582fcf4aa904357040f734a4627ba82
+  data.tar.gz: fc33d8ecd8144d30e2fdccfcee9304bdb0723f701eb40130d0366762c58d06bb64127b4d37d35a4ef556f98a0ead0a7fa36c5a74aad58781eee2d31dd15c980e

data/CHANGELOG.markdown

@@ -2,6 +2,12 @@
 
 All notable changes to this project (at least, from v0.4.0 onwards) are documented in this file.
 
+## 2.1.4 - 2019-03-10
+
+### Fixed
+
+* Fixed the overriding of Flying Sphinx connection details by Thinking Sphinx's new prepare hook (added in Thinking Sphinx v4.2.0).
+
 ## 2.1.3 - 2018-12-12
 
 ### Fixed

data/README.textile

@@ -39,4 +39,4 @@ h2. Contributors
 
 h2. Licence
 
-Copyright © 2011-2018 Pat Allan, released under an MIT licence.
+Copyright © 2011-2019 Pat Allan, released under an MIT licence.

data/lib/flying_sphinx/railtie.rb

@@ -1,13 +1,29 @@
 class FlyingSphinx::Railtie < Rails::Railtie
   rake_tasks do
+    next unless FlyingSphinx::Railtie.remote_sphinx?
+
     require 'flying_sphinx/commands'
 
     ThinkingSphinx.rake_interface = FlyingSphinx::RakeInterface
 
     load File.expand_path('../tasks.rb', __FILE__)
-  end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
+  end
 
   initializer "flying_sphinx.set_sphinx_host_and_port" do |app|
+    FlyingSphinx::Railtie.set_up_remote_connection
+  end
+
+  config.to_prepare do
+    FlyingSphinx::Railtie.set_up_remote_connection
+  end
+
+  def self.remote_sphinx?
+    ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
+  end
+
+  def self.set_up_remote_connection
+    return unless remote_sphinx?
+
     configuration = FlyingSphinx::Configuration.new
 
     ThinkingSphinx::Configuration.instance.settings['connection_options'] = {
@@ -15,5 +31,5 @@ class FlyingSphinx::Railtie < Rails::Railtie
       :port     => 9306,
       :username => configuration.username
     }
-  end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
+  end
 end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '2.1.3'
+  Version = '2.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flying-sphinx
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ey-hmac
@@ -305,8 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sphinx in the Cloud