ej 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0b332b7857e660bfaf5210b79033873d69d664f
-  data.tar.gz: 9692b219550391e6e63a8c52d96ae633e4d13845
+  metadata.gz: 643e3d4fc75c7f83f484f89845d0fcf4b75433a1
+  data.tar.gz: d65079cd2e20a88ba694ad20d8ee8db48d50df24
 SHA512:
-  metadata.gz: 82f065af8c92d75f3a0e613466e38cc9216dbe4811610762fc852bac1c528ffa71d16f38fdd21ececb79f917203db3562cd3204f03ba7439dea1f9f6d5e77fb4
-  data.tar.gz: 85e4ef0bc16bf929609025e84cc0c9725bee86a2efb5eb3a15b8451cc90a383673af6f11fee1665ce78a7103fa9f65ed92bdee7c4d2e99956542779cb735ca6a
+  metadata.gz: aeb5afcd34843b5caef5d53a408d05a42f2a4a5db6367198bf6ff6ce17c6c14fe224dbd460c123e7a2fd885506929835044056f450d61b632e008378f09083b9
+  data.tar.gz: a47937f3958993b8809c537c2b381da730de01a82b96918ff6cf8677ce46661ee64bfc84d49a927113d6f9d9cc10f382f3f0907f2bd3152395eade6d3595a82c

data/lib/ej/commands.rb

@@ -20,7 +20,6 @@ module Ej
     map '-a' => :aliases
     map '-m' => :mapping
     map '-e' => :debug_eval
-    map '--j2h' => :json_to_hash
     map '--health' => :health
 
     def initialize(args = [], options = {}, config = {})
@@ -98,8 +97,9 @@ module Ej
     desc 'aggs', 'aggs'
     option :query, type: :string, aliases: '-q', default: '*', desc: 'query'
     option :size, type: :numeric, aliases: '-n', default: 10, desc: 'size'
-    def aggs(term)
-      puts_with_format(@core.aggs(term, options['size'], options['query']))
+    option :terms, type: :array, aliases: '-t', required: true, desc: 'size'
+    def aggs
+      puts_with_format(@core.aggs(options['terms'], options['size'], options['query']))
     end
 
     desc 'min', 'term'
@@ -232,11 +232,6 @@ module Ej
       puts_with_format @core.nodes_stats
     end
 
-    desc '--j2h', 'json to hash'
-    def json_to_hash
-      pp Yajl::Parser.parse(STDIN.read)
-    end
-
     private
 
     def puts_with_format(object)

data/lib/ej/core.rb

@@ -116,17 +116,37 @@ module Ej
       @client.search index: @index, body: body
     end
 
-    def aggs(term, size, query)
-      body = {"size"=>0,
-               "query"=>
-                {"filtered"=>
-                  {"query"=>{"query_string"=>{"query"=> query}},
-                   "filter"=>{"bool"=>{"must"=>[], "must_not"=>[]}}}},
-               "aggs"=>
-                {"agg_" + term =>
-                  {"terms"=>{"field"=>term, "size"=>size, "order"=>{"_count"=>"desc"}}}}}
-      results = @client.search index: @index, body: body
-      results['aggregations']["agg_" + term]['buckets']
+    def aggs(terms, size, query)
+      body = {
+        "size"=>0,
+        "query"=>{
+          "query_string"=>{
+            "query"=>query
+          }
+        }
+      }
+
+      agg_terms = []
+      code = %Q{['aggs']}
+      terms.each_with_index do |term, i|
+        term_name = "agg_#{term}"
+        aggs_body = {
+          term_name=>{
+            "terms"=>{
+              "field"=>term,
+              "size"=>size,
+              "order"=>{
+                "_count"=>"desc"
+              }
+            }
+          }
+        }
+
+        eval(%Q{body#{code} = aggs_body})
+        code += %Q{['#{term_name}']['aggs']}
+      end
+
+      @client.search index: @index, body: body
     end
 
     def min(term)

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler