flying-sphinx 0.8.5 → 1.0.0

data/lib/flying_sphinx/controller.rb

@@ -0,0 +1,91 @@
+class FlyingSphinx::Controller
+  @index_timeout = 60 * 60 * 3 # 3 hours
+
+  # For backwards compatibility. These aren't actually used here.
+  attr_accessor :path, :bin_path, :searchd_binary_name, :indexer_binary_name
+
+  def self.index_timeout
+    @index_timeout
+  end
+
+  def self.index_timeout=(index_timeout)
+    @index_timeout = index_timeout
+  end
+
+  def initialize(api)
+    @api = api
+  end
+
+  def configure(file = nil)
+    options = file.nil? ? configuration_options :
+      {:configuration => {'sphinx' => file}, :sphinx_version => '2.0.6'}
+
+    FlyingSphinx::Action.perform api.identifier do
+      api.put 'configure', options
+    end
+  end
+
+  def index(*indices)
+    options = indices.last.is_a?(Hash) ? indices.pop : {}
+    async   = indices.any? && !options[:verbose]
+    options[:indices] = indices.join(',')
+
+    if async
+      api.post 'indices/unique', options
+    else
+      ::Delayed::Job.delete_all(
+        "handler LIKE '--- !ruby/object:FlyingSphinx::%'"
+      ) if defined?(::Delayed) && ::Delayed::Job.table_exists?
+
+      FlyingSphinx::Action.perform api.identifier, self.class.index_timeout do
+        api.post 'indices', options
+      end
+    end
+
+    true
+  end
+
+  def rebuild
+    FlyingSphinx::Action.perform api.identifier, self.class.index_timeout do
+      api.put 'rebuild', configuration_options
+    end
+  end
+
+  def restart
+    FlyingSphinx::Action.perform api.identifier do
+      api.post 'restart'
+    end
+  end
+
+  def sphinx_version
+    '2.0.4'
+  end
+
+  def start(options = {})
+    FlyingSphinx::Action.perform(api.identifier) { api.post 'start' }
+  end
+
+  def stop
+    FlyingSphinx::Action.perform(api.identifier) { api.post 'stop' }
+  end
+
+  private
+
+  attr_reader :api
+
+  def configuration_options
+    version       = '2.0.4'
+    configuration = ThinkingSphinx::Configuration.instance
+
+    if configuration.respond_to?(:version) && configuration.version.present?
+      version = configuration.version
+    end
+
+    {
+      :sphinx_version => version,
+      :configuration  => FlyingSphinx::SettingFiles.new.to_hash.merge(
+        'sphinx' => FlyingSphinx.translator.sphinx_configuration
+      )
+    }
+  end
+end

data/lib/flying_sphinx/rails.rb

@@ -2,16 +2,6 @@ require 'action_controller/dispatcher'
 
 if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
   ActionController::Dispatcher.to_prepare :flying_sphinx do
-    config = FlyingSphinx::Configuration.new
-
-    ThinkingSphinx.remote_sphinx = true
-    ThinkingSphinx::Configuration.instance.address = config.host
-    ThinkingSphinx::Configuration.instance.port    = config.port
-    ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =
-      config.client_key
-  end
-
-  if ENV['DATABASE_URL'] && ENV['DATABASE_URL'][/^mysql/].nil?
-    ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
+    FlyingSphinx::Binary.load
   end
 end

data/lib/flying_sphinx/railtie.rb

@@ -4,16 +4,10 @@ class FlyingSphinx::Railtie < Rails::Railtie
   end
 
   initializer "flying_sphinx.set_sphinx_host_and_port" do |app|
-    config = FlyingSphinx::Configuration.new
-
-    ThinkingSphinx.remote_sphinx = true
-    ThinkingSphinx::Configuration.instance.address = config.host
-    ThinkingSphinx::Configuration.instance.port    = config.port
-    ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =
-      config.client_key
-
-    if ENV['DATABASE_URL'] && ENV['DATABASE_URL'][/^mysql/].nil?
-      ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
+    if ThinkingSphinx::Configuration.instance.respond_to?(:settings)
+      FlyingSphinx::SphinxQL.load
+    else
+      FlyingSphinx::Binary.load
     end
   end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
 end

data/lib/flying_sphinx/setting_files.rb

@@ -3,17 +3,18 @@ class FlyingSphinx::SettingFiles
   SOURCE_SETTINGS = [:mysql_ssl_cert, :mysql_ssl_key, :mysql_ssl_ca]
 
   def initialize(indices = nil)
-    @indices = indices ||
-      ThinkingSphinx::Configuration.instance.configuration.indices
+    @indices = indices || FlyingSphinx.translator.sphinx_indices
   end
 
-  def upload_to(api)
+  def to_hash
+    hash = {}
+
     each_file_for_setting do |setting, file|
-      api.post '/add_file',
-        :setting   => setting.to_s,
-        :file_name => File.basename(file),
-        :content   => File.read(file)
+      hash["#{setting}:#{File.basename(file)}"] = File.read(file)
     end
+
+    hash['extra'] = hash.keys.join(';')
+    hash
   end
 
   private

