riddle 1.5.1 → 1.5.2

data/spec/fixtures/sphinxapi.2.0.1.php

@@ -124,7 +124,7 @@ define ( "SPH_GROUPBY_ATTRPAIR",	5 );
 function sphPackI64 ( $v )
 {
 	assert ( is_numeric($v) );
-	
+
 	// x64
 	if ( PHP_INT_SIZE>=8 )
 	{
@@ -136,7 +136,7 @@ function sphPackI64 ( $v )
 	if ( is_int($v) )
 		return pack ( "NN", $v < 0 ? -1 : 0, $v );
 
-	// x32, bcmath	
+	// x32, bcmath
 	if ( function_exists("bcmul") )
 	{
 		if ( bccomp ( $v, 0 ) == -1 )
@@ -173,16 +173,16 @@ function sphPackI64 ( $v )
 function sphPackU64 ( $v )
 {
 	assert ( is_numeric($v) );
-	
+
 	// x64
 	if ( PHP_INT_SIZE>=8 )
 	{
 		assert ( $v>=0 );
-		
+
 		// x64, int
 		if ( is_int($v) )
 			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
-						  
+
 		// x64, bcmath
 		if ( function_exists("bcmul") )
 		{
@@ -190,12 +190,12 @@ function sphPackU64 ( $v )
 			$l = bcmod ( $v, 4294967296 );
 			return pack ( "NN", $h, $l );
 		}
-		
+
 		// x64, no-bcmath
 		$p = max ( 0, strlen($v) - 13 );
 		$lo = (int)substr ( $v, $p );
 		$hi = (int)substr ( $v, 0, $p );
-	
+
 		$m = $lo + $hi*1316134912;
 		$l = $m % 4294967296;
 		$h = $hi*2328 + (int)($m/4294967296);
@@ -206,7 +206,7 @@ function sphPackU64 ( $v )
 	// x32, int
 	if ( is_int($v) )
 		return pack ( "NN", 0, $v );
-	
+
 	// x32, bcmath
 	if ( function_exists("bcmul") )
 	{
@@ -219,7 +219,7 @@ function sphPackU64 ( $v )
 	$p = max(0, strlen($v) - 13);
 	$lo = (float)substr($v, $p);
 	$hi = (float)substr($v, 0, $p);
-	
+
 	$m = $lo + $hi*1316134912.0;
 	$q = floor($m / 4294967296.0);
 	$l = $m - ($q * 4294967296.0);
@@ -275,11 +275,11 @@ function sphUnpackU64 ( $v )
 	// x32, bcmath
 	if ( function_exists("bcmul") )
 		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
-	
+
 	// x32, no-bcmath
 	$hi = (float)$hi;
 	$lo = (float)$lo;
-	
+
 	$q = floor($hi/10000000.0);
 	$r = $hi - $q*10000000.0;
 	$m = $lo + $r*4967296.0;
@@ -322,7 +322,7 @@ function sphUnpackI64 ( $v )
 			return $lo;
 		return sprintf ( "%.0f", $lo - 4294967296.0 );
 	}
-	
+
 	$neg = "";
 	$c = 0;
 	if ( $hi<0 )
@@ -331,7 +331,7 @@ function sphUnpackI64 ( $v )
 		$lo = ~$lo;
 		$c = 1;
 		$neg = "-";
-	}	
+	}
 
 	$hi = sprintf ( "%u", $hi );
 	$lo = sprintf ( "%u", $lo );
@@ -343,7 +343,7 @@ function sphUnpackI64 ( $v )
 	// x32, no-bcmath
 	$hi = (float)$hi;
 	$lo = (float)$lo;
-	
+
 	$q = floor($hi/10000000.0);
 	$r = $hi - $q*10000000.0;
 	$m = $lo + $r*4967296.0;
@@ -444,7 +444,7 @@ class SphinxClient
 		$this->_filters		= array ();
 		$this->_groupby		= "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
+		$this->_groupsort	= "@weight DESC";
 		$this->_groupdistinct= "";
 		$this->_maxmatches	= 1000;
 		$this->_cutoff		= 0;
@@ -506,7 +506,7 @@ class SphinxClient
 			$this->_path = $host;
 			return;
 		}
-				
+
 		assert ( is_int($port) );
 		$this->_host = $host;
 		$this->_port = $port;
@@ -586,14 +586,14 @@ class SphinxClient
 			$fp = @fsockopen ( $host, $port, $errno, $errstr );
 		else
 			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
-		
+
 		if ( !$fp )
 		{
 			if ( $this->_path )
 				$location = $this->_path;
 			else
 				$location = "{$this->_host}:{$this->_port}";
-			
+
 			$errstr = trim ( $errstr );
 			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
 			$this->_connerror = true;
@@ -932,7 +932,7 @@ class SphinxClient
 	{
 		$this->_groupby		= "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
+		$this->_groupsort	= "@weight DESC";
 		$this->_groupdistinct= "";
 	}
 
@@ -1227,7 +1227,7 @@ class SphinxClient
 					if ( $type==SPH_ATTR_FLOAT )
 					{
 						list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) ); 
+						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) );
 						$attrvals[$attr] = $fval;
 						continue;
 					}
