ultrasphinx 1.9 → 1.11

data/vendor/riddle/lib/riddle/client/response.rb

@@ -65,6 +65,16 @@ module Riddle
         return items
       end
       
+      def next_float_array
+        count = next_int
+        items = []
+        for i in 0...count
+          items << self.next_float
+        end
+        
+        return items
+      end
+      
       # Returns the length of the streamed data
       def length
         @str.length

data/vendor/riddle/spec/fixtures/data_generator.php

@@ -122,9 +122,24 @@ fclose($file);
 
 $client->SetFieldWeights(array());
 
+// comment
+$file = fopen("spec/fixtures/data/comment.bin", "w");
+fwrite($file, $client->_reqs[$client->AddQuery("test ", "*", "commenting")]);
+fclose($file);
+
 // update_simple
 $file = fopen("spec/fixtures/data/update_simple.bin", "w");
 fwrite($file, $client->UpdateAttributes("people", array("birthday"), array(1 => array(191163600))));
 fclose($file);
 
+// keywords_without_hits
+$file = fopen("spec/fixtures/data/keywords_without_hits.bin", "w");
+fwrite($file, $client->BuildKeywords("pat", "people", false));
+fclose($file);
+
+// keywords_with_hits
+$file = fopen("spec/fixtures/data/keywords_with_hits.bin", "w");
+fwrite($file, $client->BuildKeywords("pat", "people", true));
+fclose($file);
+
 ?>

data/vendor/riddle/spec/fixtures/sphinx/configuration.erb

@@ -21,10 +21,10 @@ source peoples
   sql_pass  = <%= @password %>
   sql_db    = riddle_sphinx_spec
 
-  sql_query        = SELECT id, first_name, middle_initial, last_name, gender, street_address, city, state, postcode, email, UNIX_TIMESTAMP(birthday) AS birthday FROM people WHERE id >= $start AND id <= $end
-  sql_query_range  = SELECT MIN(id), MAX(id) FROM people
-  sql_query_info   = SELECT * FROM people WHERE id = $id
-  sql_date_column  = birthday
+  sql_query           = SELECT id, first_name, middle_initial, last_name, gender, street_address, city, state, postcode, email, UNIX_TIMESTAMP(birthday) AS birthday FROM people WHERE id >= $start AND id <= $end
+  sql_query_range     = SELECT MIN(id), MAX(id) FROM people
+  sql_query_info      = SELECT * FROM people WHERE id = $id
+  sql_attr_timestamp  = birthday
 }
 
 index people

data/vendor/riddle/spec/fixtures/sphinxapi.php

@@ -1,7 +1,7 @@
 <?php
 
 //
-// $Id: sphinxapi.php 1103 2008-01-24 18:42:57Z shodan $
+// $Id: sphinxapi.php 1163 2008-02-19 21:00:40Z glook $
 //
 
 //
@@ -21,11 +21,13 @@
 define ( "SEARCHD_COMMAND_SEARCH",	0 );
 define ( "SEARCHD_COMMAND_EXCERPT",	1 );
 define ( "SEARCHD_COMMAND_UPDATE",	2 );
+define ( "SEARCHD_COMMAND_KEYWORDS",3 );
 
 /// current client-side command implementation versions
-define ( "VER_COMMAND_SEARCH",		0x112 );
+define ( "VER_COMMAND_SEARCH",		0x113 );
 define ( "VER_COMMAND_EXCERPT",		0x100 );
 define ( "VER_COMMAND_UPDATE",		0x101 );
+define ( "VER_COMMAND_KEYWORDS",	0x100 );
 
 /// known searchd status codes
 define ( "SEARCHD_OK",				0 );
@@ -591,11 +593,11 @@ class SphinxClient
 
 	/// connect to searchd server, run given search query through given indexes,
 	/// and return the search results
