embulk-output-elasticsearch_ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a39cfe60830d7b5eef921678236f63b294c80cc
-  data.tar.gz: 8c19d1d98c742dbdfea65c5a10bb45d8c0d1e5b8
+  metadata.gz: fa58203826c27f09b0718aef621215454a566ba8
+  data.tar.gz: 56df8f9037ab43256371ac5ce6676fd2b4090b51
 SHA512:
-  metadata.gz: c2605199832fe17c37fc9e1e9afeca4d4acc29054b97c188f49cb7cddcbfebd2a408f3b7c54337b202b2f2d63a178e3719c35ea0548f96f935b7c9da6fc33333
-  data.tar.gz: 8f7b3d9f33eae1a8cee0ef13f8518df4fe1bcb6fd5a8c0502390baff94683e43b7a3082e4f39fe5c5facf755e747c7fffacf904ce12bb762b7b9a64f8e6ed43f
+  metadata.gz: 2d8b36ea7a732fb07726c5c0ab97c29f74f6c4d0becfe05944004ee4dd504da0d783ec3e6d3435c959f9e2a2490b23cc2ecda4802fd98082080c0fbd0f211059
+  data.tar.gz: 88726e478cd79064319e478457b7144d8b762e867d5bc206d6fdc000bec394d8fb3624ac6018c52c6c2a84285b600c4ee016576a706b79eb81ec250258b377a6

data/embulk-output-elasticsearch_ruby.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-elasticsearch_ruby"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   spec.authors       = ["toyama0919"]
   spec.summary       = "Elasticsearch Ruby output plugin for Embulk. Elasticsearch 1.X AND 2.X AND 5.X compatible."
   spec.description   = "Dumps records to Elasticsearch Ruby. Elasticsearch 1.X AND 2.X AND 5.X compatible."

data/lib/embulk/output/elasticsearch_ruby.rb

@@ -25,10 +25,17 @@ module Embulk
           "retry_on_failure" => config.param("retry_on_failure", :integer, default: 5),
           "before_template_name" => config.param("before_template_name", :string, default: nil),
           "before_template" => config.param("before_template", :hash, default: nil),
+          "current_index_name" => config.param("current_index_name", :string, default: nil),
         }
         task['time_value'] = Time.now.strftime('%Y.%m.%d.%H.%M.%S')
         task['index'] = Time.now.strftime(task['index'])
 
+        task['current_index_name'] = if task['current_index_name']
+          task['current_index_name']
+        else
+          "#{task['index']}-#{task['index_type']}-#{task['time_value']}"
+        end
+
         unless ENABLE_MODE.include?(task['mode'])
           raise ConfigError.new "`mode` must be one of #{ENABLE_MODE.join(', ')}"
         end
@@ -79,8 +86,7 @@ module Embulk
       end
 
       def self.delete_aliases(client, task)
-        indices = client.indices.get_aliases.select { |key, value| value['aliases'].include? task['index'] }.keys
-        indices = indices.select { |index| /^#{get_index_prefix(task)}-(\d*)/ =~ index }
+        indices = client.indices.get_alias(name: task['index']).keys
         indices.each { |index|
           if index != get_index(task)
             client.indices.delete_alias index: index, name: task['index']
@@ -94,11 +100,7 @@ module Embulk
       end
 
       def self.get_index(task)
-        task['mode'] == 'replace' ? "#{get_index_prefix(task)}-#{task['time_value']}" : task['index']
-      end
-
-      def self.get_index_prefix(task)
-        "#{task['index']}-#{task['index_type']}"
+        task['mode'] == 'replace' ? task['current_index_name'] : task['index']
       end
 
       #def self.resume(task, schema, count, &control)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - toyama0919
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement