elasticsearch-dsl 0.1.6 → 0.1.10

data/lib/elasticsearch/dsl/search/filters/indices.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -28,7 +45,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-indices-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-indices-filter.html
         #
         class Indices
           include BaseComponent
@@ -65,7 +82,7 @@ module Elasticsearch
             end
             if @no_match_filter
               _no_match_filter = @no_match_filter.respond_to?(:to_hash) ? @no_match_filter.to_hash : @no_match_filter
-              hash[self.name].update(no_match_filter: _filter)
+              hash[self.name].update(no_match_filter: _no_match_filter)
             end
             hash
           end

data/lib/elasticsearch/dsl/search/filters/limit.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -17,7 +34,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-limit-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-limit-filter.html
         #
         class Limit
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/match_all.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -17,7 +34,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-match-all-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-filter.html
         #
         class MatchAll
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/missing.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -18,7 +35,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-missing-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-missing-filter.html
         #
         class Missing
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/nested.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -22,7 +39,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-nested-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-filter.html
         #
         class Nested
           include BaseComponent
@@ -38,6 +55,11 @@ module Elasticsearch
             self
           end
 
+          def query(*args, &block)
+            @query = block ? Elasticsearch::DSL::Search::Query.new(*args, &block) : args.first
+            self
+          end
+
           # Converts the query definition to a Hash
           #
           # @return [Hash]
@@ -48,6 +70,10 @@ module Elasticsearch
               _filter = @filter.respond_to?(:to_hash) ? @filter.to_hash : @filter
               hash[self.name].update(filter: _filter)
             end
+            if @query
+              _query = @query.respond_to?(:to_hash) ? @query.to_hash : @query
+              hash[self.name].update(query: _query)
+            end
             hash
           end
         end

data/lib/elasticsearch/dsl/search/filters/not.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -32,7 +49,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-not-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-not-filter.html
         #
         class Not
           include BaseComponent
@@ -45,8 +62,10 @@ module Elasticsearch
             klass = Utils.__camelize(name)
             if Filters.const_defined? klass
               @value = Filters.const_get(klass).new(*args, &block)
+            elsif @block
+              @block.binding.eval('self').send(name, *args, &block)
             else
-              raise NoMethodError, "undefined method '#{name}' for #{self}"
+              super
             end
           end
 

data/lib/elasticsearch/dsl/search/filters/or.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -33,7 +50,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-or-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-or-filter.html
         #
         class Or
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/prefix.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -17,7 +34,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-prefix-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-prefix-filter.html
         #
         class Prefix
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/query.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -21,7 +38,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-filter.html
         #
         class Query
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/range.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -20,7 +37,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
         #
         class Range
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/regexp.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -19,7 +36,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-regexp-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-filter.html
         #
         class Regexp
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/script.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -17,7 +34,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-script-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-script-filter.html
         #
         class Script
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/term.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -20,7 +37,7 @@ module Elasticsearch
         # @note The specified terms are *not analyzed* (lowercased, stemmed, etc),
         #       so they must match the indexed terms.
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
         #
         class Term
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/terms.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -20,7 +37,7 @@ module Elasticsearch
         # @note The specified terms are *not analyzed* (lowercased, stemmed, etc),
         #       so they must match the indexed terms.
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html
         #
         class Terms
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/type.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -20,7 +37,7 @@ module Elasticsearch
         #     end
         #
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-type-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-type-filter.html
         #
         class Type
           include BaseComponent

data/lib/elasticsearch/dsl/search/highlight.rb

@@ -1,10 +1,27 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
 
       # Wraps the `highlight` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-highlighting.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-highlighting.html
       #
       class Highlight
         include BaseComponent

data/lib/elasticsearch/dsl/search/options.rb

@@ -1,10 +1,27 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
 
       # Wraps the "extra" options of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-body.html
       #
       class Options
         DSL_METHODS = [
@@ -17,7 +34,8 @@ module Elasticsearch
           :version,
           :indices_boost,
           :track_scores,
-          :min_score
+          :min_score,
+          :track_total_hits
         ]
 
         def initialize(*args, &block)

data/lib/elasticsearch/dsl/search/queries/bool.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module DSL
     module Search
@@ -31,7 +48,7 @@ module Elasticsearch
         #
         # See the integration test for a working example.
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html
         #
         class Bool
           include BaseComponent
@@ -41,29 +58,30 @@ module Elasticsearch
 
           def must(*args, &block)
             @hash[name][:must] ||= []
-            value = Query.new(*args, &block).to_hash
+            value = args.empty? ? Query.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:must].push(value).flatten! unless @hash[name][:must].include?(value)
             self
           end
 
           def must_not(*args, &block)
             @hash[name][:must_not] ||= []
-            value = Query.new(*args, &block).to_hash
+            value = args.empty? ? Query.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:must_not].push(value).flatten! unless @hash[name][:must_not].include?(value)
             self
           end
 
           def should(*args, &block)
             @hash[name][:should] ||= []
-            value = Query.new(*args, &block).to_hash
+            value = args.empty? ? Query.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:should].push(value).flatten! unless @hash[name][:should].include?(value)
             self
           end
 
           def filter(*args, &block)
             @hash[name][:filter] ||= []
-            value = Filter.new(*args, &block).to_hash
-            @hash[name][:filter].push(value).flatten! unless @hash[name][:filter].include?(value)
+            if filter = block ? Filter.new(*args, &block) : args.first
+              @hash[name][:filter] << filter.to_hash
+            end
             self
           end
 
@@ -75,7 +93,6 @@ module Elasticsearch
             else
               @hash[name] = @args unless @args.nil? || @args.empty?
             end
-
             @hash
           end
         end