elasticsearch-dsl 0.1.5 → 0.1.6

data/test/unit/filters/missing_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class MissingTest < ::Test::Unit::TestCase
+      class MissingTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Missing filter" do

data/test/unit/filters/nested_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class NestedTest < ::Test::Unit::TestCase
+      class NestedTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Nested filter" do

data/test/unit/filters/not_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class NotTest < ::Test::Unit::TestCase
+      class NotTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Not filter" do

data/test/unit/filters/or_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class OrTest < ::Test::Unit::TestCase
+      class OrTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Or filter" do

data/test/unit/filters/prefix_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class PrefixTest < ::Test::Unit::TestCase
+      class PrefixTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Prefix filter" do

data/test/unit/filters/query_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class QueryTest < ::Test::Unit::TestCase
+      class QueryTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Query filter" do

data/test/unit/filters/range_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class RangeTest < ::Test::Unit::TestCase
+      class RangeTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Range filter" do

data/test/unit/filters/regexp_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class RegexpTest < ::Test::Unit::TestCase
+      class RegexpTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Regexp filter" do

data/test/unit/filters/script_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class ScriptTest < ::Test::Unit::TestCase
+      class ScriptTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Script filter" do

data/test/unit/filters/term_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class TermTest < ::Test::Unit::TestCase
+      class TermTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         subject { Term.new message: 'test' }

data/test/unit/filters/terms_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class TermsTest < ::Test::Unit::TestCase
+      class TermsTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Terms filter" do

data/test/unit/filters/type_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class TypeTest < ::Test::Unit::TestCase
+      class TypeTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "Type filter" do
@@ -12,17 +12,17 @@ module Elasticsearch
           should "be converted to a Hash" do
             assert_equal({ type: {} }, subject.to_hash)
           end
-                          
+
           should "have option methods" do
             subject = Type.new :foo
-            
+
             subject.value 'bar'
-          
+
             assert_equal %w[ value ],
                          subject.to_hash[:type][:foo].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:type][:foo][:value]
           end
-          
+
           should "take a block" do
             subject = Type.new :foo do
               value 'bar'

data/test/unit/queries/bool_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class BoolTest < ::Test::Unit::TestCase
+      class BoolTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Bool Query" do
@@ -37,13 +37,13 @@ module Elasticsearch
             end
 
             assert_equal( { bool:
-                            { 
+                            {
                               minimum_should_match: 1,
                               boost: 1.0,
                               should:     [ {term: { tag: 'wow' }}, {term: { tag: 'elasticsearch' }} ]
                             }
                           },
-                          subject.to_hash )            
+                          subject.to_hash )
           end
 
           should "take a block with multiple methods" do

data/test/unit/queries/boosting_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class BoostingTest < ::Test::Unit::TestCase
+      class BoostingTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Boosting query" do

data/test/unit/queries/common_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class CommonTest < ::Test::Unit::TestCase
+      class CommonTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Common query" do

data/test/unit/queries/constant_score_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class ConstantScoreTest < ::Test::Unit::TestCase
+      class ConstantScoreTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "ConstantScore query" do

data/test/unit/queries/dis_max_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class DisMaxTest < ::Test::Unit::TestCase
+      class DisMaxTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "DisMax query" do

data/test/unit/queries/exists_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class ExistsTest < ::Test::Unit::TestCase
+      class ExistsTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Exists query" do

data/test/unit/queries/filtered_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class FilteredTest < ::Test::Unit::TestCase
+      class FilteredTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Filtered query" do

data/test/unit/queries/function_score_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class FunctionScoreTest < ::Test::Unit::TestCase
+      class FunctionScoreTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "FunctionScore query" do

data/test/unit/queries/fuzzy_like_this_field_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class FuzzyLikeThisFieldTest < ::Test::Unit::TestCase
+      class FuzzyLikeThisFieldTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "FuzzyLikeThisField query" do
@@ -12,10 +12,10 @@ module Elasticsearch
           should "be converted to a Hash" do
             assert_equal({ fuzzy_like_this_field: {} }, subject.to_hash)
           end
-                          
+
           should "have option methods" do
             subject = FuzzyLikeThisField.new :foo
-            
+
             subject.like_text 'bar'
             subject.fuzziness 'bar'
             subject.analyzer 'bar'
@@ -23,12 +23,12 @@ module Elasticsearch
             subject.prefix_length 'bar'
             subject.boost 'bar'
             subject.ignore_tf 'bar'
-          
+
             assert_equal %w[ analyzer boost fuzziness ignore_tf like_text max_query_terms prefix_length ],
                          subject.to_hash[:fuzzy_like_this_field][:foo].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:fuzzy_like_this_field][:foo][:like_text]
           end
-          
+
           should "take a block" do
             subject = FuzzyLikeThisField.new :foo do
               like_text 'bar'

data/test/unit/queries/fuzzy_like_this_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class FuzzyLikeThisTest < ::Test::Unit::TestCase
+      class FuzzyLikeThisTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "FuzzyLikeThis query" do

data/test/unit/queries/fuzzy_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class FuzzyTest < ::Test::Unit::TestCase
+      class FuzzyTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Fuzzy query" do

