elasticsearch-dsl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa549b0dcf60175f255e9e4274863dba56808dc
-  data.tar.gz: 7ec42e3ede3c15f0904870338bc108ef5e51d742
+  metadata.gz: 07ba4dc2f609b39f8b40da442f58f58a345b5aec
+  data.tar.gz: 6dc376d8e4f6a1f2f851a0c1064f0d1e7222f836
 SHA512:
-  metadata.gz: 551986fb989ba8424a9baab7bf9ba435c4cad33d8746652ad1ab924fdb8ccd4bb33a08c1cb517c2edbfbe6a38a64f39829b45166e9ef73da1b8ecb237392d25d
-  data.tar.gz: 9c9d61b3135d4b8f2ed9757d8f383f3bd8ea106ff08d50d00833dbb07ad1e545113d5bad8d1d7466070537240583a6a0ae3b50fe1c1c031c65f0ffe7728e53c3
+  metadata.gz: 142a407caebc35cb09ac1224372327f96c70e4db2925819be9dd3b6852689acb85ca3e1a0c96b3f1220fa0924be23114aa5814ba3e6e5a4092f06577cc6506e7
+  data.tar.gz: d3d29be98f529f74278ba6347ad50d352f51cac973e460ca58b26afbdd273323c7939b1bb71cb8e4cc1b2eaaaff7e628fb57a4c970ec28b2383d8e599d3ab851

data/Rakefile

@@ -182,7 +182,7 @@ namespace :generate do
       module Elasticsearch
         module Test
           module #{module_name}
-            class #{class_name}Test < ::Test::Unit::TestCase
+            class #{class_name}Test < ::Elasticsearch::Test::UnitTestCase
               include Elasticsearch::DSL::Search::#{module_name}
 
               context "#{class_name} #{options[:type]}" do

data/elasticsearch-dsl.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
   s.rdoc_options      = [ "--charset=UTF-8" ]
 
+  s.required_ruby_version = '>= 1.9'
+
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake", "~> 11.1"
 
@@ -29,11 +31,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'shoulda-context'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'minitest', '~> 4.0'
-  s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency 'minitest-reporters', '~> 1'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'simplecov-rcov'
-  s.add_development_dependency 'ci_reporter', '~> 1.9'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'cane'
   s.add_development_dependency 'pry'

data/lib/elasticsearch/dsl/search.rb

@@ -159,6 +159,19 @@ module Elasticsearch
           end
         end
 
+        # DSL method for building the `stored_fields` part of a search definition
+        #
+        # @return [self]
+        #
+        def stored_fields(value=nil)
+          if value
+            @stored_fields = value
+            self
+          else
+            @stored_fields
+          end
+        end; alias_method :stored_fields=, :stored_fields
+
         # DSL method for building the `size` part of a search definition
         #
         # @return [self]
@@ -229,6 +242,7 @@ module Elasticsearch
           hash.update(aggregations: @aggregations.reduce({}) { |sum,item| sum.update item.first => item.last.to_hash }) if @aggregations
           hash.update(sort: @sort.to_hash) if @sort
           hash.update(size: @size) if @size
+          hash.update(stored_fields: @stored_fields) if @stored_fields
           hash.update(from: @from) if @from
           hash.update(suggest: @suggest.reduce({}) { |sum,item| sum.update item.last.to_hash }) if @suggest
           hash.update(highlight: @highlight.to_hash) if @highlight

data/lib/elasticsearch/dsl/search/aggregations/range.rb

@@ -37,10 +37,11 @@ module Elasticsearch
           option_method :field
           option_method :script
           option_method :params
+          option_method :keyed
 
           def key(key, value)
             @hash[name].update(@args) if @args
-            @hash[name][:keyed]  ||= true
+            @hash[name][:keyed] = true unless @hash[name].has_key?(:keyed)
             @hash[name][:ranges] ||= []
             @hash[name][:ranges] << value.merge(key: key) unless @hash[name][:ranges].any? { |i| i[:key] == key }
             self

data/lib/elasticsearch/dsl/search/filters/has_child.rb

@@ -30,6 +30,7 @@ module Elasticsearch
           option_method :type
           option_method :min_children
           option_method :max_children
+          option_method :inner_hits
 
           # DSL method for building the `query` part of the query definition
           #

data/lib/elasticsearch/dsl/search/filters/has_parent.rb

@@ -29,6 +29,7 @@ module Elasticsearch
 
           option_method :parent_type
           option_method :score_mode
