elastic_queue 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fba6995c9fb76fcb3b2f7e0e204bf5c955e243b
-  data.tar.gz: a47b1f04bf521b2a4c42f1fee5f2be4feee51256
+  metadata.gz: fdf43269d558684715697697975c108d4d11f31d
+  data.tar.gz: 43ce25310c882bee9ac73d5bf978c0f3657b2679
 SHA512:
-  metadata.gz: f7e36b7ac21298dd00e897b1f7c4e16f02a0b20c3bd21b33d4e68fded773acb9ebd712dba768bd73ea216f2f3b52ccc85989168997c27f57dd821f6b8044866e
-  data.tar.gz: 16409af91a7ae6020d5844a68b4ceddfbe0a53283d1bb3e7cb066210d400c40e0963ba7082a0ecaa17700a46cade6ecaa404ee585f6063dd39675c8895b23b1c
+  metadata.gz: 7ec73971d3c7452b12a21c0bdde935f52f78e0f5bf93265edd15b1be0bcb3c8a0291d40236a604e3b09aa49db2cd60eda5b51e865b6a9618dd22d6de9176e639
+  data.tar.gz: e568ab3b5c296b870fe5f7cb47b813169ef25eba80d91d10cc66d16c9b1ad1d70aac50346ee72dd98696c91c4ebcac3f7ed8629ecc0015548975a4a7ebb7d1f6

data/lib/elastic_queue/base.rb

@@ -1,11 +1,12 @@
 require 'elasticsearch'
 require 'elastic_queue/persistence'
+require 'elastic_queue/percolation'
 require 'elastic_queue/query'
 
 module ElasticQueue
   class Base
     include Persistence
-    # include Percolation
+    include Percolation
 
     def self.search_client
       Elasticsearch::Client.new
@@ -16,7 +17,7 @@ module ElasticQueue
     end
 
     def self.model_names
-      raise NotImplementedError, "No models defined in #{self.class}" unless defined?(@models)
+      fail NotImplementedError, "No models defined in #{self.class}" unless defined?(@models)
       @models
     end
 
@@ -47,6 +48,5 @@ module ElasticQueue
     def self.count
       query.count
     end
-
   end
 end

data/lib/elastic_queue/filters.rb

@@ -42,6 +42,5 @@ module ElasticQueue
     def range_filter(term, value, comparator)
       { range: { term => { comparator => value } } }
     end
-
   end
 end

data/lib/elastic_queue/percolation.rb

@@ -3,40 +3,38 @@ module ElasticQueue
     extend ActiveSupport::Concern
 
     module ClassMethods
-
-    #   def percolator_queries
-    #     queries = {}
-    #     query = { 'query' => {'match_all' => {}} }
-    #     search = search_client.search index: '_percolator', body: query.to_json, size: 1000
-    #     debugger
-    #     search['hits']['hits'].each  { |hit|           queries[hit['_id']] = hit['_source'] }
-    #     queries
-    #   end
-
+      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'] }
+        queries
+      end
+
+      def reverse_search(model)
+        percolation = search_client.percolate index: index_name, body: { 'doc' => model.indexed_for_queue }
+        percolation['matches']
+      end
+
+      def unregister_percolator_query(name)
+        search_client.delete index: '_percolator', type: index_name, id: name
+      end
+
+      def register_percolator_query(name, body)
+        search_client.index index: '_percolator', type: index_name, id: name, body: body
+      end
     end
 
-    # def reverse_search(instance)
-    #   body = { 'doc' => instance.indexed_for_queue }
-    #   search_client.percolate index: index_name, body: body.to_json
-    # end
-
-    # def register_percolator_query(name, opts)
-    #   search_client.index index: '_percolator', type: index_name, id: name, body: translate_opts_to_query_for_percolator(opts)
-    # end
-
-    # def unregister_percolator_query(name)
-    #   SEARCH_CLIENT.delete index: '_percolator', type: index_name, id: name
-    # end
-
-    # def model_in_queue?(model, queue_opts)
-    #   return false unless model_names.include?(model.class.to_s.underscore.to_sym)
-    #   search_id = SecureRandom.uuid
-    #   body = { 'doc' => model.indexed_for_queue, 'query' => {'term' => {'_id' => search_id}} }
-    #   SEARCH_CLIENT.index index: '_percolator', type: 'dynamic_percolator', id: search_id, body: translate_opts_to_query_for_percolator(queue_opts), refresh: true
-    #   search = SEARCH_CLIENT.percolate index: 'dynamic_percolator', body: body.to_json
-    #   SEARCH_CLIENT.delete index: '_percolator', type: 'dynamic_percolator', id: search_id
-    #   search['matches'].length == 1
-    # 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['matches'].length == 1
+    end
 
+    def register_as_percolator_query(name)
+      self.class.register_percolator_query(name, @query.percolator_body)
+    end
   end
 end

data/lib/elastic_queue/persistence.rb

@@ -3,7 +3,6 @@ module ElasticQueue
   module Persistence
     extend ActiveSupport::Concern
     module ClassMethods
-
       def index_exists?
         search_client.indices.exists index: index_name
       end
@@ -61,8 +60,6 @@ module ElasticQueue
       def remove_model(instance)
         search_client.delete index: index_name, id: instance.id, type: instance.class.to_s.underscore
       end
-
     end
-
   end
 end

data/lib/elastic_queue/query.rb

@@ -3,7 +3,6 @@ require 'elastic_queue/results'
 
 module ElasticQueue
   class Query
-
     def initialize(queue, options = {})
       @queue = queue
       @options = QueryOptions.new(options)
@@ -27,11 +26,23 @@ module ElasticQueue
       @options.sorts
     end
 
+    def body
+      @options.body
+    end
+
+    def percolator_body
+      @options.percolator_body
+    end
+
     def paginate(options = {})
       options.each { |k, v| @options.send("#{k}=", v) }
       all.paginate
     end
 
+    def page=(page)
+      @options.page = (page)
+    end
+
     def all
       @results ||= Results.new(@queue, execute, @options)
     end
@@ -44,7 +55,7 @@ module ElasticQueue
     def execute(count: false)
       search_type = count ? 'count' : 'query_then_fetch'
       begin
-        search = @queue.search_client.search index: @queue.index_name, body: @options.body, search_type: search_type, from: @options.from, size: @options.per_page
+        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
       rescue Elasticsearch::Transport::Transport::Errors::BadRequest
@@ -56,7 +67,5 @@ module ElasticQueue
     def failed_search
       { page: 0, hits: { hits: [], total: 0 } }
     end
-
   end
-
 end

data/lib/elastic_queue/query_options.rb

@@ -6,7 +6,7 @@ module ElasticQueue
     include Filters
     include Sorts
 
-    attr_reader :filters, :sorts
+    attr_reader :filters, :sorts, :page
     attr_accessor :per_page
 
     def initialize(options = {})
@@ -33,10 +33,6 @@ module ElasticQueue
       @page = num.to_i unless num.blank?
     end
 
-    def page
-      @page
-    end
-
     def body
       b = {}
       b[:filter] = @filters unless @filters[:and].blank?
@@ -44,5 +40,10 @@ module ElasticQueue
       b
     end
 
+    def percolator_body
+      b = {}
+      b[:filter] = @filters unless @filters[:and].blank?
+      { 'query' => { 'constant_score' => b } }
+    end
   end
 end

data/lib/elastic_queue/queueable.rb

@@ -9,7 +9,6 @@ module ElasticQueue
     end
 
     module ClassMethods
-
       def queues(*queues)
         @queues ||= queues
       end
@@ -39,9 +38,8 @@ module ElasticQueue
         @not_analyzed_queue_attributes.each do |a|
           properties[a.to_sym] = { type: :string, index: :not_analyzed }
         end
-        { self.to_s.underscore.to_sym => { properties: properties } }
+        { to_s.underscore.to_sym => { properties: properties } }
       end
-
     end
 
     def indexed_for_queue
@@ -61,6 +59,5 @@ module ElasticQueue
     def remove_from_queue_indices
       self.class.queue_classes.each { |q| q.send(:remove_model, self) }
     end
-
   end
 end

data/lib/elastic_queue/results.rb

@@ -1,26 +1,21 @@
 require 'will_paginate/collection'
 
 module ElasticQueue
-
   class Results
+    attr_reader :paginate
 
-    attr_reader :results
-
+    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)
       @start = query_options.page
       @per_page = query_options.per_page
       @total = search_results[:hits][:total]
-      @results = WillPaginate::Collection.create(@start, @per_page, @total) do |pager|
+      @paginate = WillPaginate::Collection.create(@start, @per_page, @total) do |pager|
         pager.replace(@instantiated_queue_items)
       end
     end
 
-    def paginate
-      @results
-    end
-
     def instantiate_queue_items(search_results)
       grouped_results, sort_order = group_sorted_results(search_results)
       records = fetch_records(grouped_results)
@@ -62,6 +57,5 @@ module ElasticQueue
         sort_order["#{a.class.name.underscore}_#{a.id}"] <=> sort_order["#{b.class.name.underscore}_#{b.id}"]
       end
     end
-
   end
 end

data/lib/elastic_queue/sorts.rb

@@ -2,9 +2,6 @@ module ElasticQueue
   module Sorts
     extend ActiveSupport::Concern
 
-    module ClassMethods
-    end
-
     def options_to_sorts(options)
       options.map { |k, v| option_to_sort(k, v) }
     end
@@ -18,6 +15,5 @@ module ElasticQueue
     def single_sort(order_by, order)
       { order_by => { order: order, ignore_unmapped: true } }
     end
-
   end
 end

data/lib/elastic_queue/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ruth Thompson
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   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: 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: will_paginate
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   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: 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'
 description: A library for storing and filtering documents on elastic search with
@@ -118,8 +118,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -153,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0.preview.1
 signing_key: 
 specification_version: 4
 summary: A queueing system built on top of elasticsearch.