@@ -1246,7 +1246,7 @@ class SphinxClient
 					} else if ( $type==SPH_ATTR_STRING )
 					{
 						$attrvals[$attr] = substr ( $response, $p, $val );
-						$p += $val;						
+						$p += $val;
 					} else
 					{
 						$attrvals[$attr] = sphFixUint($val);
@@ -1418,7 +1418,7 @@ class SphinxClient
 
     // Commented out for testing Riddle
     // $this->_MBPush ();
-    // 
+    //
     // if (!( $fp = $this->_Connect() ))
     // {
     //  $this->_MBPop();
@@ -1433,7 +1433,7 @@ class SphinxClient
 		$req  = pack ( "N", strlen($query) ) . $query; // req query
 		$req .= pack ( "N", strlen($index) ) . $index; // req index
 		$req .= pack ( "N", (int)$hits );
-		
+
 		// Line for testing Riddle:
 		return $req;
 
@@ -1556,7 +1556,7 @@ class SphinxClient
 						$req .= pack ( "N", $vv );
 			}
 		}
-		
+
 		// Line for testing Riddle:
 		return $req;
 
@@ -1620,7 +1620,7 @@ class SphinxClient
 
 		fclose ( $this->_socket );
 		$this->_socket = false;
-		
+
 		return true;
 	}
 
@@ -1691,7 +1691,7 @@ class SphinxClient
 		$this->_MBPop ();
 		return $tag;
 	}
-	
+
 	// Added for Riddle - code is taken from AddQuery
 	function FilterOutput()
 	{
@@ -1721,7 +1721,7 @@ class SphinxClient
 			}
 			$req .= pack ( "N", $filter["exclude"] );
 		}
-		
+
 		return $req;
 	}
 }

data/spec/fixtures/sphinxapi.2.1.0.php

@@ -447,7 +447,7 @@ class SphinxClient
 		$this->_filters		= array ();
 		$this->_groupby		= "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
+		$this->_groupsort	= "@weight DESC";
 		$this->_groupdistinct= "";
 		$this->_maxmatches	= 1000;
 		$this->_cutoff		= 0;
@@ -938,7 +938,7 @@ class SphinxClient
 	{
 		$this->_groupby		= "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
+		$this->_groupsort	= "@weight DESC";
 		$this->_groupdistinct= "";
 	}
 

data/spec/riddle/auto_version_spec.rb

@@ -50,6 +50,20 @@ describe Riddle::AutoVersion do
       Riddle::AutoVersion.configure
     end
 
+    it "should require 2.0.1 if 2.0.2-dev is being used" do
+      Riddle::AutoVersion.should_receive(:require).with('riddle/2.0.1')
+
+      @controller.stub!(:sphinx_version => '2.0.2-dev')
+      Riddle::AutoVersion.configure
+    end
+
+    it "should require 2.1.0 if 2.0.3 is being used" do
+      Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
+
+      @controller.stub!(:sphinx_version => '2.0.3-release')
+      Riddle::AutoVersion.configure
+    end
+
     it "should require 2.1.0 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
 

data/spec/riddle/query_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Riddle::Query, :live => true do
   describe '.connection' do
     let(:connection) { Riddle::Query.connection 'localhost', 9306 }
