flying-sphinx 1.3.1 → 2.0.0

data/spec/support/command_helpers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module CommandHelpers
+  def configuration_double(stubs = {})
+    double("ThinkingSphinx::Configuration", {:settings => {}}.merge(stubs))
+  end
+end
+
+RSpec.configure do |config|
+  config.include CommandHelpers
+end

data/spec/support/multipart.rb

@@ -6,20 +6,24 @@ end
 
 class MultipartRequestPattern < WebMock::RequestPattern
   def with_file(&block)
-    with { |request| block.call MultipartRequestToFile.call(request) }
+    with { |request| block.call MultipartRequest.new(request).file }
   end
-end
 
-class MultipartRequestToFile
-  def self.call(request)
-    new(request).call
+  def with_params(&block)
+    with { |request| block.call MultipartRequest.new(request).params }
   end
+end
 
+class MultipartRequest
   def initialize(request)
     @request = request
   end
 
-  def call
+  def params
+    parsed
+  end
+
+  def file
     parsed["file"][:tempfile].read
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flying-sphinx
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ey-hmac
@@ -80,34 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: riddle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -244,34 +230,59 @@ files:
 - lib/flying_sphinx.rb
 - lib/flying_sphinx/action.rb
 - lib/flying_sphinx/api.rb
-- lib/flying_sphinx/binary.rb
-- lib/flying_sphinx/binary/translator.rb
 - lib/flying_sphinx/cli.rb
+- lib/flying_sphinx/commands.rb
+- lib/flying_sphinx/commands/base.rb
+- lib/flying_sphinx/commands/clear.rb
+- lib/flying_sphinx/commands/configure.rb
+- lib/flying_sphinx/commands/index_sql.rb
+- lib/flying_sphinx/commands/merge.rb
+- lib/flying_sphinx/commands/prepare.rb
+- lib/flying_sphinx/commands/rebuild.rb
+- lib/flying_sphinx/commands/reset.rb
+- lib/flying_sphinx/commands/restart.rb
+- lib/flying_sphinx/commands/rotate.rb
+- lib/flying_sphinx/commands/running.rb
+- lib/flying_sphinx/commands/start.rb
+- lib/flying_sphinx/commands/start_attached.rb
+- lib/flying_sphinx/commands/stop.rb
 - lib/flying_sphinx/configuration.rb
 - lib/flying_sphinx/configuration_options.rb
 - lib/flying_sphinx/configurer.rb
-- lib/flying_sphinx/controller.rb
-- lib/flying_sphinx/rails.rb
 - lib/flying_sphinx/railtie.rb
+- lib/flying_sphinx/rake_interface.rb
 - lib/flying_sphinx/request/hmac.rb
 - lib/flying_sphinx/response/invalid.rb
 - lib/flying_sphinx/response/json.rb
 - lib/flying_sphinx/response/logger.rb
 - lib/flying_sphinx/setting_files.rb
 - lib/flying_sphinx/sinatra.rb
-- lib/flying_sphinx/sphinxql.rb
-- lib/flying_sphinx/sphinxql/translator.rb
 - lib/flying_sphinx/tasks.rb
+- lib/flying_sphinx/tasks/deprecated.rb
+- lib/flying_sphinx/tasks/replaced.rb
 - lib/flying_sphinx/version.rb
 - spec/acceptance/configuring_spec.rb
 - spec/acceptance/get_info_spec.rb
 - spec/acceptance/start_or_stop_sphinx_spec.rb
 - spec/flying_sphinx/action_spec.rb
 - spec/flying_sphinx/api_spec.rb
+- spec/flying_sphinx/commands/clear_spec.rb
+- spec/flying_sphinx/commands/configure_spec.rb
+- spec/flying_sphinx/commands/index_sql_spec.rb
+- spec/flying_sphinx/commands/merge_spec.rb
+- spec/flying_sphinx/commands/rebuild_spec.rb
+- spec/flying_sphinx/commands/reset_spec.rb
+- spec/flying_sphinx/commands/restart_spec.rb
+- spec/flying_sphinx/commands/rotate_spec.rb
+- spec/flying_sphinx/commands/running_spec.rb
+- spec/flying_sphinx/commands/start_attached_spec.rb
+- spec/flying_sphinx/commands/start_spec.rb
+- spec/flying_sphinx/commands/stop_spec.rb
 - spec/flying_sphinx/configuration_spec.rb
