elastify 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0776e84590a5077aede923f0523f3565590174ee
-  data.tar.gz: db4c2697ee68585beafa19121411e802ccddb3eb
+  metadata.gz: 9390c61d979851afb2b3ad0fbbdfc7f101ee60e7
+  data.tar.gz: f7cb608d84f1f8be941b3f31ede57a22f354e628
 SHA512:
-  metadata.gz: 2187b6b1b38cb00326579c023c7e0c678cb87fb88b892315eaa961c7868ae221681aff0ca9a9796a03e2bfa0043233f990dff85043d68608b61e7e66ad027a14
-  data.tar.gz: f34de86be910ce647fd68ee355cdc4fb12ce659d8713182bd0587a84707875171e62295fd1a3a55a80708faf429695a528b415cdbf78b9e9a062e605b7d4cbb8
+  metadata.gz: 2fce9c0bd9ff7830fa362ade0403963580a5428c2bc6a964178fa01756c84b995112df8cc0adc99aee56378c02af9aaf335ea1add2188a2bb739492a1a531aeb
+  data.tar.gz: 752e3f93e04c8624eec5ef23f73af6fa2c06e1485e6de0988ca53bdd027bd3b3522cfa88c873153d826087998f44be28fbe00c3385c783937449c8ae53765561

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.idea/

data/lib/elastify/active_record_extensions.rb

@@ -22,14 +22,15 @@ module Elastify::ActiveRecordExtensions
             self.elastify_options[:map] = config.opt_mapping if config.opt_mapping.present?
             self.elastify_options[:decode] = config.opt_decode if config.opt_decode.present?
             self.elastify_options[:encode] = config.opt_encode if config.opt_encode.present?
+            self.elastify_options[:scroll_timeout] = config.opt_scroll_timeout if config.opt_scroll_timeout.present?
         end
 
-        def elastify_search(dsl: nil, scroll_timer: "1m")
-            return Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).search(dsl, scroll_timer)
+        def elastify_search(dsl: nil, scroll_timeout: nil)
+            return Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).search(dsl, scroll_timeout)
         end
 
-        def elastify_scroll(scroll_id: nil, scroll_timer: "1m")
-            return Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).scroll(scroll_id, scroll_timer)
+        def elastify_scroll(scroll_id: nil, scroll_timeout: nil)
+            return Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).scroll(scroll_id, scroll_timeout)
         end
     end
 

data/lib/elastify/configurators/model.rb

@@ -2,7 +2,7 @@ module Elastify
     module Configurators
         class Model
 
-            attr_accessor :opt_index, :opt_type, :opt_mapping, :opt_encode, :opt_decode
+            attr_accessor :opt_index, :opt_type, :opt_mapping, :opt_encode, :opt_decode, :opt_scroll_timeout
 
             def index(index)
                 @opt_index = index
@@ -23,6 +23,10 @@ module Elastify
             def decode(&block)
                 @opt_decode = block if block_given?
             end
+
+            def scroll_timeout(scroll_timeout)
+                @opt_scroll_timeout = scroll_timeout
+            end
         end
     end
 end

data/lib/elastify/helpers/elastic_search/connector.rb

@@ -2,6 +2,7 @@ module Elastify
     module Helpers
         module ElasticSearch
             class Connector
+
                 def self.create(options, data)
                     if data.blank?
                         raise :elastify__create__required_data
@@ -10,9 +11,10 @@ module Elastify
                         raise :elastify__create__required_data_id
                     end
                     url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}/#{data[:id]}"
-                    response = JSON.parse(RestClient.put(url, data.to_json, {}))
+                    JSON.parse(RestClient.put(url, data.to_json, {}))
                 end
-                def self.update options, data
+
+                def self.update(options, data)
                     if data.blank?
                         raise :elastify__update__required_data
                     end
@@ -20,9 +22,10 @@ module Elastify
                         raise :elastify__update__required_data_id
                     end
                     url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}/#{data[:id]}"
-                    response = JSON.parse(RestClient.put(url, data.to_json, {})).to_hash
+                    JSON.parse(RestClient.put(url, data.to_json, {})).to_hash
                 end
-                def self.destroy options, data
+
+                def self.destroy(options, data)
                     if data.blank?
                         raise :elastify__delete__required_data
                     end
@@ -30,38 +33,44 @@ module Elastify
                         raise :elastify__delete__required_data_id
                     end
                     url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}/#{data[:id]}"
