eagle_search 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f2c540d8392becd307b86370b410a014938ad8
-  data.tar.gz: 08278f066fe793bf2d8e13bcc41830d5b19dbb6d
+  metadata.gz: 3e21ce462612e7c5a124aa8781336ebba2c89edc
+  data.tar.gz: 48b7434bd94a89894b021d1382c249e27cd5bafc
 SHA512:
-  metadata.gz: 0f63b0ca08028e9fd056220efa3731aaf6a902bc5152b2ec6f73887bdb1fecfc75f4e809bfd16ce5fb1846a86799cba7d2fc549be88274d30c4a20b569e1e6ed
-  data.tar.gz: b460acef98b7274ae245c4c8f75f565d07d7e710d8c1726bb35e35d0e9c80bf405f3d7c8b6e317c4cd248c0e8293dbabd42d52ededec6ff2c925679827ea534d
+  metadata.gz: 45a6fc3434a82ae76d15a18b92582c5d56dabd9a3bda886c4fb8d82c8a0080de7a084f278235c3d8a85ce871dad2a061f3d1119f440f0732a943d5891b962b0b
+  data.tar.gz: 33b30abb5aec2dc362e68a8663eed49dd1b02c2bd5e948aad9f185517ac489a8a61462d19a6f68cae7fa23395a8214798244e1662947f4409c65532ed90cd103

data/lib/eagle_search/interpreter/aggregation.rb

@@ -0,0 +1,87 @@
+module EagleSearch
+  class Interpreter::Aggregation
+    def initialize(aggregations)
+      @aggregations = aggregations
+    end
+
+    def payload
+      @payload ||= build_aggregation(@aggregations)
+    end
+
+    private
+    def build_aggregation(aggregation)
+      payload = {}
+
+      if terms_aggregation?(aggregation)
+        return { aggregation => build_terms_aggregation(aggregation) }
+      elsif aggregation.is_a?(Array)
+        aggregation.each do |agg|
+          payload.merge!(build_aggregation(agg))
+        end
+      elsif aggregation.is_a?(Hash)
+        aggregation.each do |field_name, aggregation_body|
+          if stats_aggregation?(aggregation_body)
+            payload.merge!({ field_name => build_stats_aggregation(field_name) })
+          elsif range_aggregation?(aggregation_body)
+            payload.merge!({ field_name => build_range_aggregation(field_name, aggregation_body) })
+          else
+            payload.merge!(build_aggregation(field_name))
+            payload[field_name].merge!(aggregations: build_aggregation(aggregation_body))
+          end
+        end
+      end
+
+      payload
+    end
+
+    def build_terms_aggregation(field)
+      {
+        terms: {
+          field: field
+        }
+      }
+    end
+
+    def build_stats_aggregation(field)
+      {
+        stats: {
+          field: field
+        }
+      }
+    end
+
+    def build_range_aggregation(field, range_aggregation)
+      agg = {
+        range: {
+          field: field,
+          ranges: []
+        }
+      }
+
+      range_aggregation[:ranges].each do |range|
+        if range.is_a?(Range)
+          agg[:range][:ranges] << {
+            from: range.min,
+            to: range.max
+          }
+        else
+          agg[:range][:ranges] << range
+        end
+      end
+
+      agg
+    end
+
+    def stats_aggregation?(aggregation)
+      aggregation.is_a?(Hash) && aggregation[:type] == "stats"
+    end
+
+    def terms_aggregation?(aggregation)
+      aggregation.is_a?(Symbol) || aggregation.is_a?(String)
+    end
+
+    def range_aggregation?(aggregation)
+      aggregation.is_a?(Hash) && aggregation[:ranges]
+    end
+  end
+end

data/lib/eagle_search/interpreter/filter.rb

@@ -1,7 +1,5 @@
 module EagleSearch
   class Interpreter::Filter
-    attr_reader :payload
-
     LOGICAL_OPERATORS = { and: :must, not: :must_not, or: :should }
 
     def initialize(filters)
@@ -47,6 +45,8 @@ module EagleSearch
         { range: { field => { gte: field_value.min, lte: field_value.max } } }
       when Regexp
         { regexp: { field => field_value.source } }
+      when nil
+        { missing: { field: field } }
       else
         { term: { field => field_value } }
       end

data/lib/eagle_search/interpreter/query.rb

@@ -1,6 +1,5 @@
 module EagleSearch
   class Interpreter::Query
-
     def initialize(index, query, options)
       @index = index
       @query = query

data/lib/eagle_search/interpreter.rb

@@ -17,7 +17,8 @@ module EagleSearch
             query: query_payload,
             filter: filter_payload
           }
-        }
+        },
+        aggregations: aggregations_payload
       }
 
       payload.merge!({ sort: @options[:sort] }) if @options[:sort]
@@ -52,5 +53,10 @@ module EagleSearch
         {}
       end
     end
+
+    def aggregations_payload
+      return {} unless @options[:aggregations]
+      EagleSearch::Interpreter::Aggregation.new(@options[:aggregations]).payload
+    end
   end
 end

data/lib/eagle_search/response.rb

@@ -29,6 +29,10 @@ module EagleSearch
       @response["hits"]["hits"]
     end
 
+    def aggregations
+      @response["aggregations"]
+    end
+
     def current_page
       @options[:page] || 1
     end

data/lib/eagle_search/version.rb

@@ -1,3 +1,3 @@
 module EagleSearch
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/eagle_search.rb

@@ -6,6 +6,7 @@ require "eagle_search/response"
 require "eagle_search/interpreter"
 require "eagle_search/interpreter/query"
 require "eagle_search/interpreter/filter"
+require "eagle_search/interpreter/aggregation"
 require "elasticsearch"
 
 module EagleSearch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eagle_search
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Igor Belo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -106,6 +106,7 @@ files:
 - lib/eagle_search/field.rb
 - lib/eagle_search/index.rb
 - lib/eagle_search/interpreter.rb
+- lib/eagle_search/interpreter/aggregation.rb
 - lib/eagle_search/interpreter/filter.rb
 - lib/eagle_search/interpreter/query.rb
 - lib/eagle_search/model.rb