elasticsearch-dsl 0.1.5 → 0.1.6

data/test/unit/queries/match_test.rb

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

data/test/unit/queries/more_like_this_test.rb

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

data/test/unit/queries/multi_match_test.rb

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

data/test/unit/queries/nested_test.rb

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

data/test/unit/queries/prefix_test.rb

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

data/test/unit/queries/query_string_test.rb

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

data/test/unit/queries/range_test.rb

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

data/test/unit/queries/regexp_test.rb

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

data/test/unit/queries/simple_query_string_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Elasticsearch
   module Test
     module Queries
-      class SimpleQueryStringTest < ::Test::Unit::TestCase
+      class SimpleQueryStringTest < ::Elasticsearch::Test::UnitTestCase
         include Elasticsearch::DSL::Search::Queries
 
         context "SimpleQueryString query" do
@@ -12,24 +12,22 @@ module Elasticsearch
           should "be converted to a Hash" do
             assert_equal({ simple_query_string: {} }, subject.to_hash)
           end
-                          
+
           should "have option methods" do
             subject = SimpleQueryString.new :foo
-            
+
             subject.query 'bar'
             subject.fields 'bar'
             subject.default_operator 'bar'
             subject.analyzer 'bar'
             subject.flags 'bar'
-            subject.lowercase_expanded_terms 'bar'
-            subject.locale 'bar'
             subject.lenient 'bar'
-          
-            assert_equal %w[ analyzer default_operator fields flags lenient locale lowercase_expanded_terms query ],
+
+            assert_equal %w[ analyzer default_operator fields flags lenient query ],
                          subject.to_hash[:simple_query_string][:foo].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:simple_query_string][:foo][:query]
           end
-          
+
           should "take a block" do
             subject = SimpleQueryString.new :foo do
               query 'bar'

data/test/unit/queries/span_first_test.rb

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

data/test/unit/queries/span_multi_test.rb

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

data/test/unit/queries/span_near_test.rb

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

data/test/unit/queries/span_not_test.rb

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

data/test/unit/queries/span_or_test.rb

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

data/test/unit/queries/span_term_test.rb

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

data/test/unit/queries/template_test.rb

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

data/test/unit/queries/term_test.rb

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

data/test/unit/queries/terms_test.rb

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

data/test/unit/queries/top_children_test.rb

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

data/test/unit/queries/wildcard_test.rb

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

data/test/unit/search_aggregation_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchAggregationTest < ::Test::Unit::TestCase
+    class SearchAggregationTest < ::Elasticsearch::Test::UnitTestCase
       subject { Elasticsearch::DSL::Search::Aggregation.new }
 
       context "Search Aggregation" do

data/test/unit/search_base_aggregation_component_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class BaseAggregationComponentTest < ::Test::Unit::TestCase
+    class BaseAggregationComponentTest < ::Elasticsearch::Test::UnitTestCase
       context "BaseAggregationComponent" do
 
         class DummyAggregationComponent

data/test/unit/search_base_component_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class BaseComponentTest < ::Test::Unit::TestCase
+    class BaseComponentTest < ::Elasticsearch::Test::UnitTestCase
       context "BaseComponent" do
 
         class DummyComponent

data/test/unit/search_filter_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchFilterTest < ::Test::Unit::TestCase
+    class SearchFilterTest < ::Elasticsearch::Test::UnitTestCase
       subject { Elasticsearch::DSL::Search::Filter.new }
 
       context "Search Filter" do

data/test/unit/search_highlight_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class HighlightTest < ::Test::Unit::TestCase
+    class HighlightTest < ::Elasticsearch::Test::UnitTestCase
       context "Search highlight" do
         subject { Elasticsearch::DSL::Search::Highlight.new }
 

data/test/unit/search_options_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchOptionsTest < ::Test::Unit::TestCase
+    class SearchOptionsTest < ::Elasticsearch::Test::UnitTestCase
       subject { Elasticsearch::DSL::Search::Options.new }
 
       context "Search options" do

