elasticated 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6d361a271487eaaa00bad98fc637d71577f84f
-  data.tar.gz: a1ad71c40b64d1681fe08558eaf0a6b7d19e49e2
+  metadata.gz: 652c62edebb74aa1b6d28929049fe5cd99d445b2
+  data.tar.gz: 759ce109407e8c30fda15f0fd9ad3cdcbfa8288a
 SHA512:
-  metadata.gz: c3c712d491f5846c8445765b5532fc0c3de738a429be5d00e1bbd6c11f1812e711eaaaa6facf0edad4a6563570aa243b15e748652ebbc82d0aebd3d1d329eacc
-  data.tar.gz: 40d195a39ecea6dc083487956a8442b69f7cf27e5947274a22f55c5fce64640f2708a53e16a3acd77fade4bb2e32cd38d4cff420e953d200293d28b5156cb524
+  metadata.gz: 555dd488f3bff9299d41898687609f244e8adbfd289e6a0e3826c0fe7c5ecf963269aff7feb83d25b1d67b42eb0cc5f52e03f5cb610a558430e5ea2ca712cf9f
+  data.tar.gz: 351b942f5927abdcd6effe9f315165a127df4dffdc1a5885da988b5b1e5a76f55edc9bcd92edb51977a658682309390a2b8b2ea7e6c1f99d02d91bf23e18d15e

data/README.md

@@ -112,6 +112,7 @@ Elasticated.configure do |config|
   config.scroll_expiration_time = '3m'
   config.scroll_page_size = 500
   config.search_page_size = 1000
+  config.transport_options.request_timeout = 5*60
 end
 ```
 
@@ -122,4 +123,5 @@ repository.logger = Elasticated::Loggers::DefaultLogger.new
 repository.scroll_expiration_time = '3m'
 repository.scroll_page_size = 500
 repository.search_page_size = 1000
+# transport_options cannot be setted for a single repository
 ```

data/lib/elasticated/client.rb

@@ -5,7 +5,7 @@ module Elasticated
     attr_accessor :transport
 
     def initialize(opts={})
-      self.transport = ::Elasticsearch::Client.new opts
+      self.transport = ::Elasticsearch::Client.new Configuration.transport_options.merge opts
     end
 
     def index_document(document_source, opts={})
@@ -18,6 +18,19 @@ module Elasticated
       log.debug "Document updated #{response.to_json}"
     end
 
+    def create_percolator(query_source, opts={})
+      transport.index index: opts.fetch(:index),
+                      type: '.percolator',
+                      id: opts.fetch(:id),
+                      body: { query: query_source }
+    end
+
+    def percolate(document_source, opts={})
+      transport.percolate index: opts.fetch(:index),
+                          type: opts.fetch(:type),
+                          body: { doc: document_source }
+    end
+
     def index_exists?(index_name)
       transport.indices.exists index: index_name
     end

data/lib/elasticated/configuration.rb

@@ -4,6 +4,7 @@ module Elasticated
     class << self
       attr_accessor :logger
       attr_accessor :scroll_expiration_time, :scroll_page_size, :search_page_size
+      attr_accessor :transport_options
     end
 
     # defaults
@@ -11,6 +12,7 @@ module Elasticated
     self.scroll_expiration_time = '3m'
     self.scroll_page_size = 500
     self.search_page_size = 1000
+    self.transport_options = Hash::Accessible.new request_timeout: 60 # 1 minute
 
   end
 end

data/lib/elasticated/index_selector.rb

@@ -23,6 +23,14 @@ module Elasticated
       indices.first
     end
 
+    def index_for_percolator(query)
+      params = strategy_params_for_percolator query
+      indices = strategy.call params
+      raise "Only one index can be affected for a percolator indexation" if indices.count > 1
+      raise "At least one index should be affected for a percolator indexation" if indices.count < 1
+      indices.first
+    end
+
     protected
 
     def strategy_params_for_document(document)
@@ -40,5 +48,9 @@ module Elasticated
       end
     end
 
+    def strategy_params_for_percolator(query)
+      { date: DateTime.now.iso8601 }
+    end
+
   end
 end

data/lib/elasticated/partitioned_repository.rb

@@ -28,6 +28,12 @@ module Elasticated
       super action, document, opts.merge(index: affected_index)
     end
 
+    # override
+    def prepare_percolator(action, query, opts={})
+      affected_index = index_selector.index_for_percolator(query)
+      super action, query, opts.merge(index: affected_index)
+    end
+
     def affected_indices_for(query)
       index_selector.indices_for_query(query)
     end

data/lib/elasticated/repository.rb

@@ -43,6 +43,14 @@ module Elasticated
       prepare :update, document, opts
     end
 
+    def create_percolator(query, opts={})
+      prepare_percolator :create_percolator, query, opts
+    end
+
+    def percolate(document, opts={})
+      prepare_percolator :percolate, document, opts
+    end
+
     def prepare_search(query, opts={})
       execute :prepare_search, query, opts
     end
@@ -72,6 +80,11 @@ module Elasticated
       client.send "#{method}_document", document.source, opts
     end
 
+    def _exec_create_percolator(query, opts={})
+      query_source = query.build.fetch(:query)
+      client.create_percolator query_source, opts
+    end
+
     # read actions
 
     def _exec_aggregations(query, opts={})
@@ -125,6 +138,11 @@ module Elasticated
       ResumableSearch.new self, query, false, opts
     end
 
+    def _exec_percolate(document, opts={})
+      document_source = document.document_source
+      client.percolate document_source, opts
+    end
+
     # abstract methods
 
     def execute(action, query, opts={})
@@ -137,5 +155,10 @@ module Elasticated
       send "_exec_#{action}", document, opts
     end
 
+    def prepare_percolator(action, query, opts={})
+      # child's implementation here
+      send "_exec_#{action}", query, opts
+    end
+
   end
 end

data/lib/elasticated/repository/intelligent_search.rb

@@ -7,13 +7,13 @@ module Elasticated
       # ------------ without sorting
       # without size, without offset  => scan_scroll
       # with size,    without offset  => single_page or scan_scroll
-      # without size, with offset     => normal_pagination                  # TODO analizar si se puede usar scroll con offset
-      # with size,    with offset     => single_page or normal_pagination   # TODO analizar si se puede usar scroll con offset
+      # without size, with offset     => normal_pagination
+      # with size,    with offset     => single_page or normal_pagination
       # ------------ with sorting
       # without size, without offset  => scroll
       # with size,    without offset  => single_page or scroll
-      # without size, with offset     => normal_pagination                  # TODO analizar si se puede usar scroll con offset
-      # with size,    with offset     => single_page or normal_pagination   # TODO analizar si se puede usar scroll con offset
+      # without size, with offset     => normal_pagination
+      # with size,    with offset     => single_page or normal_pagination
 
       # if the query is aggregated and the search strategy is use an
       # scroll-like alternative, we must do a 2-step search process

data/lib/version.rb

@@ -1,9 +1,12 @@
 module Elasticated
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end
 
 # Changelog
 
+# 2.1.0
+# Se agrega la funcionalidad para crear percolators y consultarlos con documents
+
 # 2.0.0
 # Se renombra la aggregation 'count_distinct' por 'value_count'
 # Se separan los metodos de busqueda (scroll, paginacion normal, scan & scroll) en strategies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler