Refactored specs so live sphinx index is not needed during testing

.gitignore

@@ -1,4 +1,7 @@
-rdoc
-doc
 .yardoc
+.DS_Store
+.bundle
+.rvmrc
+Gemfile.lock
+doc
 pkg

Rakefile

@@ -19,3 +19,28 @@ end
 
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+namespace :fixtures do
+  desc 'Update textures for sphinx requests'
+  task :requests do
+    Dir["#{File.dirname(__FILE__)}/spec/fixtures/requests/php/*.php"].each do |file|
+      puts name = File.basename(file, '.php')
+      File.open(File.join(File.dirname(file), '..', "#{name}.dat"), 'w') do |f|
+        f.write `env SPHINX_MOCK_REQUEST=1 php "#{file}"`
+      end
+    end
+  end
+
+  desc 'Update textures for sphinx responses'
+  task :responses do
+    Dir["#{File.dirname(__FILE__)}/spec/fixtures/responses/php/*.php"].each do |file|
+      puts name = File.basename(file, '.php')
+      File.open(File.join(File.dirname(file), '..', "#{name}.dat"), 'w') do |f|
+        f.write `env SPHINX_MOCK_RESPONSE=1 php "#{file}"`
+      end
+    end
+  end
+end
+
+desc 'Update binary fixtures'
+task :fixtures => %w[ fixtures:requests fixtures:responses]

spec/client_response_spec.rb

@@ -6,14 +6,23 @@
   before :each do
     @sphinx = Sphinx::Client.new
   end
-
+
+  def mock_sphinx_response(fixture)
+    response = sphinx_fixture(fixture, :response)
+    @sock = SphinxFakeSocket.new(response, 'rb')
+    servers = @sphinx.instance_variable_get(:@servers)
+    servers.first.stub(:get_socket => @sock, :free_socket => nil)
+  end
+
   context 'in Query method' do
     it 'should parse response' do
+      mock_sphinx_response('query')
       result = @sphinx.Query('wifi', 'test1')
       validate_results_wifi(result)
     end
 
     it 'should process 64-bit keys' do
+      mock_sphinx_response('query_id64')
       result = @sphinx.Query('wifi', 'test2')
       result['total_found'].should == 3
       result['matches'].length.should == 3
@@ -23,13 +32,15 @@
     end
 
     it 'should process errors in Query method' do
+      mock_sphinx_response('query_error')
       @sphinx.Query('wifi', 'fakeindex').should be_false
-      @sphinx.GetLastError.should_not be_empty
+      @sphinx.GetLastError.should =~ /unknown local index/
     end
   end
-  
+
   context 'in RunQueries method' do
     it 'should parse batch-query responce' do
+      mock_sphinx_response('run_queries')
       @sphinx.AddQuery('wifi', 'test1')
       @sphinx.AddQuery('gprs', 'test1')
       results = @sphinx.RunQueries
@@ -39,6 +50,7 @@
     end
 
     it 'should process errors in RunQueries method' do
+      mock_sphinx_response('run_queries_error')
       @sphinx.AddQuery('wifi', 'fakeindex')
       r = @sphinx.RunQueries
       r[0]['error'].should_not be_empty
@@ -47,13 +59,15 @@
 
   context 'in BuildExcerpts method' do
     it 'should parse response' do
+      mock_sphinx_response('build_excerpts')
       result = @sphinx.BuildExcerpts(['what the world', 'London is the capital of Great Britain'], 'test1', 'the')
       result.should == ['what <b>the</b> world', 'London is <b>the</b> capital of Great Britain']
     end
   end
 
   context 'in BuildKeywords method' do
     it 'should parse response' do
