es_tractor 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c95803c8427c65509539485cdae392f49ff00373
-  data.tar.gz: 7fbf6a5eab0236b6c80bfda83fdfd6bd933a0417
+  metadata.gz: 81b24cb42d1f02473ff67c94f7bac55727670db8
+  data.tar.gz: f0050eb804dad31fdc1ebb054c7ba2cf3cd845cd
 SHA512:
-  metadata.gz: 4693b910db8165c76056665d562332a14217f4d7a5fa0538c93df9d80cda4c4b9cbbc0ec104be2b7dea32e0e1ddd5cd32282369f21390e4de7ef89f971da6a1b
-  data.tar.gz: 296367c0e4c487087de040ca2def83761098b14af7a3b46dbf68ab959c76a6bdc7f35b77c7b1405c326a75acba5675ef7ada3d5883ae6cbbdc7dd91c8ccf216a
+  metadata.gz: a203a98c2fa74ae46cdb05f3ed146af4abec25c5f6605b0ed6b362413e8cfac16b27261e03dc1b47887648968b59013067e9cd63c476c04e396af6a3a84a9ccf
+  data.tar.gz: dec2d62a0179aef4608c3544b50dcb97707cc6daba78447a107725caeed63f8a7428864ed275bbc4e9e5a5d55aaff0646c383102268a1c7a7357fe2393d44174

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.0.6 / 2017-10-22
+
+* Doc and test for fields and sort
+
 === 0.0.5 / 2017-10-12
 
 * Add fields and sort

data/lib/es_tractor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/es_tractor'
 $LOAD_PATH.unshift File.dirname(__FILE__) \
   unless $LOAD_PATH.include?(File.dirname(__FILE__))
@@ -9,5 +10,5 @@ require 'client'
 # EsTractor provides tools to query Elasticsearch
 
 module EsTractor
-  VERSION = '0.0.5' # :nodoc:
+  VERSION = '0.0.6' # :nodoc:
 end

data/lib/es_tractor/client.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'elasticsearch'
 
 module EsTractor
@@ -122,6 +123,8 @@ module EsTractor
     #   Field name on which to apply the cardinality aggregation
     # @option opts [String] :extended_stats
     #   Field name on which to apply the extended_stats aggregation
+    # @option opts [Array] :fields
+    #   Field names to return
     # @option opts [String] :geo_bounds
     #   Field name on which to apply the geo_bounds aggregation
     # @option opts [String] :geo_centroid
@@ -132,6 +135,8 @@ module EsTractor
     #   Field name on which to apply the min aggregation
     # @option opts [String] :percentiles
     #   Field name on which to apply the percentiles aggregation
+    # @option opts [Array] :sort
+    #   Contains Hashes keyd on field name
     # @option opts [String] :stats
     #   Field name on which to apply the stats aggregation
     # @option opts [String] :sum
@@ -154,8 +159,8 @@ module EsTractor
     end
 
     def metrics_aggs
-      %i(avg cardinality extended_stats geo_bounds geo_centroid max min
-         percentiles stats sum value_count)
+      %i[avg cardinality extended_stats geo_bounds geo_centroid max min
+         percentiles stats sum value_count]
     end
 
     def aggs(opts)
@@ -191,7 +196,7 @@ module EsTractor
     def query(opts = {})
       bool = { filter: [], must: [] }
 
-      (%i(exists match query_string range term) & opts.keys)
+      (%i[exists match query_string range term] & opts.keys)
         .each do |qualifier|
         case qualifier
         when :exists

data/test/helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ENV['ESTRACTOR_ENV'] = 'test'
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 

data/test/test_client.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'helper'
 
 module EsTractor
@@ -7,7 +8,7 @@ module EsTractor
       @tractor = Client.new
     end
 
-    %w(count search).each do |action|
+    %w[count search].each do |action|
       exp = action == 'search' ? { from: 0, size: 0 } : {}
 
       define_method "test_#{action}_with_term_hash" do
@@ -94,14 +95,14 @@ module EsTractor
       end
 
       define_method "test_#{action}_with_exists_fieldname_array" do
-        opts = { exists: %w(my_field my_other_field) }
+        opts = { exists: %w[my_field my_other_field] }
         exp[:body] = { query: {
           bool: {
             must: [],
             filter: [
               {
                 exists: {
-                  field: %w(my_field my_other_field),
+                  field: %w[my_field my_other_field],
                 },
               },
             ],
@@ -129,10 +130,52 @@ module EsTractor
 
       next unless action == 'search'
 
-      %i(
+      def test_search_with_fields_arg 
+        opts = { fields: [:some_field] }
+        exp = {
+          from: 0,
+          size: 0,
+          body: { 
+            query: {
+              bool: {
+                filter: [],
+                must: [],
+              },
+            },
+            fields: [:some_field]
+          },
+        }
+
+        @tractor.client.expects(:search).with(exp)
+
+        @tractor.search opts
+      end
+
+      def test_search_with_sort_arg 
+        opts = { sort: [:some_field] }
+        exp = {
+          from: 0,
+          size: 0,
+          body: { 
+            query: {
+              bool: {
+                filter: [],
+                must: [],
+              },
+            },
+            sort: [:some_field]
+          },
+        }
+
+        @tractor.client.expects(:search).with(exp)
+
+        @tractor.search opts
+      end
+
+      %i[
         avg cardinality extended_stats geo_bounds geo_centroid max min
         percentiles stats sum value_count
-      ).each do |aggregation|
+      ].each do |aggregation|
         define_method "test_search_with_#{aggregation}_agg" do
           opts = {
             query_string: 'My query string',
@@ -142,17 +185,13 @@ module EsTractor
             from: 0,
             size: 0,
             body: {
-              query: {
-                bool: {
-                  must: [query_string: { query: 'My query string' }],
-                  filter: [],
-                },
-              },
-              aggs: {
-                "#{aggregation}-grade".to_sym => {
-                  aggregation => { field: 'grade' }
-                },
-              },
+              query: { bool: {
+                must: [query_string: { query: 'My query string' }],
+                filter: [],
+              }, },
+              aggs: { "#{aggregation}-grade".to_sym => {
+                aggregation => { field: 'grade' }
+              }, },
             },
           }
 

data/test/test_es_tractor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'helper'
 
 class TestEsTractor < Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es_tractor
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Oz Shelach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch