elasticated 2.4.0 → 2.5.0

data/spec/query_conditions_spec.rb

@@ -251,64 +251,5 @@ module Elasticated
 
     end
 
-    describe "the term delimiter" do
-
-      let :delimiter do
-        Delimiters::TermFieldDelimiter.new field: :account_id, as: :account
-      end
-
-      it "should not delimit anything" do
-        qc.equal :other_field, 68
-        qc.fill_delimiter delimiter
-        params = delimiter.build_strategy_params
-        expect(params).to be_empty
-      end
-
-      it "should delimit a single condition" do
-        qc.equal :account_id, 68
-        qc.fill_delimiter delimiter
-        params = delimiter.build_strategy_params
-        expect(params).to eq account: [68]
-      end
-
-      it "should delimit by multiple conditions (part 1)" do
-        qc.equal :account_id, [68, 31]
-        qc.fill_delimiter delimiter
-        params = delimiter.build_strategy_params
-        expect(params).to eq account: [68, 31]
-      end
-
-      it "should delimit a multiple conditions (part 2)" do
-        qc.equal :account_id, 68
-        qc.equal :account_id, 31
-        qc.fill_delimiter delimiter
-        params = delimiter.build_strategy_params
-        expect(params).to eq account: [68, 31]
-      end
-
-      it "should delimit by nested conditions" do
-        qc.equal :account_id, 68
-        qc.bool do
-          equal :account_id, 31
-        end
-        qc.fill_delimiter delimiter
-        params = delimiter.build_strategy_params
-        expect(params).to eq account: [68, 31]
-      end
-
-      it "should delimit only by the 'must' part of nested conditions" do
-        qc.equal :account_id, 68
-        qc.bool do
-          must{ equal :account_id, 31 }
-          must_not{ equal :account_id, 85 }
-          should{ equal :account_id, 58 }
-        end
-        qc.fill_delimiter delimiter
-        params = delimiter.build_strategy_params
-        expect(params).to eq account: [68, 31]
-      end
-
-    end
-
   end
 end

data/spec/strategy_params_for_query_service_spec.rb

@@ -0,0 +1,328 @@
+require_relative 'spec_helper'
+module Elasticated
+
+  describe StrategyParamsForQueryService do
+    let(:query){ Query.new }
+    let(:service){StrategyParamsForQueryService.new}
+    
+    it 'should create empty delimiter' do
+      delimiters = []
+      expected = {}
+      actual = service.strategy_params_for_query(delimiters, query)
+      expect(actual).to eq expected
+      
+      delimiters = [Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts)]
+      actual = service.strategy_params_for_query(delimiters,query)
+      expect(actual).to eq expected
+
+      delimiters = [
+        Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts),
+        Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)
+      ]
+      actual = service.strategy_params_for_query(delimiters,query)
+      expect(actual).to eq expected
+    end
+
+    it 'should create term dalimiter with a date' do
+      delimiters = [Elasticated::Delimiters::TermFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, '2017-05-28'}
+      expected = {date: ['2017-05-28']}
+      actual = service.strategy_params_for_query(delimiters, query)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since' do
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {greater_than :date, '2017-05-28'}
+      expected = {date_since: '2017-05-28'}
+      actual = service.strategy_params_for_query(delimiters, query)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date until' do
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {less_equal :date, '2017-05-30'}
+      expected = {date_until: '2017-05-30'}
+      actual = service.strategy_params_for_query(delimiters, query)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since and date until' do
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {between :date, '2017-05-28', '2017-05-30'}
+      expected = {date_since: '2017-05-28', date_until: '2017-05-30'}
+      actual = service.strategy_params_for_query(delimiters, query)
+      expect(actual).to eq expected
+    end
+
+    it 'should create term delimiter from aggregations' do
+      options = {delimit_by: [:aggregations]}
+      delimiters = [Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts)]
+      query.aggregations do
+        filter :account do
+          conditions { equal :account, 39 }
+        end
+        filter :second_account do
+          conditions { equal :account, 40 }
+        end
+      end
+      expected = {accounts: [39, 40]}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since from aggregations' do
+      options = {delimit_by: [:aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.aggregations do
+        filter :greater do
+          conditions { greater_than :date, '2017-05-29' }
+        end
+        filter :greater_eq do
+          conditions { greater_equal :date, '2017-05-27' }
+        end
+      end
+      expected = {date_since: '2017-05-27'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date until from aggregations' do
+      options = {delimit_by: [:aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.aggregations do
+        filter :less do
+          conditions { less_than :date, '2017-05-29' }
+        end
+        filter :less_eq do
+          conditions { less_equal :date, '2017-05-27' }
+        end
+      end
+      expected = {date_until: '2017-05-29'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since and date until from aggregations' do
+      options = {delimit_by: [:aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { between :date, '2017-05-24', '2017-05-25' }
+        end
+        filter :greater_and_less_2 do
+          conditions { between :date, '2017-05-27', '2017-05-28' }
+        end
+      end
+      expected = {date_since: '2017-05-24', date_until: '2017-05-28'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter without date since nor date until from aggregations' do
+      options = {delimit_by: [:aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { between :date, '2017-05-24', '2017-05-25' }
+        end
+        filter :greater_and_less_2 do
+          conditions { between :date, '2017-05-27', '2017-05-28' }
+        end
+        filter :not_dates do
+          conditions { equal :account, 39 }
+        end
+      end
+      expected = {}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create term delimiter with date from conditions and aggregations' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::TermFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, '2017-05-23'}
+      query.aggregations do
+        filter :date_zero do
+          conditions { equal :date, '2017-05-24' }
+        end
+      end
+      expected = {date: ['2017-05-23']}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since from conditions and aggregations' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {greater_than :date, '2017-05-23'}
+      query.aggregations do
+        filter :greater_than_1 do
+          conditions { greater_than :date, '2017-05-30' }
+        end
+      end
+      expected = {date_since: '2017-05-23'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date until from conditions and aggregations' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {less_than :date, '2017-05-23'}
+      query.aggregations do
+        filter :greater_than_1 do
+          conditions { less_equal :date, '2017-05-30' }
+        end
+      end
+      expected = {date_until: '2017-05-23'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since and date until from conditions and aggregations' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {between :date, '2017-05-23', '2017-05-30'}
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { between :date, '2017-05-01', '2017-05-22' }
+        end
+        filter :greater_and_less_2 do
+          conditions { between :date, '2017-05-31', '2017-06-01' }
+        end
+      end
+      expected = {date_since: '2017-05-23', date_until: '2017-05-30'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since and date until from conditions and aggregations but without query conditions defined' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { between :date, '2017-05-01', '2017-05-22' }
+        end
+        filter :greater_and_less_2 do
+          conditions { between :date, '2017-05-31', '2017-06-10' }
+        end
+      end
+      expected = {date_since: '2017-05-01', date_until: '2017-06-10'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since from conditions and aggregations when one aggregation has not date until' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {greater_than :date, '2017-05-23'}
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { between :date, '2017-05-01', '2017-05-22' }
+        end
+        filter :greater_and_less_2 do
+          conditions { between :date, '2017-05-31', '2017-06-10' }
+        end
+        filter :greater_eq do
+          conditions { greater_equal :date, '2017-05-31' }
+        end
+      end
+      expected = {date_since: '2017-05-23'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since from conditions and aggregations when one aggregation has account filter' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {greater_than :date, '2017-05-23'}
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { between :date, '2017-05-01', '2017-05-22' }
+        end
+        filter :greater_and_less_2 do
+          conditions { between :date, '2017-05-31', '2017-06-10' }
+        end
+        filter :by_account do
+          conditions { equal :account, 39 }
+        end
+      end
+      expected = {date_since: '2017-05-23'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with date since from conditions and aggregations when one aggregation has account filter' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date), Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts)]
+      query.filter {greater_than :date, '2017-05-23'}
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { between :date, '2017-05-01', '2017-05-22' }
+        end
+        filter :greater_and_less_2 do
+          conditions { between :date, '2017-05-31', '2017-06-10' }
+        end
+        filter :by_account do
+          conditions { equal :account, 39 }
+        end
+      end
+      expected = {date_since: '2017-05-23'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter as term' do
+      options = {delimit_by: [:conditions]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, '2017-05-23'}
+      expected = {date: '2017-05-23'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter as term from aggregations' do
+      options = {delimit_by: [:aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { equal :date, '2017-05-01' }
+        end
+      end
+      expected = {date: '2017-05-01'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter as term from condition and aggregations' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, '2017-05-23'}
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { equal :date, '2017-05-01' }
+        end
+      end
+      expected = {date: '2017-05-23'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter as range from terms condition and aggregations' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, ['2017-05-23', '2017-06-01']}
+      query.aggregations do
+        filter :greater_and_less_1 do
+          conditions { equal :date, '2017-05-01' }
+        end
+      end
+      expected = {date_since: '2017-05-23', date_until: '2017-06-01'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
+  end
+
+end

data/spec/term_field_delimiter_spec.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -42,76 +42,76 @@ dependencies:
   name: rake
   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: pry-byebug
   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
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hash_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !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: ''
@@ -121,7 +121,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -166,6 +166,8 @@ files:
 - 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
@@ -195,9 +197,12 @@ 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/date_field_delimiter_spec.rb
+- spec/delimiter_factory_spec.rb
 - spec/document_spec.rb
 - spec/elasticsearch_hit_1.json
 - spec/elasticsearch_response_1.json
@@ -211,6 +216,7 @@ files:
 - spec/query_spec.rb
 - spec/results_spec.rb
 - spec/spec_helper.rb
+- spec/strategy_params_for_query_service_spec.rb
 - spec/term_field_delimiter_spec.rb
 homepage: http://github.com/pablo31/elasticated
 licenses:
@@ -222,23 +228,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Elasticsearch Wrapper, with Query & Mapping Builders
 test_files:
 - spec/aggregation_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
@@ -252,4 +259,5 @@ test_files:
 - spec/query_spec.rb
 - spec/results_spec.rb
 - spec/spec_helper.rb
+- spec/strategy_params_for_query_service_spec.rb
 - spec/term_field_delimiter_spec.rb