-	function Query ( $query, $index="*" )
+	function Query ( $query, $index="*", $comment="" )
 	{
 		assert ( empty($this->_reqs) );
 
-		$this->AddQuery ( $query, $index );
+		$this->AddQuery ( $query, $index, $comment );
 		$results = $this->RunQueries ();
 
 		if ( !is_array($results) )
@@ -619,7 +621,7 @@ class SphinxClient
 
 	/// add query to multi-query batch
 	/// returns index into results array from RunQueries() call
-	function AddQuery ( $query, $index="*" )
+	function AddQuery ( $query, $index="*", $comment="" )
 	{
 		// mbstring workaround
 		$this->_MBPush ();
@@ -696,6 +698,9 @@ class SphinxClient
 		foreach ( $this->_fieldweights as $field=>$weight )
 			$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
 
+		// comment
+		$req .= pack ( "N", strlen($comment) ) . $comment;
+
 		// mbstring workaround
 		$this->_MBPop ();
 
@@ -817,7 +822,16 @@ class SphinxClient
 					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
 						substr ( $response, $p, 8 ) ) );
 					$p += 8;
-					$doc = sprintf ( "%u", $doc ); // workaround for php signed/unsigned braindamage
+
+					if ( PHP_INT_SIZE>=8 )
+					{
+						// x64 route, workaround broken unpack() in 5.2.2+
+						if ( $doc<0 ) $doc += (1<<32);
+					} else
+					{
+						// x32 route, workaround php signed/unsigned braindamage
+						$doc = sprintf ( "%u", $doc );
+					}
 				}
 				$weight = sprintf ( "%u", $weight );
 
@@ -989,6 +1003,103 @@ class SphinxClient
 		return $res;
 	}
 
+
+	/////////////////////////////////////////////////////////////////////////////
+	// keyword generation
+	/////////////////////////////////////////////////////////////////////////////
+
+	/// connect to searchd server, and generate keyword list for a given query
+	/// returns false on failure,
+	/// an array of words on success
+	function BuildKeywords ( $query, $index, $hits )
+	{
+		assert ( is_string($query) );
+		assert ( is_string($index) );
+		assert ( is_bool($hits) );
+
+    // Commented out for testing Riddle
+    // $this->_MBPush ();
+    // 
+    // if (!( $fp = $this->_Connect() ))
+    // {
+    //  $this->_MBPop();
+    //  return false;
+    // }
+
+		/////////////////
+		// build request
+		/////////////////
+
+		// v.1.0 req
+		$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;
+
+		////////////////////////////
+		// send query, get response
+		////////////////////////////
+
+		$len = strlen($req);
+		$req = pack ( "nnN", SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len ) . $req; // add header
+		$wrote = fwrite ( $fp, $req, $len+8 );
+		if (!( $response = $this->_GetResponse ( $fp, VER_COMMAND_KEYWORDS ) ))
+		{
+			$this->_MBPop ();
+			return false;
+		}
+
+		//////////////////
+		// parse response
+		//////////////////
+
+		$pos = 0;
+		$res = array ();
+		$rlen = strlen($response);
+		list(,$nwords) = unpack ( "N*", substr ( $response, $pos, 4 ) );
+		$pos += 4;
+		for ( $i=0; $i<$nwords; $i++ )
+		{
+			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
+			$tokenized = $len ? substr ( $response, $pos, $len ) : "";
+			$pos += $len;
+
+			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
+			$normalized = $len ? substr ( $response, $pos, $len ) : "";
+			$pos += $len;
+
+			$res[] = array ( "tokenized"=>$tokenized, "normalized"=>$normalized );
+
+			if ( $hits )
+			{
+				list($ndocs,$nhits) = array_values ( unpack ( "N*N*", substr ( $response, $pos, 8 ) ) );
+				$pos += 8;
+				$res [$i]["docs"] = $ndocs;
+				$res [$i]["hits"] = $nhits;
+			}
+
+			if ( $pos > $rlen )
+			{
+				$this->_error = "incomplete reply";
+				$this->_MBPop ();
+				return false;
+			}
+		}
+
+		$this->_MBPop ();
+		return $res;
+	}
+
+	function EscapeString ( $string )
+	{
+		$from = array ( '(',')','|','-','!','@','~','\"','&' );
+		$to   = array ( '\\(','\\)','\\|','\\-','\\!','\\@','\\~','\\\"', '\\&' );
+
+		return str_replace ( $from, $to, $string );
+	}
+
 	/////////////////////////////////////////////////////////////////////////////
 	// attribute updates
 	/////////////////////////////////////////////////////////////////////////////
