Merge pull request #875 from bricker/result-array

Convert raw results to array

lib/thinking_sphinx/middlewares/inquirer.rb

@@ -44,7 +44,7 @@ def initialize(context)
     end
 
     def call(raw_results, meta_results)
-      context[:results] = raw_results
+      context[:results] = raw_results.to_a
       context[:raw]     = raw_results
       context[:meta]    = meta_results.inject({}) { |hash, row|
         hash[row['Variable_name']] = row['Value']

spec/thinking_sphinx/middlewares/inquirer_spec.rb

@@ -47,5 +47,24 @@ module Middlewares; end
 
       context[:results].should == [:raw]
     end
+
+    context "with mysql2 result" do
+      class FakeResult
+        include Enumerable
+        def each; [{"fake" => "value"}].each { |m| yield m }; end
+      end
+
+      let(:batch_inquirer) { double('batcher', :append_query => true,
+        :results => [
+          FakeResult.new, [{'Variable_name' => 'meta', 'Value' => 'value'}]
+        ])
+      }
+
+      it "converts the results into an array" do
+        middleware.call [context]
+
+        context[:results].should be_a Array
+      end
+    end
   end
 end