data/lib/flying_sphinx/sinatra.rb

@@ -1,14 +1,9 @@
 require 'flying_sphinx'
 
 if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
-  config = FlyingSphinx::Configuration.new
-
-  ThinkingSphinx::Configuration.instance.address = config.host
-  ThinkingSphinx::Configuration.instance.port    = config.port
-  ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =
-    config.client_key
-
-  if ENV['DATABASE_URL'][/^mysql/].nil?
-    ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
+  if ThinkingSphinx::Configuration.instance.respond_to?(:settings)
+    FlyingSphinx::SphinxQL.load
+  else
+    FlyingSphinx::Binary.load
   end
 end

data/lib/flying_sphinx/sphinxql.rb

@@ -0,0 +1,7 @@
+module FlyingSphinx::SphinxQL
+  def self.load
+    require 'flying_sphinx/sphinxql/translator'
+
+    FlyingSphinx.translator = Translator.new FlyingSphinx::Configuration.new
+  end
+end

data/lib/flying_sphinx/sphinxql/translator.rb

@@ -0,0 +1,26 @@
+class FlyingSphinx::SphinxQL::Translator
+  def initialize(configuration)
+    thinking_sphinx.controller = FlyingSphinx::Controller.new configuration.api
+
+    thinking_sphinx.settings['connection_options'] = {
+      :host     => configuration.host,
+      :port     => 9306,
+      :username => configuration.username
+    }
+  end
+
+  def sphinx_configuration
+    @sphinx_configuration ||= thinking_sphinx.render
+  end
+
+  def sphinx_indices
+    sphinx_configuration
+    thinking_sphinx.indices
+  end
+
+  private
+
+  def thinking_sphinx
+    ThinkingSphinx::Configuration.instance
+  end
+end

data/lib/flying_sphinx/tasks.rb

@@ -1,29 +1,26 @@
 namespace :fs do
+  desc "Upload Sphinx configuration and process indices"
   task :index => :environment do
     FlyingSphinx::CLI.new('setup').run
   end
 
+  desc "Start the Sphinx daemon on Flying Sphinx servers"
   task :start => :environment do
     FlyingSphinx::CLI.new('start').run
   end
 
+  desc "Stop the Sphinx daemon on Flying Sphinx servers"
   task :stop  => :environment do
     FlyingSphinx::CLI.new('stop').run
   end
 
+  desc "Restart the Sphinx daemon on Flying Sphinx servers"
   task :restart => :environment do
     FlyingSphinx::CLI.new('restart').run
   end
 
+  desc "Stop, configure, index and then start Sphinx"
   task :rebuild => :environment do
     FlyingSphinx::CLI.new('rebuild').run
   end
-
-  task :index_log => :environment do
-    FlyingSphinx::IndexRequest.output_last_index
-  end
-
-  task :actions => :environment do
-    FlyingSphinx::Configuration.new.output_recent_actions
-  end
 end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.8.5'
+  Version = '1.0.0'
 end

data/spec/specs/action_spec.rb

@@ -0,0 +1,101 @@
+require 'light_spec_helper'
+require 'multi_json'
+require 'flying_sphinx/action'
+
+describe FlyingSphinx::Action do
+  let(:action)   { FlyingSphinx::Action.new 'abc123', 1, &block }
+  let(:block)    { Proc.new { response } }
+  let(:socket)   { double 'socket', :connect => true, :disconnect => true,
+    :subscribe => true, :[] => channel, :connected => true }
+  let(:channel)  { double 'channel', :bind => true }
+  let(:response) { double 'response', :body => body }
+  let(:body)     { double 'body', :status => 'OK', :id => 748 }
+  let(:logger)   { double 'logger', :debug => true }
+
+  before :each do
+    stub_const 'PusherClient::Socket', double(:new => socket)
+    stub_const 'FlyingSphinx::API::PUSHER_KEY', 'secret'
+
+    FlyingSphinx.stub :logger => logger
+  end
+
+  def perform_and_complete(action)
+    thread = Thread.new { action.perform }
+    sleep 0.01
+    action.send :completion, '{"id":748}'
+    thread.join
+  end
+
+  describe '#perform' do
+    it "sets up a connection to Pusher" do
+      socket.should_receive(:connect)
+
+      perform_and_complete action
+    end
+
+    it "subscribes to the identifier channel" do
+      socket.should_receive(:subscribe).with('abc123')
+
+      perform_and_complete action
+    end
+
+    it "subscribes to debug, completion and failure events" do
+      channel.should_receive(:bind).with('debug').once
+      channel.should_receive(:bind).with('completion').once
+      channel.should_receive(:bind).with('failure').once
+
+      perform_and_complete action
+    end
+
+    it "calls the provided block" do
+      block.should_receive(:call).and_return(response)
+
+      perform_and_complete action
+    end
+
+    it "raises an error if the response's status is BLOCKED" do
+      response.stub :status => 'BLOCKED'
+
+      lambda { action.perform }.should raise_error
+    end
+
+    it "retries the block if it raises an error" do
+      calls = 0
+      action = FlyingSphinx::Action.new 'abc123', 1 do
+        calls += 1
+        raise "Exception" if calls <= 1
+
+        response
+      end
+
+      lambda { perform_and_complete action }.should_not raise_error
+    end
+
+    it "only retries four times" do
+      calls = 0
+      action = FlyingSphinx::Action.new 'abc123', 1 do
+        calls += 1
+        raise "Exception" if calls <= 5
+
+        response
+      end
+
+      lambda { perform_and_complete action }.should raise_error
+    end
+
+    it "logs a warning when the action fails" do
+      logger.should_receive(:warn).with("Action failed.")
+
+      thread = Thread.new { action.perform }
+      sleep 0.01
+      action.send :failure, '{"id":748}'
+      thread.join
+    end
+
+    it "disconnects the socket" do
+      socket.should_receive(:disconnect)
+
+      perform_and_complete action
+    end
+  end
+end