+      mock_sphinx_response('build_keywords')
       result = @sphinx.BuildKeywords('wifi gprs', 'test1', true)
       result.should == [
         { 'normalized' => 'wifi', 'tokenized' => 'wifi', 'hits' => 6, 'docs' => 3 },
@@ -64,21 +78,13 @@
 
   context 'in UpdateAttributes method' do
     it 'should parse response' do
+      mock_sphinx_response('update_attributes')
       @sphinx.UpdateAttributes('test1', ['group_id'], { 2 => [1] }).should == 1
-      result = @sphinx.Query('wifi', 'test1')
-      result['matches'][0]['attrs']['group_id'].should == 1
-      @sphinx.UpdateAttributes('test1', ['group_id'], { 2 => [2] }).should == 1
-      result = @sphinx.Query('wifi', 'test1')
-      result['matches'][0]['attrs']['group_id'].should == 2
     end
 
     it 'should parse response with MVA' do
+      mock_sphinx_response('update_attributes_mva')
       @sphinx.UpdateAttributes('test1', ['tags'], { 2 => [[1, 2, 3, 4, 5, 6, 7, 8, 9]] }, true).should == 1
-      result = @sphinx.Query('wifi', 'test1')
-      result['matches'][0]['attrs']['tags'].should == [1, 2, 3, 4, 5, 6, 7, 8, 9]
-      @sphinx.UpdateAttributes('test1', ['tags'], { 2 => [[5, 6, 7, 8]] }, true).should == 1
-      result = @sphinx.Query('wifi', 'test1')
-      result['matches'][0]['attrs']['tags'].should == [5, 6, 7, 8]
     end
   end
 
@@ -90,30 +96,30 @@
       socket.should be_kind_of(Sphinx::BufferedIO)
       socket.close
     end
-  
+
     it 'should produce an error when opened twice' do
       @sphinx.Open.should be_true
       @sphinx.Open.should be_false
       @sphinx.GetLastError.should == 'already connected'
-  
+
       socket = @sphinx.servers.first.instance_variable_get(:@socket)
       socket.should be_kind_of(Sphinx::BufferedIO)
       socket.close
     end
   end
-  
+
   context 'in Close method' do
     it 'should open socket' do
       @sphinx.Open.should be_true
       @sphinx.Close.should be_true
       @sphinx.servers.first.instance_variable_get(:@socket).should be_nil
     end
-  
+
     it 'should produce socket is closed' do
       @sphinx.Close.should be_false
       @sphinx.GetLastError.should == 'not connected'
       @sphinx.servers.first.instance_variable_get(:@socket).should be_nil
-  
+
       @sphinx.Open.should be_true
       @sphinx.Close.should be_true
       @sphinx.Close.should be_false
@@ -124,16 +130,18 @@
 
   context 'in Status method' do
     it 'should parse response' do
+      mock_sphinx_response('status')
       response = @sphinx.Status
       response.should be_an(Array)
       response.size.should be > 10
     end
   end
 
-  context 'in FlushAttrs method' do
+  context 'in FlushAttributes method' do
     it 'should not raise an error' do
+      mock_sphinx_response('flush_attributes')
       expect {
-        @sphinx.FlushAttrs
+        @sphinx.FlushAttributes
       }.to_not raise_error
     end
   end
@@ -155,21 +163,21 @@ def validate_results_wifi(result)
     result['matches'][0]['id'].should == 2
     result['matches'][0]['weight'].should == 2
     result['matches'][0]['attrs']['group_id'].should == 2
-    result['matches'][0]['attrs']['created_at'].should == 1175658555
+    result['matches'][0]['attrs']['created_at'].should == 1175683755
     result['matches'][0]['attrs']['tags'].should == [5, 6, 7, 8]
     ('%0.2f' % result['matches'][0]['attrs']['rating']).should == '54.85'
 
     result['matches'][1]['id'].should == 3
     result['matches'][1]['weight'].should == 2
     result['matches'][1]['attrs']['group_id'].should == 1
-    result['matches'][1]['attrs']['created_at'].should == 1175658647
+    result['matches'][1]['attrs']['created_at'].should == 1175683847
     result['matches'][1]['attrs']['tags'].should == [1, 7, 9, 10]
     ('%0.2f' % result['matches'][1]['attrs']['rating']).should == '16.25'
 
     result['matches'][2]['id'].should == 1
     result['matches'][2]['weight'].should == 1
     result['matches'][2]['attrs']['group_id'].should == 1
-    result['matches'][2]['attrs']['created_at'].should == 1175658490
+    result['matches'][2]['attrs']['created_at'].should == 1175683690
     result['matches'][2]['attrs']['tags'].should == [1, 2, 3, 4]
     ('%0.2f' % result['matches'][2]['attrs']['rating']).should == '13.32'
 

spec/client_spec.rb

@@ -130,10 +130,10 @@
         cnt = 0
         expect {
           @sphinx.send(:with_socket, @server) { cnt += 1; sleep 2 }
-        }.to raise_error(Sphinx::SphinxResponseError, 'failed to read searchd response (msg=time\'s up!)')
+        }.to raise_error(Sphinx::SphinxResponseError, 'failed to read searchd response (msg=execution expired)')
         cnt.should == 1
 