-- spec/flying_sphinx/controller_spec.rb
+- spec/flying_sphinx/configurer_spec.rb
 - spec/flying_sphinx/setting_files_spec.rb
 - spec/spec_helper.rb
+- spec/support/command_helpers.rb
 - spec/support/hmac.rb
 - spec/support/local_pusher.rb
 - spec/support/multipart.rb
@@ -295,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sphinx in the Cloud
@@ -305,10 +316,23 @@ test_files:
 - spec/acceptance/start_or_stop_sphinx_spec.rb
 - spec/flying_sphinx/action_spec.rb
 - spec/flying_sphinx/api_spec.rb
+- spec/flying_sphinx/commands/clear_spec.rb
+- spec/flying_sphinx/commands/configure_spec.rb
+- spec/flying_sphinx/commands/index_sql_spec.rb
+- spec/flying_sphinx/commands/merge_spec.rb
+- spec/flying_sphinx/commands/rebuild_spec.rb
+- spec/flying_sphinx/commands/reset_spec.rb
+- spec/flying_sphinx/commands/restart_spec.rb
+- spec/flying_sphinx/commands/rotate_spec.rb
+- spec/flying_sphinx/commands/running_spec.rb
+- spec/flying_sphinx/commands/start_attached_spec.rb
+- spec/flying_sphinx/commands/start_spec.rb
+- spec/flying_sphinx/commands/stop_spec.rb
 - spec/flying_sphinx/configuration_spec.rb
-- spec/flying_sphinx/controller_spec.rb
+- spec/flying_sphinx/configurer_spec.rb
 - spec/flying_sphinx/setting_files_spec.rb
 - spec/spec_helper.rb
+- spec/support/command_helpers.rb
 - spec/support/hmac.rb
 - spec/support/local_pusher.rb
 - spec/support/multipart.rb

data/lib/flying_sphinx/binary.rb

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

data/lib/flying_sphinx/binary/translator.rb

@@ -1,48 +0,0 @@
-class FlyingSphinx::Binary::Translator
-  def initialize(configuration)
-    ThinkingSphinx.remote_sphinx = true
-
-    thinking_sphinx.controller = FlyingSphinx::Controller.new configuration.api
-    thinking_sphinx.address    = configuration.host
-    thinking_sphinx.port       = configuration.port
-    thinking_sphinx.configuration.searchd.client_key =
-      configuration.client_key
-
-    if ENV['DATABASE_URL'] && ENV['DATABASE_URL'][/^mysql/].nil?
-      ThinkingSphinx.database_adapter = Class.new(ThinkingSphinx::PostgreSQLAdapter) do
-        def setup
-          create_array_accum_function
-        end
-      end
-    end
-  end
-
-  def sphinx_configuration
-    @sphinx_configuration ||= begin
-      generate_configuration
-      thinking_sphinx.configuration.searchd.client_key =
-        FlyingSphinx::Configuration.new.client_key
-      thinking_sphinx.configuration.render
-    end
-  end
-
-  def sphinx_indices
-    @sphinx_indices ||= begin
-      generate_configuration
-      thinking_sphinx.configuration.indices
-    end
-  end
-
-  private
-
-  def thinking_sphinx
-    ThinkingSphinx::Configuration.instance
-  end
-
-  def generate_configuration
-    return if @generated_configuration
-
-    thinking_sphinx.generate
-    @generated_configuration = true
-  end
-end

data/lib/flying_sphinx/controller.rb

