elasticated 2.5.5 → 3.0.0

data/spec/results_spec.rb

@@ -3,10 +3,6 @@ require_relative 'spec_helper'
 module Elasticated
   describe Results do
 
-    def open_response(name)
-      JSON.parse File.read "spec/#{name}.json"
-    end
-
     it "should parse an 'search' response" do
       response = open_response 'elasticsearch_response_1'
       results = Results.parse response

data/spec/sample_responses/elasticsearch_bulk_response_1.json

@@ -0,0 +1,35 @@
+{
+   "took": 4,
+   "errors": false, 
+   "items": [
+      {  "delete": {
+            "_index":   "website",
+            "_type":    "blog",
+            "_id":      "123",
+            "_version": 2,
+            "status":   200,
+            "found":    true
+      }},
+      {  "create": {
+            "_index":   "website",
+            "_type":    "blog",
+            "_id":      "123",
+            "_version": 3,
+            "status":   201
+      }},
+      {  "create": {
+            "_index":   "website",
+            "_type":    "blog",
+            "_id":      "EiwfApScQiiy7TIKFxRCTw",
+            "_version": 1,
+            "status":   201
+      }},
+      {  "update": {
+            "_index":   "website",
+            "_type":    "blog",
+            "_id":      "123",
+            "_version": 4,
+            "status":   200
+      }}
+   ]
+}

data/spec/sample_responses/elasticsearch_bulk_response_2.json

@@ -0,0 +1,20 @@
+{
+   "took": 3,
+   "errors": true, 
+   "items": [
+      {  "create": {
+            "_index":   "website",
+            "_type":    "blog",
+            "_id":      "123",
+            "status":   409, 
+            "error":    "DocumentAlreadyExistsException[[website][4] [blog][123]: document already exists]"
+      }},
+      {  "index": {
+            "_index":   "website",
+            "_type":    "blog",
+            "_id":      "123",
+            "_version": 5,
+            "status":   200 
+      }}
+   ]
+}

data/spec/sample_responses/elasticsearch_count_1.json

@@ -0,0 +1,8 @@
+{
+  "count": 15,
+  "_shards": {
+    "total": 90,
+    "successful": 90,
+    "failed": 0
+  }
+}

data/spec/sample_responses/elasticsearch_count_2.json

@@ -0,0 +1,8 @@
+{
+  "count": 0,
+  "_shards": {
+    "total": 90,
+    "successful": 90,
+    "failed": 0
+  }
+}

data/spec/sample_responses/elasticsearch_get_response_1.json

@@ -0,0 +1,10 @@
+{
+   "_index" :   "website",
+   "_id" :      "2",
+   "_type" :    "blog",
+   "found" :    true,
+   "_source" : {
+      "text" :  "This is a piece of cake...",
+      "title" : "My first external blog entry"
+   }
+}

data/spec/sample_responses/elasticsearch_get_response_2.json

@@ -0,0 +1,6 @@
+{
+   "_index" : "website",
+   "_type" :  "blog",
+   "_id" :    "2",
+   "found" :  false
+}

data/spec/sample_responses/elasticsearch_mget_response_1.json

@@ -0,0 +1,25 @@
+{
+   "docs" : [
+      {
+         "_index" :   "website",
+         "_id" :      "id2",
+         "_type" :    "blog",
+         "found" :    true,
+         "_source" : {
+            "text" :  "This is a piece of cake...",
+            "title" : "My first external blog entry"
+         },
+         "_version" : 10
+      },
+      {
+         "_index" :   "website",
+         "_id" :      "id1",
+         "_type" :    "pageviews",
+         "found" :    true,
+         "_version" : 2,
+         "_source" : {
+            "views" : 2
+         }
+      }
+   ]
+}

data/spec/spec_helper.rb

@@ -1,2 +1,49 @@
+require 'simplecov'
+
+SimpleCov.start do
+  add_group 'Aggregations', [
+    'lib/elasticated/aggregation',
+    'lib/elasticated/aggregations'
+  ]
+  add_group 'Conditions', [
+    'lib/elasticated/conditions'
+  ]
+  add_group 'Delimiters', [
+    'lib/elasticated/delimiters'
+  ]
+  add_group 'Mapping', [
+    'lib/elasticated/mapping'
+  ]
+  add_group 'Mixins', [
+    'lib/elasticated/mixins'
+  ]
+  add_group 'Loggers', [
+    'lib/elasticated/loggers'
+  ]
+  add_group 'Repository & Client', [
+    'lib/elasticated/repository',
+    'lib/elasticated/index_selector',
+    'lib/elasticated/partitioned_repository',
+    'lib/elasticated/client'
+  ]
+  add_group 'Document', [
+    'lib/elasticated/document',
+    'lib/elasticated/results'
+  ]
+  add_group 'Query Components', [
+    'lib/elasticated/query',
+    'lib/elasticated/query_conditions',
+    'lib/elasticated/query_aggregations',
+    'lib/elasticated/boolean_clause'
+  ]
+  add_filter 'spec'
+end
+
 require 'rspec'
 require_relative '../lib/elasticated'
