elasticated 1.2.1 → 2.0.0

data/spec/query_spec.rb

@@ -195,7 +195,7 @@ module Elasticated
         end
         q.aggregations do
           group :entry_type, size: 5 do
-            count :entry_name
+            group :entry_name, compact: true
           end
         end
         q.size 20
@@ -244,7 +244,7 @@ module Elasticated
                 field: :entry_type, size: 5
               },
               aggs: {
-                count_by_entry_name: {
+                group_by_entry_name: {
                   terms: {
                     field: :entry_name, size: 0
                   }

data/spec/results_spec.rb

@@ -9,7 +9,7 @@ module Elasticated
 
     it "should parse an 'search' response" do
       response = open_response 'elasticsearch_response_1'
-      results = Results.from_elasticsearch_response response
+      results = Results.parse response
       expect(results.took).to eq 106
       expect(results.timed_out).to eq false
       expect(results.shards.total).to eq 3
@@ -21,12 +21,12 @@ module Elasticated
       expect(results.documents.first).to be_a Document
     end
 
-    it "allow to access documents as an array" do
-      response = open_response 'elasticsearch_response_1'
-      results = Results.from_elasticsearch_response response
-      expect(results).to be_an Array
-      expect(results.count).to eq 1
-    end
+    # it "allow to access documents as an array" do
+    #   response = open_response 'elasticsearch_response_1'
+    #   results = Results.parse response
+    #   expect(results).to be_an Array
+    #   expect(results.count).to eq 1
+    # end
 
     it "should parse an 'search_aggregated' response" do
       response = open_response 'elasticsearch_response_2'
@@ -35,7 +35,7 @@ module Elasticated
           nested('ads'){ group 'ads.adgroups', size: 1, as: 'group_by_adgroup' }
         end
       end
-      results = Results.from_elasticsearch_response response, query
+      results = Results.parse response, query
       expect(results.took).to eq 140
       expect(results.timed_out).to eq false
       expect(results.shards.total).to eq 3
@@ -52,7 +52,7 @@ module Elasticated
 
     it "should not parse aggregations on an 'search_aggregated' response if no query is provided" do
       response = open_response 'elasticsearch_response_2'
-      results = Results.from_elasticsearch_response response
+      results = Results.parse response
       expect(results.took).to eq 140
       expect(results.timed_out).to eq false
       expect(results.shards.total).to eq 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: timing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 description: ''
 email:
 - psfutn@gmail.com
@@ -109,24 +129,27 @@ files:
 - lib/elasticated.rb
 - lib/elasticated/aggregation.rb
 - lib/elasticated/aggregations/cardinality_aggregation.rb
-- lib/elasticated/aggregations/count_aggregation.rb
-- lib/elasticated/aggregations/count_distinct_aggregation.rb
 - lib/elasticated/aggregations/count_filtered_aggregation.rb
 - lib/elasticated/aggregations/custom_aggregation.rb
 - lib/elasticated/aggregations/date_histogram_aggregation.rb
 - lib/elasticated/aggregations/filter_aggregation.rb
 - lib/elasticated/aggregations/filter_aggregation_evaluator.rb
+- lib/elasticated/aggregations/geohash_grid_aggregation.rb
 - lib/elasticated/aggregations/group_aggregation.rb
 - lib/elasticated/aggregations/histogram_aggregation.rb
+- lib/elasticated/aggregations/missing_aggregation.rb
 - lib/elasticated/aggregations/nested_aggregation.rb
 - lib/elasticated/aggregations/range_aggregation.rb
 - lib/elasticated/aggregations/range_aggregation_evaluator.rb
 - lib/elasticated/aggregations/ranges_builder.rb
+- lib/elasticated/aggregations/safe_date_histogram_aggregation.rb
 - lib/elasticated/aggregations/single_value_aggregation.rb
+- lib/elasticated/aggregations/stats_aggregation.rb
 - lib/elasticated/aggregations/subaggregated.rb
 - lib/elasticated/aggregations/sum_distinct_aggregation.rb
 - lib/elasticated/aggregations/terms_aggregation.rb
 - lib/elasticated/aggregations/top_hits_aggregation.rb
+- lib/elasticated/aggregations/value_count_aggregation.rb
 - lib/elasticated/block_evaluation.rb
 - lib/elasticated/boolean_clause.rb
 - lib/elasticated/client.rb
@@ -143,7 +166,6 @@ files:
 - lib/elasticated/conditions_builder.rb
 - lib/elasticated/configurable.rb
 - lib/elasticated/configuration.rb
-- lib/elasticated/default_logger.rb
 - lib/elasticated/delimiters/date_field_delimiter.rb
 - lib/elasticated/delimiters/standard_field_delimiter.rb
 - lib/elasticated/delimiters/term_field_delimiter.rb
@@ -151,6 +173,8 @@ files:
 - lib/elasticated/helpers.rb
 - lib/elasticated/index_selector.rb
 - lib/elasticated/inspectionable.rb
+- lib/elasticated/loggers/default_logger.rb
+- lib/elasticated/loggers/silent_logger.rb
 - lib/elasticated/mapping.rb
 - lib/elasticated/mapping/builder.rb
 - lib/elasticated/mapping/fields_builder.rb
@@ -163,6 +187,13 @@ files:
 - lib/elasticated/query_aggregations.rb
 - lib/elasticated/query_conditions.rb
 - lib/elasticated/repository.rb
+- lib/elasticated/repository/intelligent_search.rb
+- lib/elasticated/repository/normal_search.rb
+- lib/elasticated/repository/resumable_search.rb
+- lib/elasticated/repository/scan_scroll_search.rb
+- lib/elasticated/repository/scroll_search.rb
+- lib/elasticated/repository/search.rb
+- lib/elasticated/repository/single_page_search.rb
 - lib/elasticated/results.rb
 - lib/version.rb
 - spec/aggregation_spec.rb
@@ -173,6 +204,7 @@ files:
 - spec/elasticsearch_response_2.json
 - spec/elasticsearch_top_hits_response.json
 - spec/integration_spec.rb
+- spec/intelligent_search_spec.rb
 - spec/mapping_spec.rb
 - spec/query_aggregations_spec.rb
 - spec/query_conditions_spec.rb
@@ -213,6 +245,7 @@ test_files:
 - spec/elasticsearch_response_2.json
 - spec/elasticsearch_top_hits_response.json
 - spec/integration_spec.rb
+- spec/intelligent_search_spec.rb
 - spec/mapping_spec.rb
 - spec/query_aggregations_spec.rb
 - spec/query_conditions_spec.rb

data/lib/elasticated/aggregations/count_aggregation.rb

@@ -1,15 +0,0 @@
-module Elasticated
-  class CountAggregation < TermsAggregation
-
-    def default_name
-      "count_by_#{field}"
-    end
-
-    def parse(response)
-      response['buckets'].inject({}) do |hash, bucket|
-        hash.merge bucket['key'] => bucket['doc_count']
-      end
-    end
-
-  end
-end

data/lib/elasticated/default_logger.rb

@@ -1,27 +0,0 @@
-module Elasticated
-  class DefaultLogger
-
-    # interface
-
-    def trace(message)
-      puts "TRACE #{message}"
-    end
-
-    def debug(message)
-      puts "DEBUG #{message}"
-    end
-
-    def info(message)
-      puts "INFO #{message}"
-    end
-
-    def warn(message)
-      puts "WARN #{message}"
-    end
-
-    def error(message)
-      puts "ERROR #{message}"
-    end
-
-  end
-end