thinking-sphinx 3.2.0 → 3.3.0

data/spec/thinking_sphinx/middlewares/stale_id_checker_spec.rb

@@ -25,7 +25,7 @@ describe ThinkingSphinx::Middlewares::StaleIdChecker do
       context[:results] << double('instance', :id => 24)
       context[:results] << double('instance', :id => 42)
 
-      app.should_receive(:call)
+      expect(app).to receive(:call)
 
       middleware.call [context]
     end
@@ -37,11 +37,11 @@ describe ThinkingSphinx::Middlewares::StaleIdChecker do
       context[:results] << double('instance', :id => 24)
       context[:results] << nil
 
-      lambda {
+      expect {
         middleware.call [context]
-      }.should raise_error(ThinkingSphinx::Search::StaleIdsException) { |err|
-        err.ids.should == [42]
-        err.context.should == context
+      }.to raise_error(ThinkingSphinx::Search::StaleIdsException) { |err|
+        expect(err.ids).to eq([42])
+        expect(err.context).to eq(context)
       }
     end
   end

data/spec/thinking_sphinx/middlewares/stale_id_filter_spec.rb

@@ -15,12 +15,12 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
 
   describe '#call' do
     before :each do
-      context.stub :search => search
+      allow(context).to receive_messages :search => search
     end
 
     context 'one stale ids exception' do
       before :each do
-        app.stub(:call) do
+        allow(app).to receive(:call) do
           @calls ||= 0
           @calls += 1
           raise ThinkingSphinx::Search::StaleIdsException.new([12], context) if @calls == 1
@@ -30,7 +30,7 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
       it "appends the ids to the without_ids filter" do
         middleware.call [context]
 
-        search.options[:without_ids].should == [12]
+        expect(search.options[:without_ids]).to eq([12])
       end
 
       it "respects existing without_ids filters" do
@@ -38,13 +38,13 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
 
         middleware.call [context]
 
-        search.options[:without_ids].should == [11, 12]
+        expect(search.options[:without_ids]).to eq([11, 12])
       end
     end
 
     context  'two stale ids exceptions' do
       before :each do
-        app.stub(:call) do
+        allow(app).to receive(:call) do
           @calls ||= 0
           @calls += 1
           raise ThinkingSphinx::Search::StaleIdsException.new([12], context) if @calls == 1
@@ -55,7 +55,7 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
       it "appends the ids to the without_ids filter" do
         middleware.call [context]
 
-        search.options[:without_ids].should == [12, 13]
+        expect(search.options[:without_ids]).to eq([12, 13])
       end
 
       it "respects existing without_ids filters" do
@@ -63,13 +63,13 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
 
         middleware.call [context]
 
-        search.options[:without_ids].should == [11, 12, 13]
+        expect(search.options[:without_ids]).to eq([11, 12, 13])
       end
     end
 
     context 'three stale ids exceptions' do
       before :each do
-        app.stub(:call) do
+        allow(app).to receive(:call) do
           @calls ||= 0
           @calls += 1
 
@@ -80,10 +80,10 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
       end
 
       it "raises the final stale ids exceptions" do
-        lambda {
+        expect {
           middleware.call [context]
-        }.should raise_error(ThinkingSphinx::Search::StaleIdsException) { |err|
-          err.ids.should == [14]
+        }.to raise_error(ThinkingSphinx::Search::StaleIdsException) { |err|
+          expect(err.ids).to eq([14])
         }
       end
     end
@@ -92,8 +92,8 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
       let(:context2) { {:raw => [], :results => []} }
       let(:search2) { double('search2', :options => {}) }
       before :each do
-        context2.stub :search => search2
-        app.stub(:call) do
+        allow(context2).to receive_messages :search => search2
+        allow(app).to receive(:call) do
           @calls ||= 0
           @calls += 1
           raise ThinkingSphinx::Search::StaleIdsException.new([12], context2) if @calls == 1
@@ -102,8 +102,8 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
 
       it "appends the ids to the without_ids filter in the correct context" do
         middleware.call [context, context2]
-        search.options[:without_ids].should == nil
-        search2.options[:without_ids].should == [12]
+        expect(search.options[:without_ids]).to eq(nil)
+        expect(search2.options[:without_ids]).to eq([12])
       end
     end
 

data/spec/thinking_sphinx/panes/attributes_pane_spec.rb

@@ -15,7 +15,7 @@ describe ThinkingSphinx::Panes::AttributesPane do
     it "returns the object's sphinx attributes by default" do
       raw['foo'] = 24
 
-      pane.sphinx_attributes.should == {'foo' => 24}
+      expect(pane.sphinx_attributes).to eq({'foo' => 24})
     end
   end
 end

data/spec/thinking_sphinx/panes/distance_pane_spec.rb

@@ -15,13 +15,13 @@ describe ThinkingSphinx::Panes::DistancePane do
     it "returns the object's geodistance attribute by default" do
       raw['geodist'] = 123.45
 
-      pane.distance.should == 123.45
+      expect(pane.distance).to eq(123.45)
     end
 
     it "converts string geodistances to floats" do
       raw['geodist'] = '123.450'
 
-      pane.distance.should == 123.45
+      expect(pane.distance).to eq(123.45)
     end
   end
 
@@ -29,13 +29,13 @@ describe ThinkingSphinx::Panes::DistancePane do
     it "returns the object's geodistance attribute by default" do
       raw['geodist'] = 123.45
 
-      pane.geodist.should == 123.45
+      expect(pane.geodist).to eq(123.45)
     end
 
     it "converts string geodistances to floats" do
       raw['geodist'] = '123.450'
 
-      pane.geodist.should == 123.45
+      expect(pane.geodist).to eq(123.45)
     end
   end
 end

data/spec/thinking_sphinx/panes/excerpts_pane_spec.rb

@@ -13,7 +13,7 @@ describe ThinkingSphinx::Panes::ExcerptsPane do
   let(:search)  { double('search', :query => 'foo', :options => {}) }
 
   before :each do
-    context.stub :search => search
+    allow(context).to receive_messages :search => search
   end
 
   describe '#excerpts' do
@@ -22,18 +22,18 @@ describe ThinkingSphinx::Panes::ExcerptsPane do
 
     before :each do
       stub_const 'ThinkingSphinx::Excerpter', double(:new => excerpter)
-      ThinkingSphinx::Panes::ExcerptsPane::Excerpts.stub :new => excerpts
+      allow(ThinkingSphinx::Panes::ExcerptsPane::Excerpts).to receive_messages :new => excerpts
     end
 
     it "returns an excerpt glazing" do
-      pane.excerpts.should == excerpts
+      expect(pane.excerpts).to eq(excerpts)
     end
 
     it "creates an excerpter with the first index and the query and conditions values" do
       context[:indices] = [double(:name => 'alpha'), double(:name => 'beta')]
       context.search.options[:conditions] = {:baz => 'bar'}
 
-      ThinkingSphinx::Excerpter.should_receive(:new).
+      expect(ThinkingSphinx::Excerpter).to receive(:new).
         with('alpha', 'foo bar', anything).and_return(excerpter)
 
       pane.excerpts
@@ -42,7 +42,7 @@ describe ThinkingSphinx::Panes::ExcerptsPane do
     it "passes through excerpts options" do
       search.options[:excerpts] = {:before_match => 'foo'}
 
-      ThinkingSphinx::Excerpter.should_receive(:new).
+      expect(ThinkingSphinx::Excerpter).to receive(:new).
         with(anything, anything, :before_match => 'foo').and_return(excerpter)
 
       pane.excerpts

data/spec/thinking_sphinx/panes/weight_pane_spec.rb

@@ -14,7 +14,7 @@ describe ThinkingSphinx::Panes::WeightPane do
     it "returns the object's weight by default" do
       raw[ThinkingSphinx::SphinxQL.weight[:column]] = 101
 
-      pane.weight.should == 101
+      expect(pane.weight).to eq(101)
     end
   end
 end

data/spec/thinking_sphinx/rake_interface_spec.rb

@@ -5,31 +5,31 @@ describe ThinkingSphinx::RakeInterface do
   let(:interface)     { ThinkingSphinx::RakeInterface.new }
 
   before :each do
-    ThinkingSphinx::Configuration.stub :instance => configuration
-    interface.stub(:puts => nil)
+    allow(ThinkingSphinx::Configuration).to receive_messages :instance => configuration
+    allow(interface).to receive_messages(:puts => nil)
   end
 
   describe '#clear_all' do
     let(:controller) { double 'controller' }
 
     before :each do
-      configuration.stub(
+      allow(configuration).to receive_messages(
         :indices_location => '/path/to/indices',
         :searchd          => double(:binlog_path => '/path/to/binlog')
       )
 
-      FileUtils.stub :rm_r => true
-      File.stub :exists? => true
+      allow(FileUtils).to receive_messages :rm_r => true
+      allow(File).to receive_messages :exists? => true
     end
 
     it "removes the directory for the index files" do
-      FileUtils.should_receive(:rm_r).with('/path/to/indices')
+      expect(FileUtils).to receive(:rm_r).with('/path/to/indices')
 
       interface.clear_all
     end
 
     it "removes the directory for the binlog files" do
-      FileUtils.should_receive(:rm_r).with('/path/to/binlog')
+      expect(FileUtils).to receive(:rm_r).with('/path/to/binlog')
 
       interface.clear_all
     end
@@ -42,31 +42,32 @@ describe ThinkingSphinx::RakeInterface do
     }
 
     before :each do
-      configuration.stub(
-        :indices => [double(:type => 'plain'), index],
-        :searchd => double(:binlog_path => '/path/to/binlog')
+      allow(configuration).to receive_messages(
+        :indices         => [double(:type => 'plain'), index],
+        :searchd         => double(:binlog_path => '/path/to/binlog'),
+        :preload_indices => true
       )
 
-      Dir.stub :[] => ['foo.a', 'foo.b']
-      FileUtils.stub :rm_r => true, :rm => true
-      File.stub :exists? => true
+      allow(Dir).to receive_messages :[] => ['foo.a', 'foo.b']
+      allow(FileUtils).to receive_messages :rm_r => true, :rm => true
+      allow(File).to receive_messages :exists? => true
     end
 
     it 'finds each file for real-time indices' do
-      Dir.should_receive(:[]).with('/path/to/my/index.*').and_return([])
+      expect(Dir).to receive(:[]).with('/path/to/my/index.*').and_return([])
 
       interface.clear_real_time
     end
 
     it "removes each file for real-time indices" do
-      FileUtils.should_receive(:rm).with('foo.a')
-      FileUtils.should_receive(:rm).with('foo.b')
+      expect(FileUtils).to receive(:rm).with('foo.a')
+      expect(FileUtils).to receive(:rm).with('foo.b')
 
       interface.clear_real_time
     end
 
     it "removes the directory for the binlog files" do
-      FileUtils.should_receive(:rm_r).with('/path/to/binlog')
+      expect(FileUtils).to receive(:rm_r).with('/path/to/binlog')
 
       interface.clear_real_time
     end
@@ -76,20 +77,20 @@ describe ThinkingSphinx::RakeInterface do
     let(:controller) { double('controller') }
 
     before :each do
-      configuration.stub(
+      allow(configuration).to receive_messages(
         :configuration_file => '/path/to/foo.conf',
         :render_to_file     => true
       )
     end
 
     it "renders the configuration to a file" do
-      configuration.should_receive(:render_to_file)
+      expect(configuration).to receive(:render_to_file)
 
       interface.configure
     end
 
     it "prints a message stating the file is being generated" do
-      interface.should_receive(:puts).
+      expect(interface).to receive(:puts).
         with('Generating configuration to /path/to/foo.conf')
 
       interface.configure
@@ -100,30 +101,30 @@ describe ThinkingSphinx::RakeInterface do
     let(:controller) { double('controller', :index => true) }
 
     before :each do
-      ThinkingSphinx.stub :before_index_hooks => []
-      configuration.stub(
+      allow(ThinkingSphinx).to receive_messages :before_index_hooks => []
+      allow(configuration).to receive_messages(
         :configuration_file => '/path/to/foo.conf',
         :render_to_file     => true,
         :indices_location   => '/path/to/indices'
       )
 
-      FileUtils.stub :mkdir_p => true
+      allow(FileUtils).to receive_messages :mkdir_p => true
     end
 
     it "renders the configuration to a file by default" do
-      configuration.should_receive(:render_to_file)
+      expect(configuration).to receive(:render_to_file)
 
       interface.index
     end
 
     it "does not render the configuration if requested" do
-      configuration.should_not_receive(:render_to_file)
+      expect(configuration).not_to receive(:render_to_file)
 
       interface.index false
     end
 
     it "creates the directory for the index files" do
-      FileUtils.should_receive(:mkdir_p).with('/path/to/indices')
+      expect(FileUtils).to receive(:mkdir_p).with('/path/to/indices')
 
       interface.index
     end
@@ -134,66 +135,73 @@ describe ThinkingSphinx::RakeInterface do
 
       interface.index
 
-      called.should be_true
+      expect(called).to be_truthy
     end
 
     it "indexes all indices verbosely" do
-      controller.should_receive(:index).with(:verbose => true)
+      expect(controller).to receive(:index).with(:verbose => true)
 
       interface.index
     end
 
     it "does not index verbosely if requested" do
-      controller.should_receive(:index).with(:verbose => false)
+      expect(controller).to receive(:index).with(:verbose => false)
 
       interface.index true, false
     end
   end
 
   describe '#start' do
-    let(:controller) { double('controller', :start => true, :pid => 101) }
+    let(:controller) { double('controller', :start => result, :pid => 101) }
+    let(:result)     { double 'result', :command => 'start', :status => 1,
+      :output => '' }
 
     before :each do
-      controller.stub(:running?).and_return(false, true)
-      configuration.stub :indices_location => 'my/index/files'
+      allow(controller).to receive(:running?).and_return(false, true)
+      allow(configuration).to receive_messages(
+        :indices_location => 'my/index/files',
+        :searchd          => double(:log => '/path/to/log')
+      )
 
-      FileUtils.stub :mkdir_p => true
+      allow(FileUtils).to receive_messages :mkdir_p => true
     end
 
     it "creates the index files directory" do
-      FileUtils.should_receive(:mkdir_p).with('my/index/files')
+      expect(FileUtils).to receive(:mkdir_p).with('my/index/files')
 
       interface.start
     end
 
     it "starts the daemon" do
-      controller.should_receive(:start)
+      expect(controller).to receive(:start)
 
       interface.start
     end
 
     it "raises an error if the daemon is already running" do
-      controller.stub :running? => true
+      allow(controller).to receive_messages :running? => true
 
-      lambda {
+      expect {
         interface.start
-      }.should raise_error(RuntimeError)
+      }.to raise_error(ThinkingSphinx::SphinxAlreadyRunning)
     end
 
     it "prints a success message if the daemon has started" do
-      controller.stub(:running?).and_return(false, true)
+      allow(controller).to receive(:running?).and_return(false, true)
 
-      interface.should_receive(:puts).
+      expect(interface).to receive(:puts).
         with('Started searchd successfully (pid: 101).')
 
       interface.start
     end
 
     it "prints a failure message if the daemon does not start" do
-      controller.stub(:running?).and_return(false, false)
+      allow(controller).to receive(:running?).and_return(false, false)
+      allow(interface).to receive(:exit)
 
-      interface.should_receive(:puts).
-        with('Failed to start searchd. Check the log files for more information.')
+      expect(interface).to receive(:puts) do |string|
+        expect(string).to match('The Sphinx start command failed')
+      end
 
       interface.start
     end
@@ -201,33 +209,38 @@ describe ThinkingSphinx::RakeInterface do
 
   describe '#stop' do
     let(:controller) { double('controller', :stop => true, :pid => 101) }
+    let(:result)     { double 'result', :command => 'start', :status => 1,
+      :output => '' }
 
     before :each do
-      controller.stub :running? => true
+      allow(controller).to receive(:running?).and_return(true, true, false)
     end
 
     it "prints a message if the daemon is not already running" do
-      controller.stub :running? => false
+      allow(controller).to receive_messages :running? => false
 
-      interface.should_receive(:puts).with('searchd is not currently running.')
+      expect(interface).to receive(:puts).with('searchd is not currently running.')
 
       interface.stop
     end
 
     it "stops the daemon" do
-      controller.should_receive(:stop)
+      expect(controller).to receive(:stop)
 
       interface.stop
     end
 
     it "prints a message informing the daemon has stopped" do
-      interface.should_receive(:puts).with('Stopped searchd daemon (pid: 101).')
+      expect(interface).to receive(:puts).with('Stopped searchd daemon (pid: 101).')
 
       interface.stop
     end
 
     it "should retry stopping the daemon until it stops" do
-      controller.should_receive(:stop).twice.and_return(false, true)
+      allow(controller).to receive(:running?).
+        and_return(true, true, true, false)
+
+      expect(controller).to receive(:stop).twice
 
       interface.stop
     end
@@ -237,18 +250,18 @@ describe ThinkingSphinx::RakeInterface do
     let(:controller) { double('controller') }
 
     it "reports when the daemon is running" do
-      controller.stub :running? => true
+      allow(controller).to receive_messages :running? => true
 
-      interface.should_receive(:puts).
+      expect(interface).to receive(:puts).
         with('The Sphinx daemon searchd is currently running.')
 
       interface.status
     end
 
     it "reports when the daemon is not running" do
-      controller.stub :running? => false
+      allow(controller).to receive_messages :running? => false
 
-      interface.should_receive(:puts).
+      expect(interface).to receive(:puts).
         with('The Sphinx daemon searchd is not currently running.')
 
       interface.status