data/test/unit/queries/geo_shape_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class GeoShapeTest < ::Test::Unit::TestCase
+      class GeoShapeTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "GeoShape query" do

data/test/unit/queries/has_child_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class HasChildTest < ::Test::Unit::TestCase
+      class HasChildTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "HasChild query" do
@@ -21,10 +21,12 @@ module Elasticsearch
             subject.score_mode 'bar'
             subject.min_children 'bar'
             subject.max_children 'bar'
+            subject.inner_hits({ size: 1 })
 
-            assert_equal %w[ max_children min_children query score_mode type ],
+            assert_equal %w[ inner_hits max_children min_children query score_mode type ],
                          subject.to_hash[:has_child].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:has_child][:type]
+            assert_equal({ size: 1 }, subject.to_hash[:has_child][:inner_hits])
           end
 
           should "take a block" do

data/test/unit/queries/has_parent_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class HasParentTest < ::Test::Unit::TestCase
+      class HasParentTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "HasParent query" do
@@ -19,10 +19,12 @@ module Elasticsearch
             subject.parent_type 'bar'
             subject.query 'bar'
             subject.score_mode 'bar'
+            subject.inner_hits({ size: 1 })
 
-            assert_equal %w[ parent_type query score_mode ],
+            assert_equal %w[ inner_hits parent_type query score_mode ],
                          subject.to_hash[:has_parent].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:has_parent][:parent_type]
+            assert_equal({ size: 1 }, subject.to_hash[:has_parent][:inner_hits])
           end
 
           should "take a block" do

data/test/unit/queries/ids_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class IdsTest < ::Test::Unit::TestCase
+      class IdsTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Ids query" do

data/test/unit/queries/indices_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class IndicesTest < ::Test::Unit::TestCase
+      class IndicesTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "Indices query" do

data/test/unit/queries/match_all_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class MatchAllTest < ::Test::Unit::TestCase
+      class MatchAllTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "MatchAll query" do

data/test/unit/queries/match_phrase_prefix_test.rb

@@ -0,0 +1,62 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Queries
+      class MatchPhrasePrefixTest < ::Elasticsearch::Test::UnitTestCase
+        include Elasticsearch::DSL::Search::Queries
+
+        context "Match Phrase Prefix Query" do
+          subject { MatchPhrasePrefix.new }
+
+          should "be converted to a Hash" do
+            assert_equal({ match_phrase_prefix: {} }, subject.to_hash)
+          end
+
+          should "take a concrete value" do
+            subject = MatchPhrasePrefix.new message: 'test'
+
+            assert_equal({match_phrase_prefix: {message: "test"}}, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = MatchPhrasePrefix.new
+
+            subject.query    'bar'
+            subject.boost    10
+            subject.max_expansions     1
+
+            assert_equal %w[ boost max_expansions query ],
+                         subject.to_hash[:match_phrase_prefix].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:match_phrase_prefix][:query]
+          end
+
+          should "take a Hash" do
+            subject = MatchPhrasePrefix.new message: { query: 'test' }
+
+            assert_equal({match_phrase_prefix: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+          should "take a block" do
+            subject = MatchPhrasePrefix.new :message do
+              query          'test'
+              boost          2
+              max_expansions 1
+            end
+
+            assert_equal({match_phrase_prefix: {message: {query: "test", max_expansions: 1, boost: 2 }}},
+                         subject.to_hash)
+          end
+
+          should "take a method call" do
+            subject = MatchPhrasePrefix.new :message
+            subject.query    'test'
+
+            assert_equal({match_phrase_prefix: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+        end
+      end
+    end
+  end
+end

data/test/unit/queries/match_phrase_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Queries
+      class MatchPhraseTest < ::Elasticsearch::Test::UnitTestCase
+        include Elasticsearch::DSL::Search::Queries
+
+        context "Match Phrase Query" do
+          subject { MatchPhrase.new }
+
+          should "be converted to a Hash" do
+            assert_equal({ match_phrase: {} }, subject.to_hash)
+          end
+
+          should "take a concrete value" do
+            subject = MatchPhrase.new message: 'test'
+
+            assert_equal({match_phrase: {message: "test"}}, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = MatchPhrase.new
+
+            subject.query    'bar'
+            subject.analyzer 'standard'
+            subject.boost    10
+            subject.slop     1
+
+            assert_equal %w[ analyzer boost query slop ],
+                         subject.to_hash[:match_phrase].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:match_phrase][:query]
+          end
+
+          should "take a Hash" do
+            subject = MatchPhrase.new message: { query: 'test' }
+
+            assert_equal({match_phrase: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+          should "take a block" do
+            subject = MatchPhrase.new :message do
+              query     'test'
+              slop      1
+              boost     2
+            end
+
+            assert_equal({match_phrase: {message: {query: "test", slop: 1, boost: 2 }}},
+                         subject.to_hash)
+          end
+
+          should "take a method call" do
+            subject = MatchPhrase.new :message
+            subject.query    'test'
+
+            assert_equal({match_phrase: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+        end
+      end
+    end
+  end
+end