riddle 1.2.1 → 1.2.2

data/README.textile

@@ -83,3 +83,4 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Amir Yalon
 * Sam Goldstein
 * Matt Todd
+* Paco Guzmán

data/lib/riddle/auto_version.rb

@@ -6,7 +6,7 @@ class Riddle::AutoVersion
     case version
     when '0.9.8', '0.9.9'
       require "riddle/#{version}"
-    when '1.10-beta'
+    when '1.10-beta', '1.10-id64-beta'
       require 'riddle/1.10'
     end
   end

data/lib/riddle/client.rb

@@ -136,8 +136,9 @@ module Riddle
     # accessed and changed via the attribute accessors.
     def initialize(servers=nil, port=nil)
       Riddle.version_warning
-      
-      @servers = Array(servers || "localhost").shuffle
+
+      servers = Array(servers || "localhost")
+      @servers = servers.respond_to?(:shuffle) ? servers.shuffle : servers.sort_by{ rand }
       @port   = port     || 9312
       @socket = nil
       

data/lib/riddle/controller.rb

@@ -12,7 +12,7 @@ module Riddle
     end
     
     def sphinx_version
-      `#{indexer} 2>&1`[/^Sphinx (\d+\.\d+(\.\d+|\-beta))/, 1]
+      `#{indexer} 2>&1`[/^Sphinx (\d+\.\d+(\.\d+|(\-id64)?\-beta))/, 1]
     rescue
       nil
     end

data/spec/riddle/auto_version_spec.rb

@@ -27,5 +27,12 @@ describe Riddle::AutoVersion do
       @controller.stub!(:sphinx_version => '1.10-beta')
       Riddle::AutoVersion.configure
     end
+    
+    it "should require 1.10 if using 1.10 with 64 bit IDs" do
+      Riddle::AutoVersion.should_receive(:require).with('riddle/1.10')
+      
+      @controller.stub!(:sphinx_version => '1.10-id64-beta')
+      Riddle::AutoVersion.configure
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +11:00
+date: 2010-12-22 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency