arelastic 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48bbbfd23e2aaa2b73017ccc16b002661b6a31f5
-  data.tar.gz: 48fa91f28a48d51ba96eae2a66776b76187405c5
+  metadata.gz: 07f59256aabbab61856a138e8fe03c35869d1458
+  data.tar.gz: 8058c713097d4abdaa99c31876ca4004a47cdff8
 SHA512:
-  metadata.gz: 934d9ac4da52da217fa78904a70899f1b6fca2857159b7054f1b2976cebac351355864cdd1d1184e1647b798980ad0c84f79b39159202beb785b6b747849d939
-  data.tar.gz: d89ea4221656300193f51b424cdf4a222a32eef357bee03206c583adc4edf02e28ebbfb3d89454aeb9e9ae9bfccde414239b6163f3440dbfaeb4c790e45142e7
+  metadata.gz: de4a47668f6a772019ccb19605e3a1084a187cf73efe232d23eb4c8d98db9a74960a52ff022888754d9e27f6a3e81937baefdc82a7719ffcf9f22250d9b65f9e
+  data.tar.gz: b4a33f99f145257dd727f2f5303976e97ae6e4de54262fa267c68d2b4586f804d6804fec20df64570ae3b50d7875af163f5bb943febdc49a4f89bcef9eb8fe6e

data/lib/arelastic/aggregations/aggregation.rb

@@ -0,0 +1,25 @@
+module Arelastic
+  module Aggregations
+    class Aggregation < Arelastic::Nodes::Node
+      attr_accessor :name, :options, :aggs
+
+      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}
+      end
+
+      # def nested path
+      #   Arelastic::Aggregations::Nested.new path, self
+      # end
+    end
+  end
+end

data/lib/arelastic/aggregations/min.rb

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

data/lib/arelastic/aggregations/terms.rb

@@ -0,0 +1,9 @@
+module Arelastic
+  module Aggregations
+    class Terms < Arelastic::Aggregations::Aggregation
+      def as_elastic_aggregation
+        {"terms" => options}
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations.rb

@@ -0,0 +1,3 @@
+require 'arelastic/aggregations/aggregation'
+
+require 'arelastic/aggregations/terms'

data/lib/arelastic/builders/aggregation.rb

@@ -0,0 +1,19 @@
+module Arelastic
+  module Builders
+    class Aggregation < Struct.new :name
+      class << self
+        def [](name)
+          new(name)
+        end
+      end
+
+      def terms field, options = {}
+        Arelastic::Facets::Terms.new name, field, options
+      end
+
+      def histogram options
+        Arelastic::Facets::Histogram.new name, options
+      end
+    end
+  end
+end

data/lib/arelastic/builders/search.rb

@@ -10,6 +10,10 @@ module Arelastic
           filter[field]
         end
 
+        def aggregation
+          Arelastic::Builders::Aggregation
+        end
+
         def facet
           Arelastic::Builders::Facet
         end
@@ -24,4 +28,4 @@ module Arelastic
       end
     end
   end
-end
+end

data/lib/arelastic/builders.rb

@@ -1,3 +1,4 @@
+require 'arelastic/builders/aggregation'
 require 'arelastic/builders/filter'
 require 'arelastic/builders/facet'
 require 'arelastic/builders/mapping'

data/lib/arelastic/searches/aggregations.rb

@@ -0,0 +1,14 @@
+module Arelastic
+  module Searches
+    class Aggregations < Arelastic::Searches::Search
+      attr_accessor :grouping
+      def initialize aggregations
+        @grouping = Arelastic::Nodes::HashGroup.new aggregations
+      end
+
+      def as_elastic
+        { "aggs" => convert_to_elastic(grouping) }
+      end
+    end
+  end
+end

data/lib/arelastic/searches/terms.rb

@@ -0,0 +1,18 @@
+module Arelastic
+  module Aggregations
+    class Terms < Arelastic::Aggs::Aggregation
+      attr_accessor :field, :options
+
+      def initialize field, options = {}
+        @field = field
+        @options = options
+      end
+
+      def as_elastic
+        params = {"field" => field}.update(options)
+
+        {"terms" => params}
+      end
+    end
+  end
+end

data/lib/arelastic/searches.rb

@@ -1,5 +1,6 @@
 require 'arelastic/searches/search'
 
+require 'arelastic/searches/aggregations'
 require 'arelastic/searches/facets'
 require 'arelastic/searches/filter'
 require 'arelastic/searches/from'

data/lib/arelastic.rb

