elasticsearch-dsl 0.1.5 → 0.1.6

data/test/integration/search_query_test.rb

@@ -7,7 +7,7 @@ module Elasticsearch
 
       context "Queries integration" do
         startup do
-          Elasticsearch::Extensions::Test::Cluster.start(nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
         end
 
         setup do
@@ -25,6 +25,14 @@ module Elasticsearch
           end
         end
 
+        context "for match_phrase_prefix query" do
+          should "find the document" do
+            response = @client.search index: 'test', body: search { query { match_phrase_prefix title: 'te' } }.to_hash
+
+            assert_equal 1, response['hits']['total']
+          end
+        end
+
         context "for query_string query" do
           should "find the document" do
             response = @client.search index: 'test', body: search { query { query_string { query 'te*' } } }.to_hash

data/test/integration/search_size_from_test.rb

@@ -7,7 +7,11 @@ module Elasticsearch
 
         context "Search results pagination" do
           setup do
+            @client.indices.create index: 'test', body: {
+              mappings: { d: { properties: { title: { type: 'text', fields: { keyword: { type: 'keyword' } } } } } } }
+
             25.times { |i| @client.index index: 'test', type: 'd', id: i, body: { title: "Test #{sprintf('%03d', i)}" } }
+
             @client.indices.refresh index: 'test'
           end
 
@@ -26,7 +30,7 @@ module Elasticsearch
               query { match(:title) { query 'test' and type 'phrase_prefix' } }
               size 5
               from 5
-              sort { by :title }
+              sort { by 'title.keyword' }
             }.to_hash
 
             assert_equal 25, response['hits']['total']

data/test/integration/search_sort_test.rb

@@ -7,13 +7,13 @@ module Elasticsearch
 
       context "Sorting integration" do
         startup do
-          Elasticsearch::Extensions::Test::Cluster.start(nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
         end
 
         setup do
           @client.indices.create index: 'test'
-          @client.index index: 'test', type: 'd', id: '1', body: { tags: ['one'], clicks: 5 }
-          @client.index index: 'test', type: 'd', id: '2', body: { tags: ['one', 'two'], clicks: 15 }
+          @client.index index: 'test', type: 'd', id: '1', body: { tags: ['one'], clicks: 15 }
+          @client.index index: 'test', type: 'd', id: '2', body: { tags: ['one', 'two'], clicks: 5 }
           @client.index index: 'test', type: 'd', id: '3', body: { tags: ['one', 'three'], clicks: 20 }
           @client.indices.refresh index: 'test'
         end
@@ -26,7 +26,7 @@ module Elasticsearch
               end
             }.to_hash
 
-            assert_same_elements ['3', '2', '1'], response['hits']['hits'].map { |d| d['_id'] }
+            assert_same_elements ['3', '1', '2'], response['hits']['hits'].map { |d| d['_id'] }
           end
         end
 

data/test/integration/search_suggest_test.rb

@@ -9,7 +9,7 @@ module Elasticsearch
 
       context "Suggest integration" do
         startup do
-          Elasticsearch::Extensions::Test::Cluster.start(nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
         end
 
         setup do
@@ -17,10 +17,13 @@ module Elasticsearch
             mappings: {
               d: {
                 properties: {
-                  title: { type: 'string' },
-                  title_suggest: {
-                    type: 'completion',
-                    payloads: true
+                  title: { type: 'text' },
+                  suggest: {
+                    type: 'object',
+                    properties: {
+                      title:   { type: 'completion' },
+                      payload: { type: 'object', enabled: false }
+                    }
                   }
                 }
               }
@@ -29,32 +32,50 @@ module Elasticsearch
 
           @client.index index: 'test', type: 'd', id: '1', body: {
             title: 'One',
-            title_suggest: { input: ['one', 'uno', 'jedna'] }, output: 'ONE', payload: { id: '1' } }
+            suggest: {
+              title: { input: ['one', 'uno', 'jedna'] },
+              payload: { id: '1' }
+            }
+          }
           @client.index index: 'test', type: 'd', id: '2', body: {
             title: 'Two',
-            title_suggest: { input: ['two', 'due', 'dvě'] }, output: 'TWO', payload: { id: '2' } }
+            suggest: {
+              title: { input: ['two', 'due', 'dvě'] },
+              payload: { id: '2' }
+            }
+          }
           @client.index index: 'test', type: 'd', id: '3', body: {
             title: 'Three',
-            title_suggest: { input: ['three', 'tres', 'tři'] }, output: 'THREE', payload: { id: '3' } }
+            suggest: {
+              title: { input: ['three', 'tres', 'tři'] },
+              payload: { id: '3' }
+            }
+          }
           @client.indices.refresh index: 'test'
         end
 
         should "return suggestions" do
           s = search do
-            suggest :title, text: 't', completion: { field: 'title_suggest' }
+            suggest :title, text: 't', completion: { field: 'suggest.title' }
           end
 
           response = @client.search index: 'test', body: s.to_hash
-          assert_equal 4, response['suggest']['title'][0]['options'].size
+
+          assert_equal 2, response['suggest']['title'][0]['options'].size
+
+          assert_same_elements %w[2 3], response['suggest']['title'][0]['options'].map { |d| d['_source']['suggest']['payload']['id'] }
         end
 
         should "return a single suggestion" do
           s = search do
-            suggest :title, text: 'th', completion: { field: 'title_suggest' }
+            suggest :title, text: 'th', completion: { field: 'suggest.title' }
           end
 
           response = @client.search index: 'test', body: s.to_hash
+
           assert_equal 1, response['suggest']['title'][0]['options'].size
+
+          assert_same_elements %w[3], response['suggest']['title'][0]['options'].map { |d| d['_source']['suggest']['payload']['id'] }
         end
       end
     end

data/test/integration/search_test.rb

@@ -34,7 +34,7 @@ module Elasticsearch
 
       context "The Search class" do
         startup do
-          Elasticsearch::Extensions::Test::Cluster.start(nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
         end
 
         setup do

data/test/test_helper.rb

@@ -7,12 +7,15 @@ end
 
 at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks }
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'shoulda-context'
 require 'mocha/setup'
 
 require 'minitest/reporters'
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+# Minitest::Reporters.use! [ Minitest::Reporters::SpecReporter.new,
+#                            Minitest::Reporters::JUnitReporter.new,
+#                            Minitest::Reporters::HtmlReporter.new ]
 
 require 'elasticsearch'
 require 'elasticsearch/extensions/test/cluster'
@@ -22,13 +25,29 @@ require 'elasticsearch/dsl'
 
 module Elasticsearch
   module Test
-    class IntegrationTestCase < ::Test::Unit::TestCase
+    module Assertions
+      def assert_nothing_raised(*)
+        yield
+      end
+    end
+
+    class UnitTestCase < ::Minitest::Test
+      include Assertions
+      alias_method :assert_not_nil, :refute_nil
+      alias_method :assert_raise, :assert_raises
+    end
+
+    class IntegrationTestCase < ::Minitest::Test
+      include Assertions
+      alias_method :assert_not_nil, :refute_nil
+      alias_method :assert_raise, :assert_raises
+
       include Elasticsearch::Extensions::Test
       extend  StartupShutdown
 
       startup do
-        Cluster.start(nodes: 1) if ENV['SERVER'] \
-                                && ! Elasticsearch::Extensions::Test::Cluster.running?
+        Cluster.start(number_of_nodes: 1) if ENV['SERVER'] \
+                                && ! Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
       end
 
       shutdown do
@@ -51,7 +70,7 @@ module Elasticsearch
           ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
         end
 
-        @client = Elasticsearch::Client.new host: "localhost:#{@port}", logger: @logger
+        @client = Elasticsearch::Client.new host: "localhost:#{@port}", logger: (ENV['QUIET'] ? nil : @logger)
         @version = @client.info['version']['number']
       end
 

data/test/unit/aggregations/avg_test.rb

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

data/test/unit/aggregations/cardinality_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Aggregations
-      class CardinalityTest < ::Test::Unit::TestCase
+      class CardinalityTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Aggregations
 
         context "Cardinality agg" do
@@ -12,21 +12,21 @@ module Elasticsearch
           should "be converted to a Hash" do
             assert_equal({ cardinality: {} }, subject.to_hash)
           end
-                          
+
           should "have option methods" do
             subject = Cardinality.new :foo
-            
+
             subject.field 'bar'
             subject.precision_threshold 'bar'
             subject.rehash 'bar'
             subject.script 'bar'
             subject.params 'bar'
-          
+
             assert_equal %w[ field params precision_threshold rehash script ],
                          subject.to_hash[:cardinality][:foo].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:cardinality][:foo][:field]
           end
-          
+
           should "take a block" do
             subject = Cardinality.new :foo do
               field 'bar'

data/test/unit/aggregations/children_test.rb

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

data/test/unit/aggregations/date_histogram_test.rb

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

data/test/unit/aggregations/date_range_test.rb

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

data/test/unit/aggregations/extended_stats_test.rb

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

data/test/unit/aggregations/filter_test.rb

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

data/test/unit/aggregations/filters_test.rb

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

data/test/unit/aggregations/geo_bounds_test.rb

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

data/test/unit/aggregations/geo_distance_test.rb

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

data/test/unit/aggregations/geohash_grid_test.rb

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

data/test/unit/aggregations/global_test.rb

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

data/test/unit/aggregations/histogram_test.rb

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

data/test/unit/aggregations/ip_range_test.rb

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

data/test/unit/aggregations/max_test.rb

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

data/test/unit/aggregations/min_test.rb

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

data/test/unit/aggregations/missing_test.rb

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

data/test/unit/aggregations/nested_test.rb

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

data/test/unit/aggregations/percentile_ranks_test.rb

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

data/test/unit/aggregations/percentiles_test.rb

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

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

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