+          option_method :inner_hits
 
           # DSL method for building the `query` part of the query definition
           #

data/lib/elasticsearch/dsl/search/options.rb

@@ -21,7 +21,6 @@ module Elasticsearch
         ]
 
         def initialize(*args, &block)
-          super
           @hash = {}
         end
 

data/lib/elasticsearch/dsl/search/queries/has_child.rb

@@ -27,6 +27,7 @@ module Elasticsearch
           option_method :score_mode
           option_method :min_children
           option_method :max_children
+          option_method :inner_hits
 
           # DSL method for building the `query` part of the query definition
           #

data/lib/elasticsearch/dsl/search/queries/has_parent.rb

@@ -27,6 +27,7 @@ module Elasticsearch
 
           option_method :parent_type
           option_method :score_mode
+          option_method :inner_hits
 
           # DSL method for building the `query` part of the query definition
           #

data/lib/elasticsearch/dsl/search/queries/match.rb

@@ -35,6 +35,7 @@ module Elasticsearch
           option_method :lenient
           option_method :zero_terms_query
           option_method :cutoff_frequency
+          option_method :max_expansions
         end
 
       end

data/lib/elasticsearch/dsl/search/queries/match_phrase.rb

@@ -0,0 +1,33 @@
+module Elasticsearch
+  module DSL
+    module Search
+      module Queries
+
+        # A query that analyzes the text and creates a phrase query out of the analyzed text
+        #
+        # @example
+        #
+        #     search do
+        #       query do
+        #         match_phrase :content do
+        #           query 'example content'
+        #           analyzer 'standard'
+        #         end
+        #       end
+        #     end
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query-phrase.html
+        #
+        class MatchPhrase
+          include BaseComponent
+
+          option_method :query
+          option_method :analyzer
+          option_method :boost
+          option_method :slop
+        end
+
+      end
+    end
+  end
+end

data/lib/elasticsearch/dsl/search/queries/match_phrase_prefix.rb

@@ -0,0 +1,32 @@
+module Elasticsearch
+  module DSL
+    module Search
+      module Queries
+
+        # The same as match_phrase, except that it allows for prefix matches on the last term in the text
+        #
+        # @example
+        #
+        #     search do
+        #       query do
+        #         match_phrase_prefix :content do
+        #           query 'example content'
+        #           max_expansions 10
+        #         end
+        #       end
+        #     end
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query-phrase-prefix.html
+        #
+        class MatchPhrasePrefix
+          include BaseComponent
+
+          option_method :query
+          option_method :boost
+          option_method :max_expansions
+        end
+
+      end
+    end
+  end
+end

data/lib/elasticsearch/dsl/search/queries/simple_query_string.rb

@@ -27,9 +27,11 @@ module Elasticsearch
           option_method :default_operator
           option_method :analyzer
           option_method :flags
-          option_method :lowercase_expanded_terms
-          option_method :locale
+          option_method :analyze_wildcard
           option_method :lenient
+          option_method :minimum_should_match
+          option_method :quote_field_suffix
+          option_method :all_fields
         end
 
       end

data/lib/elasticsearch/dsl/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module DSL
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/test/integration/search_aggregation_children_test.rb

@@ -7,18 +7,23 @@ module Elasticsearch
 
       context "A children aggregation" 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: 'articles-test', body: {
             mappings: {
-              article: {},
+              article: {
+                properties: {
+                  title:    { type: 'text' },
+                  category: { type: 'keyword' }
+                }
+              },
               comment: {
                 _routing: { required: true },
                 _parent:  { type: 'article' },
                 properties: {
-                  author: { type: 'string', analyzer: 'keyword' }
+                  author: { type: 'keyword' }
                 }
               }
             }

data/test/integration/search_aggregation_geo_test.rb

@@ -7,7 +7,7 @@ module Elasticsearch
 
       context "A geo aggregation" 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/integration/search_aggregation_nested_test.rb

@@ -7,7 +7,7 @@ module Elasticsearch
 
       context "A nested aggregation" 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
@@ -15,10 +15,12 @@ module Elasticsearch
             mappings: {
               product: {
                 properties: {
+                  title: { type: 'text' },
+                  category: { type: 'keyword' },
                   offers: {
                     type: 'nested',
                     properties: {
-                      name:  { type: 'string' },
+                      name:  { type: 'text' },
                       price: { type: 'double' }
                     }
                   }
@@ -61,14 +63,18 @@ module Elasticsearch
         should "return the top categories for offer price range" do
           response = @client.search index: 'products-test', body: search {
             query do
-              filtered do
-                filter do
+              bool do
+                must do
                   nested do
                     path 'offers'
-                    filter do
-                      range 'offers.price' do
-                        gte 100
-                        lte 300
+                    query do
+                      bool do
+                        filter do
+                          range 'offers.price' do
+                            gte 100
+                            lte 300
+                          end
+                        end
                       end
                     end
                   end

data/test/integration/search_aggregations_test.rb

@@ -7,7 +7,15 @@ module Elasticsearch
 
       context "Aggregations integration" do
         setup do
-          @client.indices.create index: 'test'
+          @client.indices.create index: 'test', body: {
+            mappings: {
+              d: {
+                properties: {
+                  tags: { type: 'keyword' }
+                }
+              }
+            }
+          }
           @client.index index: 'test', type: 'd', id: '1', body: { title: 'A', tags: %w[one], clicks: 5 }
           @client.index index: 'test', type: 'd', id: '2', body: { title: 'B', tags: %w[one two], clicks: 15 }
           @client.index index: 'test', type: 'd', id: '3', body: { title: 'C', tags: %w[one three], clicks: 20 }
@@ -98,7 +106,7 @@ module Elasticsearch
           should "define a global aggregation" do
             response = @client.search index: 'test', body: search {
                 query do
-                  filtered filter: { terms: { tags: ['two'] } }
+                  bool filter: { terms: { tags: ['two'] } }
                 end
 
                 aggregation :avg_clicks do
@@ -178,10 +186,10 @@ module Elasticsearch
             response = @client.search index: 'test', body: search {
               aggregation :clicks_for_one do
                 scripted_metric do
-                  init_script "_agg['transactions'] = []"
-                  map_script  "if (doc['tags'].value.contains('one')) { _agg.transactions.add(doc['clicks'].value) }"
-                  combine_script "sum = 0; for (t in _agg.transactions) { sum += t }; return sum"
-                  reduce_script "sum = 0; for (a in _aggs) { sum += a }; return sum"
+                  init_script "params._agg.transactions = []"
+                  map_script  "if (doc['tags'].value.contains('one')) { params._agg.transactions.add(doc['clicks'].value) }"
+                  combine_script "double sum = 0; for (t in params._agg.transactions) { sum += t } return sum"
+                  reduce_script "double sum = 0; for (a in params._aggs) { sum += a } return sum"
                 end
               end
             }.to_hash

data/test/integration/search_filters_test.rb

@@ -9,7 +9,7 @@ module Elasticsearch
 
       context "Filters 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
@@ -70,7 +70,7 @@ module Elasticsearch
           should "return matching documents" do
             response = @client.search index: 'test', body: search {
               query do
-                filtered do
+                bool do
                   filter do
                     term color: 'red'
                   end
@@ -87,7 +87,7 @@ module Elasticsearch
           should "return matching documents" do
             response = @client.search index: 'test', body: search {
               query do
-                filtered do
+                bool do
                   filter do
                     terms color: ['red', 'grey', 'gold']
                   end
@@ -99,94 +99,11 @@ module Elasticsearch
           end
         end
 
-        context "and/or/not filters" do
-          should "find the document with and as a Hash" do
-            response = @client.search index: 'test', body: search {
-              query do
-                filtered do
-                  filter do
-                    _and filters: [ { term: { color: 'red' } }, { term: { size: 'xxl' } } ]
-                  end
-                end
-              end
-            }.to_hash
-
-            assert_equal 1, response['hits']['total']
-          end
-
-          should "find the document with and as a block" do
-            response = @client.search index: 'test', body: search {
-              query do
-                filtered do
-                  filter do
-                    _and do
-                      term color: 'red'
-                      term size:  'xxl'
-                    end
-                  end
-                end
-              end
-            }.to_hash
-
-            assert_equal 1, response['hits']['total']
-          end
-
-          should "find the documents with or" do
-            response = @client.search index: 'test', body: search {
-              query do
-                filtered do
-                  filter do
-                    _or do
-                      term size: 'l'
-                      term size: 'm'
-                    end
-                  end
-                end
-              end
-            }.to_hash
-
-            assert_equal 3, response['hits']['total']
-            assert response['hits']['hits'].all? { |h| ['l', 'm'].include? h['_source']['size']  }
-          end
-
-          should "find the documents with not as a Hash" do
-            response = @client.search index: 'test', body: search {
-              query do
-                filtered do
-                  filter do
-                    _not term: { size: 'xxl' }
-                  end
-                end
-              end
-            }.to_hash
-
-            assert_equal 6, response['hits']['total']
-            assert response['hits']['hits'].none? { |h| h['_source']['size'] == 'xxl' }
-          end
-
-          should "find the documents with not as a block" do
-            response = @client.search index: 'test', body: search {
-              query do
-                filtered do
-                  filter do
-                    _not do
-                      term size: 'xxl'
-                    end
-                  end
-                end
-              end
-            }.to_hash
-
-            assert_equal 6, response['hits']['total']
-            assert response['hits']['hits'].none? { |h| h['_source']['size'] == 'xxl' }
-          end
-        end
-
         context "bool filter" do
           should "return correct documents" do
             response = @client.search index: 'test', body: search {
               query do
-                filtered do
+                bool do
                   filter do
                     bool do
                       must do
@@ -222,10 +139,7 @@ module Elasticsearch
                 d: {
                   properties: {
                     location: {
-                      type: 'geo_point',
-                      geohash: true,
-                      geohash_prefix: true,
-                      geohash_precision: 6
+                      type: 'geo_point'
                     }
                   }
                 }
@@ -245,7 +159,7 @@ module Elasticsearch
           should "find documents within the bounding box" do
             response = @client.search index: 'places', body: search {
               query do
-                filtered do
+                bool do
                   filter do
                     geo_bounding_box :location do
                       top_right   "50.1815123678,14.7149200439"
@@ -263,7 +177,7 @@ module Elasticsearch
           should "find documents within the distance specified with a hash" do
             response = @client.search index: 'places', body: search {
               query do
-                filtered do
+                bool do
                   filter do
                     geo_distance location: '50.090223,14.399590', distance: '5km'
                   end
@@ -278,7 +192,7 @@ module Elasticsearch
           should "find documents within the distance specified with a block" do
             response = @client.search index: 'places', body: search {
               query do
-                filtered do
+                bool do
                   filter do
                     geo_distance :location do
                       lat '50.090223'
@@ -297,23 +211,40 @@ module Elasticsearch
           should "find documents within the geographical distance range" do
             response = @client.search index: 'places', body: search {
               query do
-                filtered do
+                bool do
                   filter do
-                    geo_distance_range location: { lat: '50.090223', lon: '14.399590' },
-                                       gte: '10km', lte: '50km'
+                    geo_distance location: { lat: '50.090223', lon: '14.399590' },
+                                       distance: '50km'
+                  end
+                end
+              end
+              aggregation :distance_ranges do
+                geo_distance do
+                  field  :location
+                  origin '50.090223,14.399590'
+                  unit   'km'
+                  ranges [ { from: 10, to: 50 } ]
+
+                  aggregation :results do
+                    top_hits _source: { include: 'name' }
                   end
                 end
               end
             }.to_hash
 
-            assert_equal 1, response['hits']['hits'].size
-            assert_equal 'Karlštejn', response['hits']['hits'][0]['_source']['name']
+            assert_equal 2, response['hits']['hits'].size
+
+            bucket = response['aggregations']['distance_ranges']['buckets'][0]
+
+            assert_equal 1, bucket['doc_count']
+            assert_equal 1, bucket['results']['hits']['hits'].size
+            assert_equal 'Karlštejn', bucket['results']['hits']['hits'][0]['_source']['name']
           end
 
           should "find documents within the polygon" do
             response = @client.search index: 'places', body: search {
               query do
-                filtered do
+                bool do
                   filter do
                     geo_polygon :location do
                       points [
@@ -332,26 +263,6 @@ module Elasticsearch
             assert_equal 1, response['hits']['hits'].size
             assert_equal 'Vyšehrad', response['hits']['hits'][0]['_source']['name']
           end
-
-          should "find documents within the geohash cell" do
-            response = @client.search index: 'places', body: search {
-              query do
-                filtered do
-                  filter do
-                    geohash_cell :location do
-                      lat '50.090223'
-                      lon '14.399590'
-                      precision '10km'
-                      neighbors true
-                    end
-                  end
-                end
-              end
-            }.to_hash
-
-            assert_equal 1, response['hits']['hits'].size
-            assert_equal 'Vyšehrad', response['hits']['hits'][0]['_source']['name']
-          end
         end
       end
     end