data/spec/specs/api_spec.rb

@@ -7,16 +7,20 @@ describe FlyingSphinx::API do
   let(:faraday)    { fire_class_double('Faraday', :new => connection) }
   let(:adapter)    { double('adapter') }
   let(:connection) { double('connection') }
+  let(:logger)     { double :debug => true }
+  let(:response)   { double :body => '' }
 
   before :each do
     faraday.as_replaced_constant
+
+    FlyingSphinx.stub :logger => logger
   end
 
   shared_examples_for 'an API call' do
     it "sets up a connection with the appropriate headers" do
       faraday.should_receive(:new) do |options|
         options[:headers].should == {
-          'Accept'                  => 'application/vnd.flying-sphinx-v3+json',
+          'Accept'                  => 'application/vnd.flying-sphinx-v4+json',
           'X-Flying-Sphinx-Token'   => 'foo:bar',
           'X-Flying-Sphinx-Version' => FlyingSphinx::Version
         }
@@ -40,10 +44,10 @@ describe FlyingSphinx::API do
 
   describe '#get' do
     let(:request)      { double('request', :url => true) }
-    let(:send_request) { api.get '/resource', 'param' => 'value'}
+    let(:send_request) { api.get '/resource', 'param' => 'value' }
 
     before :each do
-      connection.stub(:get).and_yield(request)
+      connection.stub(:get).and_yield(request).and_return(response)
     end
 
     it_should_behave_like 'an API call'
@@ -60,14 +64,15 @@ describe FlyingSphinx::API do
     let(:send_request) { api.post '/resource', 'param' => 'value' }
 
     before :each do
-      connection.stub(:post => true)
+      connection.stub(:post => response)
     end
 
     it_should_behave_like 'an API call'
 
     it "sends the POST request with the given path and data" do
       connection.should_receive(:post).
-        with('/api/my/app/resource', 'param' => 'value')
+        with('/api/my/app/resource', 'param' => 'value').
+        and_return(response)
 
       send_request
     end
@@ -77,14 +82,15 @@ describe FlyingSphinx::API do
     let(:send_request) { api.put '/resource', 'param' => 'value' }
 
     before :each do
-      connection.stub(:put => true)
+      connection.stub(:put => response)
     end
 
     it_should_behave_like 'an API call'
 
     it "sends the PUT request with the given path and data" do
       connection.should_receive(:put).
-        with('/api/my/app/resource', 'param' => 'value')
+        with('/api/my/app/resource', 'param' => 'value').
+        and_return(response)
 
       send_request
     end

data/spec/specs/configuration_spec.rb

@@ -2,34 +2,26 @@ require 'light_spec_helper'
 require 'flying_sphinx/configuration'
 
 describe FlyingSphinx::Configuration do
-  let(:api)  { fire_double('FlyingSphinx::API',
+  let(:api)        { fire_double('FlyingSphinx::API',
     :get => double(:body => body, :status => 200)) }
-  let(:body) { double(:server => 'foo.bar.com', :port => 9319,
-    :ssh_server => 'ssh.bar.com', :database_port => 10319) }
+  let(:body)       { double(:server => 'foo.bar.com', :port => 9319) }
+  let(:api_key)    { 'foo-bar-baz' }
+  let(:identifier) { 'my-identifier' }
+  let(:config)     { FlyingSphinx::Configuration.new identifier, api_key }
 
   before :each do
     fire_class_double('FlyingSphinx::API', :new => api).as_replaced_constant
   end
 
-  describe '#initialize' do
-    let(:api_key)    { 'foo-bar-baz' }
-    let(:identifier) { 'my-identifier' }
-    let(:config)     { FlyingSphinx::Configuration.new identifier, api_key }
-
-    it "sets the host from the API information" do
+  describe '#host' do
+    it "reads the server from the API" do
       config.host.should == 'foo.bar.com'
     end
+  end
 
-    it "sets the port from the API information" do
+  describe '#port' do
+    it "reads the port from the API" do
       config.port.should == 9319
     end
-
-    it "sets the ssh server address" do
-      config.ssh_server.should == 'ssh.bar.com'
-    end
-
-    it "sets the database port" do
-      config.database_port.should == 10319
-    end
   end
 end