-        @sphinx.GetLastError.should == 'failed to read searchd response (msg=time\'s up!)'
+        @sphinx.GetLastError.should == 'failed to read searchd response (msg=execution expired)'
         @sphinx.IsConnectError.should be_false
       end
 

spec/fixtures/default_search.php → spec/fixtures/requests/php/default_search.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->Query('query');

spec/fixtures/default_search_index.php → spec/fixtures/requests/php/default_search_index.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->Query('query', 'index');

spec/fixtures/excerpt_custom.php → spec/fixtures/requests/php/excerpt_custom.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->BuildExcerpts(array('10', '20'), 'index', 'word1 word2', array('before_match' => 'before',

spec/fixtures/excerpt_default.php → spec/fixtures/requests/php/excerpt_default.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->BuildExcerpts(array('10', '20'), 'index', 'word1 word2');

spec/fixtures/excerpt_flags.php → spec/fixtures/requests/php/excerpt_flags.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->BuildExcerpts(array('10', '20'), 'index', 'word1 word2', array('exact_phrase'   => true,

spec/fixtures/field_weights.php → spec/fixtures/requests/php/field_weights.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFieldWeights(array('field1' => 10, 'field2' => 20));

spec/fixtures/filter.php → spec/fixtures/requests/php/filter.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilter('attr', array(10, 20, 30));

spec/fixtures/filter_exclude.php → spec/fixtures/requests/php/filter_exclude.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilter('attr', array(10, 20, 30), true);

spec/fixtures/filter_float_range.php → spec/fixtures/requests/php/filter_float_range.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilterFloatRange('attr', 10.5, 20.3);

spec/fixtures/filter_float_range_exclude.php → spec/fixtures/requests/php/filter_float_range_exclude.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilterFloatRange('attr', 10.5, 20.3, true);

spec/fixtures/filter_range.php → spec/fixtures/requests/php/filter_range.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilterRange('attr', 10, 20);

spec/fixtures/filter_range_exclude.php → spec/fixtures/requests/php/filter_range_exclude.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilterRange('attr', 10, 20, true);

spec/fixtures/filter_range_int64.php → spec/fixtures/requests/php/filter_range_int64.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilterRange('attr1', -10, 20);

spec/fixtures/filter_ranges.php → spec/fixtures/requests/php/filter_ranges.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilterRange('attr2', 30, 40);

spec/fixtures/filters.php → spec/fixtures/requests/php/filters.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilter('attr2', array(40, 50));

spec/fixtures/filters_different.php → spec/fixtures/requests/php/filters_different.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetFilterRange('attr1', 10, 20, true);

spec/fixtures/geo_anchor.php → spec/fixtures/requests/php/geo_anchor.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetGeoAnchor('attrlat', 'attrlong', 20.3, 40.7);

spec/fixtures/group_by_attr.php → spec/fixtures/requests/php/group_by_attr.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetGroupBy('attr', SPH_GROUPBY_ATTR);

spec/fixtures/group_by_attrpair.php → spec/fixtures/requests/php/group_by_attrpair.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetGroupBy('attr', SPH_GROUPBY_ATTRPAIR);

spec/fixtures/group_by_day.php → spec/fixtures/requests/php/group_by_day.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetGroupBy('attr', SPH_GROUPBY_DAY);

spec/fixtures/group_by_day_sort.php → spec/fixtures/requests/php/group_by_day_sort.php

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetGroupBy('attr', SPH_GROUPBY_DAY, 'somesort');