arelastic 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3dfdb1c53a2b4a1212dc4dc8c0bdeba81ae481f
-  data.tar.gz: b137778aaf23ff83245097e52bb334a443bbc465
+  metadata.gz: 8edf892187c4bc1b1dfd20957cb7f906a174e477
+  data.tar.gz: f70671331e9a01954dae642a81b43536c17566aa
 SHA512:
-  metadata.gz: 92ba970d8aa6fe7504d7746b76d3549d6529a295a3f863b6343ad5067035db3f869c41b69583fb16f4e440b61b21a641f892334d47ac19d884cb7a8e76e4faa5
-  data.tar.gz: 1ca4a168ca68149c6ebea89396672c1e5496c0a584ce87884b319378c0a3600fc5fd03268fd67a13699c63f80af2f0ffffe480e5519ab1a4cf948819908e7822
+  metadata.gz: 5d3950ddc9d39032578070a19a24df1674fe1f6ca52ae94e5d04d421aa8b86f71b75f233e32f1382a6cb14069830b1e135da5665e7e9a6a12ef8681c5b6e0e3d
+  data.tar.gz: 3e0fee651967a41f0de510d2d5fdcde18d5aa33a058f59d781dca74fc9981e10a01cdc27e07a7045331b0b652366dab1b11612b29351f208eb4476eaff4e5f7f

data/lib/arelastic/aggregations.rb

@@ -1,5 +1,7 @@
 require 'arelastic/aggregations/aggregation'
 
+require 'arelastic/aggregations/date_histogram'
 require 'arelastic/aggregations/filter'
+require 'arelastic/aggregations/min'
 require 'arelastic/aggregations/nested'
 require 'arelastic/aggregations/terms'

data/lib/arelastic/aggregations/aggregation.rb

@@ -12,6 +12,10 @@ module Arelastic
         {name => as_elastic_aggregation}
       end
 
+      def nested(path)
+        Arelastic::Aggregations::Nested.new(name, path, [self])
+      end
+
       def as_elastic_aggregation
         raise 'not implemented'
       end

data/lib/arelastic/aggregations/date_histogram.rb

@@ -0,0 +1,9 @@
+module Arelastic
+  module Aggregations
+    class DateHistogram < Arelastic::Aggregations::Aggregation
+      def as_elastic_aggregation
+        {'date_histogram' => options}
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations/min.rb

@@ -1,15 +1,8 @@
 module Arelastic
   module Aggregations
-    class Min < Arelastic::Aggs::Aggregation
-      attr_accessor :options
-
-      def initialize name, options
-        super name
-        @options = options
-      end
-
+    class Min < Arelastic::Aggregations::Aggregation
       def as_elastic_aggregation
-        # {"min" => options}
+        {"min" => options}
       end
     end
   end

