arelastic 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7e6147284908ea72345b434db648ed51a887286
-  data.tar.gz: a992f57aee01a9b9541ceb4f844c0ca8a7ee1318
+  metadata.gz: e3dfdb1c53a2b4a1212dc4dc8c0bdeba81ae481f
+  data.tar.gz: b137778aaf23ff83245097e52bb334a443bbc465
 SHA512:
-  metadata.gz: 8bf09de6b0fabf1834878b3ee0e7194a952e60f0a2b99ba177e4c399af754ccc46ca69a437a5503aacf555221a74f479b5b03f392f18aaab69dc84defca5d9aa
-  data.tar.gz: 274c22454a4a8b1646e2a71069dc004671ee87d363b988701f9cb11d553b97114c9b58d2b8719163000e5c4ae57b86ba6e9b4e0b3109080f22f2e5e79214dec6
+  metadata.gz: 92ba970d8aa6fe7504d7746b76d3549d6529a295a3f863b6343ad5067035db3f869c41b69583fb16f4e440b61b21a641f892334d47ac19d884cb7a8e76e4faa5
+  data.tar.gz: 1ca4a168ca68149c6ebea89396672c1e5496c0a584ce87884b319378c0a3600fc5fd03268fd67a13699c63f80af2f0ffffe480e5519ab1a4cf948819908e7822

data/lib/arelastic/aggregations/aggregation.rb

@@ -1,25 +1,20 @@
 module Arelastic
   module Aggregations
     class Aggregation < Arelastic::Nodes::Node
-      attr_accessor :name, :options, :aggs
+      attr_accessor :name, :options
 
-      def initialize(name, options)
+      def initialize(name, options = {})
         @name = name
         @options = options
       end
 
       def as_elastic
-        params = as_elastic_aggregation
-        # if aggs.any?
-        #   params['aggs'] = convert_to_elastic(aggs)
-        # end
-
-        {name => params}
+        {name => as_elastic_aggregation}
       end
 
-      # def nested path
-      #   Arelastic::Aggregations::Nested.new path, self
-      # end
+      def as_elastic_aggregation
+        raise 'not implemented'
+      end
     end
   end
 end

data/lib/arelastic/aggregations/filter.rb

@@ -0,0 +1,16 @@
+module Arelastic
+  module Aggregations
+    class Filter < Arelastic::Aggregations::Aggregation
+      attr_accessor :filter
+
+      def initialize name, filter
+        super name
+        @filter = filter
+      end
+
+      def as_elastic_aggregation
+        {'filter' => convert_to_elastic(filter)}
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations/min.rb

@@ -4,7 +4,7 @@ module Arelastic
       attr_accessor :options
 
       def initialize name, options
-        # @field = field
+        super name
         @options = options
       end
 

data/lib/arelastic/aggregations/nested.rb

@@ -0,0 +1,24 @@
+module Arelastic
+  module Aggregations
+    class Nested < Arelastic::Aggregations::Aggregation
+      attr_accessor :path, :aggregations
+
+      # HashGroup
+      def initialize name, path, aggregations
+        super name
+        @path = path
+        @aggregations = aggregations
+      end
+
+      def as_elastic
+        grouping = Arelastic::Nodes::HashGroup.new aggregations
+        {
+          name => {
+            "nested" => {"path" => path},
+            "aggs"   => grouping.as_elastic
+          }
+        }
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations/terms.rb

@@ -2,7 +2,7 @@ module Arelastic
   module Aggregations
     class Terms < Arelastic::Aggregations::Aggregation
       def as_elastic_aggregation
-        {"terms" => options}
+        {'terms' => options}
       end
     end
   end

data/lib/arelastic/aggregations.rb

@@ -1,3 +1,5 @@
 require 'arelastic/aggregations/aggregation'
 
+require 'arelastic/aggregations/filter'
+require 'arelastic/aggregations/nested'
 require 'arelastic/aggregations/terms'

data/lib/arelastic/searches/aggregations.rb

@@ -1,13 +1,18 @@
 module Arelastic
   module Searches
     class Aggregations < Arelastic::Searches::Search
