From 710cbfde1d5172faaf18962784fbc829af825960 Mon Sep 17 00:00:00 2001
From: Mat Brown <mat@patch.com>
Date: Thu, 15 Jul 2010 10:58:06 -0400
Subject: [PATCH] Filter nil components out of connectives

[#113 state:resolved]
---
 sunspot/lib/sunspot/query/connective.rb        | 10 +++++++---
 sunspot/lib/sunspot/query/scope.rb             |  9 ++++++++-
 sunspot/spec/api/query/connectives_examples.rb | 12 +++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/sunspot/lib/sunspot/query/connective.rb b/sunspot/lib/sunspot/query/connective.rb
index ffc471ab9..bfdd0c033 100644
--- a/sunspot/lib/sunspot/query/connective.rb
+++ b/sunspot/lib/sunspot/query/connective.rb
@@ -80,10 +80,14 @@ def to_boolean_phrase #:nodoc:
               if @components.length == 1
                 @components.first.to_boolean_phrase
               else
-                component_phrases = @components.map do |component|
-                  component.to_boolean_phrase
+                component_phrases = []
+                @components.each do |component|
+                  boolean_phrase = component.to_boolean_phrase
+                  component_phrases << boolean_phrase if boolean_phrase
+                end
+                unless component_phrases.empty?
+                  "(#{component_phrases.join(" #{connector} ")})"
                 end
-                "(#{component_phrases.join(" #{connector} ")})"
               end
             if negated?
               "-#{phrase}"
diff --git a/sunspot/lib/sunspot/query/scope.rb b/sunspot/lib/sunspot/query/scope.rb
index a73cad919..884c0d1b0 100644
--- a/sunspot/lib/sunspot/query/scope.rb
+++ b/sunspot/lib/sunspot/query/scope.rb
@@ -2,7 +2,14 @@ module Sunspot
   module Query
     class Scope < Connective::Conjunction
       def to_params
-        { :fq => @components.map { |component| component.to_filter_query }}
+        filters = []
+        @components.each do |component|
+          filter = component.to_filter_query
+          filters << filter unless filter.nil?
+        end
+        if filters.empty? then {}
+        else { :fq => filters}
+        end
       end
     end
   end
diff --git a/sunspot/spec/api/query/connectives_examples.rb b/sunspot/spec/api/query/connectives_examples.rb
index 1ee663e29..5d00a68eb 100644
--- a/sunspot/spec/api/query/connectives_examples.rb
+++ b/sunspot/spec/api/query/connectives_examples.rb
@@ -167,10 +167,20 @@
     )
   end
 
-  it 'should ignore empty connectives' do
+  it 'ignores empty connectives' do
     search do
       any_of {}
     end
     connection.should_not have_last_search_including(:fq, '')
   end
+
+  it 'ignores multiple empty nested connectives' do # regression test
+    search do
+      any_of do
+        all_of { any_of {}}
+        all_of { any_of {}}
+      end
+    end
+    connection.searches.last[:fq].should have(1).item
+  end
 end