flying-sphinx 1.3.1 → 2.0.0

data/lib/flying_sphinx/commands/merge.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Merge < FlyingSphinx::Commands::Base
+  def call
+    run_action 'merge', index_timeout, merging_options
+  end
+
+  private
+
+  def merging_options
+    {
+      :core_index  => options[:core_index].name,
+      :delta_index => options[:delta_index].name,
+      :filters     => MultiJson.dump(options[:filters])
+    }
+  end
+end

data/lib/flying_sphinx/commands/prepare.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Prepare < FlyingSphinx::Commands::Base
+  def call
+    # nothing to do
+  end
+end

data/lib/flying_sphinx/commands/rebuild.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Rebuild < FlyingSphinx::Commands::Base
+  def call
+    run_action_with_path 'rebuild', index_timeout
+  end
+end

data/lib/flying_sphinx/commands/reset.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Reset < FlyingSphinx::Commands::Base
+  def call
+    run_action_with_path 'reset'
+  end
+end

data/lib/flying_sphinx/commands/restart.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Restart < FlyingSphinx::Commands::Base
+  def call
+    run_action 'restart'
+  end
+end

data/lib/flying_sphinx/commands/rotate.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Rotate < FlyingSphinx::Commands::Base
+  def call
+    run_action 'rotate'
+  end
+end

data/lib/flying_sphinx/commands/running.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Running < FlyingSphinx::Commands::Base
+  def call
+    api.get("/running")["running"]
+  end
+end

data/lib/flying_sphinx/commands/start.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Start < FlyingSphinx::Commands::Base
+  def call
+    run_action 'start'
+  end
+end

data/lib/flying_sphinx/commands/start_attached.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::StartAttached < FlyingSphinx::Commands::Base
+  def call
+    stream.puts <<-MESSAGE
+It is not possible to start the Sphinx daemon as an attached process. Please
+use ts:start without the NODETACH flag set.
+    MESSAGE
+  end
+end

data/lib/flying_sphinx/commands/stop.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FlyingSphinx::Commands::Stop < FlyingSphinx::Commands::Base
+  def call
+    run_action 'stop'
+  end
+end

data/lib/flying_sphinx/configuration_options.rb

@@ -1,13 +1,14 @@
 class FlyingSphinx::ConfigurationOptions
-  attr_reader :raw
+  attr_reader :raw, :engine
 
   def initialize(raw = nil, version = nil)
-    @raw     = raw || FlyingSphinx.translator.sphinx_configuration
-    @version = version || '2.2.3'
+    @raw     = raw || configuration.render
+    @version = version || '2.2.11'
+    @engine  = configuration.settings["engine"] || "sphinx"
   end
 
   def settings
-    @settings ||= FlyingSphinx::SettingFiles.new.to_hash
+    @settings ||= FlyingSphinx::SettingFiles.new(indices).to_hash
   end
 
   def version
@@ -20,7 +21,12 @@ class FlyingSphinx::ConfigurationOptions
     @configuration ||= ThinkingSphinx::Configuration.instance
   end
 
+  def indices
+    configuration.render
+    configuration.indices
+  end
+
   def version_defined?
-    configuration.respond_to?(:version) && configuration.version.present?
+    configuration.version.present?
   end
 end

data/lib/flying_sphinx/configurer.rb

@@ -2,7 +2,11 @@ class FlyingSphinx::Configurer
   PresignatureError = Class.new FlyingSphinx::Error
   UploadError = Class.new FlyingSphinx::Error
 
-  def initialize(api, input)
+  def self.call(api, input = nil)
+    new(api, input).call
+  end
+
+  def initialize(api, input = nil)
     @api   = api
     @input = input
   end
@@ -47,11 +51,12 @@ class FlyingSphinx::Configurer
 
     writer.add "sphinx/raw.conf",    config.raw
     writer.add "sphinx/version.txt", config.version
+    writer.add "sphinx/engine.txt",  config.engine
     writer.add "sphinx/extra.txt",   config.settings["extra"]
 
     config.settings["extra"].split(";").each do |key|
       writer.add key, config.settings[key]
-    end unless config.settings["extra"].empty?
+    end unless config.settings["extra"].blank?
 
     StringIO.new writer.output
   end

data/lib/flying_sphinx/railtie.rb

@@ -4,10 +4,12 @@ class FlyingSphinx::Railtie < Rails::Railtie
   end
 
   initializer "flying_sphinx.set_sphinx_host_and_port" do |app|
-    if ThinkingSphinx::Configuration.instance.respond_to?(:settings)
-      FlyingSphinx::SphinxQL.load
-    else
-      FlyingSphinx::Binary.load
-    end
+    configuration = FlyingSphinx::Configuration.new
+
+    ThinkingSphinx::Configuration.instance.settings['connection_options'] = {
+      :host     => configuration.host,
+      :port     => 9306,
+      :username => configuration.username
+    }
   end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
 end

data/lib/flying_sphinx/rake_interface.rb