data/test/arelastic/aggregations/aggregation_test.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+class Arelastic::Aggregations::AggregationTest < Minitest::Test
+  def test_nested
+    aggregation = Arelastic::Aggregations::Min.new('smallest', 'field' => 'pets.weight').nested('pets')
+
+    expected = {
+      "smallest" => {
+        "nested" => {
+          "path" => "pets"
+        },
+        "aggs" => {
+          "smallest" => {
+            "min" => { "field" => "pets.weight" }
+          }
+        }
+      }
+    }
+
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/aggregations/date_histogram_test.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class Arelastic::Aggregations::DateHistogramTest < Minitest::Test
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::DateHistogram.new('foo', 'field' => 'birthdate', 'interval' => 'month')
+
+    expected = {
+      "foo" => {
+        "date_histogram" => {
+          "field" => "birthdate",
+          "interval" => "month"
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/aggregations/filter_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Aggregations::TermsTest < MiniTest::Unit::TestCase
+class Arelastic::Aggregations::TermsTest < Minitest::Test
   def test_as_elastic
     aggregation = Arelastic::Aggregations::Filter.new('foo', 'exists' => {'field' => 'color'})
     expected = {

data/test/arelastic/aggregations/nested_test.rb

@@ -1,4 +1,9 @@
 require 'helper'
 
-class Arelastic::Aggregations::NestedTest < MiniTest::Unit::TestCase
+class Arelastic::Aggregations::NestedTest < Minitest::Test
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::Nested.new('favorite', 'movies', [
+
+    ])
+  end
 end

data/test/arelastic/aggregations/terms_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Aggregations::TermsTest < MiniTest::Unit::TestCase
+class Arelastic::Aggregations::TermsTest < Minitest::Test
   def test_as_elastic
     aggregation = Arelastic::Aggregations::Terms.new('foo', 'field' => 'tags', 'size' => 10)
     expected = {

data/test/arelastic/arities/binary_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Arities::BinaryTest < MiniTest::Unit::TestCase
+class Arelastic::Arities::BinaryTest < Minitest::Test
   def test_binary
     node = Class.new(Arelastic::Nodes::Node) do
       binary 'suffix'

data/test/arelastic/arities/polyadic_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Arities::PolyadicTest < MiniTest::Unit::TestCase
+class Arelastic::Arities::PolyadicTest < Minitest::Test
   def test_polyadic
     expr = Struct.new(:as_elastic)
     node = Class.new(Arelastic::Nodes::Node) do

data/test/arelastic/arities/unary_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Arities::UnaryTest < MiniTest::Unit::TestCase
+class Arelastic::Arities::UnaryTest < Minitest::Test
   def test_unary
     node = Class.new(Arelastic::Nodes::Node) do
       unary 'unicorn'

data/test/arelastic/builders/aggregation_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Builders::AggregationTest < MiniTest::Unit::TestCase
+class Arelastic::Builders::AggregationTest < Minitest::Test
   def test_terms
     expected = {"name" => {"terms" => {"field" => "term"}}}
     actual = Arelastic::Builders::Aggregation['name'].terms('term').as_elastic

data/test/arelastic/builders/facet_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Builders::FacetTest < MiniTest::Unit::TestCase
+class Arelastic::Builders::FacetTest < Minitest::Test
   def test_terms
     expected = {"name" => {"terms" => {"field" => "term"}}}
     actual = Arelastic::Builders::Facet['name'].terms('term').as_elastic

data/test/arelastic/builders/filter_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Builders::FilterTest < MiniTest::Unit::TestCase
+class Arelastic::Builders::FilterTest < Minitest::Test
   def test_ids
     expected = {"ids" => {"values"=>["5", "6"]}}
     assert_equal expected, Arelastic::Builders::Filter.ids('5', '6').as_elastic

data/test/arelastic/builders/mapping_test.rb

@@ -1,4 +1,4 @@
 require 'helper'
 
-class Arelastic::Builders::MappingTest < MiniTest::Unit::TestCase
+class Arelastic::Builders::MappingTest < Minitest::Test
 end

data/test/arelastic/builders/query_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Builders::QueryTest < MiniTest::Unit::TestCase
+class Arelastic::Builders::QueryTest < Minitest::Test
   def test_constant_score
     query = Arelastic::Builders::Query.constant_score({"foo" => "bar"})
     expected = {"query" => {"constant_score" => {"foo" => "bar"}}}

data/test/arelastic/builders/search_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Builders::SearchTest < MiniTest::Unit::TestCase
+class Arelastic::Builders::SearchTest < Minitest::Test
   def test_filter
     assert_equal Arelastic::Builders::Filter, Arelastic::Builders::Search.filter
   end

data/test/arelastic/builders/sort_test.rb

@@ -1,5 +1,5 @@
 require 'helper'
 
-class Arelastic::Builders::SortTest < MiniTest::Unit::TestCase
+class Arelastic::Builders::SortTest < Minitest::Test
   
 end

data/test/arelastic/facets/date_histogram_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Facets::DateHistogramTest < MiniTest::Unit::TestCase
+class Arelastic::Facets::DateHistogramTest < Minitest::Test
   def test_as_elastic
     facet = Arelastic::Facets::DateHistogram.new('histo', "field" => "field_name", "interval" => "day")
     expected = {

data/test/arelastic/facets/facet_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Facets::FacetTest < MiniTest::Unit::TestCase
+class Arelastic::Facets::FacetTest < Minitest::Test
   def test_nested
     facet = Class.new(Arelastic::Facets::Facet) do
       def as_elastic_facet

data/test/arelastic/facets/histogram_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Facets::HistogramTest < MiniTest::Unit::TestCase
+class Arelastic::Facets::HistogramTest < Minitest::Test
   def test_as_elastic
     facet = Arelastic::Facets::Histogram.new('histo', "field" => "field_name", "interval" => 100)
     expected = {

data/test/arelastic/facets/terms_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Facets::TermsTest < MiniTest::Unit::TestCase
+class Arelastic::Facets::TermsTest < Minitest::Test
   def test_as_elastic
     facet = Arelastic::Facets::Terms.new('foo', 'tags', "size" => 10)
     expected = {

data/test/arelastic/filters/exists_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::ExistsTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::ExistsTest < Minitest::Test
   def test_as_elastic
     expected = {"exists" => { "field" => "color" }}
 

data/test/arelastic/filters/filter_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::FilterTest < MiniTest::Unit::TestCase
+class Arelastic::FilterTest < Minitest::Test
   def test_or
     filter = Arelastic::Filters::Filter.new
 

data/test/arelastic/filters/geo_distance_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::GeoDistanceTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::GeoDistanceTest < Minitest::Test
   def test_as_elastic
     expected = {
       "geo_distance" => {

data/test/arelastic/filters/has_child_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::HasChildTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::HasChildTest < Minitest::Test
   def test_as_elastic
     expected = {"has_child" => {"type" => "comment", "query" => {"query_string" => "lol"}}}
 

data/test/arelastic/filters/ids_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::IdsTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::IdsTest < Minitest::Test
   def test_as_elastic
     expected = {"ids" => {"values" => ["foo", "bar"]}}
 

data/test/arelastic/filters/match_all_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::MatchAllTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::MatchAllTest < Minitest::Test
   def test_as_elastic
     match_all = Arelastic::Queries::MatchAll.new
     expected = {"match_all" => {}}

data/test/arelastic/filters/missing_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::MissingTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::MissingTest < Minitest::Test
   def test_as_elastic
     expected = {"missing" => { "field" => "color" }}
 

data/test/arelastic/filters/nested_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::NestedTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::NestedTest < Minitest::Test
   def test_as_elastic
     expected = {
       "nested" => {

data/test/arelastic/filters/not_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::NotTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::NotTest < Minitest::Test
   def test_as_elastic
     expected = {"not" => { "foo" => "bar" }}
 

data/test/arelastic/filters/query_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::QueryTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::QueryTest < Minitest::Test
   def test_as_elastic
     expected = {"query" => { "match" => {"message" => "this is a test"} }}
 

data/test/arelastic/filters/script_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::ScriptTest < MiniTest::Unit::TestCase
+class Arelastic::Filters::ScriptTest < Minitest::Test
   def test_as_elastic
     expected = {"script" => {"script" => "doc['color'].value.charAt(0) == 'r'"}}
 

data/test/arelastic/mappings/types/binary_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Mappings::BinaryTest < MiniTest::Unit::TestCase
+class Arelastic::Mappings::BinaryTest < Minitest::Test
   def test_as_elastic
     type = Arelastic::Mappings::Binary.new('message', 'index' => 'analyzed')
     expected = {'message' => {'type' => 'binary', 'index' => 'analyzed'}}

data/test/arelastic/mappings/types/multi_field_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Mappings::MultiFieldTest < MiniTest::Unit::TestCase
+class Arelastic::Mappings::MultiFieldTest < Minitest::Test
   def test_as_elastic
     type = Arelastic::Mappings::MultiField.new('message', 'message' => {'type' => 'string', 'index' => 'analyzed'}, 'untouched' => {'type' => 'string', 'index' => 'not_analyzed'})
     expected = {

data/test/arelastic/mappings/types/string_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Mappings::StringTest < MiniTest::Unit::TestCase
+class Arelastic::Mappings::StringTest < Minitest::Test
   def test_as_elastic
     type = Arelastic::Mappings::String.new('message', 'index' => 'analyzed')
     expected = {'message' => {'type' => 'string', 'index' => 'analyzed'}}

data/test/arelastic/nodes/node_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Nodes::NodeTest < MiniTest::Unit::TestCase
+class Arelastic::Nodes::NodeTest < Minitest::Test
   def test_equality
     node = Class.new(Arelastic::Nodes::Node) do
       def initialize(value)

data/test/arelastic/queries/bool_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::BoolTest < MiniTest::Unit::TestCase
+class Arelastic::Queries::BoolTest < Minitest::Test
   def test_as_elastic
     bool = Arelastic::Queries::Bool.new(
       'must' => {

data/test/arelastic/queries/filtered_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::FilteredTest < MiniTest::Unit::TestCase
+class Arelastic::Queries::FilteredTest < Minitest::Test
   def test_as_elastic
     filtered = Arelastic::Queries::Filtered.new(
       query: {"query_string" => "bar"},

data/test/arelastic/queries/match_all_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::MatchAllTest < MiniTest::Unit::TestCase
+class Arelastic::Queries::MatchAllTest < Minitest::Test
   def test_as_elastic
     match_all = Arelastic::Queries::MatchAll.new
     expected = {"match_all" => {}}

data/test/arelastic/queries/multi_match_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::MultiMatchTest < MiniTest::Unit::TestCase
+class Arelastic::Queries::MultiMatchTest < Minitest::Test
   def test_as_elastic
     query = "bar"
     fields = ["field_1", "field_2"]

data/test/arelastic/queries/query_string_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::QueryStringTest < MiniTest::Unit::TestCase
+class Arelastic::Queries::QueryStringTest < Minitest::Test
   def test_as_elastic
     query_string = Arelastic::Queries::QueryString.new('foo')
     expected = {"query_string" => {"query" => "foo"}}

data/test/arelastic/queries/query_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::QueryTest < MiniTest::Unit::TestCase
+class Arelastic::Queries::QueryTest < Minitest::Test
   def test_as_elastic
   end
 end

data/test/arelastic/queries/wildcard_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::WildcardTest < MiniTest::Unit::TestCase
+class Arelastic::Queries::WildcardTest < Minitest::Test
   def test_as_elastic
     expected = {"wildcard" => {"foo" => "bar*"}}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -21,6 +21,7 @@ files:
 - lib/arelastic.rb
 - lib/arelastic/aggregations.rb
 - lib/arelastic/aggregations/aggregation.rb
+- lib/arelastic/aggregations/date_histogram.rb
 - lib/arelastic/aggregations/filter.rb
 - lib/arelastic/aggregations/min.rb
 - lib/arelastic/aggregations/nested.rb
@@ -102,6 +103,8 @@ files:
 - lib/arelastic/sorts.rb
 - lib/arelastic/sorts/asc.rb
 - lib/arelastic/sorts/sort.rb
+- test/arelastic/aggregations/aggregation_test.rb
+- test/arelastic/aggregations/date_histogram_test.rb
 - test/arelastic/aggregations/filter_test.rb
 - test/arelastic/aggregations/nested_test.rb
 - test/arelastic/aggregations/terms_test.rb
@@ -166,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Elastic Search query builder