riddle 0.9.8.1198 → 0.9.8.1198.1

data/lib/riddle.rb

@@ -9,14 +9,17 @@ module Riddle #:nodoc:
   end
   
   module Version #:nodoc:
-    Major = 0
-    Minor = 9
-    Tiny  = 8
+    Major   = 0
+    Minor   = 9
+    Tiny    = 8
     # Revision number for RubyForge's sake, taken from what Sphinx
     # outputs to the command line.
-    Rev   = 1198
+    Rev     = 1198
+    # Release number to mark my own fixes, beyond feature parity with
+    # Sphinx itself.
+    Release = 1
     
     String      = [Major, Minor, Tiny].join('.') + "rc1"
-    GemVersion  = [Major, Minor, Tiny, Rev].join('.')
+    GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')
   end
 end

data/lib/riddle/client.rb

@@ -206,14 +206,9 @@ module Riddle
 
           result[:matches] << {:doc => doc, :weight => weight, :index => i, :attributes => {}}
           result[:attribute_names].each do |attr|
-            case result[:attributes][attr]
-            when AttributeTypes[:float]
-              result[:matches].last[:attributes][attr] = response.next_float
-            when AttributeTypes[:multi]
-              result[:matches].last[:attributes][attr] = response.next_int_array
-            else
-              result[:matches].last[:attributes][attr] = response.next_int
-            end
+            result[:matches].last[:attributes][attr] = attribute_from_type(
+              result[:attributes][attr], response
+            )
           end
         end
 
@@ -583,5 +578,16 @@ module Riddle
       
       message.to_s
     end
+    
+    def attribute_from_type(type, response)
+      type -= AttributeTypes[:multi] if is_multi = type > AttributeTypes[:multi]
+      
+      case type
+      when AttributeTypes[:float]
+        is_multi ? response.next_float_array : response.next_float
+      else
+        is_multi ? response.next_int_array   : response.next_int
+      end
+    end
   end
 end

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  version: 0.9.8.1198
+  version: 0.9.8.1198.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-21 00:00:00 +11:00
+date: 2008-03-22 00:00:00 +11:00
 default_executable: 
 dependencies: []