riddle 1.0.1 → 1.0.2

data/README.textile

@@ -78,3 +78,4 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Rob Anderton
 * Dylan Egan
 * Jerry Vos
+* Piotr Sarnacki

data/lib/riddle/client.rb

@@ -113,9 +113,18 @@ module Riddle
       :match_mode, :sort_mode, :sort_by, :weights, :id_range, :filters,
       :group_by, :group_function, :group_clause, :group_distinct, :cut_off,
       :retry_count, :retry_delay, :anchor, :index_weights, :rank_mode,
-      :max_query_time, :field_weights, :timeout, :overrides, :select
+      :max_query_time, :field_weights, :timeout, :overrides, :select,
+      :connection
     attr_reader :queue
     
+    def self.connection=(value)
+      Thread.current[:riddle_connection] = value
+    end
+
+    def self.connection
+      Thread.current[:riddle_connection]
+    end
+    
     # Can instantiate with a specific server and port - otherwise it assumes
     # defaults of localhost and 3312 respectively. All other settings can be
     # accessed and changed via the attribute accessors.
@@ -477,7 +486,7 @@ module Riddle
     
     def initialise_connection
       socket = initialise_socket
-
+      
       # Checking version
       version = socket.recv(4).unpack('N*').first
       if version < 1
@@ -494,7 +503,13 @@ module Riddle
     def initialise_socket
       tries = 0
       begin
-        socket = TCPSocket.new @server, @port
+        socket = if self.connection
+          self.connection.call(self)
+        elsif self.class.connection
+          self.class.connection.call(self)
+        else
+          TCPSocket.new @server, @port
+        end
       rescue Errno::ECONNREFUSED => e
         retry if (tries += 1) < 5
         raise Riddle::ConnectionError,

data/spec/fixtures/sphinx/searchd.log

@@ -3951,3 +3951,234 @@
 [Mon Nov 16 15:05:10.592 2009] [40836] accepting connections
 [Mon Nov 16 15:05:11.641 2009] [40836] caught SIGTERM, shutting down
 [Mon Nov 16 15:05:11.651 2009] [40836] shutdown complete