data/test/unit/search_query_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchQueryTest < ::Test::Unit::TestCase
+    class SearchQueryTest < ::Elasticsearch::Test::UnitTestCase
       subject { Elasticsearch::DSL::Search::Query.new }
 
       context "Search Query" do

data/test/unit/search_size_from_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchSizeTest < ::Test::Unit::TestCase
+    class SearchSizeTest < ::Elasticsearch::Test::UnitTestCase
       context "Search pagination" do
 
         should "encode the size parameter" do

data/test/unit/search_sort_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchSortTest < ::Test::Unit::TestCase
+    class SearchSortTest < ::Elasticsearch::Test::UnitTestCase
       subject { Elasticsearch::DSL::Search::Sort.new }
 
       context "Search sort" do

data/test/unit/search_suggest_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchSuggestTest < ::Test::Unit::TestCase
+    class SearchSuggestTest < ::Elasticsearch::Test::UnitTestCase
       subject { Elasticsearch::DSL::Search::Suggest.new :foo }
 
       context "Search suggest" do

data/test/unit/search_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class SearchTest < ::Test::Unit::TestCase
+    class SearchTest < ::Elasticsearch::Test::UnitTestCase
       subject { Elasticsearch::DSL::Search::Search.new }
 
       context "The Search module" do
@@ -38,6 +38,7 @@ module Elasticsearch
               search do |q|
                 q.from value
                 q.size @other_value
+                q.stored_fields ['term']
 
                 q.filter do |q|
                   q._and do |q|
@@ -51,6 +52,7 @@ module Elasticsearch
 
           assert_equal({from: 42,
                         size: 'foo',
+                        stored_fields: ['term'],
                         filter: { and: [ { term:  { thang: 'foo' } },
                                          { term:  { attributes: 42 } }]}},
           DummySearchReceiver.new.search_definition.to_hash)

data/test/unit/utils_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class UtilsTest < ::Test::Unit::TestCase
+    class UtilsTest < ::Elasticsearch::Test::UnitTestCase
       context "Utils" do
         should "convert a string to camelcase" do
           assert_equal 'Foo', Elasticsearch::DSL::Utils.__camelize('foo')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,21 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: A Ruby DSL builder for Elasticsearch
 email:
 - karel.minarik@elasticsearch.com
@@ -318,6 +304,8 @@ files:
 - lib/elasticsearch/dsl/search/queries/indices.rb
 - lib/elasticsearch/dsl/search/queries/match.rb
 - lib/elasticsearch/dsl/search/queries/match_all.rb
+- lib/elasticsearch/dsl/search/queries/match_phrase.rb
+- lib/elasticsearch/dsl/search/queries/match_phrase_prefix.rb
 - lib/elasticsearch/dsl/search/queries/more_like_this.rb
 - lib/elasticsearch/dsl/search/queries/multi_match.rb
 - lib/elasticsearch/dsl/search/queries/nested.rb
@@ -441,6 +429,8 @@ files:
 - test/unit/queries/ids_test.rb
 - test/unit/queries/indices_test.rb
 - test/unit/queries/match_all_test.rb
+- test/unit/queries/match_phrase_prefix_test.rb
+- test/unit/queries/match_phrase_test.rb
 - test/unit/queries/match_test.rb
 - test/unit/queries/more_like_this_test.rb
 - test/unit/queries/multi_match_test.rb
@@ -486,7 +476,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -494,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Ruby DSL builder for Elasticsearch
@@ -598,6 +588,8 @@ test_files:
 - test/unit/queries/ids_test.rb
 - test/unit/queries/indices_test.rb
 - test/unit/queries/match_all_test.rb
+- test/unit/queries/match_phrase_prefix_test.rb
+- test/unit/queries/match_phrase_test.rb
 - test/unit/queries/match_test.rb
 - test/unit/queries/more_like_this_test.rb
 - test/unit/queries/multi_match_test.rb