-    
+
     it "returns a MySQL Client" do
       connection.should be_a(Mysql2::Client)
     end
-    
+
     it "should handle search requests" do
       connection.query(Riddle::Query.tables).to_a[0].should == {
         'Index' => 'people', 'Type' => 'local'
@@ -21,35 +21,40 @@ describe Riddle::Query do
     it 'handles a single value' do
       Riddle::Query.set('foo', 'bar').should == 'SET GLOBAL foo = bar'
     end
-    
+
     it 'handles multiple values' do
       Riddle::Query.set('foo', [1, 2, 3]).should == 'SET GLOBAL foo = (1, 2, 3)'
     end
-    
+
     it 'handles non-global settings' do
       Riddle::Query.set('foo', 'bar', false).should == 'SET foo = bar'
     end
   end
-  
+
   describe '.snippets' do
     it 'handles a basic request' do
       Riddle::Query.snippets('foo bar baz', 'foo_core', 'foo').
         should == "CALL SNIPPETS('foo bar baz', 'foo_core', 'foo')"
     end
-    
+
     it 'handles a request with options' do
       Riddle::Query.snippets('foo bar baz', 'foo_core', 'foo', :around => 5).
         should == "CALL SNIPPETS('foo bar baz', 'foo_core', 'foo', 5 AS around)"
     end
+
+    it 'handles string options' do
+      Riddle::Query.snippets('foo bar baz', 'foo_core', 'foo',
+        :before_match => '<strong>').should == "CALL SNIPPETS('foo bar baz', 'foo_core', 'foo', '<strong>' AS before_match)"
+    end
   end
-  
+
   describe '.create_function' do
     it 'handles a basic create request' do
       Riddle::Query.create_function('foo', :bigint, 'foo.sh').
         should == "CREATE FUNCTION foo RETURNS BIGINT SONAME 'foo.sh'"
     end
   end
-  
+
   describe '.update' do
     it 'handles a basic update request' do
       Riddle::Query.update('foo_core', 5, :deleted => 1).

data/spec/unit/client_spec.rb

@@ -265,4 +265,26 @@ describe Riddle::Client do
       }.should raise_error(Riddle::ConnectionError)
     end unless RUBY_PLATFORM == 'java' # JRuby doesn't like Timeout
   end
+
+  it "should fail if the server has the wrong version" do
+    client = Riddle::Client.new
+    client.port     = 9314
+    client.timeout  = 1
+
+    server = TCPServer.new "localhost", 9314
+
+    thread = Thread.new do
+      client = server.accept
+      client.send [0].pack("N"), 0
+      client.close
+    end
+
+    lambda {
+      client.send(:connect) { |socket| }
+    }.should raise_error(Riddle::VersionError)
+
+    thread.exit
+    server.close
+  end
+
 end

metadata

@@ -1,56 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: riddle
-version: !ruby/object:Gem::Version
-  version: 1.5.1
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 1
+  - 5
+  - 2
+  version: 1.5.2
 platform: ruby
-authors:
+authors: 
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70316764766880 !ruby/object:Gem::Requirement
+
+date: 2012-05-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-  type: :development
+  version_requirements: *id001
   prerelease: false
-  version_requirements: *70316764766880
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70316764765360 !ruby/object:Gem::Requirement
+  name: rake
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-  type: :development
+  version_requirements: *id002
   prerelease: false
-  version_requirements: *70316764765360
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70316764763300 !ruby/object:Gem::Requirement
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
-  type: :development
+  version_requirements: *id003
   prerelease: false
-  version_requirements: *70316764763300
+  name: yard
 description: A Ruby API and configuration helper for the Sphinx search service.
-email:
+email: 
 - pat@freelancing-gods.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -252,35 +276,38 @@ files:
 - spec/unit/riddle_spec.rb
 homepage: http://freelancing-god.github.com/riddle/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -2420399523402402729
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -2420399523402402729
+      version: "0"
 requirements: []
+
 rubyforge_project: riddle
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: An API for Sphinx, written in and for Ruby.
-test_files:
+test_files: 
 - spec/fixtures/.gitignore
 - spec/fixtures/data/0.9.9/anchor.bin
 - spec/fixtures/data/0.9.9/any.bin