es-reindex 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd1bacbfe466185d042ad4c4e0a376465247effd
-  data.tar.gz: 8c57e5ffc56aced527ae24fdeed9f503055cc1fb
+  metadata.gz: 6bb1862c74c923e6e30a22bc694f2b4cc97a11ac
+  data.tar.gz: bc5529358af365d1803a6d5c5a5158c6e265fd36
 SHA512:
-  metadata.gz: 8c72172b076d24e2bcd034f78099085168aa3f47cd3607b643f43b9a2bd8346d7ed82920e20bf25bfe9cd07e1579f4da9a0390fc8722fcab0b8ce32c0800882f
-  data.tar.gz: 12735b79ed00178836f866ea5c55e6601e6a9a0fecb79fab481bfdce31acbc58d5915a1b07011c064476bee23e225ca88b20b6f274e493ab1f5c8cd127ade92d
+  metadata.gz: 5eec5cb2304c337e4fd242f2035d99354f1542939948830292f5a94f4a1d4d684e066f1a6cd576e23f27fac84678d203d9fad544ce81235c337beeff0ec8b99d
+  data.tar.gz: 341436662c907031f3ed38ead2e96dca6a2228203b47b6c70d5d7a1f6a9f84cd648c01d5b61d0332dc30f2811057f603660ecb061d647b7269772ee8fd69ccd7

data/CHANGELOG.markdown

@@ -1,6 +1,7 @@
 ## Changelog
 
-+ __0.3.1__:  Add activesupport dependency since es-reindex uses methods from it.
++ __0.3.2__: Remove activesupport dependency entirely, handle aliased indices [@waterlink](https://github.com/waterlink)
++ __0.3.1__: Add activesupport dependency since es-reindex uses methods from it.
 + __0.3.0__: Add `:if` and `:unless` callbacks
 + __0.2.1__: [BUGFIX] Improve callback presence check
 + __0.2.0__: Lots of bugfixes, use elasticsearch client gem, add .reindex! method and callbacks

data/es-reindex.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'elasticsearch', '>= 1.0.0'
-  s.add_runtime_dependency 'activesupport', '>= 0'
 
   # Development Dependencies:
   s.add_development_dependency 'elasticsearch-persistence', '~> 0.1'

data/lib/es-reindex.rb

@@ -39,7 +39,7 @@ class ESReindex
     %w{
       if unless mappings settings before_create after_create before_each after_each after_copy
     }.each do |callback|
-      if options[callback.to_sym].present? && !options[callback.to_sym].respond_to?(:call)
+      if options.has_key?(callback.to_sym) && !options[callback.to_sym].respond_to?(:call)
         raise ArgumentError, "#{callback} must be a callable object"
       end
     end
@@ -65,8 +65,8 @@ class ESReindex
 
   def okay_to_proceed?
     okay = true
-    okay = options[:if].call(sclient, dclient) if options[:if].present?
-    okay = (okay && !(options[:unless].call sclient, dclient)) if options[:unless].present?
+    okay = options[:if].call(sclient, dclient) if options.has_key?(:if)
+    okay = (okay && !(options[:unless].call sclient, dclient)) if options.has_key?(:unless)
     log 'Skipping action due to guard callbacks' unless okay
     okay
   end
@@ -113,13 +113,13 @@ class ESReindex
         create_msg = ""
       end
 
-      options[:before_create].try(:call)
+      options[:before_create] && options[:before_create].call
 
       log "Creating '#{durl}/#{didx}' index#{create_msg}..."
       dclient.indices.create index: didx, body: { settings: settings, mappings: mappings }
       log "Succesfully created '#{durl}/#{didx}''#{create_msg}."
 
-      options[:after_create].try(:call)
+      options[:after_create] && options[:after_create].call
     end
 
     true
@@ -131,7 +131,7 @@ class ESReindex
       return false
     end
 
-    @settings = settings[sidx]["settings"]
+    @settings = fetch_index_config(settings, sidx)["settings"]
     @settings["index"]["version"].delete "created"
   end
 
@@ -140,7 +140,7 @@ class ESReindex
       log "Failed to obtain original index '#{surl}/#{sidx}' mappings!", :error
       return false
     end
-    @mappings = mappings[sidx]["mappings"]
+    @mappings = fetch_index_config(mappings, sidx)["mappings"]
   end
 
   def copy_docs
@@ -157,13 +157,13 @@ class ESReindex
     while scroll = sclient.scroll(scroll_id: scroll['_scroll_id'], scroll: '10m') and not scroll['hits']['hits'].empty? do
       bulk = []
       scroll['hits']['hits'].each do |doc|
-        options[:before_each].try(:call)
+        options[:before_each] && options[:before_each].call
         ### === implement possible modifications to the document
         ### === end modifications to the document
         base = {'_index' => didx, '_id' => doc['_id'], '_type' => doc['_type'], data: doc['_source']}
         bulk << {action => base}
         @done = done + 1
-        options[:after_each].try(:call)
+        options[:after_each] && options[:after_each].call
       end
       unless bulk.empty?
         dclient.bulk body: bulk
@@ -175,7 +175,7 @@ class ESReindex
 
     log "Copy progress: %u/%u done in %s.\n" % [done, total, tm_len]
 
-    options[:after_copy].try(:call)
+    options[:after_copy] && options[:after_copy].call
 
     true
   end
@@ -242,4 +242,11 @@ private
     out
   end
 
+  # Accounts for aliased indices. When index is aliased there will not
+  # be a key nor in settings, nor in mappings. But there will be the
+  # only key for original index name.
+  def fetch_index_config(config, index)
+    config.fetch(index) { config.values.first }
+  end
+
 end

data/lib/es-reindex/version.rb

@@ -1,3 +1,3 @@
 class ESReindex
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/integration/copy_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe "copy!", type: :integration do
   let(:orig_index_name)  { "test_index" }
   let(:new_index_name)   { "test_index_clone" }
+  let(:orig_index_alias) { "test_index_alias" }
 
   let!(:original_klass)  { test_klass index_name: orig_index_name }
   let!(:new_klass)       { test_klass index_name: new_index_name }
@@ -10,6 +11,9 @@ describe "copy!", type: :integration do
   let(:test_post)        { original_klass.create id: 1, text: 'test_post' }
   let(:test_post_2)      { new_klass.create      id: 2, text: 'other_post' }
 
+  let(:elastic_client)   { Elasticsearch::Client.new(host: ES_HOST, log: false) }
+  let(:alias_index)      { elastic_client.indices.put_alias(index: orig_index_name, name: orig_index_alias) }
+
   # Create the index (test_index) on the test_klass:
   before do
     original_klass.create_index!
@@ -22,6 +26,12 @@ describe "copy!", type: :integration do
     expect(new_klass.find test_post.id).to be_present
   end
 
+  it "copies the aliased index" do
+    alias_index
+    ESReindex.copy! "#{ES_HOST}/#{orig_index_alias}", "#{ES_HOST}/#{new_index_name}", {}
+    expect(new_klass.find test_post.id).to be_present
+  end
+
   context "when the destination index already exists" do
 
     # Create the index (test_index_clone) on the destination klass:

data/spec/integration/reindex_spec.rb

@@ -3,12 +3,16 @@ require 'spec_helper'
 describe "reindex!", type: :integration do
   let(:orig_index_name)  { "test_index" }
   let(:new_index_name)   { "test_index_clone" }
+  let(:orig_index_alias) { "test_index_alias" }
 
   let!(:original_klass)  { test_klass index_name: orig_index_name }
   let!(:new_klass)       { test_klass index_name: new_index_name, attributes: [:foo] }
 
   let(:test_post)        { original_klass.create id: 1, text: 'test_post' }
 
+  let(:elastic_client)   { Elasticsearch::Client.new(host: ES_HOST, log: false) }
+  let(:alias_index)      { elastic_client.indices.put_alias(index: orig_index_name, name: orig_index_alias) }
+
   # Create the index (test_index) on the test_klass:
   before do
     original_klass.create_index!
@@ -16,13 +20,14 @@ describe "reindex!", type: :integration do
     original_klass.refresh_index!
   end
 
-  let(:reindexed_post) { new_klass.find test_post.id }
+  let(:reindexed_post)  { new_klass.find test_post.id }
 
-  let(:reindex)    { ESReindex.reindex! "#{ES_HOST}/#{orig_index_name}", "#{ES_HOST}/#{new_index_name}", opts }
-  let(:mappings)   { ->{ new_klass.mappings } }
-  let(:settings)   { ->{ new_klass.settings } }
-  let(:other_opts) { {} }
-  let(:opts)       { {mappings: mappings, settings: settings}.merge other_opts }
+  let(:reindex)         { ESReindex.reindex! "#{ES_HOST}/#{orig_index_name}", "#{ES_HOST}/#{new_index_name}", opts }
+  let(:aliased_reindex) { ESReindex.reindex! "#{ES_HOST}/#{orig_index_alias}", "#{ES_HOST}/#{new_index_name}", opts }
+  let(:mappings)        { ->{ new_klass.mappings } }
+  let(:settings)        { ->{ new_klass.settings } }
+  let(:other_opts)      { {} }
+  let(:opts)            { {mappings: mappings, settings: settings}.merge other_opts }
 
   it "reindexes with the selected mappings" do
     reindex
@@ -32,6 +37,16 @@ describe "reindex!", type: :integration do
     expect(reindexed_post).to respond_to :foo
   end
 
+  it "reindexes alias with the selected mappings" do
+    alias_index
+
+    aliased_reindex
+
+    expect(reindexed_post.id).to   eq test_post.id
+    expect(reindexed_post.text).to eq test_post.text
+    expect(reindexed_post).to respond_to :foo
+  end
+
   context "with a :unless guard" do
     let(:other_opts) do
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: es-reindex
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Justin Aiken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !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-persistence
   requirement: !ruby/object:Gem::Requirement