+[Mon Nov 16 21:38:36.121 2009] [47463] accepting connections
+[Mon Nov 16 21:38:37.515 2009] [47463] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:37.516 2009] [47463] shutdown complete
+[Mon Nov 16 21:38:37.592 2009] [47481] accepting connections
+[Mon Nov 16 21:38:38.650 2009] [47481] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:38.663 2009] [47481] shutdown complete
+[Mon Nov 16 21:38:38.735 2009] [47501] accepting connections
+[Mon Nov 16 21:38:39.793 2009] [47501] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:39.806 2009] [47501] shutdown complete
+[Mon Nov 16 21:38:39.878 2009] [47520] accepting connections
+[Mon Nov 16 21:38:40.930 2009] [47520] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:40.941 2009] [47520] shutdown complete
+[Mon Nov 16 21:38:41.016 2009] [47536] accepting connections
+[Mon Nov 16 21:38:42.120 2009] [47536] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:42.131 2009] [47536] shutdown complete
+[Mon Nov 16 21:38:42.201 2009] [47561] accepting connections
+[Mon Nov 16 21:38:43.262 2009] [47561] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:43.335 2009] [47561] shutdown complete
+[Mon Nov 16 21:38:43.406 2009] [47582] accepting connections
+[Mon Nov 16 21:38:45.514 2009] [47582] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:45.524 2009] [47582] shutdown complete
+[Mon Nov 16 21:38:45.601 2009] [47597] accepting connections
+[Mon Nov 16 21:38:46.655 2009] [47597] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:46.666 2009] [47597] shutdown complete
+[Mon Nov 16 21:38:46.750 2009] [47612] accepting connections
+[Mon Nov 16 21:38:47.803 2009] [47612] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:47.814 2009] [47612] shutdown complete
+[Mon Nov 16 21:38:47.896 2009] [47627] accepting connections
+[Mon Nov 16 21:38:48.950 2009] [47627] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:48.960 2009] [47627] shutdown complete
+[Mon Nov 16 21:38:49.038 2009] [47642] accepting connections
+[Mon Nov 16 21:38:50.093 2009] [47642] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:50.103 2009] [47642] shutdown complete
+[Mon Nov 16 21:38:50.181 2009] [47657] accepting connections
+[Mon Nov 16 21:38:51.229 2009] [47657] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:51.241 2009] [47657] shutdown complete
+[Mon Nov 16 21:38:51.318 2009] [47672] accepting connections
+[Mon Nov 16 21:38:52.372 2009] [47672] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:52.383 2009] [47672] shutdown complete
+[Mon Nov 16 21:38:52.464 2009] [47687] accepting connections
+[Mon Nov 16 21:38:53.522 2009] [47687] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:53.533 2009] [47687] shutdown complete
+[Mon Nov 16 21:38:53.612 2009] [47702] accepting connections
+[Mon Nov 16 21:38:54.666 2009] [47702] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:54.676 2009] [47702] shutdown complete
+[Mon Nov 16 21:38:54.762 2009] [47717] accepting connections
+[Mon Nov 16 21:38:55.812 2009] [47717] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:55.823 2009] [47717] shutdown complete
+[Mon Nov 16 21:38:55.897 2009] [47732] accepting connections
+[Mon Nov 16 21:38:56.945 2009] [47732] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:56.955 2009] [47732] shutdown complete
+[Mon Nov 16 21:38:57.030 2009] [47747] accepting connections
+[Mon Nov 16 21:38:58.078 2009] [47747] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:58.093 2009] [47747] shutdown complete
+[Mon Nov 16 21:38:58.174 2009] [47762] accepting connections
+[Mon Nov 16 21:38:59.228 2009] [47762] caught SIGTERM, shutting down
+[Mon Nov 16 21:38:59.238 2009] [47762] shutdown complete
+[Mon Nov 16 21:42:45.518 2009] [47821] accepting connections
+[Mon Nov 16 21:42:46.638 2009] [47821] caught SIGTERM, shutting down
+[Mon Nov 16 21:42:46.648 2009] [47821] shutdown complete
+[Mon Nov 16 21:46:15.680 2009] [47865] accepting connections
+[Mon Nov 16 21:46:16.738 2009] [47865] caught SIGTERM, shutting down
+[Mon Nov 16 21:46:16.748 2009] [47865] shutdown complete
+[Mon Nov 16 21:46:16.818 2009] [47881] accepting connections
+[Mon Nov 16 21:46:17.880 2009] [47881] caught SIGTERM, shutting down
+[Mon Nov 16 21:46:17.891 2009] [47881] shutdown complete
+[Mon Nov 16 21:46:58.292 2009] [47910] accepting connections
+[Mon Nov 16 21:46:59.452 2009] [47910] caught SIGTERM, shutting down
+[Mon Nov 16 21:46:59.453 2009] [47910] shutdown complete
+[Mon Nov 16 21:46:59.532 2009] [47925] accepting connections
+[Mon Nov 16 21:47:00.598 2009] [47925] caught SIGTERM, shutting down
+[Mon Nov 16 21:47:00.599 2009] [47925] shutdown complete
+[Mon Nov 16 21:48:20.813 2009] [47949] accepting connections
+[Mon Nov 16 21:48:21.909 2009] [47949] caught SIGTERM, shutting down
+[Mon Nov 16 21:48:21.919 2009] [47949] shutdown complete
+[Mon Nov 16 21:48:21.989 2009] [47964] accepting connections
+[Mon Nov 16 21:48:23.071 2009] [47964] caught SIGTERM, shutting down
+[Mon Nov 16 21:48:23.162 2009] [47964] shutdown complete
+[Mon Nov 16 21:49:35.935 2009] [47987] accepting connections
+[Mon Nov 16 21:49:37.029 2009] [47987] caught SIGTERM, shutting down
+[Mon Nov 16 21:49:37.039 2009] [47987] shutdown complete
+[Mon Nov 16 21:49:37.108 2009] [48002] accepting connections
+[Mon Nov 16 21:49:38.173 2009] [48002] caught SIGTERM, shutting down
+[Mon Nov 16 21:49:38.183 2009] [48002] shutdown complete
+[Mon Nov 16 21:50:14.502 2009] [48026] accepting connections
+[Mon Nov 16 21:50:15.622 2009] [48026] caught SIGTERM, shutting down
+[Mon Nov 16 21:50:15.623 2009] [48026] shutdown complete
+[Mon Nov 16 21:50:15.702 2009] [48041] accepting connections
+[Mon Nov 16 21:50:16.769 2009] [48041] caught SIGTERM, shutting down
+[Mon Nov 16 21:50:16.780 2009] [48041] shutdown complete
+[Mon Nov 16 21:51:38.164 2009] [48067] accepting connections
+[Mon Nov 16 21:51:39.257 2009] [48067] caught SIGTERM, shutting down
+[Mon Nov 16 21:51:39.267 2009] [48067] shutdown complete
+[Mon Nov 16 21:51:39.337 2009] [48082] accepting connections
+[Mon Nov 16 21:51:40.402 2009] [48082] caught SIGTERM, shutting down
+[Mon Nov 16 21:51:40.403 2009] [48082] shutdown complete
+[Mon Nov 16 21:52:26.724 2009] [48111] accepting connections
+[Mon Nov 16 21:52:27.858 2009] [48111] caught SIGTERM, shutting down
+[Mon Nov 16 21:52:27.860 2009] [48111] shutdown complete
+[Mon Nov 16 21:52:27.937 2009] [48127] accepting connections
+[Mon Nov 16 21:52:29.003 2009] [48127] caught SIGTERM, shutting down
+[Mon Nov 16 21:52:29.014 2009] [48127] shutdown complete
+[Mon Nov 16 21:52:58.991 2009] [48153] accepting connections
+[Mon Nov 16 21:53:00.050 2009] [48153] caught SIGTERM, shutting down
+[Mon Nov 16 21:53:00.060 2009] [48153] shutdown complete
+[Mon Nov 16 21:53:00.133 2009] [48169] accepting connections
+[Mon Nov 16 21:53:01.193 2009] [48169] caught SIGTERM, shutting down
+[Mon Nov 16 21:53:01.194 2009] [48169] shutdown complete
+[Mon Nov 16 21:57:01.795 2009] [48222] accepting connections
+[Mon Nov 16 21:57:02.941 2009] [48222] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:03.006 2009] [48222] shutdown complete
+[Mon Nov 16 21:57:03.030 2009] [48238] accepting connections
+[Mon Nov 16 21:57:04.085 2009] [48238] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:04.096 2009] [48238] shutdown complete
+[Mon Nov 16 21:57:04.182 2009] [48255] accepting connections
+[Mon Nov 16 21:57:05.238 2009] [48255] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:05.249 2009] [48255] shutdown complete
+[Mon Nov 16 21:57:05.332 2009] [48275] accepting connections
+[Mon Nov 16 21:57:06.389 2009] [48275] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:06.399 2009] [48275] shutdown complete
+[Mon Nov 16 21:57:06.480 2009] [48294] accepting connections
+[Mon Nov 16 21:57:07.537 2009] [48294] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:07.538 2009] [48294] shutdown complete
+[Mon Nov 16 21:57:07.623 2009] [48310] accepting connections
+[Mon Nov 16 21:57:08.723 2009] [48310] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:08.737 2009] [48310] shutdown complete
+[Mon Nov 16 21:57:08.808 2009] [48335] accepting connections
+[Mon Nov 16 21:57:09.875 2009] [48335] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:09.888 2009] [48335] shutdown complete
+[Mon Nov 16 21:57:09.960 2009] [48356] accepting connections
+[Mon Nov 16 21:57:12.065 2009] [48356] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:12.075 2009] [48356] shutdown complete
+[Mon Nov 16 21:57:12.152 2009] [48371] accepting connections
+[Mon Nov 16 21:57:13.201 2009] [48371] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:13.202 2009] [48371] shutdown complete
+[Mon Nov 16 21:57:13.283 2009] [48386] accepting connections
+[Mon Nov 16 21:57:14.336 2009] [48386] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:14.351 2009] [48386] shutdown complete
+[Mon Nov 16 21:57:14.420 2009] [48401] accepting connections
+[Mon Nov 16 21:57:15.476 2009] [48401] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:15.488 2009] [48401] shutdown complete
+[Mon Nov 16 21:57:15.568 2009] [48416] accepting connections
+[Mon Nov 16 21:57:16.612 2009] [48416] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:16.622 2009] [48416] shutdown complete
+[Mon Nov 16 21:57:16.705 2009] [48431] accepting connections
+[Mon Nov 16 21:57:17.757 2009] [48431] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:17.767 2009] [48431] shutdown complete
+[Mon Nov 16 21:57:17.843 2009] [48446] accepting connections
+[Mon Nov 16 21:57:18.897 2009] [48446] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:18.913 2009] [48446] shutdown complete
+[Mon Nov 16 21:57:19.989 2009] [48464] accepting connections
+[Mon Nov 16 21:57:21.017 2009] [48464] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:21.027 2009] [48464] shutdown complete
+[Mon Nov 16 21:57:21.097 2009] [48480] accepting connections
+[Mon Nov 16 21:57:22.147 2009] [48480] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:22.157 2009] [48480] shutdown complete
+[Mon Nov 16 21:57:22.232 2009] [48495] accepting connections
+[Mon Nov 16 21:57:23.289 2009] [48495] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:23.292 2009] [48495] shutdown complete
+[Mon Nov 16 21:57:23.382 2009] [48510] accepting connections
+[Mon Nov 16 21:57:24.434 2009] [48510] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:24.435 2009] [48510] shutdown complete
+[Mon Nov 16 21:57:24.520 2009] [48525] accepting connections
+[Mon Nov 16 21:57:25.571 2009] [48525] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:25.581 2009] [48525] shutdown complete
+[Mon Nov 16 21:57:25.659 2009] [48540] accepting connections
+[Mon Nov 16 21:57:26.712 2009] [48540] caught SIGTERM, shutting down
+[Mon Nov 16 21:57:26.728 2009] [48540] shutdown complete
+[Mon Nov 16 22:00:05.972 2009] [48701] accepting connections
+[Mon Nov 16 22:00:07.069 2009] [48701] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:07.070 2009] [48701] shutdown complete
+[Mon Nov 16 22:00:07.153 2009] [48717] accepting connections
+[Mon Nov 16 22:00:08.214 2009] [48717] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:08.227 2009] [48717] shutdown complete
+[Mon Nov 16 22:00:08.299 2009] [48734] accepting connections
+[Mon Nov 16 22:00:09.355 2009] [48734] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:09.380 2009] [48734] shutdown complete
+[Mon Nov 16 22:00:09.782 2009] [48756] accepting connections
+[Mon Nov 16 22:00:10.840 2009] [48756] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:10.850 2009] [48756] shutdown complete
+[Mon Nov 16 22:00:10.937 2009] [48775] accepting connections
+[Mon Nov 16 22:00:11.987 2009] [48775] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:11.998 2009] [48775] shutdown complete
+[Mon Nov 16 22:00:12.074 2009] [48791] accepting connections
+[Mon Nov 16 22:00:13.182 2009] [48791] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:13.192 2009] [48791] shutdown complete
+[Mon Nov 16 22:00:13.267 2009] [48816] accepting connections
+[Mon Nov 16 22:00:14.320 2009] [48816] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:14.331 2009] [48816] shutdown complete
+[Mon Nov 16 22:00:14.411 2009] [48833] accepting connections
+[Mon Nov 16 22:00:15.521 2009] [48833] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:15.534 2009] [48833] shutdown complete
+[Mon Nov 16 22:00:15.668 2009] [48854] accepting connections
+[Mon Nov 16 22:00:17.790 2009] [48854] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:17.800 2009] [48854] shutdown complete
+[Mon Nov 16 22:00:17.876 2009] [48869] accepting connections
+[Mon Nov 16 22:00:18.930 2009] [48869] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:18.953 2009] [48869] shutdown complete
+[Mon Nov 16 22:00:19.026 2009] [48885] accepting connections
+[Mon Nov 16 22:00:20.079 2009] [48885] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:20.089 2009] [48885] shutdown complete
+[Mon Nov 16 22:00:20.178 2009] [48900] accepting connections
+[Mon Nov 16 22:00:21.231 2009] [48900] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:21.242 2009] [48900] shutdown complete
+[Mon Nov 16 22:00:21.319 2009] [48915] accepting connections
+[Mon Nov 16 22:00:22.371 2009] [48915] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:22.386 2009] [48915] shutdown complete
+[Mon Nov 16 22:00:22.510 2009] [48930] accepting connections
+[Mon Nov 16 22:00:23.573 2009] [48930] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:23.587 2009] [48930] shutdown complete
+[Mon Nov 16 22:00:23.689 2009] [48945] accepting connections
+[Mon Nov 16 22:00:24.744 2009] [48945] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:24.754 2009] [48945] shutdown complete
+[Mon Nov 16 22:00:24.831 2009] [48960] accepting connections
+[Mon Nov 16 22:00:25.882 2009] [48960] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:25.894 2009] [48960] shutdown complete
+[Mon Nov 16 22:00:25.970 2009] [48975] accepting connections
+[Mon Nov 16 22:00:27.021 2009] [48975] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:27.030 2009] [48975] shutdown complete
+[Mon Nov 16 22:00:27.119 2009] [48990] accepting connections
+[Mon Nov 16 22:00:28.170 2009] [48990] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:28.171 2009] [48990] shutdown complete
+[Mon Nov 16 22:00:28.256 2009] [49005] accepting connections
+[Mon Nov 16 22:00:29.307 2009] [49005] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:29.317 2009] [49005] shutdown complete
+[Mon Nov 16 22:00:29.407 2009] [49020] accepting connections
+[Mon Nov 16 22:00:30.460 2009] [49020] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:30.471 2009] [49020] shutdown complete
+[Mon Nov 16 22:00:30.552 2009] [49035] accepting connections
+[Mon Nov 16 22:00:31.599 2009] [49035] caught SIGTERM, shutting down
+[Mon Nov 16 22:00:31.609 2009] [49035] shutdown complete

data/spec/fixtures/sphinx/searchd.query.log

@@ -1090,3 +1090,73 @@
 [Mon Nov 16 15:04:55.379 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] Ellie K Ford
 [Mon Nov 16 15:04:55.382 2009] 0.000 sec [all/0/rel 64 (0,20)] [*] Steele
 [Mon Nov 16 15:04:55.387 2009] 0.000 sec [all/0/rel 64 (0,20)] [*] Steele
+[Mon Nov 16 21:38:37.386 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:37.463 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:37.469 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.041 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.045 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.045 2009] 0.000 sec [all/0/rel 201 (0,20)] [*] jones
+[Mon Nov 16 21:38:42.051 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.060 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.066 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.069 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.073 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.076 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.080 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:38:42.092 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] smith victoria
+[Mon Nov 16 21:38:43.225 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] Ellie K Ford
+[Mon Nov 16 21:38:43.230 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] Ellie K Ford
+[Mon Nov 16 21:38:43.233 2009] 0.000 sec [all/0/rel 64 (0,20)] [*] Steele
+[Mon Nov 16 21:38:43.237 2009] 0.000 sec [all/0/rel 64 (0,20)] [*] Steele
+[Mon Nov 16 21:42:46.554 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:42:46.571 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:42:46.588 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:46:16.708 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:46:17.845 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:46:17.851 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:50:16.727 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:50:16.738 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:51:40.359 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:51:40.370 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:52:27.750 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:52:28.961 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:52:28.972 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:53:00.017 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:53:01.159 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:53:01.165 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:02.913 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:04.057 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:04.062 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.649 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.653 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.653 2009] 0.000 sec [all/0/rel 201 (0,20)] [*] jones
+[Mon Nov 16 21:57:08.658 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.668 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.675 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.678 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.682 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.685 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.690 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 21:57:08.696 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] smith victoria
+[Mon Nov 16 21:57:09.836 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] Ellie K Ford
+[Mon Nov 16 21:57:09.842 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] Ellie K Ford
+[Mon Nov 16 21:57:09.845 2009] 0.000 sec [all/0/rel 64 (0,20)] [*] Steele
+[Mon Nov 16 21:57:09.849 2009] 0.000 sec [all/0/rel 64 (0,20)] [*] Steele
+[Mon Nov 16 22:00:07.039 2009] 0.002 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:08.183 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:08.188 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.099 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.105 2009] 0.000 sec x2 [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.105 2009] 0.000 sec x2 [all/0/rel 201 (0,20)] [*] jones
+[Mon Nov 16 22:00:13.110 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.120 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.126 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.131 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.135 2009] 0.000 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.141 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.148 2009] 0.001 sec [all/0/rel 65 (0,20)] [*] smith
+[Mon Nov 16 22:00:13.152 2009] 0.000 sec [all/0/rel 1 (0,20)] [*] smith victoria
+[Mon Nov 16 22:00:15.434 2009] 0.001 sec [all/0/rel 1 (0,20)] [*] Ellie K Ford
+[Mon Nov 16 22:00:15.481 2009] 0.001 sec [all/0/rel 1 (0,20)] [*] Ellie K Ford
+[Mon Nov 16 22:00:15.484 2009] 0.001 sec [all/0/rel 64 (0,20)] [*] Steele
+[Mon Nov 16 22:00:15.489 2009] 0.000 sec [all/0/rel 64 (0,20)] [*] Steele