@@ -1,104 +0,0 @@
-class FlyingSphinx::Controller
-  DEFAULT_TIMEOUT = 60
-  @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)
-    run_action_with_path 'configure', file
-  end
-
-  def index(*indices)
-    options = indices.last.is_a?(Hash) ? indices.pop : {}
-    async   = indices.any? && !options[:verbose]
-    options[:indices] = indices.join(',')
-
-    if async
-      send_action 'index', options.merge(:unique => 'true')
-    else
-      ::Delayed::Job.delete_all(
-        "handler LIKE '--- !ruby/object:FlyingSphinx::%'"
-      ) if defined?(::Delayed) && ::Delayed::Job.table_exists?
-
-      run_action 'index', self.class.index_timeout, options
-    end
-
-    true
-  end
-
-  def rebuild
-    run_action_with_path 'rebuild', nil, self.class.index_timeout
-  end
-
-  def regenerate(file = nil)
-    reset file
-
-    interface = ThinkingSphinx::RakeInterface.new
-    if interface.respond_to?(:generate)
-      interface.generate
-    else
-      interface.rt.index
-    end
-  end
-
-  def reset(file = nil)
-    run_action_with_path 'reset', file
-  end
-
-  def restart
-    run_action 'restart'
-  end
-
-  def rotate
-    run_action 'rotate'
-  end
-
-  def running?
-    true
-  end
-
-  def sphinx_version
-    '2.0.4'
-  end
-
-  def start(options = {})
-    run_action 'start'
-  end
-
-  def stop
-    run_action 'stop'
-  end
-
-  private
-
-  attr_reader :api
-
-  def run_action(action, timeout = DEFAULT_TIMEOUT, parameters = {})
-    FlyingSphinx::Action.perform api.identifier, timeout do
-      send_action action, parameters
-    end
-  end
-
-  def run_action_with_path(action, file = nil, timeout = DEFAULT_TIMEOUT)
-    path = FlyingSphinx::Configurer.new(api, file).call
-
-    run_action action, timeout, :path => path
-  end
-
-  def send_action(action, parameters = {})
-    api.post '/perform', parameters.merge(:action => action)
-  end
-end

data/lib/flying_sphinx/rails.rb

@@ -1,7 +0,0 @@
-require 'action_controller/dispatcher'
-
-if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
-  ActionController::Dispatcher.to_prepare :flying_sphinx do
-    FlyingSphinx::Binary.load
-  end
-end

data/lib/flying_sphinx/sphinxql.rb

@@ -1,7 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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/spec/flying_sphinx/controller_spec.rb

@@ -1,71 +0,0 @@
-require 'spec_helper'
-
-describe FlyingSphinx::Controller do
-  let(:controller)    { FlyingSphinx::Controller.new api }
-  let(:api)           { double 'API', :identifier => 'foo', :put => true,
-    :get => {"path" => "/foo", "url" => "https://confserver", "status" => "OK"} }
-  let(:action_class)  { double }
-  let(:configuration) { double 'TS Configuration' }
-  let(:setting_files) { double :to_hash => {'extra' => 'wordforms/txt.txt',
-    'wordforms/txt.txt' => 'something'} }
-  let(:translator)    { double :sphinx_configuration => 'indexer ...' }
-
-  before :each do
-    stub_const 'FlyingSphinx::Action', action_class
-    action_class.stub(:perform) do |identifier, &block|
-      block.call
-    end
-
-    stub_const 'ThinkingSphinx::Configuration',
-      double(:instance => configuration)
-
-    stub_const 'FlyingSphinx::SettingFiles', double(:new => setting_files)
-    FlyingSphinx.stub :translator => translator
-
-    stub_request(:post, "https://confserver").to_return(:status => 200)
-  end
-
-  describe 'configure' do
-    it 'sends data to the server' do
-      api.should_receive(:post)
-
-      controller.configure
-    end
-
-    it 'sends through gzipped configuration archive' do
-      expect(api).to receive(:post).with '/perform',
-        :action => 'configure',
-        :path   => '/foo'
-
-      controller.configure
-
-      expect(
-        a_multipart_request(:post, 'https://confserver').
-        with_file { |contents|
-          reader = GZippedTar::Reader.new contents
-
-          reader.read("sphinx/raw.conf") == "indexer ..." &&
-          reader.read("sphinx/version.txt") == "2.2.3" &&
-          reader.read("wordforms/txt.txt") == "something"
-        }
-      ).to have_been_made
-    end
-
-    it 'sends through file if provided' do
-      expect(api).to receive(:post).with '/perform',
-        :action => 'configure',
-        :path   => '/foo'
-
-      controller.configure 'searchd ...'
-
-      expect(
-        a_multipart_request(:post, 'https://confserver').
-        with_file { |contents|
-          reader = GZippedTar::Reader.new contents
-
-          reader.read("sphinx/raw.conf") == "searchd ..."
-        }
-      ).to have_been_made
-    end
-  end
-end