sphinx 0.9.10.2122 → 2.1.1.3711

data/spec/client_validations_spec.rb

@@ -4,7 +4,7 @@ describe Sphinx::Client, 'disconnected' do
   before :each do
     @sphinx = Sphinx::Client.new
   end
-  
+
   context 'in SetServer method' do
     it 'should raise an error when host is not String' do
       expect {
@@ -66,7 +66,7 @@ describe Sphinx::Client, 'disconnected' do
       }.to raise_error(ArgumentError)
     end
   end
-  
+
   context 'in SetLimits method' do
     it 'should raise an error when offset is not Integer' do
       expect {
@@ -131,7 +131,7 @@ describe Sphinx::Client, 'disconnected' do
       }.to raise_error(ArgumentError)
     end
   end
-  
+
   context 'in SetMatchMode method' do
     it 'should raise an error when mode is not Integer, String or Symbol' do
       expect {
@@ -174,8 +174,14 @@ describe Sphinx::Client, 'disconnected' do
         @sphinx.SetRankingMode(100)
       }.to raise_error(ArgumentError)
     end
+
+    it 'should raise an error when ranker is expr and expression is not specified' do
+      expect {
+        @sphinx.SetRankingMode(:expr)
+      }.to raise_error(ArgumentError)
+    end
   end
-  
+
   context 'in SetSortMode method' do
     it 'should raise an error when mode is not Integer, String or Symbol' do
       expect {
@@ -209,7 +215,7 @@ describe Sphinx::Client, 'disconnected' do
       }.to raise_error(ArgumentError)
     end
   end
-  
+
   context 'in SetWeights method' do
     it 'should raise an error when weights is not Array' do
       expect {
@@ -694,7 +700,7 @@ describe Sphinx::Client, 'disconnected' do
       }.to_not raise_error(ArgumentError)
     end
   end
-  
+
   context 'in SetSelect method' do
     it 'should raise an error when select is not String' do
       expect {
@@ -710,7 +716,55 @@ describe Sphinx::Client, 'disconnected' do
       }.to_not raise_error(ArgumentError)
     end
   end
-  
+
+  context 'in SetQueryFlag method' do
+    it 'should raise an error when unknown flag passed' do
+      expect {
+        @sphinx.SetQueryFlag('unknown', 1)
+      }.to raise_error(ArgumentError)
+    end
+
+    [ :reverse_scan, :sort_method, :max_predicted_time, :boolean_simplify, :idf ].each do |flag|
+      it "should raise an error when #{flag} flag has incorrect value" do
+        expect {
+          @sphinx.SetQueryFlag(flag, 'invalid')
+        }.to raise_error(ArgumentError)
+      end
+    end
+
+    it "should raise an error when :max_predicted_time flag has negative value" do
+      expect {
+        @sphinx.SetQueryFlag(:max_predicted_time, -1)
+      }.to raise_error(ArgumentError)
+    end
+  end
+
+  context 'in SetOuterSelect method' do
+    it 'should raise an error when orderby is not a String' do
+      expect {
+        @sphinx.SetOuterSelect([], 0, 1)
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'should raise an error when offset is not an Integer' do
+      expect {
+        @sphinx.SetOuterSelect('sortby', 'a', 1)
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'should raise an error when offset is negative' do
+      expect {
+        @sphinx.SetOuterSelect('sortby', -1, 1)
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'should raise an error when limit is less than 1' do
+      expect {
+        @sphinx.SetOuterSelect('sortby', 1, 0)
+      }.to raise_error(ArgumentError)
+    end
+  end
+
   context 'in BuildExcerpts method' do
     it 'should raise an error when docs is not Array of Strings' do
       expect {

data/spec/fixtures/{default_search.php → requests/php/default_search.php}

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

data/spec/fixtures/{default_search_index.php → 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');

data/spec/fixtures/{excerpt_custom.php → 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',

data/spec/fixtures/{excerpt_default.php → 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');

data/spec/fixtures/{excerpt_flags.php → 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,

data/spec/fixtures/{field_weights.php → 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));

data/spec/fixtures/{filter.php → 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));

data/spec/fixtures/{filter_exclude.php → 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);

data/spec/fixtures/{filter_float_range.php → 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);

data/spec/fixtures/{filter_float_range_exclude.php → 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);

data/spec/fixtures/{filter_range.php → 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);

data/spec/fixtures/{filter_range_exclude.php → 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);

data/spec/fixtures/{filter_range_int64.php → 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);

data/spec/fixtures/{filter_ranges.php → 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);

data/spec/fixtures/{filters.php → 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));

data/spec/fixtures/{filters_different.php → 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);

data/spec/fixtures/{geo_anchor.php → 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);

data/spec/fixtures/{group_by_attr.php → 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);

data/spec/fixtures/{group_by_attrpair.php → 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);

data/spec/fixtures/{group_by_day.php → 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);

data/spec/fixtures/{group_by_day_sort.php → 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');

data/spec/fixtures/{group_by_month.php → requests/php/group_by_month.php}

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

data/spec/fixtures/{group_by_week.php → requests/php/group_by_week.php}

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

data/spec/fixtures/{group_by_year.php → requests/php/group_by_year.php}

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

data/spec/fixtures/{group_distinct.php → requests/php/group_distinct.php}

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

data/spec/fixtures/{id_range.php → requests/php/id_range.php}

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

data/spec/fixtures/{id_range64.php → requests/php/id_range64.php}

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

data/spec/fixtures/{index_weights.php → requests/php/index_weights.php}

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