elastic_queue 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf43269d558684715697697975c108d4d11f31d
-  data.tar.gz: 43ce25310c882bee9ac73d5bf978c0f3657b2679
+  metadata.gz: 874af79f54d54bd97ed1bc58b7f3c45a66c8d915
+  data.tar.gz: 99fea70408e60937b93936fdf7512cbcc64a33dd
 SHA512:
-  metadata.gz: 7ec73971d3c7452b12a21c0bdde935f52f78e0f5bf93265edd15b1be0bcb3c8a0291d40236a604e3b09aa49db2cd60eda5b51e865b6a9618dd22d6de9176e639
-  data.tar.gz: e568ab3b5c296b870fe5f7cb47b813169ef25eba80d91d10cc66d16c9b1ad1d70aac50346ee72dd98696c91c4ebcac3f7ed8629ecc0015548975a4a7ebb7d1f6
+  metadata.gz: bee5165a495abd8785135c1eb8c45ad5d02ee9057183ce47db064582b38c7a9063a042aef642e3347f5dce6c02444fc593b0a50b0b6bf70275e9ee856a8de713
+  data.tar.gz: f754e63c2d2759ef31817a142ff33dc8c883a919aec2bd80980fbfe355f04ddb2ec449c202b208b97ef60ef0f10f39ae16001c3a4fa173fdf1bb543a4266493e

data/lib/elastic_queue/filters.rb

@@ -17,13 +17,17 @@ module ElasticQueue
       elsif value.is_a? Hash
         # date?
         time_filter(key, value)
+      elsif value.nil?
+        null_filter(key, value)
       else
         term_filter(key, value)
       end
     end
 
     def or_filter(term, values)
-      { or: values.map { |v| term_filter(term, v) } }
+      # flatten here because ranges return arrays
+      conditions = values.map { |v| option_to_filter(term, v) }.flatten
+      { or: conditions }
     end
 
     def term_filter(term, value)
@@ -42,5 +46,10 @@ module ElasticQueue
     def range_filter(term, value, comparator)
       { range: { term => { comparator => value } } }
     end
+
+    def null_filter(term, value)
+      { missing: { field: term, existence: true, null_value: true } }
+    end
+
   end
 end

data/lib/elastic_queue/percolation.rb

@@ -5,13 +5,13 @@ module ElasticQueue
     module ClassMethods
       def percolator_queries
         queries = {}
-        search = search_client.search index: '_percolator', body: { 'query' => { 'match_all' => {} } }, size: 1000
-        search['hits']['hits'].each  { |hit| queries[hit['_id']] = hit['_source'] }
+        search = search_client.search index: '_percolator', body: { query: { match_all: {} } }, size: 1000
+        search['hits']['hits'].each { |hit| queries[hit['_id']] = hit['_source'] }
         queries
       end
 
       def reverse_search(model)
-        percolation = search_client.percolate index: index_name, body: { 'doc' => model.indexed_for_queue }
+        percolation = search_client.percolate index: index_name, body: { doc: model.indexed_for_queue }
         percolation['matches']
       end
 
@@ -22,14 +22,20 @@ module ElasticQueue
       def register_percolator_query(name, body)
         search_client.index index: '_percolator', type: index_name, id: name, body: body
       end
+
+      def dynamically_percolate(model, percolator_body)
+        search_id = SecureRandom.uuid
+        # create a dynamic percolator with the query params, index our model in it and see if there are any matches
+        search_client.index index: '_percolator', type: 'dynamic_percolator', id: search_id, body: percolator_body, refresh: true
+        search = search_client.percolate index: 'dynamic_percolator', body: { doc: model.indexed_for_queue, query: { term: { _id: search_id } } }
+        search_client.delete index: '_percolator', type: 'dynamic_percolator', id: search_id
+        search
+      end
+
     end
 
     def in_queue?(model)
-      return false unless self.class.model_names.include?(model.class.to_s.underscore.to_sym)
-      search_id = SecureRandom.uuid
-      self.class.search_client.index index: '_percolator', type: 'dynamic_percolator', id: search_id, body: @query.percolator_body, refresh: true
-      search = self.class.search_client.percolate index: 'dynamic_percolator', body: { 'doc' => model.indexed_for_queue, 'query' => { 'term' => { '_id' => search_id } } }
-      self.class.search_client.delete index: '_percolator', type: 'dynamic_percolator', id: search_id
+      search = self.class.dynamically_percolate(model, @query.percolator_body)
       search['matches'].length == 1
     end
 

data/lib/elastic_queue/query.rb

@@ -26,6 +26,15 @@ module ElasticQueue
       @options.sorts
     end
 
+    def search(string)
+      @options.add_search(string)
+      self
+    end
+
+    def searches
+      @options.search
+    end
+
     def body
       @options.body
     end
@@ -47,23 +56,41 @@ module ElasticQueue
       @results ||= Results.new(@queue, execute, @options)
     end
 
+    # return just the ids of the records (useful when combined with SQL queries)
+    def ids
+      results = execute
+      results[:hits][:hits].map { |h| h[:_source][:id] }
+    end
+
     def count
       res = execute(count: true)
       res[:hits][:total].to_i
     end
 
     def execute(count: false)
-      search_type = count ? 'count' : 'query_then_fetch'
       begin
-        search = @queue.search_client.search index: @queue.index_name, body: body, search_type: search_type, from: @options.from, size: @options.per_page
-        # search[:page] = @page
-        # search = substitute_page(opts, search) if !count && opts[:page_substitution_ok] && search['hits']['hits'].length == 0 && search['hits']['total'] != 0
+        search = execute_query(count: false)
+        search = substitute_page(search) if !count && search['hits']['hits'].length == 0 && search['hits']['total'] != 0
       rescue Elasticsearch::Transport::Transport::Errors::BadRequest
         search = failed_search
       end
       search.with_indifferent_access
     end
 
+    private
+
+    def execute_query(count: false)
+      search_type = count ? 'count' : 'query_then_fetch'
+      @queue.search_client.search index: @queue.index_name, body: body, search_type: search_type, from: @options.from, size: @options.per_page
+    end
+
+    def substitute_page(search)
+      total_hits = search['hits']['total'].to_i
+      per_page = @options.per_page
+      @options.page = (total_hits / per_page.to_f).ceil
+      execute_query
+    end
+
     def failed_search
       { page: 0, hits: { hits: [], total: 0 } }
     end

data/lib/elastic_queue/query_options.rb

@@ -6,7 +6,7 @@ module ElasticQueue
     include Filters
     include Sorts
 
-    attr_reader :filters, :sorts, :page
+    attr_reader :filters, :sorts, :page, :search
     attr_accessor :per_page
 
     def initialize(options = {})
@@ -25,6 +25,10 @@ module ElasticQueue
       @sorts += options_to_sorts(options)
     end
 
+    def add_search(string)
+      @search = string
+    end
+
     def from
       (page - 1) * per_page
     end
@@ -37,13 +41,14 @@ module ElasticQueue
       b = {}
       b[:filter] = @filters unless @filters[:and].blank?
       b[:sort] = @sorts unless @sorts.blank?
+      b[:query] = { query_string: { query: @search } } unless @search.blank?
       b
     end
 
     def percolator_body
       b = {}
       b[:filter] = @filters unless @filters[:and].blank?
-      { 'query' => { 'constant_score' => b } }
+      { query: { constant_score: b } }
     end
   end
 end

data/lib/elastic_queue/results.rb

@@ -5,6 +5,7 @@ module ElasticQueue
     attr_reader :paginate
 
     delegate :empty?, :each, :total_entries, :total_pages, :current_page, to: :paginate
+
     def initialize(queue, search_results, query_options)
       @queue = queue
       @instantiated_queue_items = instantiate_queue_items(search_results)

data/lib/elastic_queue/version.rb

@@ -1,3 +1,3 @@
 module ElasticQueue
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ruth Thompson
@@ -135,7 +135,6 @@ files:
 - lib/elastic_queue/query_options.rb
 - lib/elastic_queue/queueable.rb
 - lib/elastic_queue/results.rb
-- lib/elastic_queue/search.rb
 - lib/elastic_queue/sorts.rb
 - lib/elastic_queue/version.rb
 - spec/factories.rb

data/lib/elastic_queue/search.rb

@@ -1,5 +0,0 @@
-module ElasticQueue
-  class Search
-    # TODO
-  end
-end