@@ -0,0 +1,25 @@
+class FlyingSphinx::RakeInterface < ThinkingSphinx::RakeInterface
+  def clear
+    command :clear
+  end
+
+  def rebuild
+    command :rebuild
+  end
+
+  def reset
+    command :reset
+  end
+
+  def restart
+    command :restart
+  end
+
+  private
+
+  def command(command, extra_options = {})
+    ThinkingSphinx::Commander.call(
+      command, configuration, options.merge(extra_options)
+    )
+  end
+end

data/lib/flying_sphinx/response/invalid.rb

@@ -2,6 +2,6 @@ class FlyingSphinx::Response::Invalid < Faraday::Response::Middleware
   def on_complete(environment)
     return unless environment[:status] == 403
 
-    raise 'Invalid Flying Sphinx credentials'
+    raise FlyingSphinx::Error, 'Invalid Flying Sphinx credentials'
   end
 end

data/lib/flying_sphinx/setting_files.rb

@@ -2,8 +2,8 @@ class FlyingSphinx::SettingFiles
   INDEX_SETTINGS  = [:stopwords, :wordforms, :exceptions]
   SOURCE_SETTINGS = [:mysql_ssl_cert, :mysql_ssl_key, :mysql_ssl_ca]
 
-  def initialize(indices = nil)
-    @indices = indices || FlyingSphinx.translator.sphinx_indices
+  def initialize(indices)
+    @indices = indices
   end
 
   def to_hash

data/lib/flying_sphinx/tasks.rb

@@ -1,31 +1,38 @@
-namespace :fs do
-  desc "Upload Sphinx configuration and process indices"
-  task :index => :environment do
-    FlyingSphinx::CLI.new('setup').run
+module FlyingSphinx
+  module Tasks
+    #
   end
+end
 
-  desc "Start the Sphinx daemon on Flying Sphinx servers"
-  task :start => :environment do
-    FlyingSphinx::CLI.new('start').run
-  end
+require_relative "tasks/replaced"
+require_relative "tasks/deprecated"
 
-  desc "Stop the Sphinx daemon on Flying Sphinx servers"
-  task :stop  => :environment do
-    FlyingSphinx::CLI.new('stop').run
-  end
+# Replaced ts tasks
+FlyingSphinx::Tasks::Replaced.call "ts:clear" do
+  interface.clear
+end
 
-  desc "Restart the Sphinx daemon on Flying Sphinx servers"
-  task :restart => :environment do
-    FlyingSphinx::CLI.new('restart').run
-  end
+FlyingSphinx::Tasks::Replaced.call "ts:rebuild",
+  ["ts:sql:rebuild", "ts:rt:index"]
 
-  desc "Stop, configure, index and then start Sphinx"
-  task :rebuild => :environment do
-    FlyingSphinx::CLI.new('rebuild').run
-  end
+FlyingSphinx::Tasks::Replaced.call "ts:restart" do
+  interface.restart
+end
 
-  desc "Stop, clear, configure, start then populate Sphinx"
-  task :regenerate => :environment do
-    FlyingSphinx::CLI.new('regenerate').run
-  end
+FlyingSphinx::Tasks::Replaced.call "ts:sql:rebuild" do
+  interface.rebuild
+end
+
+FlyingSphinx::Tasks::Replaced.call "ts:rt:rebuild" do
+  interface.reset
+
+  Rake::Task["ts:rt:index"].invoke
 end
+
+# Deprecated tasks in the fs namespace
+FlyingSphinx::Tasks::Deprecated.call :index
+FlyingSphinx::Tasks::Deprecated.call :start
+FlyingSphinx::Tasks::Deprecated.call :stop
+FlyingSphinx::Tasks::Deprecated.call :restart
+FlyingSphinx::Tasks::Deprecated.call :rebuild
+FlyingSphinx::Tasks::Deprecated.call :regenerate, :rebuild

data/lib/flying_sphinx/tasks/deprecated.rb

@@ -0,0 +1,31 @@
+class FlyingSphinx::Tasks::Deprecated
+  include Rake::DSL
+
+  def self.call(old_name, new_name = nil)
+    new(old_name, new_name || old_name).call
+  end
+
+  def initialize(old_name, new_name)
+    @old_name = old_name
+    @new_name = new_name
+  end
+
+  def call
+    namespace :fs do
+      desc "Deprecated: Use ts:#{new_name} instead."
+      task old_name do
+        puts <<-MESSAGE
+The task fs:#{old_name} is now deprecated. Please use the standard Thinking
+Sphinx task instead: ts:#{new_name} (Thinking Sphinx tasks will now invoke the
+appropriate behaviour for both local and Flying Sphinx environments).
+        MESSAGE
+
+        Rake::Task["ts:#{new_name}"].invoke
+      end
+    end
+  end
+
+  private
+
+  attr_reader :old_name, :new_name
+end

data/lib/flying_sphinx/tasks/replaced.rb

