arelastic 0.1.3 → 0.2.0

data/lib/arelastic/builders/query.rb

@@ -6,8 +6,8 @@ module Arelastic
           new(field)
         end
 
-        def constant_score(filter_or_query)
-          query Arelastic::Queries::ConstantScore.new(filter_or_query)
+        def constant_score(search)
+          query Arelastic::Queries::ConstantScore.new(search)
         end
 
         def filtered(query, filter)

data/lib/arelastic/filters.rb

@@ -3,6 +3,7 @@ require 'arelastic/filters/filter'
 require 'arelastic/filters/and'
 require 'arelastic/filters/exists'
 require 'arelastic/filters/geo_distance'
+require 'arelastic/filters/has_child'
 require 'arelastic/filters/ids'
 require 'arelastic/filters/limit'
 require 'arelastic/filters/match_all'

data/lib/arelastic/filters/has_child.rb

@@ -0,0 +1,21 @@
+module Arelastic
+  module Filters
+    class HasChild < Arelastic::Filters::Filter
+      attr_reader :type, :query
+
+      def initialize type, query
+        @type = type
+        @query = query
+      end
+
+      def as_elastic
+        {
+          "has_child" => {
+            "type"  => type,
+            "query" => convert_to_elastic(query)
+          }
+        }
+      end
+    end
+  end
+end

data/lib/arelastic/queries/filtered.rb

@@ -8,7 +8,12 @@ module Arelastic
       end
 
       def as_elastic
-        { "filtered" => Arelastic::Nodes::HashGroup.new([query, filter]).as_elastic }
+        {
+          "filtered" => {
+            "query"   => convert_to_elastic(query),
+            "filter"  => convert_to_elastic(filter)
+          }
+        }
       end
     end
   end

data/test/arelastic/builders/query_test.rb

@@ -9,8 +9,8 @@ class Arelastic::Builders::QueryTest < MiniTest::Spec
   end
 
   def test_filtered
-    query = Arelastic::Builders::Query.filtered({"query" => "foo"}, {"filter" => "bar"})
-    expected = {"query" => {"filtered" => {"query" => "foo", "filter" => "bar"}}}
+    query = Arelastic::Builders::Query.filtered({"query_string" => "foo"}, {"term" => "bar"})
+    expected = {"query" => {"filtered" => {"query" => {"query_string" => "foo"}, "filter" => {"term" => "bar"}}}}
 
     assert_equal expected, query.as_elastic
   end

data/test/arelastic/filters/has_child_test.rb

@@ -0,0 +1,9 @@
+require 'helper'
+
+class Arelastic::Filters::HasChildTest < MiniTest::Spec
+  def test_as_elastic
+    expected = {"has_child" => {"type" => "comment", "query" => {"query_string" => "lol"}}}
+
+    assert_equal expected, Arelastic::Filters::HasChild.new("comment", {"query_string" => "lol"}).as_elastic
+  end
+end

data/test/arelastic/queries/filtered_test.rb

@@ -2,8 +2,8 @@ require 'helper'
 
 class Arelastic::Queries::FilteredTest < MiniTest::Spec
   def test_as_elastic
-    filtered = Arelastic::Queries::Filtered.new({"query" => "bar"}, {"filter" => "baz"})
-    expected = {"filtered" => {"query" => "bar", "filter" => "baz"}}
+    filtered = Arelastic::Queries::Filtered.new({"query_string" => "bar"}, {"term" => "baz"})
+    expected = {"filtered" => {"query" => {"query_string" => "bar"}, "filter" => {"term" => "baz"}}}
 
     assert_equal expected, filtered.as_elastic
   end

data/test/arelastic/queries/query_test.rb

@@ -1,5 +1,6 @@
 require 'helper'
 
 class Arelastic::Queries::QueryTest < MiniTest::Spec
-  
+  def test_as_elastic
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -37,6 +37,7 @@ files:
 - lib/arelastic/filters/exists.rb
 - lib/arelastic/filters/filter.rb
 - lib/arelastic/filters/geo_distance.rb
+- lib/arelastic/filters/has_child.rb
 - lib/arelastic/filters/ids.rb
 - lib/arelastic/filters/limit.rb
 - lib/arelastic/filters/match_all.rb
@@ -85,6 +86,7 @@ files:
 - test/arelastic/filters/exists_test.rb
 - test/arelastic/filters/filter_test.rb
 - test/arelastic/filters/geo_distance_test.rb
+- test/arelastic/filters/has_child_test.rb
 - test/arelastic/filters/ids_test.rb
 - test/arelastic/filters/match_all_test.rb
 - test/arelastic/filters/match_test.rb