@@ -1060,7 +1171,7 @@ class SphinxClient
 }
 
 //
-// $Id: sphinxapi.php 1103 2008-01-24 18:42:57Z shodan $
+// $Id: sphinxapi.php 1163 2008-02-19 21:00:40Z glook $
 //
 
 ?>

data/vendor/riddle/spec/functional/keywords_spec.rb

@@ -0,0 +1,40 @@
+require 'spec/spec_helper'
+
+describe "Sphinx Keywords" do
+  before :each do
+    @client = Riddle::Client.new("localhost", 3313)
+  end
+  
+  it "should return an array of hashes" do
+    results = @client.keywords("pat", "people")
+    results.should be_kind_of(Array)
+    
+    results.each do |result|
+      result.should be_kind_of(Hash)
+    end
+  end
+  
+  it "should have keys for normalised and tokenised versions of the keywords" do
+    results = @client.keywords("pat", "people")
+    results.each do |result|
+      result.keys.should include(:normalised)
+      result.keys.should include(:tokenised)
+    end
+  end
+  
+  it "shouldn't have docs or hits keys if not requested" do
+    results = @client.keywords("pat", "people")
+    results.each do |result|
+      result.keys.should_not include(:docs)
+      result.keys.should_not include(:hits)
+    end
+  end
+  
+  it "should have docs and hits keys if requested" do
+    results = @client.keywords("pat", "people", true)
+    results.each do |result|
+      result.keys.should include(:docs)
+      result.keys.should include(:hits)
+    end
+  end
+end

data/vendor/riddle/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'riddle'
+require 'spec'
 require 'spec/sphinx_helper'
 
 Spec::Runner.configure do |config|

data/vendor/riddle/spec/unit/client_spec.rb

@@ -123,6 +123,12 @@ describe Riddle::Client do
     client.queue.first.should == query_contents(:field_weights)
   end
   
+  it "should build a message with acomment correctly" do
+    client = Riddle::Client.new
+    client.append_query "test ", "*", "commenting"
+    client.queue.first.should == query_contents(:comment)
+  end
+  
   it "should keep multiple messages in the queue" do
     client = Riddle::Client.new
     client.weights = [100, 1]
@@ -151,4 +157,24 @@ describe Riddle::Client do
       {1 => [191163600]}
     ).should == query_contents(:update_simple)
   end
+  
+  it "should build a keywords request without hits correctly" do
+    client = Riddle::Client.new
+    client.send(
+      :keywords_message,
+      "pat",
+      "people",
+      false
+    ).should == query_contents(:keywords_without_hits)
+  end
+  
+  it "should build a keywords request with hits correctly" do
+    client = Riddle::Client.new
+    client.send(
+      :keywords_message,
+      "pat",
+      "people",
+      true
+    ).should == query_contents(:keywords_with_hits)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ultrasphinx
 version: !ruby/object:Gem::Version 
-  version: "1.9"
+  version: "1.11"
 platform: ruby
 authors: 
 - ""
@@ -30,11 +30,12 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-03-08 00:00:00 -05:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chronic
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -48,8 +49,18 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- CHANGELOG
+- DEPLOYMENT_NOTES
+- lib/ultrasphinx/is_indexed.rb
+- lib/ultrasphinx/search.rb
+- lib/ultrasphinx/spell.rb
+- lib/ultrasphinx/ultrasphinx.rb
+- lib/ultrasphinx.rb
+- LICENSE
+- RAKE_TASKS
+- README
+- TODO
 files: 
 - CHANGELOG
 - DEPLOYMENT_NOTES
@@ -90,6 +101,7 @@ files:
 - test/integration/app/app/helpers/sellers_helper.rb
 - test/integration/app/app/helpers/states_helper.rb
 - test/integration/app/app/helpers/users_helper.rb