@@ -1,5 +1,6 @@
 require 'arelastic/arities'
 require 'arelastic/nodes'
+require 'arelastic/aggregations'
 require 'arelastic/facets'
 require 'arelastic/filters'
 require 'arelastic/mappings'
@@ -7,4 +8,4 @@ require 'arelastic/queries'
 require 'arelastic/searches'
 require 'arelastic/sorts'
 
-require 'arelastic/builders'
+require 'arelastic/builders'

data/test/arelastic/aggregations/terms_test.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class Arelastic::Aggregations::TermsTest < MiniTest::Unit::TestCase
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::Terms.new('foo', 'field' => 'tags', 'size' => 10)
+    expected = {
+      "foo" => {
+        "terms" => {
+          "field" => "tags",
+          "size"  => 10,
+        }
+      }
+    }
+
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/builders/aggregation_test.rb

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

data/test/arelastic/builders/facet_test.rb

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

data/test/arelastic/builders/search_test.rb

@@ -9,6 +9,10 @@ class Arelastic::Builders::SearchTest < MiniTest::Unit::TestCase
     assert_kind_of Arelastic::Builders::Filter, Arelastic::Builders::Search['poop']
   end
 
+  def test_aggregation
+    assert_equal Arelastic::Builders::Aggregation, Arelastic::Builders::Search.aggregation
+  end
+
   def test_facet
     assert_equal Arelastic::Builders::Facet, Arelastic::Builders::Search.facet
   end
@@ -20,4 +24,4 @@ class Arelastic::Builders::SearchTest < MiniTest::Unit::TestCase
   def test_filter
     assert_equal Arelastic::Builders::Sort, Arelastic::Builders::Search.sort
   end
-end
+end

data/test/arelastic/queries/multi_match_test.rb

@@ -4,7 +4,7 @@ class Arelastic::Queries::MultiMatchTest < MiniTest::Unit::TestCase
   def test_as_elastic
     query = "bar"
     fields = ["field_1", "field_2"]
-    multi_match = Arelastic::Queries::MultiMatch.new(query, fields)
+    multi_match = Arelastic::Queries::MultiMatch.new(fields, query)
     expected = {
       "multi_match" => {
         "query" => "bar",
@@ -21,7 +21,7 @@ class Arelastic::Queries::MultiMatchTest < MiniTest::Unit::TestCase
       "use_dis_max" => false,
       "tie_breaker" => 0.5
     }
-    multi_match = Arelastic::Queries::MultiMatch.new(query, fields, options)
+    multi_match = Arelastic::Queries::MultiMatch.new(fields, query, options)
     expected = {
       "multi_match" => {
         "query" => "bar",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -19,11 +19,16 @@ extra_rdoc_files:
 files:
 - README.rdoc
 - lib/arelastic.rb
+- lib/arelastic/aggregations.rb
+- lib/arelastic/aggregations/aggregation.rb
+- lib/arelastic/aggregations/min.rb
+- lib/arelastic/aggregations/terms.rb
 - lib/arelastic/arities.rb
 - lib/arelastic/arities/binary.rb
 - lib/arelastic/arities/polyadic.rb
 - lib/arelastic/arities/unary.rb
 - lib/arelastic/builders.rb
+- lib/arelastic/builders/aggregation.rb
 - lib/arelastic/builders/facet.rb
 - lib/arelastic/builders/filter.rb
 - lib/arelastic/builders/mapping.rb
@@ -81,6 +86,7 @@ files:
 - lib/arelastic/queries/term.rb
 - lib/arelastic/queries/terms.rb
 - lib/arelastic/searches.rb
+- lib/arelastic/searches/aggregations.rb
 - lib/arelastic/searches/facets.rb
 - lib/arelastic/searches/filter.rb
 - lib/arelastic/searches/from.rb
@@ -88,12 +94,15 @@ files:
 - lib/arelastic/searches/search.rb
 - lib/arelastic/searches/size.rb
 - lib/arelastic/searches/sort.rb
+- lib/arelastic/searches/terms.rb
 - lib/arelastic/sorts.rb
 - lib/arelastic/sorts/asc.rb
 - lib/arelastic/sorts/sort.rb
+- test/arelastic/aggregations/terms_test.rb
 - test/arelastic/arities/binary_test.rb
 - test/arelastic/arities/polyadic_test.rb
 - test/arelastic/arities/unary_test.rb
+- test/arelastic/builders/aggregation_test.rb
 - test/arelastic/builders/facet_test.rb
 - test/arelastic/builders/filter_test.rb
 - test/arelastic/builders/mapping_test.rb