thinking-sphinx 3.4.2 → 4.0.0

data/spec/thinking_sphinx/interfaces/real_time_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe ThinkingSphinx::Interfaces::SQL do
@@ -8,8 +10,13 @@ RSpec.describe ThinkingSphinx::Interfaces::SQL do
     :render => true, :indices_location => '/path/to/indices',
     :preload_indices => true }
   let(:controller)    { double 'controller', :running? => true }
+  let(:commander)     { double :call => true }
   let(:stream)        { double :puts => nil }
 
+  before :each do
+    stub_const "ThinkingSphinx::Commander", commander
+  end
+
   describe '#clear' do
     let(:plain_index) { double(:type => 'plain') }
     let(:users_index) { double(:name => 'users', :type => 'rt', :render => true,
@@ -19,52 +26,41 @@ RSpec.describe ThinkingSphinx::Interfaces::SQL do
 
     before :each do
       allow(configuration).to receive_messages(
-        :indices => [plain_index, users_index, parts_index],
-        :searchd => double(:binlog_path => '/path/to/binlog')
+        :indices => [plain_index, users_index, parts_index]
       )
-
-      allow(Dir).to receive(:[]).with('/path/to/my/index/users.*').
-        and_return(['users.a', 'users.b'])
-      allow(Dir).to receive(:[]).with('/path/to/my/index/parts.*').
-        and_return(['parts.a', 'parts.b'])
-
-      allow(FileUtils).to receive_messages :mkdir_p => true, :rm_r => true,
-        :rm => true
-      allow(File).to receive_messages :exists? => true
-    end
-
-    it 'finds each file for real-time indices' do
-      expect(Dir).to receive(:[]).with('/path/to/my/index/users.*').
-        and_return([])
-
-      interface.clear
     end
 
-    it "removes the directory for the binlog files" do
-      expect(FileUtils).to receive(:rm_r).with('/path/to/binlog')
+    it 'prepares the indices' do
+      expect(commander).to receive(:call).with(
+        :prepare, configuration, {}, stream
+      )
 
       interface.clear
     end
 
-    it "removes each file for real-time indices" do
-      expect(FileUtils).to receive(:rm).with('users.a')
-      expect(FileUtils).to receive(:rm).with('users.b')
-      expect(FileUtils).to receive(:rm).with('parts.a')
-      expect(FileUtils).to receive(:rm).with('parts.b')
+    it 'invokes the clear command' do
+      expect(commander).to receive(:call).with(
+        :clear_real_time,
+        configuration,
+        {:indices => [users_index, parts_index]},
+        stream
+      )
 
       interface.clear
     end
 
-    context "with options[:index_filter]" do
+    context "with options[:index_names]" do
       let(:interface) { ThinkingSphinx::Interfaces::RealTime.new(
-        configuration, {:index_filter => 'users'}, stream
+        configuration, {:index_names => ['users']}, stream
       ) }
 
       it "removes each file for real-time indices that match :index_filter" do
-        expect(FileUtils).to receive(:rm).with('users.a')
-        expect(FileUtils).to receive(:rm).with('users.b')
-        expect(FileUtils).not_to receive(:rm).with('parts.a')
-        expect(FileUtils).not_to receive(:rm).with('parts.b')
+        expect(commander).to receive(:call).with(
+          :clear_real_time,
+          configuration,
+          {:index_names => ['users'], :indices => [users_index]},
+          stream
+        )
 
         interface.clear
       end
@@ -80,27 +76,31 @@ RSpec.describe ThinkingSphinx::Interfaces::SQL do
       allow(configuration).to receive_messages(
         :indices => [plain_index, users_index, parts_index]
       )
-
-      allow(FileUtils).to receive_messages :mkdir_p => true
     end
 
-    it 'populates each real-index' do
-      expect(ThinkingSphinx::RealTime::Populator).to receive(:populate).with(users_index)
-      expect(ThinkingSphinx::RealTime::Populator).to receive(:populate).with(parts_index)
-      expect(ThinkingSphinx::RealTime::Populator).not_to receive(:populate).with(plain_index)
+    it 'invokes the index command with real-time indices' do
+      expect(commander).to receive(:call).with(
+        :index_real_time,
+        configuration,
+        {:indices => [users_index, parts_index]},
+        stream
+      )
 
       interface.index
     end
 
-    context "with options[:index_filter]" do
+    context "with options[:index_names]" do
       let(:interface) { ThinkingSphinx::Interfaces::RealTime.new(
-        configuration, {:index_filter => 'users'}, stream
+        configuration, {:index_names => ['users']}, stream
       ) }
 
-      it 'populates each real-index that matches :index_filter' do
-        expect(ThinkingSphinx::RealTime::Populator).to receive(:populate).with(users_index)
-        expect(ThinkingSphinx::RealTime::Populator).not_to receive(:populate).with(parts_index)
-        expect(ThinkingSphinx::RealTime::Populator).not_to receive(:populate).with(plain_index)
+      it 'invokes the index command for matching indices' do
+        expect(commander).to receive(:call).with(
+          :index_real_time,
+          configuration,
+          {:index_names => ['users'], :indices => [users_index]},
+          stream
+        )
 
         interface.index
       end

data/spec/thinking_sphinx/interfaces/sql_spec.rb

@@ -1,98 +1,122 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe ThinkingSphinx::Interfaces::SQL do
   let(:interface)     { ThinkingSphinx::Interfaces::SQL.new(
     configuration, {:verbose => true}, stream
   ) }
+  let(:commander) { double :call => true }
   let(:configuration) { double 'configuration', :preload_indices => true,
-    :render => true, :indices => [double(:index, :type => 'plain')],
-    :indices_location   => '/path/to/indices' }
+    :render => true, :indices => [double(:index, :type => 'plain')] }
   let(:stream)        { double :puts => nil }
 
+  before :each do
+    stub_const 'ThinkingSphinx::Commander', commander
+  end
+
   describe '#clear' do
-    let(:users_index) { double(:name => 'users', :type => 'plain',
-      :render => true, :path => '/path/to/my/index/users') }
-    let(:parts_index) { double(:name => 'users', :type => 'plain',
-      :render => true, :path => '/path/to/my/index/parts') }
+    let(:users_index) { double(:type => 'plain') }
+    let(:parts_index) { double(:type => 'plain') }
     let(:rt_index)    { double(:type => 'rt') }
 
     before :each do
-      allow(configuration).to receive_messages(
-        :indices => [users_index, parts_index, rt_index]
-      )
-
-      allow(Dir).to receive(:[]).with('/path/to/my/index/users.*').
-        and_return(['users.a', 'users.b'])
-      allow(Dir).to receive(:[]).with('/path/to/my/index/parts.*').
-        and_return(['parts.a', 'parts.b'])
-
-      allow(FileUtils).to receive_messages :mkdir_p => true, :rm_r => true,
-        :rm => true
-      allow(File).to receive_messages :exists? => true
-    end
-
-    it 'finds each file for sql-backed indices' do
-      expect(Dir).to receive(:[]).with('/path/to/my/index/users.*').
-        and_return([])
-
-      interface.clear
+      allow(configuration).to receive(:indices).
+        and_return([users_index, parts_index, rt_index])
     end
 
-    it "removes each file for real-time indices" do
-      expect(FileUtils).to receive(:rm).with('users.a')
-      expect(FileUtils).to receive(:rm).with('users.b')
-      expect(FileUtils).to receive(:rm).with('parts.a')
-      expect(FileUtils).to receive(:rm).with('parts.b')
+    it "invokes the clear_sql command" do
+      expect(commander).to receive(:call).with(
+        :clear_sql,
+        configuration,
+        {:verbose => true, :indices => [users_index, parts_index]},
+        stream
+      )
 
       interface.clear
     end
   end
 
   describe '#index' do
-    let(:index_command)     { double :call => true }
-    let(:configure_command) { double :call => true }
-
-    before :each do
-      stub_const 'ThinkingSphinx::Commands::Index', index_command
-      stub_const 'ThinkingSphinx::Commands::Configure', configure_command
+    it "invokes the prepare command" do
+      expect(commander).to receive(:call).with(
+        :prepare, configuration, {:verbose => true}, stream
+      )
 
-      allow(ThinkingSphinx).to receive_messages :before_index_hooks => []
-      allow(FileUtils).to receive_messages :mkdir_p => true
+      interface.index
     end
 
     it "renders the configuration to a file by default" do
-      expect(configure_command).to receive(:call)
+      expect(commander).to receive(:call).with(
+        :configure, configuration, {:verbose => true}, stream
+      )
 
       interface.index
     end
 
     it "does not render the configuration if requested" do
-      expect(configure_command).not_to receive(:call)
+      expect(commander).not_to receive(:call).with(
+        :configure, configuration, {:verbose => true}, stream
+      )
 
       interface.index false
     end
 
-    it "creates the directory for the index files" do
-      expect(FileUtils).to receive(:mkdir_p).with('/path/to/indices')
+    it "executes the index command" do
+      expect(commander).to receive(:call).with(
+        :index_sql, configuration, {:verbose => true, :indices => nil}, stream
+      )
 
       interface.index
     end
 
-    it "calls all registered hooks" do
-      called = false
-      ThinkingSphinx.before_index_hooks << Proc.new { called = true }
+    context "with options[:index_names]" do
+      let(:users_index) { double(:name => 'users', :type => 'plain') }
+      let(:parts_index) { double(:name => 'parts', :type => 'plain') }
+      let(:rt_index)    { double(:type => 'rt') }
+      let(:interface)   { ThinkingSphinx::Interfaces::SQL.new(
+        configuration, {:index_names => ['users']}, stream
+      ) }
+
+      before :each do
+        allow(configuration).to receive(:indices).
+          and_return([users_index, parts_index, rt_index])
+      end
+
+      it 'invokes the index command for matching indices' do
+        expect(commander).to receive(:call).with(
+          :index_sql,
+          configuration,
+          {:index_names => ['users'], :indices => ['users']},
+          stream
+        )
+
+        interface.index
+      end
+    end
+  end
 
-      interface.index
+  describe '#merge' do
+    it "invokes the merge command" do
+      expect(commander).to receive(:call).with(
+        :merge_and_update, configuration, {:verbose => true}, stream
+      )
 
-      expect(called).to be_truthy
+      interface.merge
     end
 
-    it "executes the index command" do
-      expect(index_command).to receive(:call).with(
-        configuration, {:verbose => true}, stream
-      )
+    context "with options[:index_names]" do
+      let(:interface)   { ThinkingSphinx::Interfaces::SQL.new(
+        configuration, {:index_names => ['users']}, stream
+      ) }
 
-      interface.index
+      it 'invokes the merge command with the index_names option' do
+        expect(commander).to receive(:call).with(
+          :merge_and_update, configuration, {:index_names => ['users']}, stream
+        )
+
+        interface.merge
+      end
     end
   end
 end

data/spec/thinking_sphinx/masks/pagination_mask_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Masks; end
 end

data/spec/thinking_sphinx/masks/scopes_mask_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Masks; end
 end

data/spec/thinking_sphinx/middlewares/active_record_translator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Middlewares; end
   class  Search; end

data/spec/thinking_sphinx/middlewares/geographer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Middlewares; end
 end

data/spec/thinking_sphinx/middlewares/glazier_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Middlewares; end
 end

data/spec/thinking_sphinx/middlewares/inquirer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Middlewares; end
 end

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Middlewares; end
 end
@@ -16,7 +18,6 @@ require 'active_support/core_ext/string/inflections'
 require 'thinking_sphinx/middlewares/middleware'
 require 'thinking_sphinx/middlewares/sphinxql'
 require 'thinking_sphinx/errors'
-require 'thinking_sphinx/sphinxql'
 
 describe ThinkingSphinx::Middlewares::SphinxQL do
   let(:app)           { double('app', :call => true) }

data/spec/thinking_sphinx/middlewares/stale_id_checker_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Middlewares; end
   class  Search; end

data/spec/thinking_sphinx/middlewares/stale_id_filter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Middlewares; end
   class  Search; end

data/spec/thinking_sphinx/middlewares/valid_options_spec.rb

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

data/spec/thinking_sphinx/panes/attributes_pane_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Panes; end
 end

data/spec/thinking_sphinx/panes/distance_pane_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Panes; end
 end

data/spec/thinking_sphinx/panes/excerpts_pane_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Panes; end
 end

data/spec/thinking_sphinx/panes/weight_pane_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module Panes; end
 end
@@ -12,7 +14,7 @@ describe ThinkingSphinx::Panes::WeightPane do
 
   describe '#weight' do
     it "returns the object's weight by default" do
-      raw[ThinkingSphinx::SphinxQL.weight[:column]] = 101
+      raw["weight()"] = 101
 
       expect(pane.weight).to eq(101)
     end

data/spec/thinking_sphinx/rake_interface_spec.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::RakeInterface do
-  let(:interface)     { ThinkingSphinx::RakeInterface.new }
-
-  describe '#configure' do
-    let(:command) { double 'command', :call => true }
+  let(:interface) { ThinkingSphinx::RakeInterface.new }
+  let(:commander) { double :call => nil }
 
-    before :each do
-      stub_const 'ThinkingSphinx::Commands::Configure', command
-    end
+  before :each do
+    stub_const 'ThinkingSphinx::Commander', commander
+  end
 
+  describe '#configure' do
     it 'sends the configure command' do
-      expect(command).to receive(:call)
+      expect(commander).to receive(:call).
+        with(:configure, anything, {:verbose => true})
 
       interface.configure
     end