@@ -0,0 +1,27 @@
+class FlyingSphinx::Tasks::Replaced
+  include Rake::DSL
+
+  def self.call(name, dependencies = [:environment], &block)
+    new(name, dependencies, block).call
+  end
+
+  def initialize(name, dependencies, block)
+    @name = name
+    @dependencies = dependencies
+    @block = block
+  end
+
+  def call
+    return unless Rake::Task.task_defined?(name)
+
+    original = Rake::Task[name]
+    original.clear
+
+    desc original.comment
+    task name => dependencies, &block
+  end
+
+  private
+
+  attr_reader :name, :dependencies, :block
+end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '1.3.1'
+  Version = '2.0.0'
 end

data/spec/acceptance/configuring_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 require 'cgi'
 
 describe 'Configuring Sphinx' do
-  let(:cli)        { FlyingSphinx::CLI.new 'configure' }
-  let(:translator) { double 'Translator', :sphinx_indices => [index],
-    :sphinx_configuration => 'searchd { }' }
-  let(:index)      { double 'Index' }
+  let(:interface)     { ThinkingSphinx.rake_interface.new }
+  let(:configuration) { configuration_double :indices => [double('Index')],
+    :render => 'searchd { }', :version => '2.2.11' }
 
   before :each do
-    allow(FlyingSphinx).to receive(:translator).and_return(translator)
+    allow(ThinkingSphinx::Configuration).to receive(:instance).
+      and_return(configuration)
 
     stub_hmac_request(:post, 'https://flying-sphinx.com/api/my/v5/perform').
       to_return(:body => '{"id":953, "status":"OK"}')
@@ -20,7 +20,7 @@ describe 'Configuring Sphinx' do
   end
 
   it 'sends the configuration to the server' do
-    SuccessfulAction.new(953).matches? lambda { cli.run }
+    SuccessfulAction.new(953).matches? lambda { interface.configure }
 
     expect(
       a_hmac_request(:post, 'https://flying-sphinx.com/api/my/v5/perform').
@@ -29,6 +29,6 @@ describe 'Configuring Sphinx' do
   end
 
   it 'handles the full request successfully' do
-    expect { cli.run }.to be_successful_with 953
+    expect { interface.configure }.to be_successful_with 953
   end
 end

data/spec/acceptance/start_or_stop_sphinx_spec.rb

@@ -1,15 +1,18 @@
 require 'spec_helper'
 
 describe 'Starting Sphinx' do
-  let(:cli) { FlyingSphinx::CLI.new 'start' }
+  let(:interface) { ThinkingSphinx.rake_interface.new.daemon }
 
   before :each do
+    stub_hmac_request(:get, 'https://flying-sphinx.com/api/my/v5/running').
+      to_return(:status => 200, :body => '{"running":false, "status":"OK"}')
+
     stub_hmac_request(:post, 'https://flying-sphinx.com/api/my/v5/perform').
       to_return(:status => 200, :body => '{"id":429, "status":"OK"}')
   end
 
   it 'makes the request to the server', :retry => 3 do
-    expect { cli.run }.to be_successful_with 429
+    expect { interface.start }.to be_successful_with 429
 
     expect(
       a_hmac_request(:post, 'https://flying-sphinx.com/api/my/v5/perform').
@@ -19,7 +22,7 @@ describe 'Starting Sphinx' do
 end
 
 describe 'Stopping Sphinx', :retry => 3 do
-  let(:cli) { FlyingSphinx::CLI.new 'stop' }
+  let(:interface) { ThinkingSphinx.rake_interface.new.daemon }
 
   before :each do
     stub_request(:post, 'https://flying-sphinx.com/api/my/v5/perform').
@@ -27,7 +30,7 @@ describe 'Stopping Sphinx', :retry => 3 do
   end
 
   it 'makes the request to the server', :retry => 3 do
-    expect { cli.run }.to be_successful_with 537
+    expect { interface.stop }.to be_successful_with 537
 
     expect(
       a_hmac_request(:post, 'https://flying-sphinx.com/api/my/v5/perform').

data/spec/flying_sphinx/action_spec.rb

@@ -72,7 +72,7 @@ describe FlyingSphinx::Action do
       calls = 0
       action = FlyingSphinx::Action.new 'abc123', 1 do
         calls += 1
-        raise "Exception" if calls <= 5
+        raise StandardError, "Exception" if calls <= 5
 
         response
       end

data/spec/flying_sphinx/commands/clear_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+RSpec.describe FlyingSphinx::Commands::Clear do
+  let(:subject) do
+    FlyingSphinx::Commands::Clear.new configuration_double, :api => api
+  end
+  let(:api) do
+    double 'API', :identifier => 'foo', :post => {'status' => 'OK'}
+  end
+  let(:action_class) { double }
+
+  before :each do
+    stub_const 'FlyingSphinx::Action', action_class
+    action_class.stub(:perform) { |identifier, &block| block.call }
+  end
+
+  it "sends through action" do
+    expect(api).to receive(:post).with "/perform", :action => "clear"
+
+    subject.call
+  end
+end