elasticsearch-dsl 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e9bb408fa97be4d12b615340b7fa44090287e08
-  data.tar.gz: d4c70bf0fcc2864c11226855c471dc921d23687c
+  metadata.gz: caa549b0dcf60175f255e9e4274863dba56808dc
+  data.tar.gz: 7ec42e3ede3c15f0904870338bc108ef5e51d742
 SHA512:
-  metadata.gz: b0cdfe1bfb6786cffd3610c4fd9687fb86baf6b51c49d0282d867ebb4cf91fbd0aaa1c0594a572e01ad0ca34a2ce5fc56feff1761a319943fead579a1f4d1628
-  data.tar.gz: d721ec3d8824fff4598984d0292c07df508134d431264fe51a54404dec837e45de2d7ccb2fa4a6c07faf5000ee4842693ed80e344fb59118566c4b4895cae115
+  metadata.gz: 551986fb989ba8424a9baab7bf9ba435c4cad33d8746652ad1ab924fdb8ccd4bb33a08c1cb517c2edbfbe6a38a64f39829b45166e9ef73da1b8ecb237392d25d
+  data.tar.gz: 9c9d61b3135d4b8f2ed9757d8f383f3bd8ea106ff08d50d00833dbb07ad1e545113d5bad8d1d7466070537240583a6a0ae3b50fe1c1c031c65f0ffe7728e53c3

data/Gemfile

@@ -3,18 +3,18 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-dsl.gemspec
 gemspec
 
-if File.exists? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
   gem 'elasticsearch', :path => File.expand_path("../../elasticsearch", __FILE__), :require => false
 end
 
-if File.exists? File.expand_path("../../elasticsearch-transport", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-transport", __FILE__)
   gem 'elasticsearch-transport', :path => File.expand_path("../../elasticsearch-transport", __FILE__), :require => true
 end
 
-if File.exists? File.expand_path("../../elasticsearch-api", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-api", __FILE__)
   gem 'elasticsearch-api', :path => File.expand_path("../../elasticsearch-api", __FILE__), :require => false
 end
 
-if File.exists? File.expand_path("../../elasticsearch-extensions", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-extensions", __FILE__)
   gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => false
 end

data/Rakefile

@@ -11,13 +11,15 @@ namespace :test do
   Rake::TestTask.new(:unit) do |test|
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/unit/**/*_test.rb"]
-    # test.verbose = true
-    # test.warning = true
+    test.verbose = false
+    test.warning = false
   end
 
   Rake::TestTask.new(:integration) do |test|
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/integration/**/*_test.rb"]
+    test.verbose = false
+    test.warning = false
   end
 
   desc "Run unit and integration tests"

data/lib/elasticsearch/dsl/search.rb

@@ -116,7 +116,7 @@ module Elasticsearch
         # @return [self]
         #
         def aggregation(*args, &block)
-          @aggregations ||= {}
+          @aggregations ||= AggregationsCollection.new
 
           if block
             @aggregations.update args.first => Aggregation.new(*args, &block)

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

@@ -6,6 +6,12 @@ module Elasticsearch
       #
       module Aggregations;end
 
+      class AggregationsCollection < Hash
+        def to_hash
+          @hash ||= Hash[map { |k,v| [k, v.to_hash] }]
+        end
+      end
+
       # Wraps the `aggregations` part of a search definition
       #
       # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations.html

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

@@ -33,7 +33,7 @@ module Elasticsearch
           # @return [self]
           #
           def aggregation(*args, &block)
-            @aggregations ||= {}
+            @aggregations ||= AggregationsCollection.new
             @aggregations.update args.first => Aggregation.new(*args, &block)
             self
           end
@@ -50,8 +50,7 @@ module Elasticsearch
             @hash = { name => @args } unless @hash && @hash[name] && ! @hash[name].empty?
 
             if @aggregations
-              @hash[:aggregations] = {}
-              @aggregations.map { |name, value| @hash[:aggregations][name] = value.to_hash }
+              @hash[:aggregations] = @aggregations.to_hash
             end
             @hash
           end

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

@@ -43,6 +43,7 @@ module Elasticsearch
             #       # => {:mycustomquery=>{:foo=>{:custom=>"TEST"}}}
             #
             def option_method(name, block=nil)
+              option_methods << name
               if block
                 self.__send__ :define_method, name, &block
               else
@@ -102,6 +103,10 @@ module Elasticsearch
           def name=(value)
             @name = value.to_sym
           end
+
+          def option_methods
+            @option_methods ||= []
+          end
         end
 
         module InstanceMethods

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

@@ -36,6 +36,9 @@ module Elasticsearch
         class Bool
           include BaseComponent
 
+          option_method :minimum_should_match
+          option_method :boost
+
           def must(*args, &block)
             @hash[name][:must] ||= []
             value = Query.new(*args, &block).to_hash
@@ -58,7 +61,9 @@ module Elasticsearch
           end
 
           def filter(*args, &block)
-            @filter = block ? Filter.new(*args, &block) : args.first
+            @hash[name][:filter] ||= []
+            value = Filter.new(*args, &block).to_hash
+            @hash[name][:filter].push(value).flatten! unless @hash[name][:filter].include?(value)
             self
           end
 
@@ -71,11 +76,6 @@ module Elasticsearch
               @hash[name] = @args unless @args.nil? || @args.empty?
             end
 
-            if @filter
-              _filter = @filter.respond_to?(:to_hash) ? @filter.to_hash : @filter
-              @hash[name].update(filter: _filter)
-            end
-
             @hash
           end
         end

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

@@ -0,0 +1,44 @@
+module Elasticsearch
+  module DSL
+    module Search
+      module Queries
+
+        # Returns documents that have at least one non-null value in the field.
+        #
+        # @example Find documents with non-empty "name" property
+        #
+        #     search do
+        #       query do
+        #         exists do
+        #           field 'name'
+        #         end
+        #       end
+        #     end
+        #
+        # @note The "Exists" query can be used as a "Missing" query in a "Bool" query "Must Not" context.
+        #
+        # @example Find documents with an empty "name" property
+        #
+        #     search do
+        #       query do
+        #         bool do
+        #           must_not do
+        #             exists do
+        #               field 'name'
+        #             end
+        #           end
+        #         end
+        #       end
+        #     end
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/5.1/query-dsl-exists-query.html
+        #
+        class Exists
+          include BaseComponent
+
+          option_method :field
+        end
+      end
+    end
+  end
+end

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

@@ -24,9 +24,17 @@ module Elasticsearch
 
           option_method :query
           option_method :operator
+          option_method :minimum_should_match
           option_method :type
           option_method :boost
           option_method :fuzziness
+          option_method :prefix_length
+          option_method :max_expansions
+          option_method :fuzzy_rewrite
+          option_method :analyzer
+          option_method :lenient
+          option_method :zero_terms_query
+          option_method :cutoff_frequency
         end
 
       end

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

@@ -10,7 +10,7 @@ module Elasticsearch
         #     search do
         #       query do
         #         more_like_this do
-        #           like_text 'Eyjafjallajökull'
+        #           like   ['Eyjafjallajökull']
         #           fields [:title, :abstract, :content]
         #         end
         #       end
@@ -22,7 +22,7 @@ module Elasticsearch
         #     search do
         #       query do
         #         more_like_this do
-        #           ids    [1, 2, 3]
+        #           like   [{_id: 1}, {_id: 2}, {_id: 3}]
         #           fields [:title, :abstract]
         #         end
         #       end
@@ -33,12 +33,18 @@ module Elasticsearch
         class MoreLikeThis
           include BaseComponent
 
-          option_method :fields
+          # like/unlike is since 2.0.0
+          option_method :like
+          option_method :unlike
+
+          # before 2.0.0 the following 3 options were available
           option_method :like_text
-          option_method :min_term_freq
-          option_method :max_query_terms
           option_method :docs
           option_method :ids
+
+          option_method :fields
+          option_method :min_term_freq
+          option_method :max_query_terms
           option_method :include
           option_method :exclude
           option_method :percent_terms_to_match

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

@@ -25,6 +25,7 @@ module Elasticsearch
 
           option_method :path
           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/query_string.rb

@@ -42,6 +42,7 @@ module Elasticsearch
           option_method :locale
           option_method :use_dis_max
           option_method :tie_breaker
+          option_method :time_zone
         end
 
       end

data/lib/elasticsearch/dsl/version.rb

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

data/test/integration/search_query_test.rb

@@ -47,6 +47,22 @@ module Elasticsearch
             assert_equal 2, response['hits']['total']
             assert_equal 'Test', response['hits']['hits'][0]['_source']['title']
           end
+
+          should "find the document with a filter" do
+            skip "Not supported on this Elasticsearch version" unless @version > '2'
+
+            response = @client.search index: 'test', body: search {
+                query do
+                  bool do
+                    filter  { terms tags: ['one'] }
+                    filter  { terms tags: ['two'] }
+                  end
+                end
+              }.to_hash
+
+            assert_equal 1, response['hits']['total']
+            assert_equal 'Rest', response['hits']['hits'][0]['_source']['title']
+          end
         end
 
       end

data/test/test_helper.rb

@@ -52,6 +52,7 @@ module Elasticsearch
         end
 
         @client = Elasticsearch::Client.new host: "localhost:#{@port}", logger: @logger
+        @version = @client.info['version']['number']
       end
 
       def teardown

data/test/unit/queries/bool_test.rb

@@ -27,17 +27,38 @@ module Elasticsearch
             assert_equal( { bool: {must: [ {match: { foo: 'bar' }} ] } }, subject.to_hash )
           end
 
+          should "have option methods" do
+            subject = Bool.new do
+              should   { term tag: 'wow' }
+              should   { term tag: 'elasticsearch' }
+
+              minimum_should_match 1
+              boost 1.0
+            end
+
+            assert_equal( { bool:
+                            { 
+                              minimum_should_match: 1,
+                              boost: 1.0,
+                              should:     [ {term: { tag: 'wow' }}, {term: { tag: 'elasticsearch' }} ]
+                            }
+                          },
+                          subject.to_hash )            
+          end
+
           should "take a block with multiple methods" do
             subject = Bool.new do
               must     { match foo: 'bar' }
               must_not { match moo: 'bam' }
               should   { match xoo: 'bax' }
+              filter   { term  zoo: 'baz'}
             end
 
             assert_equal( { bool:
                             { must:     [ {match: { foo: 'bar' }} ],
                               must_not: [ {match: { moo: 'bam' }} ],
-                              should:   [ {match: { xoo: 'bax' }} ]
+                              should:   [ {match: { xoo: 'bax' }} ],
+                              filter:   [ {term:  { zoo: 'baz' }}]
                             }
                           },
                           subject.to_hash )
@@ -92,13 +113,23 @@ module Elasticsearch
                           subject.to_hash )
           end
 
-          should "allow adding a filter" do
+          should "combine chained filters" do
             subject = Bool.new
-            subject.filter do
-              term foo: 'bar'
-            end
+            subject.
+              filter {
+                term foo: "bar"
+              }
+            subject.filter {
+                term zoo: "baz"
+              }
 
-            assert_equal( { bool: { filter: { term: { foo: "bar" } } } }, subject.to_hash)
+            assert_equal( { bool:
+                            { filter: [
+                              { term: { foo: "bar"}},
+                              { term: { zoo: "baz"}}
+                            ] }
+                          },
+                          subject.to_hash)
           end
 
           should "be chainable" do

data/test/unit/queries/exists_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Queries
+      class ExistsTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Queries
+
+        context "Exists query" do
+          subject { Exists.new }
+
+          should "be converted to a Hash" do
+            assert_equal({ exists: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = Exists.new
+
+            subject.field 'bar'
+
+            assert_equal %w[ field ],
+                         subject.to_hash[:exists].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:exists][:field]
+          end
+
+          should "take a block" do
+            subject = Exists.new do
+              field 'bar'
+            end
+            assert_equal({ exists: { field: 'bar' } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

data/test/unit/queries/nested_test.rb

@@ -19,10 +19,12 @@ module Elasticsearch
             subject.path 'bar'
             subject.score_mode 'bar'
             subject.query 'bar'
+            subject.inner_hits({ size: 1 })
 
-            assert_equal %w[ path query score_mode ],
+            assert_equal %w[ inner_hits path query score_mode ],
                          subject.to_hash[:nested].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:nested][:path]
+            assert_equal({ size: 1 }, subject.to_hash[:nested][:inner_hits])
           end
 
           should "take the query as a Hash" do

data/test/unit/queries/query_string_test.rb

@@ -36,8 +36,9 @@ module Elasticsearch
             subject.locale 'bar'
             subject.use_dis_max 'bar'
             subject.tie_breaker 'bar'
+            subject.time_zone 'bar'
 
-            assert_equal %w[ allow_leading_wildcard analyze_wildcard analyzer auto_generate_phrase_queries boost default_field default_operator enable_position_increments fields fuzziness fuzzy_max_expansions fuzzy_prefix_length lenient locale lowercase_expanded_terms minimum_should_match phrase_slop query tie_breaker use_dis_max ],
+            assert_equal %w[ allow_leading_wildcard analyze_wildcard analyzer auto_generate_phrase_queries boost default_field default_operator enable_position_increments fields fuzziness fuzzy_max_expansions fuzzy_prefix_length lenient locale lowercase_expanded_terms minimum_should_match phrase_slop query tie_breaker time_zone use_dis_max ],
                          subject.to_hash[:query_string][:foo].keys.map(&:to_s).sort
             assert_equal 'bar', subject.to_hash[:query_string][:foo][:query]
           end

data/test/unit/search_base_component_test.rb

@@ -64,6 +64,16 @@ module Elasticsearch
           assert_equal({ dummy_component_with_option_method: { foo: { bar: 'BAM' } } }, subject.to_hash)
         end
 
+        should "keep track of option methods" do
+          class DummyComponentWithCustomOptionMethod
+            include Elasticsearch::DSL::Search::BaseComponent
+            option_method :foo
+          end
+
+          subject = DummyComponentWithCustomOptionMethod
+          assert_includes subject.option_methods, :foo
+        end
+
         should "have an option method without args" do
           class DummyComponentWithOptionMethod
             include Elasticsearch::DSL::Search::BaseComponent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -305,6 +305,7 @@ files:
 - lib/elasticsearch/dsl/search/queries/common.rb
 - lib/elasticsearch/dsl/search/queries/constant_score.rb
 - lib/elasticsearch/dsl/search/queries/dis_max.rb
+- lib/elasticsearch/dsl/search/queries/exists.rb
 - lib/elasticsearch/dsl/search/queries/filtered.rb
 - lib/elasticsearch/dsl/search/queries/function_score.rb
 - lib/elasticsearch/dsl/search/queries/fuzzy.rb
@@ -428,6 +429,7 @@ files:
 - test/unit/queries/common_test.rb
 - test/unit/queries/constant_score_test.rb
 - test/unit/queries/dis_max_test.rb
+- test/unit/queries/exists_test.rb
 - test/unit/queries/filtered_test.rb
 - test/unit/queries/function_score_test.rb
 - test/unit/queries/fuzzy_like_this_field_test.rb
@@ -584,6 +586,7 @@ test_files:
 - test/unit/queries/common_test.rb
 - test/unit/queries/constant_score_test.rb
 - test/unit/queries/dis_max_test.rb
+- test/unit/queries/exists_test.rb
 - test/unit/queries/filtered_test.rb
 - test/unit/queries/function_score_test.rb
 - test/unit/queries/fuzzy_like_this_field_test.rb
@@ -627,4 +630,3 @@ test_files:
 - test/unit/search_suggest_test.rb
 - test/unit/search_test.rb
 - test/unit/utils_test.rb
-has_rdoc: