riddle 1.5.1 → 1.5.2

data/.travis.yml

@@ -1,12 +1,10 @@
+language: ruby
 rvm:
-  - 1.8.6
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
-  - rbx-2.0
   - ree
-  - jruby
+  - jruby-18mode
   - ruby-head
 env:
   - SPHINX_BIN=/usr/local/sphinx-0.9.9/bin SPHINX_VERSION=0.9.9

data/HISTORY

@@ -1,4 +1,16 @@
-1.5.1 - January 2nd 2011
+1.5.2 - May 14th 2012
+- Fixing 64-bit MVA support.
+- Grouped searches now sort by weight instead of by group as a default. You can change this setting via Riddle::Client#group_clause.
+- Use a local array of servers - don't clear the main set (S. Christoffer Eliesen).
+- Fixing VersionError reference for Sphinx 0.9.9 or better (S. Christoffer Eliesen).
+- Consistent documentation for default port: 9312 (Aleksey Morozov).
+- Sphinx 2.0.4 support (Ilia Lobsanov).
+- Handle single-value float filters (by translating them to a range) (Steven Bristol).
+- Sphinx 2.0.2-dev handled as Sphinx 2.0.1.
+- Sphinx 2.0.3 support.
+- String options handled appropriately for SphinxQL excerpts calls.
+
+1.5.1 - January 2nd 2012
 - If no known servers work, raise an appropriate error.
 - Sphinx 2.1.0-dev support.
 

data/README.textile

@@ -1,5 +1,7 @@
 h1. Riddle
 
+"!https://secure.travis-ci.org/freelancing-god/riddle.png!":http://travis-ci.org/freelancing-god/riddle
+
 This client has been written to interface with "Sphinx":http://sphinxsearch.com/. It is written by "Pat Allan":http://freelancing-gods.com, and has been influenced by both Dmytro Shteflyuk's Ruby client and the original PHP client - credit where credit's due, after all.
 
 It does not follow the same syntax as those two, though (not much point writing this otherwise) - opting for a more Ruby-like structure.
@@ -17,7 +19,7 @@ require 'riddle/0.9.9'</code></pre>
 
 To get started, just instantiate a Client object:
 
-<pre><code>client = Riddle::Client.new # defaults to localhost and port 3312
+<pre><code>client = Riddle::Client.new # defaults to localhost and port 9312
 client = Riddle::Client.new "sphinxserver.domain.tld", 3333 # custom settings</code></pre>
 
 And then set the parameters to what you want, before running a query:
@@ -83,3 +85,7 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Paul Gibler
 * Ngan Pham
 * Aaron Gilbralter
+* Steven Bristol
+* Ilia Lobsanov
+* Aleksey Morozov
+* S. Christoffer Eliesen

data/lib/riddle/0.9.9/client.rb

@@ -3,33 +3,33 @@ Riddle::Client::Versions[:update] = 0x102
 
 class Riddle::Client
   private
-  
+
   def initialise_connection
     socket = initialise_socket
 
     # Send version
     socket.send [1].pack('N'), 0
-    
+
     # Checking version
     version = socket.recv(4).unpack('N*').first
     if version < 1
       socket.close
-      raise VersionError, "Can only connect to searchd version 1.0 or better, not version #{version}"
+      raise Riddle::VersionError, "Can only connect to searchd version 1.0 or better, not version #{version}"
     end
-    
+
     socket
   end
-  
+
   def update_message(index, attributes, values_by_doc)
     message = Message.new
-    
+
     message.append_string index
     message.append_int attributes.length
     attributes.each_with_index do |attribute, index|
       message.append_string attribute
       message.append_boolean values_by_doc.values.first[index].is_a?(Array)
     end
-    
+
     message.append_int values_by_doc.length
     values_by_doc.each do |key,values|
       message.append_64bit_int key # document ID
@@ -43,7 +43,7 @@ class Riddle::Client
         end
       end
     end
-    
+
     message.to_s
   end
 end

data/lib/riddle/auto_version.rb

@@ -8,9 +8,9 @@ class Riddle::AutoVersion
       require "riddle/#{version}"
     when /1.10/
       require 'riddle/1.10'
-    when /2.0.\d/
+    when /2.0.[12]/
       require 'riddle/2.0.1'
-    when /2.1.\d/
+    when /2.0.3/, /2.0.4/, /2.1.\d/
       require 'riddle/2.1.0'
     end
   end

data/lib/riddle/client.rb

@@ -136,7 +136,7 @@ module Riddle
     end
 
     # Can instantiate with a specific server and port - otherwise it assumes
-    # defaults of localhost and 3312 respectively. All other settings can be
+    # defaults of localhost and 9312 respectively. All other settings can be
     # accessed and changed via the attribute accessors.
     def initialize(servers = nil, port = nil, key = nil)
       Riddle.version_warning
@@ -165,7 +165,7 @@ module Riddle
       @filters        = []
       @group_by       = ''
       @group_function = :day
-      @group_clause   = '@group desc'
+      @group_clause   = '@weight DESC'
       @group_distinct = ''
       @cut_off        = 0
       @retry_count    = 0
@@ -495,6 +495,8 @@ module Riddle
     def open_socket
       raise "Already Connected" unless @socket.nil?
 
+      available_servers = servers.dup
+
       if @timeout == 0
         @socket = initialise_connection
       else
@@ -502,8 +504,8 @@ module Riddle
           Timeout.timeout(@timeout) { @socket = initialise_connection }
         rescue Timeout::Error, Riddle::ConnectionError => e
           failed_servers ||= []
-          failed_servers << servers.shift
-          retry if !servers.empty?
+          failed_servers << available_servers.shift
+          retry if !available_servers.empty?
 
           case e
           when Timeout::Error

data/lib/riddle/client/filter.rb

@@ -2,21 +2,21 @@ module Riddle
   class Client
     class Filter
       attr_accessor :attribute, :values, :exclude
-  
+
       # Attribute name, values (which can be an array or a range), and whether
       # the filter should be exclusive.
       def initialize(attribute, values, exclude=false)
         @attribute, @values, @exclude = attribute, values, exclude
       end
-  
+
       def exclude?
         self.exclude
       end
-  
+
       # Returns the message for this filter to send to the Sphinx service
       def query_message
         message = Message.new
-    
+
         message.append_string self.attribute.to_s
         case self.values
         when Range
@@ -28,21 +28,26 @@ module Riddle
             append_integer_range message, self.values
           end
         when Array
-          message.append_int FilterTypes[:values]
-          message.append_int self.values.length
-          append_array message, self.values
+          if self.values.first.is_a?(Float) && self.values.length == 1
+            message.append_int FilterTypes[:float_range]
+            message.append_floats self.values.first, self.values.first
+          else
+            message.append_int FilterTypes[:values]
+            message.append_int self.values.length
+            append_array message, self.values
+          end
         end
         message.append_int self.exclude? ? 1 : 0
-    
+
         message.to_s
       end
-  
+
       private
-  
+
       def append_integer_range(message, range)
         message.append_ints self.values.first, self.values.last
       end
-  
+
       # Using to_f is a hack from the PHP client - to workaround 32bit signed
       # ints on x32 platforms
       def append_array(message, array)

data/lib/riddle/client/response.rb

@@ -10,39 +10,39 @@ module Riddle
         @str = str
         @marker = 0
       end
-      
+
       # Return the next string value in the stream
       def next
         len = next_int
         result = @str[@marker, len]
         @marker += len
-        
+
         Riddle.encode(result)
       end
-      
+
       # Return the next integer value from the stream
       def next_int
         int = @str[@marker, 4].unpack('N*').first
         @marker += 4
-        
+
         int
       end
-      
+
       def next_64bit_int
         high, low = @str[@marker, 8].unpack('N*N*')[0..1]
         @marker += 8
-        
+
         (high << 32) + low
       end
-      
+
       # Return the next float value from the stream
       def next_float
         float = @str[@marker, 4].unpack('N*').pack('L').unpack('f*').first
         @marker += 4
-        
+
         float
       end
-      
+
       # Returns an array of string items
       def next_array
         count = next_int
@@ -50,10 +50,10 @@ module Riddle
         count.times do
           items << self.next
         end
-        
+
         items
       end
-      
+
       # Returns an array of int items
       def next_int_array
         count = next_int
@@ -61,30 +61,30 @@ module Riddle
         count.times do
           items << self.next_int
         end
-        
+
         items
       end
-      
+
       def next_float_array
         count = next_int
         items = []
         count.times do
           items << self.next_float
         end
-        
+
         items
       end
-      
+
       def next_64bit_int_array
-        count = next_int
+        byte_count = next_int
         items = []
-        count.times do
+        (byte_count / 2).times do
           items << self.next_64bit_int
         end
-        
+
         items
       end
-      
+
       # Returns the length of the streamed data
       def length
         @str.length

data/lib/riddle/query.rb

@@ -59,7 +59,10 @@ module Riddle::Query
 
   def self.snippets(data, index, query, options = nil)
     options = ', ' + options.keys.collect { |key|
-      "#{options[key]} AS #{key}"
+      value = options[key]
+      value = "'#{value}'" if value.is_a?(String)
+
+      "#{value} AS #{key}"
     }.join(', ') unless options.nil?
 
     "CALL SNIPPETS('#{data}', '#{index}', '#{query}'#{options})"

data/lib/riddle/version.rb

@@ -1,3 +1,3 @@
 module Riddle
-  Version = '1.5.1'
+  Version = '1.5.2'
 end