+- test/integration/app/app/models/category.rb
 - test/integration/app/app/models/geo/address.rb
 - test/integration/app/app/models/geo/country.rb
 - test/integration/app/app/models/geo/state.rb
@@ -124,7 +136,6 @@ files:
 - test/integration/app/config/locomotive.yml
 - test/integration/app/config/routes.rb
 - test/integration/app/config/ultrasphinx/default.base
-- test/integration/app/config/ultrasphinx/development.conf
 - test/integration/app/config/ultrasphinx/development.conf.canonical
 - test/integration/app/db/migrate/001_create_users.rb
 - test/integration/app/db/migrate/002_create_sellers.rb
@@ -135,7 +146,8 @@ files:
 - test/integration/app/db/migrate/007_add_lat_and_long_to_address.rb
 - test/integration/app/db/migrate/008_add_mission_statement_to_seller.rb
 - test/integration/app/db/migrate/009_create_countries.rb
-- test/integration/app/db/schema.rb
+- test/integration/app/db/migrate/010_create_categories.rb
+- test/integration/app/db/migrate/011_categories_sellers.rb
 - test/integration/app/doc/README_FOR_APP
 - test/integration/app/public/404.html
 - test/integration/app/public/500.html
@@ -168,6 +180,8 @@ files:
 - test/integration/app/script/runner
 - test/integration/app/script/server
 - test/integration/app/test/fixtures/addresses.yml
+- test/integration/app/test/fixtures/categories.yml
+- test/integration/app/test/fixtures/categories_sellers.yml
 - test/integration/app/test/fixtures/countries.yml
 - test/integration/app/test/fixtures/sellers.yml
 - test/integration/app/test/fixtures/states.yml
@@ -178,6 +192,7 @@ files:
 - test/integration/app/test/functional/users_controller_test.rb
 - test/integration/app/test/test_helper.rb
 - test/integration/app/test/unit/address_test.rb
+- test/integration/app/test/unit/category_test.rb
 - test/integration/app/test/unit/country_test.rb
 - test/integration/app/test/unit/seller_test.rb
 - test/integration/app/test/unit/state_test.rb
@@ -206,6 +221,7 @@ files:
 - vendor/riddle/spec/fixtures/data/anchor.bin
 - vendor/riddle/spec/fixtures/data/any.bin
 - vendor/riddle/spec/fixtures/data/boolean.bin
+- vendor/riddle/spec/fixtures/data/comment.bin
 - vendor/riddle/spec/fixtures/data/distinct.bin
 - vendor/riddle/spec/fixtures/data/field_weights.bin
 - vendor/riddle/spec/fixtures/data/filter.bin
@@ -219,6 +235,8 @@ files:
 - vendor/riddle/spec/fixtures/data/group.bin
 - vendor/riddle/spec/fixtures/data/index.bin
 - vendor/riddle/spec/fixtures/data/index_weights.bin
+- vendor/riddle/spec/fixtures/data/keywords_with_hits.bin
+- vendor/riddle/spec/fixtures/data/keywords_without_hits.bin
 - vendor/riddle/spec/fixtures/data/phrase.bin
 - vendor/riddle/spec/fixtures/data/rank_mode.bin
 - vendor/riddle/spec/fixtures/data/simple.bin
@@ -232,6 +250,7 @@ files:
 - vendor/riddle/spec/fixtures/sql/data.sql
 - vendor/riddle/spec/fixtures/sql/structure.sql
 - vendor/riddle/spec/functional/excerpt_spec.rb
+- vendor/riddle/spec/functional/keywords_spec.rb
 - vendor/riddle/spec/functional/search_spec.rb
 - vendor/riddle/spec/functional/update_spec.rb
 - vendor/riddle/spec/spec_helper.rb
@@ -242,11 +261,19 @@ files:
 - vendor/riddle/spec/unit/response_spec.rb
 - vendor/will_paginate/LICENSE
 - ultrasphinx.gemspec
+- Rakefile
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/ultrasphinx/
-post_install_message: 
-rdoc_options: []
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Ultrasphinx
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -259,14 +286,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.0.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby on Rails configurator and client to the Sphinx fulltext search engine.
 test_files: 
 - test/test_all.rb