thinking-sphinx 3.4.2 → 4.0.0

data/spec/thinking_sphinx/commands/prepare_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ThinkingSphinx::Commands::Prepare do
+  let(:command)       { ThinkingSphinx::Commands::Prepare.new(
+    configuration, {}, stream
+  ) }
+  let(:configuration) { double 'configuration',
+    :indices_location => '/path/to/indices'
+  }
+  let(:stream)        { double :puts => nil }
+
+  before :each do
+    allow(FileUtils).to receive_messages :mkdir_p => true
+  end
+
+  it "creates the directory for the index files" do
+    expect(FileUtils).to receive(:mkdir_p).with('/path/to/indices')
+
+    command.call
+  end
+end

data/spec/thinking_sphinx/commands/start_detached_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe ThinkingSphinx::Commands::StartDetached do

data/spec/thinking_sphinx/commands/stop_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe ThinkingSphinx::Commands::Stop do
@@ -7,13 +9,18 @@ RSpec.describe ThinkingSphinx::Commands::Stop do
   let(:configuration) { double 'configuration', :controller => controller }
   let(:controller)    { double 'controller', :stop => true, :pid => 101 }
   let(:stream)        { double :puts => nil }
+  let(:commander)     { double :call => nil }
 
   before :each do
-    allow(controller).to receive(:running?).and_return(true, true, false)
+    stub_const 'ThinkingSphinx::Commander', commander
+
+    allow(commander).to receive(:call).
+      with(:running, configuration, {}, stream).and_return(true, true, false)
   end
 
   it "prints a message if the daemon is not already running" do
-    allow(controller).to receive_messages :running? => false
+    allow(commander).to receive(:call).
+      with(:running, configuration, {}, stream).and_return(false)
 
     expect(stream).to receive(:puts).with('searchd is not currently running.').
       and_return(nil)
@@ -24,7 +31,8 @@ RSpec.describe ThinkingSphinx::Commands::Stop do
   end
 
   it "does not try to stop the daemon if it's not running" do
-    allow(controller).to receive_messages :running? => false
+    allow(commander).to receive(:call).
+      with(:running, configuration, {}, stream).and_return(false)
 
     expect(controller).to_not receive(:stop)
 
@@ -44,7 +52,8 @@ RSpec.describe ThinkingSphinx::Commands::Stop do
   end
 
   it "should retry stopping the daemon until it stops" do
-    allow(controller).to receive(:running?).
+    allow(commander).to receive(:call).
+      with(:running, configuration, {}, stream).
       and_return(true, true, true, false)
 
     expect(controller).to receive(:stop).twice

data/spec/thinking_sphinx/configuration/minimum_fields_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe ThinkingSphinx::Configuration::MinimumFields do

data/spec/thinking_sphinx/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::Configuration do
@@ -112,6 +114,53 @@ describe ThinkingSphinx::Configuration do
 
       expect(config.indices_location).to eq('/my/index/files')
     end
+
+    it "respects relative paths" do
+      write_configuration 'indices_location' => 'my/index/files'
+
+      expect(config.indices_location).to eq('my/index/files')
+    end
+
+    it "translates relative paths to absolute if config requests it" do
+      write_configuration(
+        'indices_location' => 'my/index/files',
+        'absolute_paths'   => true
+      )
+
+      expect(config.indices_location).to eq(
+        File.join(config.framework.root, 'my/index/files')
+      )
+    end
+
+    it "respects paths that are already absolute" do
+      write_configuration(
+        'indices_location' => '/my/index/files',
+        'absolute_paths'   => true
+      )
+
+      expect(config.indices_location).to eq('/my/index/files')
+    end
+
+    it "translates linked directories" do
+      write_configuration(
+        'indices_location' => 'mine/index/files',
+        'absolute_paths'   => true
+      )
+
+      framework   = ThinkingSphinx::Frameworks.current
+      local_path  = File.join framework.root, "mine"
+      linked_path = File.join framework.root, "my"
+
+      FileUtils.mkdir_p linked_path
+      `ln -s #{linked_path} #{local_path}`
+
+      expect(config.indices_location).to eq(
+        File.join(config.framework.root, "my/index/files")
+      )
+
+      FileUtils.rm local_path
+      FileUtils.rmdir linked_path
+    end
   end
 
   describe '#initialize' do
@@ -342,6 +391,33 @@ describe ThinkingSphinx::Configuration do
       end
     end
 
+    describe '#log' do
+      it "defaults to an environment-specific file" do
+        expect(config.searchd.log).to eq(
+          File.join(config.framework.root, "log/test.searchd.log")
+        )
+      end
+
+      it "translates linked directories" do
+        framework   = ThinkingSphinx::Frameworks.current
+        log_path    = File.join framework.root, "log"
+        linked_path = File.join framework.root, "logging"
+        log_exists  = File.exist? log_path
+
+        FileUtils.mv log_path, "#{log_path}-tmp" if log_exists
+        FileUtils.mkdir_p linked_path
+        `ln -s #{linked_path} #{log_path}`
+
+        expect(config.searchd.log).to eq(
+          File.join(config.framework.root, "logging/test.searchd.log")
+        )
+
+        FileUtils.rm log_path
+        FileUtils.rmdir linked_path
+        FileUtils.mv "#{log_path}-tmp", log_path if log_exists
+      end unless RUBY_PLATFORM == "java"
+    end
+
     describe '#mysql41' do
       it "defaults to 9306" do
         expect(config.searchd.mysql41).to eq(9306)
@@ -359,6 +435,56 @@ describe ThinkingSphinx::Configuration do
         expect(config.searchd.mysql41).to eq(9307)
       end
     end
+
+    describe "#socket" do
+      it "does not set anything by default" do
+        expect(config.searchd.socket).to be_nil
+      end
+
+      it "ignores unspecified address and port when socket is set" do
+        write_configuration("socket" => "/my/socket")
+
+        expect(config.searchd.socket).to eq("/my/socket:mysql41")
+        expect(config.searchd.address).to be_nil
+        expect(config.searchd.mysql41).to be_nil
+      end
+
+      it "allows address and socket settings" do
+        write_configuration("socket" => "/my/socket", "address" => "1.1.1.1")
+
+        expect(config.searchd.socket).to eq("/my/socket:mysql41")
+        expect(config.searchd.address).to eq("1.1.1.1")
+        expect(config.searchd.mysql41).to eq(9306)
+      end
+
+      it "allows mysql41 and socket settings" do
+        write_configuration("socket" => "/my/socket", "mysql41" => 9307)
+
+        expect(config.searchd.socket).to eq("/my/socket:mysql41")
+        expect(config.searchd.address).to eq("127.0.0.1")
+        expect(config.searchd.mysql41).to eq(9307)
+      end
+
+      it "allows port and socket settings" do
+        write_configuration("socket" => "/my/socket", "port" => 9307)
+
+        expect(config.searchd.socket).to eq("/my/socket:mysql41")
+        expect(config.searchd.address).to eq("127.0.0.1")
+        expect(config.searchd.mysql41).to eq(9307)
+      end
+
+      it "allows address, mysql41 and socket settings" do
+        write_configuration(
+          "socket"  => "/my/socket",
+          "address" => "1.2.3.4",
+          "mysql41" => 9307
+        )
+
+        expect(config.searchd.socket).to eq("/my/socket:mysql41")
+        expect(config.searchd.address).to eq("1.2.3.4")
+        expect(config.searchd.mysql41).to eq(9307)
+      end
+    end
   end
 
   describe '#settings' do
@@ -390,11 +516,11 @@ describe ThinkingSphinx::Configuration do
         config.settings
       end
 
-      it "returns an empty hash when no settings for the environment exist" do
+      it "returns the default hash when no settings for the environment exist" do
         allow(File).to receive_messages :read => {'test' => {'foo' => 'bar'}}.to_yaml
         allow(Rails).to receive_messages :env => 'staging'
 
-        expect(config.settings).to eq({})
+        expect(config.settings.class).to eq(Hash)
       end
     end
 
@@ -409,15 +535,15 @@ describe ThinkingSphinx::Configuration do
         config.settings
       end
 
-      it "returns an empty hash" do
-        expect(config.settings).to eq({})
+      it "returns a hash" do
+        expect(config.settings.class).to eq(Hash)
       end
     end
   end
 
   describe '#version' do
-    it "defaults to 2.1.4" do
-      expect(config.version).to eq('2.1.4')
+    it "defaults to 2.2.11" do
+      expect(config.version).to eq('2.2.11')
     end
 
     it "respects supplied YAML versions" do

data/spec/thinking_sphinx/connection_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::Connection do

data/spec/thinking_sphinx/deletion_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::Deletion do

data/spec/thinking_sphinx/deltas/default_delta_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::Deltas::DefaultDelta do
@@ -68,13 +70,18 @@ describe ThinkingSphinx::Deltas::DefaultDelta do
     let(:config)     { double('config', :controller => controller,
       :settings => {}) }
     let(:controller) { double('controller') }
+    let(:commander)  { double('commander', :call => true) }
 
     before :each do
+      stub_const 'ThinkingSphinx::Commander', commander
+
       allow(ThinkingSphinx::Configuration).to receive_messages :instance => config
     end
 
     it "indexes the given index" do
-      expect(controller).to receive(:index).with('foo_delta', :verbose => false)
+      expect(commander).to receive(:call).with(
+        :index_sql, config, :indices => ['foo_delta'], :verbose => false
+      )
 
       delta.index double('index', :name => 'foo_delta')
     end

data/spec/thinking_sphinx/deltas_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::Deltas do

data/spec/thinking_sphinx/errors_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::SphinxError do

data/spec/thinking_sphinx/excerpter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::Excerpter do

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::FacetSearch do
@@ -25,12 +27,12 @@ describe ThinkingSphinx::FacetSearch do
   DumbSearch = ::Struct.new(:query, :options) do
     def raw
       [{
-        'sphinx_internal_class'                    => 'Foo',
-        'price_bracket'                            => 3,
-        'tag_ids'                                  => '1,2',
-        'category_id'                              => 11,
-        ThinkingSphinx::SphinxQL.count[:column]    => 5,
-        ThinkingSphinx::SphinxQL.group_by[:column] => 2
+        'sphinx_internal_class' => 'Foo',
+        'price_bracket'         => 3,
+        'tag_ids'               => '1,2',
+        'category_id'           => 11,
+        "sphinx_internal_count" => 5,
+        "sphinx_internal_group" => 2
       }]
     end
   end

data/spec/thinking_sphinx/hooks/guard_presence_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe ThinkingSphinx::Hooks::GuardPresence do
+  let(:subject) do
+    ThinkingSphinx::Hooks::GuardPresence.new configuration, stream
+  end
+  let(:configuration) { double "configuration", :indices_location => "/path" }
+  let(:stream)        { double "stream", :puts => nil }
+
+  describe "#call" do
+    it "outputs nothing if no guard files exist" do
+      allow(Dir).to receive(:[]).with('/path/ts-*.tmp').and_return([])
+
+      expect(stream).not_to receive(:puts)
+
+      subject.call
+    end
+
+    it "outputs a warning if a guard file exists" do
+      allow(Dir).to receive(:[]).with('/path/ts-*.tmp').
+        and_return(['/path/ts-foo.tmp'])
+
+      expect(stream).to receive(:puts)
+
+      subject.call
+    end
+  end
+end

data/spec/thinking_sphinx/index_set_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx; end
 
 require 'active_support/core_ext/string/inflections'

data/spec/thinking_sphinx/index_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::Index do

data/spec/thinking_sphinx/interfaces/daemon_spec.rb

@@ -1,28 +1,34 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe ThinkingSphinx::Interfaces::Daemon do
-  let(:configuration) { double 'configuration', :controller => controller }
-  let(:controller)    { double 'controller', :running? => false }
+  let(:configuration) { double 'configuration' }
   let(:stream)        { double 'stream', :puts => true }
+  let(:commander)     { double :call => nil }
   let(:interface)     {
     ThinkingSphinx::Interfaces::Daemon.new(configuration, {}, stream)
   }
 
-  describe '#start' do
-    let(:command) { double 'command', :call => true }
+  before :each do
+    stub_const 'ThinkingSphinx::Commander', commander
 
-    before :each do
-      stub_const 'ThinkingSphinx::Commands::StartDetached', command
-    end
+    allow(commander).to receive(:call).
+      with(:running, configuration, {}, stream).and_return(false)
+  end
 
+  describe '#start' do
     it "starts the daemon" do
-      expect(command).to receive(:call)
+      expect(commander).to receive(:call).with(
+        :start_detached, configuration, {}, stream
+      )
 
       interface.start
     end
 
     it "raises an error if the daemon is already running" do
-      allow(controller).to receive_messages :running? => true
+      allow(commander).to receive(:call).
+        with(:running, configuration, {}, stream).and_return(true)
 
       expect {
         interface.start
@@ -32,7 +38,8 @@ RSpec.describe ThinkingSphinx::Interfaces::Daemon do
 
   describe '#status' do
     it "reports when the daemon is running" do
-      allow(controller).to receive_messages :running? => true
+      allow(commander).to receive(:call).
+        with(:running, configuration, {}, stream).and_return(true)
 
       expect(stream).to receive(:puts).
         with('The Sphinx daemon searchd is currently running.')
@@ -41,7 +48,8 @@ RSpec.describe ThinkingSphinx::Interfaces::Daemon do
     end
 
     it "reports when the daemon is not running" do
-      allow(controller).to receive_messages :running? => false
+      allow(commander).to receive(:call).
+        with(:running, configuration, {}, stream).and_return(false)
 
       expect(stream).to receive(:puts).
         with('The Sphinx daemon searchd is not currently running.')