arelastic 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e61299c1a151518149a1394644685e6f9ce879
-  data.tar.gz: e288608cd5e98ca466f12ea6b7ebf29cd4bbebc8
+  metadata.gz: 461f0c1c4638378978028848fa4b076be47c2e2f
+  data.tar.gz: 08a45801e8a532840076b49315029a4984ba0632
 SHA512:
-  metadata.gz: 94f6f848709e97ecd2d127920b15f1784e36bf2405d0f1c050499babc177cc86b79df22c4d19d190ce58487637de667d7fa9ebfdef3f8480ab23d844a4460c31
-  data.tar.gz: 594c93e4d097b2d6fdb47077f9f719a638b65f7b472f4b06ce24dacb52fb2e95ae2630d0976bb7e190605cda40104a8476ac7dfd0795ae1b6efea3e76c4a86c4
+  metadata.gz: 80d59ba50365fb2902826794e215114d6c28b93d1772328aba566ff18921665f83ec76865863febdda8a7d5e6c0b173a98af2e2cc30e5bdbf68113997c829567
+  data.tar.gz: 6c6d9e6b38e7d1717a50a1850aa94f8d4796434f7ada756deaf380e9830093a0a8135fc13aafea999571283f3bdc56d4bc13495a9b93c3cc933224cf41fa0753

data/lib/arelastic/arities/polyadic.rb

@@ -18,7 +18,7 @@ module Arelastic
         end
 
         def as_elastic
-          {self.class.operator => children.map { |child| convert_to_elastic(child) }}
+          {self.class.operator => convert_to_elastic(children)}
         end
       end
     end

data/lib/arelastic/nodes/node.rb

@@ -6,7 +6,11 @@ module Arelastic
       extend Arelastic::Arities::Unary
 
       def convert_to_elastic(expr)
-        expr.respond_to?(:as_elastic) ? expr.as_elastic : expr
+        if expr.is_a?(Array)
+          expr.map { |e| convert_to_elastic(e) }
+        else
+          expr.respond_to?(:as_elastic) ? expr.as_elastic : expr
+        end
       end
 
       def ==(other)

data/lib/arelastic/queries.rb

@@ -1,5 +1,6 @@
 require 'arelastic/queries/query'
 
+require 'arelastic/queries/bool'
 require 'arelastic/queries/constant_score'
 require 'arelastic/queries/field'
 require 'arelastic/queries/filtered'

data/lib/arelastic/queries/bool.rb

@@ -0,0 +1,19 @@
+module Arelastic
+  module Queries
+    class Bool < Arelastic::Queries::Query
+      attr_accessor :options
+      def initialize(options)
+        @options = options
+      end
+
+      def as_elastic
+        params = {}
+        options.each do |key, value|
+          params[key] = convert_to_elastic(value)
+        end
+
+        { "bool" => params }
+      end
+    end
+  end
+end

data/test/arelastic/filters/nested_test.rb

@@ -13,7 +13,7 @@ class Arelastic::Filters::NestedTest < MiniTest::Unit::TestCase
       }
     }
 
-    assert_equal expected, Arelastic::Filters::Nested.new('bunnies', Arelastic::Searches::Query(Arelastic::Queries::Match.new('name', 'Harry'))).as_elastic
+    assert_equal expected, Arelastic::Filters::Nested.new('bunnies', Arelastic::Searches::Query.new(Arelastic::Queries::Match.new('name', 'Harry'))).as_elastic
   end
 
 end

data/test/arelastic/queries/bool_test.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+class Arelastic::Queries::BoolTest < MiniTest::Unit::TestCase
+  def test_as_elastic
+    bool = Arelastic::Queries::Bool.new(
+      'must' => {
+        'prefix' => {
+          'user' => 'kimchy'
+        }
+      },
+      'must_not' => Arelastic::Queries::Match.new('color', 'green'),
+      'should' => [
+        Arelastic::Queries::Match.new('height', 6)
+      ]
+    )
+
+    expected = {
+      'bool' => {
+        'must' => {
+          'prefix' => {
+            'user' => 'kimchy'
+          }
+        },
+        'must_not' => {
+          'match' => {
+            'color'=>'green'
+          }
+        },
+        'should' => [
+          'match' => {
+            'height' => 6
+          }
+        ]
+      }
+    }
+
+    assert_equal expected, bool.as_elastic
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -63,6 +63,7 @@ files:
 - lib/arelastic/nodes/hash_group.rb
 - lib/arelastic/nodes/node.rb
 - lib/arelastic/nodes.rb
+- lib/arelastic/queries/bool.rb
 - lib/arelastic/queries/constant_score.rb
 - lib/arelastic/queries/field.rb
 - lib/arelastic/queries/filtered.rb
@@ -112,6 +113,7 @@ files:
 - test/arelastic/mappings/types/multi_field_test.rb
 - test/arelastic/mappings/types/string_test.rb
 - test/arelastic/nodes/node_test.rb
+- test/arelastic/queries/bool_test.rb
 - test/arelastic/queries/filtered_test.rb
 - test/arelastic/queries/match_all_test.rb
 - test/arelastic/queries/multi_match_test.rb