-      attr_accessor :grouping
-      def initialize aggregations
-        @grouping = Arelastic::Nodes::HashGroup.new aggregations
+      attr_accessor :aggregations
+      def initialize *aggregations
+        @aggregations = aggregations.flatten
       end
 
       def as_elastic
-        { "aggs" => convert_to_elastic(grouping) }
+        grouping = Arelastic::Nodes::HashGroup.new aggregations.flatten
+        { "aggs" => grouping.as_elastic }
+      end
+
+      def nested(name, path)
+        Arelastic::Aggregations::Nested.new name, path, aggregations
       end
     end
   end

data/test/arelastic/aggregations/filter_test.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+class Arelastic::Aggregations::TermsTest < MiniTest::Unit::TestCase
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::Filter.new('foo', 'exists' => {'field' => 'color'})
+    expected = {
+      "foo" => {
+        "filter" => {
+          "exists" => {
+            "field" => "color"
+          }
+        }
+      }
+    }
+
+    assert_equal expected, aggregation.as_elastic
+  end
+
+  def test_as_elastic_with_node
+    aggregation = Arelastic::Aggregations::Filter.new('foo', Arelastic::Filters::Exists.new('color'))
+    expected = {
+      "foo" => {
+        "filter" => {
+          "exists" => {
+            "field" => "color"
+          }
+        }
+      }
+    }
+
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/aggregations/nested_test.rb

@@ -0,0 +1,4 @@
+require 'helper'
+
+class Arelastic::Aggregations::NestedTest < MiniTest::Unit::TestCase
+end

data/test/arelastic/searches/aggregations_test.rb

@@ -0,0 +1,51 @@
+require 'helper'
+
+class Arelastic::Searches::AggregationsTest < MiniTest::Spec
+  def test_as_elastic
+    aggregations = Arelastic::Searches::Aggregations.new(
+      Arelastic::Aggregations::Terms.new('popular_tags', 'field' => 'tags', 'size' => 10),
+      "colorful" => {"filter" => {"exists" => {"field" => "color"}}}
+    )
+
+    expected = {
+      "aggs" => {
+        "popular_tags" => {
+          "terms" => {
+            "field" => "tags",
+            "size" => 10
+          }
+        },
+        "colorful" => {
+          "filter" => {
+            "exists" => {
+              "field" => "color"
+            }
+          }
+        }
+      }
+    }
+    assert_equal expected, aggregations.as_elastic
+  end
+
+  def test_nested
+    aggregations = Arelastic::Searches::Aggregations.new "favorites" => {"terms" => {"field" => "pencils.color"}}
+    nested = aggregations.nested("pencil_colors", "pencils")
+
+    expected = {
+      "pencil_colors" => {
+        "nested" => {
+          "path" => "pencils"
+        },
+        "aggs" => {
+          "favorites" => {
+            "terms" => {
+              "field"=>"pencils.color"
+            }
+          }
+        }
+      }
+    }
+
+    assert_equal expected, nested.as_elastic
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -21,7 +21,9 @@ files:
 - lib/arelastic.rb
 - lib/arelastic/aggregations.rb
 - lib/arelastic/aggregations/aggregation.rb
+- lib/arelastic/aggregations/filter.rb
 - lib/arelastic/aggregations/min.rb
+- lib/arelastic/aggregations/nested.rb
 - lib/arelastic/aggregations/terms.rb
 - lib/arelastic/arities.rb
 - lib/arelastic/arities/binary.rb
@@ -100,6 +102,8 @@ files:
 - lib/arelastic/sorts.rb
 - lib/arelastic/sorts/asc.rb
 - lib/arelastic/sorts/sort.rb
+- test/arelastic/aggregations/filter_test.rb
+- test/arelastic/aggregations/nested_test.rb
 - test/arelastic/aggregations/terms_test.rb
 - test/arelastic/arities/binary_test.rb
 - test/arelastic/arities/polyadic_test.rb
@@ -138,6 +142,7 @@ files:
 - test/arelastic/queries/query_string_test.rb
 - test/arelastic/queries/query_test.rb
 - test/arelastic/queries/wildcard_test.rb
+- test/arelastic/searches/aggregations_test.rb
 - test/arelastic/searches/sort_test.rb
 - test/arelastic/sorts/sort_test.rb
 - test/helper.rb