flying-sphinx 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2807e3e46524597089c220cf1a840b519296605e8e1f62cb50d91da81f825b1b
-  data.tar.gz: 4d7a2630b95e2ff52e3e036f3a0aaaf08a40a7ba80af077159301ed85c142a02
+  metadata.gz: 3ede5850df89be920156e46226c4c1f3c9111f08f2f41c0eb140ede9c5ed55f9
+  data.tar.gz: 071a398ef29ba09d5fcedd14a24eb722ea7332c113f02d762c57d521bae2c9d5
 SHA512:
-  metadata.gz: 9e9b63714c37e6a6b978a12564e97f9c56d91a97b290c4e436a75faebe23c0498cb302b29d749a88109f1c6e13dd66056c6e42054f38d129fe1623cf994f7b85
-  data.tar.gz: 71fac7eeea72fb1a46406a62e8d8d756d78ac9edb70975de009b669d5f2ac4a28516caf7058dfbae7d9c5f558fd58ca61359c086ecb607b273c8bebb7d5596c8
+  metadata.gz: dc841aa0121d1e48d1d40dc7e8eb42248754145011be8e41e15832fa694e7d2cb3078f4004f63a9011c33421ffa3e2869bf414dba49eaffe2301f894ea914cc0
+  data.tar.gz: 205df50f8e2df62f38a719c70bb17034b6b4c3af589e73b28feef69f5294d9bf67fdf3b9466b75f45676b697ce09616fd4b1be9d39f7a733596d0b194fb48600

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.2 - 2018-06-09
+
+### Fixed
+
+* Does not override Thinking Sphinx rake tasks when in a non-Flying Sphinx environment (as determined by the presence of the FLYING_SPHINX_IDENTIFIER environment variable). This fixed behaviour is the same as pre-v2.0 releases.
+
 ## 2.1.1 - 2018-04-30
 
 ### Fixed

data/README.textile

@@ -9,7 +9,7 @@ This is all covered pretty well on "the Flying Sphinx site":http://flying-sphinx
 <pre><code>gem 'flying-sphinx',
   :git    => 'git://github.com/flying-sphinx/flying-sphinx.git',
   :branch => 'master',
-  :ref    => '95acb39052'</code></pre>
+  :ref    => 'e8a4aa6b1d'</code></pre>
 
 h2. Compatibility and Limitations
 
@@ -35,6 +35,8 @@ h2. Contributors
 
 * "Josh Kalderimis":http://blog.cookiestack.com/ for switching the API calls to Faraday, improving the specs, a ton of debugging, and encouraging a versioned API.
 * "Paolo Perrotta":http://ducktypo.blogspot.com/ and "Matthew Zikherman":https://github.com/mzikherman for updating dependencies for faraday_middleware.
+* "David Nix":https://github.com/DavidNix for an improvement to consistent configuration data.
+* "Kiril Mitov":https://github.com/thebravoman for fixing deletion syntax with Delayed Job.
 
 h2. Licence
 

data/lib/flying_sphinx.rb

@@ -35,7 +35,6 @@ require 'flying_sphinx/version'
 require 'flying_sphinx/action'
 require 'flying_sphinx/api'
 require 'flying_sphinx/cli'
-require 'flying_sphinx/commands'
 require 'flying_sphinx/configuration'
 require 'flying_sphinx/configuration_options'
 require 'flying_sphinx/configurer'
@@ -50,5 +49,3 @@ require 'flying_sphinx/response/logger'
 if defined?(Rails) && defined?(Rails::Railtie)
   require 'flying_sphinx/railtie'
 end
-
-ThinkingSphinx.rake_interface = FlyingSphinx::RakeInterface

data/lib/flying_sphinx/railtie.rb

@@ -1,7 +1,11 @@
 class FlyingSphinx::Railtie < Rails::Railtie
   rake_tasks do
+    require 'flying_sphinx/commands'
+
+    ThinkingSphinx.rake_interface = FlyingSphinx::RakeInterface
+
     load File.expand_path('../tasks.rb', __FILE__)
-  end
+  end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
 
   initializer "flying_sphinx.set_sphinx_host_and_port" do |app|
     configuration = FlyingSphinx::Configuration.new

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '2.1.1'
+  Version = '2.1.2'
 end

data/spec/spec_helper.rb

@@ -12,6 +12,9 @@ WebMock.disable_net_connect!
 require 'thinking_sphinx'
 require 'flying_sphinx'
 
+require 'flying_sphinx/commands'
+ThinkingSphinx.rake_interface = FlyingSphinx::RakeInterface
+
 unless FlyingSphinx.logger.level == Logger::DEBUG
   FlyingSphinx.logger.level = Logger::WARN
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flying-sphinx
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ey-hmac