data/spec/functional/connection_spec.rb

@@ -0,0 +1,58 @@
+require 'spec/spec_helper'
+
+class RiddleSpecConnectionProcError < StandardError; end
+
+describe "Sphinx Client" do
+  before :each do
+    @client = Riddle::Client.new("localhost", 3313)
+  end
+
+  after :each do
+    Riddle::Client.connection = nil
+  end
+  
+  describe '.connection' do
+    it "should use the given block" do
+      Riddle::Client.connection = lambda { |client|
+        TCPsocket.new(client.server, client.port)
+      }
+      @client.query("smith").should be_kind_of(Hash)
+    end
+    
+    it "should fail with errors from the given block" do
+      Riddle::Client.connection = lambda { |client|
+        raise RiddleSpecConnectionProcError
+      }
+      lambda { @client.query("smith") }.
+        should raise_error(RiddleSpecConnectionProcError)
+    end
+  end
+  
+  describe '#connection' do
+    it "use the given block" do
+      @client.connection = lambda { |client|
+        TCPsocket.new(client.server, client.port)
+      }
+      @client.query("smith").should be_kind_of(Hash)
+    end
+
+    it "should fail with errors from the given block" do
+      @client.connection = lambda { |client|
+        raise RiddleSpecConnectionProcError
+      }
+      lambda { @client.query("smith") }.
+        should raise_error(RiddleSpecConnectionProcError)
+    end
+
+    it "should prioritise instance over class connection" do
+      Riddle::Client.connection = lambda { |client|
+        raise RiddleSpecConnectionProcError
+      }
+      @client.connection = lambda { |client|
+        TCPsocket.new(client.server, client.port)
+      }
+    
+      lambda { @client.query("smith") }.should_not raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -138,6 +138,7 @@ test_files:
 - spec/fixtures/sql/conf.yml
 - spec/fixtures/sql/data.sql
 - spec/fixtures/sql/structure.sql
+- spec/functional/connection_spec.rb
 - spec/functional/excerpt_spec.rb
 - spec/functional/keywords_spec.rb
 - spec/functional/persistance_spec.rb