+
+def open_response(name)
+  JSON.parse File.read "spec/sample_responses/#{name}.json"
+end
+
+require_relative 'spec_helper/fake_index_selector'

data/spec/spec_helper/fake_index_selector.rb

@@ -0,0 +1,27 @@
+module SpecHelper
+  class FakeIndexSelector < Elasticated::IndexSelector
+
+    def delimiters
+      [Elasticated::Delimiters::DateFieldDelimiter.new(field: :created_at, as: :date)]
+    end
+
+    def strategy
+      Proc.new do |params|
+        date = params[:date]
+        date_since = params[:date_since]
+        date_until = params[:date_until]
+        if date
+          date = Date.parse date
+          [date.strftime("fakeindex-%Y-%m-%d")]
+        elsif date_since
+          date_since = Date.parse date_since
+          date_until = Date.parse date_until
+          (date_since..date_until).map{ |date| date.strftime "fakeindex-%Y-%m-%d" }
+        else
+          ['fakeindex']
+        end
+      end
+    end
+
+  end
+end

data/spec/term_field_delimiter_spec.rb

@@ -4,32 +4,32 @@ module Elasticated
   module Delimiters
     describe TermFieldDelimiter do
 
-      let :empty_delimiter do
+      let :delimiter do
         TermFieldDelimiter.new field: :account_id, as: :account
       end
 
       it "should not delimit anything" do
-        params = empty_delimiter.build_strategy_params
+        params = delimiter.build_strategy_params
         expect(params).to be_empty
       end
 
       it "should delimit by one term" do
-        delimiter = empty_delimiter.completed_with conditions: [{account_id: 'nombre1'}], aggregations: []
+        delimiter.add_term :account_id, 'nombre1'
         params = delimiter.build_strategy_params
         expect(params).to eq account: ['nombre1']
       end
 
       it "should delimit by multiple terms" do
-        delimiter = empty_delimiter.completed_with conditions: [{account_id: 'nombre1'}]
-        delimiter = delimiter.completed_with conditions: [{account_id: 'nombre2'}]
+        delimiter.add_term :account_id, 'nombre1'
+        delimiter.add_term :account_id, 'nombre2'
         params = delimiter.build_strategy_params
         expect(params).to eq account: ['nombre1', 'nombre2']
       end
 
       it "should ignore duplicated terms" do
-        delimiter = empty_delimiter.completed_with conditions: [{account_id: 'nombre2'}]
-        delimiter = delimiter.completed_with conditions: [{account_id: 'nombre2'}]
-        delimiter = delimiter.completed_with conditions: [{account_id: 'nombre1'}]
+        delimiter.add_term :account_id, 'nombre2'
+        delimiter.add_term :account_id, 'nombre2'
+        delimiter.add_term :account_id, 'nombre1'
         params = delimiter.build_strategy_params
         expect(params).to eq account: ['nombre2', 'nombre1']
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -150,10 +178,17 @@ files:
 - 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/bulk_actions/create_action.rb
+- lib/elasticated/bulk_actions/delete_action.rb
+- lib/elasticated/bulk_actions/index_action.rb
+- lib/elasticated/bulk_actions/standard_action.rb
+- lib/elasticated/bulk_actions/update_action.rb
+- lib/elasticated/bulk_actions/upsert_action.rb
+- lib/elasticated/bulk_request.rb
+- lib/elasticated/bulk_request/response.rb
+- lib/elasticated/bulk_request/response_item.rb
 - lib/elasticated/client.rb
-- lib/elasticated/clonable.rb
 - lib/elasticated/conditions/custom_condition.rb
 - lib/elasticated/conditions/exists_condition.rb
 - lib/elasticated/conditions/missing_condition.rb
@@ -161,20 +196,18 @@ files:
 - lib/elasticated/conditions/range_condition.rb
 - lib/elasticated/conditions/script_condition.rb
 - lib/elasticated/conditions/standard_condition.rb
+- lib/elasticated/conditions/term_condition.rb
 - lib/elasticated/conditions/terms_condition.rb
 - lib/elasticated/conditions/wildcard_condition.rb
 - lib/elasticated/conditions_builder.rb
-- lib/elasticated/configurable.rb
 - lib/elasticated/configuration.rb
-- lib/elasticated/date_delimiter_factory.rb
-- lib/elasticated/delimiter_visitor.rb
 - lib/elasticated/delimiters/date_field_delimiter.rb
 - lib/elasticated/delimiters/standard_field_delimiter.rb
 - lib/elasticated/delimiters/term_field_delimiter.rb
 - lib/elasticated/document.rb
+- lib/elasticated/enum.rb
 - 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
@@ -184,10 +217,15 @@ files:
 - lib/elasticated/mapping/object_builder.rb
 - lib/elasticated/mapping/partial.rb
 - lib/elasticated/mapping/type_builder.rb
+- lib/elasticated/mixins/block_evaluation.rb
+- lib/elasticated/mixins/clonable.rb
+- lib/elasticated/mixins/configurable.rb
+- lib/elasticated/mixins/inspectionable.rb
 - lib/elasticated/partitioned_repository.rb
 - lib/elasticated/query.rb
 - lib/elasticated/query_aggregations.rb
 - lib/elasticated/query_conditions.rb
+- lib/elasticated/quick.rb
 - lib/elasticated/repository.rb
 - lib/elasticated/repository/intelligent_search.rb
 - lib/elasticated/repository/normal_search.rb
@@ -197,26 +235,33 @@ files:
 - lib/elasticated/repository/search.rb
 - lib/elasticated/repository/single_page_search.rb
 - lib/elasticated/results.rb
-- lib/elasticated/strategy_params_for_query_service.rb
-- lib/elasticated/term_delimiter_factory.rb
 - lib/version.rb
 - spec/aggregation_spec.rb
+- spec/bulk_request_spec.rb
 - spec/date_field_delimiter_spec.rb
-- spec/delimiter_factory_spec.rb
 - spec/document_spec.rb
-- spec/elasticsearch_hit_1.json
-- spec/elasticsearch_response_1.json
-- 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/partitioned_repository_spec.rb
 - spec/query_aggregations_spec.rb
 - spec/query_conditions_spec.rb
 - spec/query_spec.rb
+- spec/repository_spec.rb
 - spec/results_spec.rb
+- spec/sample_responses/elasticsearch_bulk_response_1.json
+- spec/sample_responses/elasticsearch_bulk_response_2.json
+- spec/sample_responses/elasticsearch_count_1.json
+- spec/sample_responses/elasticsearch_count_2.json
+- spec/sample_responses/elasticsearch_get_response_1.json
+- spec/sample_responses/elasticsearch_get_response_2.json
+- spec/sample_responses/elasticsearch_hit_1.json
+- spec/sample_responses/elasticsearch_mget_response_1.json
+- spec/sample_responses/elasticsearch_response_1.json
+- spec/sample_responses/elasticsearch_response_2.json
+- spec/sample_responses/elasticsearch_top_hits_response.json
 - spec/spec_helper.rb
-- spec/strategy_params_for_query_service_spec.rb
+- spec/spec_helper/fake_index_selector.rb
 - spec/term_field_delimiter_spec.rb
 homepage: http://github.com/pablo31/elasticated
 licenses:
@@ -244,20 +289,29 @@ specification_version: 4
 summary: Elasticsearch Wrapper, with Query & Mapping Builders
 test_files:
 - spec/aggregation_spec.rb
+- spec/bulk_request_spec.rb
 - spec/date_field_delimiter_spec.rb
-- spec/delimiter_factory_spec.rb
 - spec/document_spec.rb
-- spec/elasticsearch_hit_1.json
-- spec/elasticsearch_response_1.json
-- 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/partitioned_repository_spec.rb
 - spec/query_aggregations_spec.rb
 - spec/query_conditions_spec.rb
 - spec/query_spec.rb
+- spec/repository_spec.rb
 - spec/results_spec.rb
+- spec/sample_responses/elasticsearch_bulk_response_1.json
+- spec/sample_responses/elasticsearch_bulk_response_2.json
+- spec/sample_responses/elasticsearch_count_1.json
+- spec/sample_responses/elasticsearch_count_2.json
+- spec/sample_responses/elasticsearch_get_response_1.json
+- spec/sample_responses/elasticsearch_get_response_2.json
+- spec/sample_responses/elasticsearch_hit_1.json
+- spec/sample_responses/elasticsearch_mget_response_1.json
+- spec/sample_responses/elasticsearch_response_1.json
+- spec/sample_responses/elasticsearch_response_2.json
+- spec/sample_responses/elasticsearch_top_hits_response.json
 - spec/spec_helper.rb
-- spec/strategy_params_for_query_service_spec.rb
+- spec/spec_helper/fake_index_selector.rb
 - spec/term_field_delimiter_spec.rb