-                    response = JSON.parse(RestClient.delete(url)).to_hash
+                    JSON.parse(RestClient.delete(url)).to_hash
                 end
-                def self.search options, dsl, scroll_timer
+
+                def self.search(options, dsl, scroll_timeout)
                     if dsl.blank?
                         raise :elastify__search__required_dsl
                     end
                     url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}/_search"
-                    url += "?scroll=#{scroll_timer}" if scroll_timer.present?
-                    puts url
-                    response = Elastify::Helpers::ElasticSearch::SearchResultCollection.new(RestClient.post(url, dsl.to_json, {}), options)
+                    scroll_timeout ||= options[:scroll_timeout]
+                    url += "?scroll=#{scroll_timeout}" if scroll_timeout.present?
+                    Elastify::Helpers::ElasticSearch::SearchResultCollection.new(RestClient.post(url, dsl.to_json, {}), options)
                 end
-                def self.scroll options, scroll_id, scroll_timer
+
+                def self.scroll(options, scroll_id, scroll_timeout)
                     if scroll_id.blank?
                         raise :elastify__search__required_scroll_id
                     end
                     url = "#{options[:base_url]}/_search/scroll"
-                    dsl = { scroll: scroll_timer, scroll_id: scroll_id }
-                    puts dsl.to_json
-                    response = Elastify::Helpers::ElasticSearch::SearchResultCollection.new(RestClient.post(url, dsl.to_json, {}), options)
+                    dsl = { scroll_id: scroll_id }
+                    scroll_timeout ||= options[:scroll_timeout]
+                    dsl[:scroll] = scroll_timeout if scroll_timeout.present?
+                    Elastify::Helpers::ElasticSearch::SearchResultCollection.new(RestClient.post(url, dsl.to_json, {}), options)
                 end
-                def self.create_index options
+
+                def self.create_index(options)
                     url = "#{options[:base_url]}/#{options[:index]}"
-                    response = JSON.parse(RestClient.put(url, {}.to_json, {})).to_hash
+                    JSON.parse(RestClient.put(url, {}.to_json, {})).to_hash
                 end
-                def self.destroy_index options
+
+                def self.destroy_index(options)
                     url = "#{options[:base_url]}/#{options[:index]}"
-                    response = JSON.parse(RestClient.delete(url)).to_hash
+                    JSON.parse(RestClient.delete(url)).to_hash
                 end
-                def self.create_mapping options
+
+                def self.create_mapping(options)
                     url = "#{options[:base_url]}/#{options[:index]}/_mappings/#{options[:type]}"
                     puts options[:map]
-                    response = JSON.parse(RestClient.put(url, options[:map].squish, {})).to_hash
+                    JSON.parse(RestClient.put(url, options[:map].squish, {})).to_hash
                 end
             end
         end

data/lib/elastify/helpers/elastic_search/document.rb

@@ -15,11 +15,11 @@ module Elastify
                 def destroy(model)
                     Connector.destroy(@options, model)
                 end
-                def search(dsl, scroll_timer = nil)
-                    Connector.search(@options, dsl, scroll_timer)
+                def search(dsl, scroll_timeout = nil)
+                    Connector.search(@options, dsl, scroll_timeout)
                 end
-                def scroll(scroll_id, scroll_timer = nil)
-                    Connector.scroll(@options, scroll_id, scroll_timer)
+                def scroll(scroll_id, scroll_timeout = nil)
+                    Connector.scroll(@options, scroll_id, scroll_timeout)
                 end
             end
         end

data/lib/elastify/helpers/query_builder.rb

@@ -0,0 +1,106 @@
+module Elastify
+    module Helpers
+        class QueryBuilder
+
+            attr_accessor :queries, :filters, :sort, :scroll_size, :scroll_timeout
+
+            def initialize(scroll_size: 15, scroll_timeout: '1m')
+                @queries = []
+                @filters = []
+                @sort = {}
+                @scroll_size = scroll_size
+                @scroll_timeout = scroll_timeout
+            end
+
+            def search_term(fields, term)
+                @queries << { term: term, fields: fields.instance_of?(Array) ? fields : [fields] }
+            end
+
+            def filter(*args)
+                must_filter(*args)
+            end
+
+            def must_filter(fields, field_rules)
+                @filters << { type: :must, field_rules: field_rules, fields: fields.instance_of?(Array) ? fields : [fields] }
+            end
+
+            def should_filter(fields, field_rules)
+                @filters << { type: :should, field_rules: field_rules, fields: fields.instance_of?(Array) ? fields : [fields] }
+            end
+
+            def sort(field, direction)
+                @sort[field] = { order: direction }
+            end
+
+            def scroll(scroll_size, scroll_timeout)
+                @scroll_size = scroll_size
+                @scroll_timeout = scroll_timeout
+            end
+
+            def scroll_size(size)
+                @scroll_size = size
+            end
+
+            def scroll_timeout(timeout)
+                @scroll_timeout = timeout
+            end
+
+            def to_dsl
+                max_scroll_size = 100; @scroll_size ||= 15
+                @scroll_size = @scroll_size.to_i <= max_scroll_size ? @scroll_size : max_scroll_size
+                if @sort.blank?
+                    @sort = @queries.blank? ? { id: { order: :desc } } : { _score: { order: :desc } }
+                end
+                dsl = { sort: @sort, size: @scroll_size, query: {} }
+                if @queries.blank? and @filters.blank?
+                    dsl[:query][:match_all] = {}
+                    return dsl
+                end
+                dsl[:query] = { bool: { must: [], must_not: [], should: [] } }
+                if @queries.present?
+                    dsl[:query][:bool][:must] += @queries.map do |query|
+                        { multi_match: { query: "#{query[:term].sanitize}", fields: query[:fields], operator: :and } }
+                    end
+                end
+                if @filters.present?
+                    @filters.select { |filter| filter[:type].equal?(:must) }.each do |filter|
+                        filter[:fields].each do |field|
+                            dsl[:query][:bool][:must] += map_has(field, filter[:field_rules][:has]) if filter[:field_rules][:has].present?
+                            dsl[:query][:bool][:must] << map_in(field, filter[:field_rules][:in]) if filter[:field_rules][:in].present?
+                            dsl[:query][:bool][:must_not] << map_in(field, filter[:field_rules][:not_in]) if filter[:field_rules][:not_in].present?
+                            dsl[:query][:bool][:must] << map_range(field, filter[:field_rules][:range]) if filter[:field_rules][:range].present?
+                        end
+                    end
+                    @filters.select { |filter| filter[:type].equal?(:should) }.each do |filter|
+                        filter[:fields].each_with_index do |field, index|
+                            dsl[:query][:bool][:should][index] ||= { bool: { must: [], must_not: [] } }
+                            dsl[:query][:bool][:should][index][:bool][:must] += map_has(field, filter[:field_rules][:has]) if filter[:field_rules][:has].present?
+                            dsl[:query][:bool][:should][index][:bool][:must] << map_in(field, filter[:field_rules][:in]) if filter[:field_rules][:in].present?
+                            dsl[:query][:bool][:should][index][:bool][:must_not] << map_in(field, filter[:field_rules][:not_in]) if filter[:field_rules][:not_in].present?
+                            dsl[:query][:bool][:should][index][:bool][:must] << map_range(field, filter[:field_rules][:range]) if filter[:field_rules][:range].present?
+                        end
+                    end
+                    dsl[:query][:bool][:minimum_number_should_match] = 1 if dsl[:query][:bool][:should].present?
+                end
+                return dsl
+            end
+
+            private
+            def map_has(field, data)
+                data.map { |value| { term: { field.to_s => value } } }
+            end
+
+            def map_in(field, data)
+                { terms: { field.to_s => data } }
+            end
+
+            def map_not_in(field, data)
+                { terms: { field.to_s => data } }
+            end
+
+            def map_range(field, data)
+                { range: { field.to_s => { gte: data.first, lte: data.last, format: 'yyyy-MM-dd\'T\'HH:mm:ssZ' } } }
+            end
+        end
+    end
+end

data/lib/elastify/version.rb

@@ -1,3 +1,3 @@
 module Elastify
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastify
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Bruno Bortolotti Ribeiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -182,6 +182,7 @@ files:
 - lib/elastify/helpers/elastic_search/document.rb
 - lib/elastify/helpers/elastic_search/search_result.rb
 - lib/elastify/helpers/elastic_search/search_result_collection.rb
+- lib/elastify/helpers/query_builder.rb
 - lib/elastify/version.rb
 homepage: https://github.com/brunobortolotti/elastify.git
 licenses: