elasticsearch-dsl 0.1.5 → 0.1.6

data/test/unit/aggregations/pipeline/bucket_script_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class BucketScriptTest < ::Test::Unit::TestCase
+      class BucketScriptTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Bucket Script agg" do

data/test/unit/aggregations/pipeline/bucket_selector_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class BucketSelectorTest < ::Test::Unit::TestCase
+      class BucketSelectorTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Bucket Selector agg" do

data/test/unit/aggregations/pipeline/cumulative_sum_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class CumulativeSumTest < ::Test::Unit::TestCase
+      class CumulativeSumTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Cumulative Sum Bucket agg" do

data/test/unit/aggregations/pipeline/derivative_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class DerivativeTest < ::Test::Unit::TestCase
+      class DerivativeTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Derivative agg" do

data/test/unit/aggregations/pipeline/extended_stats_bucket_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class ExtendedStatsBucketTest < ::Test::Unit::TestCase
+      class ExtendedStatsBucketTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Extended Stats Bucket agg" do

data/test/unit/aggregations/pipeline/max_bucket_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class MaxBucketTest < ::Test::Unit::TestCase
+      class MaxBucketTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Max Bucket agg" do

data/test/unit/aggregations/pipeline/min_bucket_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class MinBucketTest < ::Test::Unit::TestCase
+      class MinBucketTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Min Bucket agg" do

data/test/unit/aggregations/pipeline/moving_avg_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class MovingAvgTest < ::Test::Unit::TestCase
+      class MovingAvgTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Moving Average Bucket agg" do

data/test/unit/aggregations/pipeline/percentiles_bucket_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class PercentilesBucketTest < ::Test::Unit::TestCase
+      class PercentilesBucketTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Percentiles Bucket agg" do

data/test/unit/aggregations/pipeline/serial_diff_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class SerialDiffTest < ::Test::Unit::TestCase
+      class SerialDiffTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Serial Defferencing agg" do

data/test/unit/aggregations/pipeline/stats_bucket_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class StatsBucketTest < ::Test::Unit::TestCase
+      class StatsBucketTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Stats Bucket agg" do

data/test/unit/aggregations/pipeline/sum_bucket_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class SumBucketTest < ::Test::Unit::TestCase
+      class SumBucketTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Sum Bucket agg" do

data/test/unit/aggregations/range_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class RangeTest < ::Test::Unit::TestCase
+      class RangeTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Range aggregation" do
@@ -32,6 +32,17 @@ module Elasticsearch
             assert_equal({ range: { field: "test", keyed: true, ranges: [ {to: 10, key: 'foo'}, { from: 10, to: 20, key: 'bar'}]}}, subject.to_hash)
           end
 
+          should "let you set keyed to false explicitly" do
+            subject = Range.new do
+              keyed false
+              field 'test'
+              key   'foo', to: 10
+              key   'bar', from: 10, to: 20
+            end
+
+            assert_equal({ range: { field: "test", keyed: false, ranges: [ {to: 10, key: 'foo'}, { from: 10, to: 20, key: 'bar'}]}}, subject.to_hash)
+          end
+
           should "define field in the block" do
             subject = Range.new do
               field 'test'

data/test/unit/aggregations/reverse_nested_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class ReverseNestedTest < ::Test::Unit::TestCase
+      class ReverseNestedTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "ReverseNested aggregation" do
@@ -12,7 +12,7 @@ module Elasticsearch
           should "be converted to a Hash" do
             assert_equal({ reverse_nested: {} }, subject.to_hash)
           end
-          
+
         end
       end
     end

data/test/unit/aggregations/scripted_metric_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class ScriptedMetricTest < ::Test::Unit::TestCase
+      class ScriptedMetricTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "ScriptedMetric agg" do

data/test/unit/aggregations/significant_terms_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class SignificantTermsTest < ::Test::Unit::TestCase
+      class SignificantTermsTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "SignificantTerms aggregation" do

data/test/unit/aggregations/stats_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class StatsTest < ::Test::Unit::TestCase
+      class StatsTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Stats agg" do

data/test/unit/aggregations/sum_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class SumTest < ::Test::Unit::TestCase
+      class SumTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Sum agg" do

data/test/unit/aggregations/terms_test.rb

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

data/test/unit/aggregations/top_hits_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class TopHitsTest < ::Test::Unit::TestCase
+      class TopHitsTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "TopHits agg" do

data/test/unit/aggregations/value_count_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class ValueCountTest < ::Test::Unit::TestCase
+      class ValueCountTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "ValueCount agg" do

data/test/unit/dsl_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class DSLTest < ::Test::Unit::TestCase
+    class DSLTest < ::Elasticsearch::Test::UnitTestCase
       context "The DSL" do
         class DummyDSLReceiver
           include Elasticsearch::DSL

data/test/unit/filters/and_test.rb

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

data/test/unit/filters/bool_test.rb

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

data/test/unit/filters/exists_test.rb

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

data/test/unit/filters/geo_bounding_box_test.rb

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

data/test/unit/filters/geo_distance_range_test.rb

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

data/test/unit/filters/geo_distance_test.rb

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

data/test/unit/filters/geo_polygon_test.rb

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

data/test/unit/filters/geo_shape_test.rb

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

data/test/unit/filters/geohash_cell_test.rb

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

data/test/unit/filters/has_child_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class HasChildTest < ::Test::Unit::TestCase
+      class HasChildTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "HasChild filter" do
@@ -21,10 +21,12 @@ module Elasticsearch
             subject.filter 'bar'
             subject.min_children 'bar'
             subject.max_children 'bar'
+            subject.inner_hits({ size: 1 })
 
-            assert_equal %w[ filter max_children min_children query type ],
+            assert_equal %w[ filter inner_hits max_children min_children query 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/filters/has_parent_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class HasParentTest < ::Test::Unit::TestCase
+      class HasParentTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "HasParent filter" do
@@ -20,10 +20,12 @@ module Elasticsearch
             subject.filter 'bar'
             subject.query 'bar'
             subject.score_mode 'bar'
+            subject.inner_hits({ size: 1 })
 
-            assert_equal %w[ filter parent_type query score_mode ],
+            assert_equal %w[ filter 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/filters/ids_test.rb

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

data/test/unit/filters/indices_test.rb

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

data/test/unit/filters/limit_test.rb

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

data/test/unit/filters/match_all_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Filters
-      class MatchAllTest < ::Test::Unit::TestCase
+      class MatchAllTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Filters
 
         context "MatchAll filter" do
@@ -12,7 +12,7 @@ module Elasticsearch
           should "be converted to a Hash" do
             assert_equal({ match_all: {} }, subject.to_hash)
           end
-          
+
         end
       end
     end