elasticsearch-dsl 0.1.3 → 0.1.4

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

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class ExtendedStatsBucketTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Extended Stats Bucket agg" do
+          subject { ExtendedStatsBucket.new }
+
+          should "be converted to a hash" do
+            assert_equal({ extended_stats_bucket: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = ExtendedStatsBucket.new :foo
+
+            subject.buckets_path 'bar'
+            subject.gap_policy 'skip'
+            subject.format 'bar'
+
+            assert_equal %w[ buckets_path format gap_policy ],
+              subject.to_hash[:extended_stats_bucket][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:extended_stats_bucket][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = ExtendedStatsBucket.new :foo do
+              format 'bar'
+            end
+            assert_equal({extended_stats_bucket: { foo: { format: 'bar' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class MaxBucketTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Max Bucket agg" do
+          subject { MaxBucket.new }
+
+          should "be converted to a hash" do
+            assert_equal({ max_bucket: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = MaxBucket.new :foo
+
+            subject.buckets_path 'bar'
+            subject.gap_policy 'bar'
+            subject.format 'bar'
+
+            assert_equal %w[ buckets_path format gap_policy ],
+              subject.to_hash[:max_bucket][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:max_bucket][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = MaxBucket.new :foo do
+              format 'bar'
+            end
+            assert_equal({max_bucket: { foo: { format: 'bar' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class MinBucketTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Min Bucket agg" do
+          subject { MinBucket.new }
+
+          should "be converted to a hash" do
+            assert_equal({ min_bucket: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = MinBucket.new :foo
+
+            subject.buckets_path 'bar'
+            subject.gap_policy 'bar'
+            subject.format 'bar'
+
+            assert_equal %w[ buckets_path format gap_policy ],
+              subject.to_hash[:min_bucket][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:min_bucket][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = MinBucket.new :foo do
+              format 'bar'
+            end
+            assert_equal({min_bucket: { foo: { format: 'bar' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class MovingAvgTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Moving Average Bucket agg" do
+          subject { MovingAvg.new }
+
+          should "be converted to a hash" do
+            assert_equal({ moving_avg: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = MovingAvg.new :foo
+
+            subject.buckets_path 'bar'
+            subject.gap_policy 'skip'
+            subject.minimize false
+            subject.model 'simple'
+            subject.settings({ period: 7 })
+            subject.window 5
+
+            assert_equal %w[ buckets_path gap_policy minimize model settings window ],
+              subject.to_hash[:moving_avg][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:moving_avg][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = MovingAvg.new :foo do
+              format 'bar'
+            end
+            assert_equal({moving_avg: { foo: { format: 'bar' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class PercentilesBucketTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Percentiles Bucket agg" do
+          subject { PercentilesBucket.new }
+
+          should "be converted to a hash" do
+            assert_equal({ percentiles_bucket: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = PercentilesBucket.new :foo
+
+            subject.buckets_path 'bar'
+            subject.gap_policy 'skip'
+            subject.format 'bar'
+            subject.percents [ 1, 5, 25, 50, 75, 95, 99 ]
+
+            assert_equal %w[ buckets_path format gap_policy percents ],
+              subject.to_hash[:percentiles_bucket][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:percentiles_bucket][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = PercentilesBucket.new :foo do
+              format 'bar'
+            end
+            assert_equal({percentiles_bucket: { foo: { format: 'bar' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class SerialDiffTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Serial Defferencing agg" do
+          subject { SerialDiff.new }
+
+          should "be converted to a hash" do
+            assert_equal({ serial_diff: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = SerialDiff.new :foo
+
+            subject.buckets_path 'bar'
+            subject.lag 1
+            subject.gap_policy 'skip'
+            subject.format 'foo'
+
+            assert_equal %w[ buckets_path format gap_policy lag ],
+              subject.to_hash[:serial_diff][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:serial_diff][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = SerialDiff.new :foo do
+              gap_policy 'skip'
+            end
+            assert_equal({serial_diff: { foo: { gap_policy: 'skip' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class StatsBucketTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Stats Bucket agg" do
+          subject { StatsBucket.new }
+
+          should "be converted to a hash" do
+            assert_equal({ stats_bucket: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = StatsBucket.new :foo
+
+            subject.buckets_path 'bar'
+            subject.gap_policy 'bar'
+            subject.format 'bar'
+
+            assert_equal %w[ buckets_path format gap_policy ],
+              subject.to_hash[:stats_bucket][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:stats_bucket][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = StatsBucket.new :foo do
+              format 'bar'
+            end
+            assert_equal({stats_bucket: { foo: { format: 'bar' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Aggregations
+      class SumBucketTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Aggregations
+
+        context "Sum Bucket agg" do
+          subject { SumBucket.new }
+
+          should "be converted to a hash" do
+            assert_equal({ sum_bucket: {} }, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = SumBucket.new :foo
+
+            subject.buckets_path 'bar'
+            subject.gap_policy 'bar'
+            subject.format 'bar'
+
+            assert_equal %w[ buckets_path format gap_policy ],
+              subject.to_hash[:sum_bucket][:foo].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:sum_bucket][:foo][:buckets_path]
+          end
+
+          should "take a block" do
+            subject = SumBucket.new :foo do
+              format 'bar'
+            end
+            assert_equal({sum_bucket: { foo: { format: 'bar' } } }, subject.to_hash)
+          end
+        end
+      end
+    end
+  end
+end

data/test/unit/queries/bool_test.rb

@@ -92,6 +92,15 @@ module Elasticsearch
                           subject.to_hash )
           end
 
+          should "allow adding a filter" do
+            subject = Bool.new
+            subject.filter do
+              term foo: 'bar'
+            end
+
+            assert_equal( { bool: { filter: { term: { foo: "bar" } } } }, subject.to_hash)
+          end
+
           should "be chainable" do
             subject = Bool.new
 

data/test/unit/search_sort_test.rb

@@ -34,6 +34,31 @@ module Elasticsearch
               { bar: { order: 'desc' } },
             ], subject.to_hash )
         end
+
+        should "be empty" do
+          subject = Elasticsearch::DSL::Search::Sort.new
+          assert_equal subject.empty?, true
+        end
+
+        should "not be empty" do
+          subject = Elasticsearch::DSL::Search::Sort.new foo: { order: 'desc' }
+          assert_equal subject.empty?, false
+        end
+
+        context "#to_hash" do
+          should "not duplicate values when defined by arguments" do
+            subject = Elasticsearch::DSL::Search::Sort.new foo: { order: 'desc' }
+            assert_equal(subject.to_hash, subject.to_hash)
+          end
+
+          should "not duplicate values when defined by a block" do
+            subject = Elasticsearch::DSL::Search::Sort.new do
+              by :foo
+            end
+
+            assert_equal(subject.to_hash, subject.to_hash)
+          end
+        end
       end
     end
   end

data/test/unit/search_test.rb

@@ -21,6 +21,40 @@ module Elasticsearch
 
           assert_instance_of Elasticsearch::DSL::Search::Search, Elasticsearch::DSL::Search.search
         end
+
+        should "have access to the calling context" do
+          class DummySearchReceiver
+            include Elasticsearch::DSL::Search
+
+            def initialize
+              @other_value = 'foo'
+            end
+
+            def value
+              42
+            end
+
+            def search_definition
+              search do |q|
+                q.from value
+                q.size @other_value
+
+                q.filter do |q|
+                  q._and do |q|
+                    q.term thang: @other_value
+                    q.term attributes: value
+                  end
+                end
+              end
+            end
+          end
+
+          assert_equal({from: 42,
+                        size: 'foo',
+                        filter: { and: [ { term:  { thang: 'foo' } },
+                                         { term:  { attributes: 42 } }]}},
+          DummySearchReceiver.new.search_definition.to_hash)
+        end
       end
 
       context "The Search class" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -241,9 +241,23 @@ files:
 - lib/elasticsearch/dsl/search/aggregations/ip_range.rb
 - lib/elasticsearch/dsl/search/aggregations/max.rb
 - lib/elasticsearch/dsl/search/aggregations/min.rb
+- lib/elasticsearch/dsl/search/aggregations/missing.rb
 - lib/elasticsearch/dsl/search/aggregations/nested.rb
 - lib/elasticsearch/dsl/search/aggregations/percentile_ranks.rb
 - lib/elasticsearch/dsl/search/aggregations/percentiles.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/avg_bucket.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/bucket_script.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/bucket_selector.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/cumulative_sum.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/derivative.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/extended_stats_bucket.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/max_bucket.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/min_bucket.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/moving_avg.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/percentiles_bucket.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/serial_diff.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/stats_bucket.rb
+- lib/elasticsearch/dsl/search/aggregations/pipeline/sum_bucket.rb
 - lib/elasticsearch/dsl/search/aggregations/range.rb
 - lib/elasticsearch/dsl/search/aggregations/reverse_nested.rb
 - lib/elasticsearch/dsl/search/aggregations/scripted_metric.rb
@@ -337,6 +351,7 @@ files:
 - test/integration/search_size_from_test.rb
 - test/integration/search_sort_test.rb
 - test/integration/search_suggest_test.rb
+- test/integration/search_test.rb
 - test/test_helper.rb
 - test/unit/aggregations/avg_test.rb
 - test/unit/aggregations/cardinality_test.rb
@@ -354,9 +369,23 @@ files:
 - test/unit/aggregations/ip_range_test.rb
 - test/unit/aggregations/max_test.rb
 - test/unit/aggregations/min_test.rb
+- test/unit/aggregations/missing_test.rb
 - test/unit/aggregations/nested_test.rb
 - test/unit/aggregations/percentile_ranks_test.rb
 - test/unit/aggregations/percentiles_test.rb
+- test/unit/aggregations/pipeline/avg_bucket_test.rb
+- test/unit/aggregations/pipeline/bucket_script_test.rb
+- test/unit/aggregations/pipeline/bucket_selector_test.rb
+- test/unit/aggregations/pipeline/cumulative_sum_test.rb
+- test/unit/aggregations/pipeline/derivative_test.rb
+- test/unit/aggregations/pipeline/extended_stats_bucket_test.rb
+- test/unit/aggregations/pipeline/max_bucket_test.rb
+- test/unit/aggregations/pipeline/min_bucket_test.rb
+- test/unit/aggregations/pipeline/moving_avg_test.rb
+- test/unit/aggregations/pipeline/percentiles_bucket_test.rb
+- test/unit/aggregations/pipeline/serial_diff_test.rb
+- test/unit/aggregations/pipeline/stats_bucket_test.rb
+- test/unit/aggregations/pipeline/sum_bucket_test.rb
 - test/unit/aggregations/range_test.rb
 - test/unit/aggregations/reverse_nested_test.rb
 - test/unit/aggregations/scripted_metric_test.rb
@@ -478,6 +507,7 @@ test_files:
 - test/integration/search_size_from_test.rb
 - test/integration/search_sort_test.rb
 - test/integration/search_suggest_test.rb
+- test/integration/search_test.rb
 - test/test_helper.rb
 - test/unit/aggregations/avg_test.rb
 - test/unit/aggregations/cardinality_test.rb
@@ -495,9 +525,23 @@ test_files:
 - test/unit/aggregations/ip_range_test.rb
 - test/unit/aggregations/max_test.rb
 - test/unit/aggregations/min_test.rb
+- test/unit/aggregations/missing_test.rb
 - test/unit/aggregations/nested_test.rb
 - test/unit/aggregations/percentile_ranks_test.rb
 - test/unit/aggregations/percentiles_test.rb
+- test/unit/aggregations/pipeline/avg_bucket_test.rb
+- test/unit/aggregations/pipeline/bucket_script_test.rb
+- test/unit/aggregations/pipeline/bucket_selector_test.rb
+- test/unit/aggregations/pipeline/cumulative_sum_test.rb
+- test/unit/aggregations/pipeline/derivative_test.rb
+- test/unit/aggregations/pipeline/extended_stats_bucket_test.rb
+- test/unit/aggregations/pipeline/max_bucket_test.rb
+- test/unit/aggregations/pipeline/min_bucket_test.rb
+- test/unit/aggregations/pipeline/moving_avg_test.rb
+- test/unit/aggregations/pipeline/percentiles_bucket_test.rb
+- test/unit/aggregations/pipeline/serial_diff_test.rb
+- test/unit/aggregations/pipeline/stats_bucket_test.rb
+- test/unit/aggregations/pipeline/sum_bucket_test.rb
 - test/unit/aggregations/range_test.rb
 - test/unit/aggregations/reverse_nested_test.rb
 - test/unit/aggregations/scripted_metric_test.rb