es-reindex 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eed6bf0fb22e4ef0644bc07f8044707489dcac19
-  data.tar.gz: 785f245811cf514f8ccd50fb5bd6b24d91e65b81
+  metadata.gz: 0bfec9b90b4f6f60bca9fbc2e31b512e91859ee0
+  data.tar.gz: 34d5f1814a05ad2cb3eeee1427bb8fb1126006a0
 SHA512:
-  metadata.gz: 6504ac4e4e7b46ba4e00c15bf2d90889e688479389d9ec399e571d67a709caa3324fb65f6b57d38c7f6558dd85acd9a017ebbea3855fb63ef71e40454b43359f
-  data.tar.gz: c01e98b13e0edcd1c6075827b2236e4666eb5759772c79e60722cfe8bde36062776df149feeaf18c8acc1a15cc032cd0157aeea14d3f14410fd0b6ac3c0ac8a4
+  metadata.gz: fa461c5f68ded8c5e1fb03436cc414df23d7c7dd21e8896c29675c21f6d1a5b5114db2a19de2027d0bbd6ccb773441fb9b59781bf1b769b9d60a597e17828ead
+  data.tar.gz: 0a7288a5c3a040c061f99bdb32f3153789cf76d13827535f3a2a5f866469d65527e4f85d2df1f184c40506fe01ad8afd47bca3f60c3f05cf23332e4963f84b38

data/README.markdown

@@ -79,6 +79,7 @@ ESReindex.copy! 'http://my_server/index', 'http://my_server/index_copy',
 
 ## Changelog
 
++ __0.2.1__: [BUGFIX] Improve callback presence check
 + __0.2.0__: Lots of bugfixes, use elasticsearch client gem, add .reindex! method and callbacks
 + __0.1.0__: First gem release
 + __0.0.9__: Gemification, Oj -> MultiJSON

data/lib/es-reindex.rb

@@ -97,13 +97,13 @@ class ESReindex
         create_msg = ""
       end
 
-      options[:before_create].call if options[:before_create].present?
+      options[:before_create].call if options[:before_create] && options[:before_create].respond_to?(: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].call if options[:after_create].present?
+      options[:after_create].call if options[:after_create] && options[:after_create].respond_to?(:call)
     end
 
     true
@@ -141,13 +141,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].call doc if options[:before_each].present?
+        options[:before_each].call doc if options[:before_each] && options[:before_each].respond_to?(: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].call doc if options[:after_each].present?
+        options[:after_each].call doc if options[:after_each] && options[:after_each].respond_to?(:call)
       end
       unless bulk.empty?
         dclient.bulk body: bulk
@@ -159,7 +159,7 @@ class ESReindex
 
     log "Copy progress: %u/%u done in %s.\n" % [done, total, tm_len]
 
-    options[:after_copy].call if options[:after_copy].present?
+    options[:after_copy].call if options[:after_copy] && options[:after_copy].respond_to?(:call)
 
     true
   end

data/lib/es-reindex/version.rb

@@ -1,3 +1,3 @@
 class ESReindex
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: es-reindex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Justin Aiken