Merge branch 'master' into rails3

lib/thinking_sphinx/search.rb

@@ -731,11 +731,22 @@ def include_for_class(klass)
         includes.select { |inc| klass.reflections[inc] }
       when Symbol
         klass.reflections[includes].nil? ? nil : includes
+      when Hash
+        include_from_hash includes, klass
       else
         includes
       end
     end
 
+    def include_from_hash(hash, klass)
+      scoped_hash = {}
+      hash.keys.each do |key|
+        scoped_hash[key] = hash[key] unless klass.reflections[key].nil?
+      end
+
+      scoped_hash.empty? ? nil : scoped_hash
+    end
+
     def instances_from_class(klass, matches)
       index_options = klass.sphinx_index_options
 

spec/thinking_sphinx/search_spec.rb

@@ -246,6 +246,32 @@
       ThinkingSphinx::Search.new(:include => :betas).first
     end
 
+    it "should respect complex includes" do
+      Alpha.should_receive(:find) do |type, options|
+        options[:include].should == {:betas => :gammas}
+        [@alpha_a, @alpha_b]
+      end
+
+      Beta.should_receive(:find) do |type, options|
+        options[:include].should be_nil
+        [@beta_a, @beta_b]
+      end
+
+      ThinkingSphinx::Search.new(:include => {:betas => :gammas}).first
+    end
+
+    it "should respect includes for single class searches" do
+      Alpha.should_receive(:find) do |type, options|
+        options[:include].should == {:betas => :gammas}
+        [@alpha_a, @alpha_b]
+      end
+
+      ThinkingSphinx::Search.new(
+        :include => {:betas => :gammas},
+        :classes => [Alpha]
+      ).first
+    end
+
     describe 'query' do
       it "should concatenate arguments with spaces" do
         @client.should_receive(:query) do |query, index, comment|