zelastic 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f642b0f5988b4f4a0fb9198da0f0276208d3039a
-  data.tar.gz: bb4a08940cf9791cac531be04d7eed6d63ca6fe4
+  metadata.gz: 19307349dedf8d7ea1ed2c3bea0f21aaa07ee4ee
+  data.tar.gz: c2ffdf1cea48bcc8275d092298dbca72cf97a693
 SHA512:
-  metadata.gz: bb13a0754667b7de1bb7a78e478beb4740641775bd609a2294063bcbc27186dd835d77ca7789f67dbef0d462b3e204402697ea92714fe9c19be8dab415535de7
-  data.tar.gz: 29ecd1278cca977883c5f2e90ddc4163f674e5064308955ba1363a58fbc7cc56e7f357ce557329422cd6e777d34ae023bac80403f2608dc697b0d3d0549a40de
+  metadata.gz: 104a24a17ebfe4e227cd4b993b9d3c47c601b70c95c6fe1adc5ed757310e8f8af5eb2b9d40ead0e7eb3fe580d6fb3c0555f42618025ad23145dbbe5b7321dc4e
+  data.tar.gz: 2e629f323d6ebc0b9003980348a45754d1a03043a77d1fb92f20a9e67c3673b4cd24fc7076b61ffba772144dc952162e015f763a5a21f2687a9246fc78f591ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelastic (0.3.0)
+    zelastic (0.3.1)
       activesupport
 
 GEM

data/README.md

@@ -48,6 +48,9 @@ You can also override some defaults, if you wish:
 - `write_alias`: by default this is the `read_alias`, with `_write` appended
 - `type`: by default this is `read_alias.singularize`
 
+If you pass an array to as the `client` argument, all writes will be applied to every client in the
+array.
+
 ### Normal usage
 
 You'll need to make sure the following gets run whenever an instance of MyModel is updated:
@@ -83,7 +86,7 @@ points at both the old and new indices, so both receive writes. The following st
 full reindex:
 
 1. `new_name = SecureRandom.hex(3)`
-2. `index_manager = Zelastic::IndexManager.new(MyModelIndex)`
+2. `index_manager = Zelastic::IndexManager.new(MyModelIndex, client: Elasticsearch::Client.new(...))`
 2. `index_manager.create_index(new_name)`
 3. `index_manager.populate_index(new_name, batch_size: 3000)`
 4. Check that the new index is looking alrightish
@@ -92,6 +95,10 @@ full reindex:
 7. `index_manager.stop_dual_writes`
 8. `index_manager.cleanup_old_indices`
 
+The `client` keyword argument to `Zelastic::IndexManager.new` is optional. It defaults to the client
+passed to `Zelastic::Config.new`, if one client is passed, or the first client in the array, if an
+array is passed to `Zelastic::Config.new`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/zelastic/index_manager.rb

@@ -28,7 +28,7 @@ module Zelastic
                    end
 
       config.data_source.find_in_batches(batch_size: batch_size) do |batch|
-        indexer.index_batch(batch, index_name: index_name)
+        indexer.index_batch(batch, client: client, index_name: index_name)
       end
     end
 

data/lib/zelastic/indexer.rb

@@ -17,11 +17,11 @@ module Zelastic
       @config = config
     end
 
-    def index_batch(batch, index_name: nil)
+    def index_batch(batch, client: nil, index_name: nil)
       logger.info("ES: Indexing #{config.type} record")
 
       version = current_version
-      execute_bulk do |index_name|
+      execute_bulk(client: client, index_name: index_name) do |index_name|
         batch.map do |record|
           index_command(index: index_name, version: version, record: record)
         end
@@ -90,9 +90,14 @@ module Zelastic
       }
     end
 
-    def execute_bulk
+    def execute_bulk(client: nil, index_name: nil)
+      clients = Array(client || config.clients)
+
       config.clients.map do |client|
-        commands = write_indices(client).map { |index_name| yield(index) }
+        indices = Array(index_name || write_indices(client))
+
+        commands = indices.map { |index_name| yield(index) }
+
         client.bulk(body: commands).tap do |result|
           raise IndexingError, result if result['errors']
         end

data/lib/zelastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zelastic
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - carwow Developers