ej 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1f79efd243a83e80d9b4ace0f58213ceee0c76
-  data.tar.gz: bc86ffef97ad3a387c332a735437c661f6825970
+  metadata.gz: 1c2fa0d4e1e6e487bad78a7aca5dd1835cfb2081
+  data.tar.gz: 13aec98633b2fda985ae14ccfa320c9f28c73223
 SHA512:
-  metadata.gz: 4a1074107c6d568c830ee1153d5adf0b294bcaf7c408ee45117cd4a05b0a09504aa4d362b9f88d6b4bab4e916eb8d29687bbd327681ce8e258b94002cf144ee9
-  data.tar.gz: 5b627b9a60eb8cc01194795bb63aa99a9e28c03151b3964288a1bf18f763ae8f418f18706dbb8c95815e33598ca2b75bcd9731058d2a81bf2749fb29f814a2a6
+  metadata.gz: 683b1f431d24d4adc5028bf5bda1056067c9a4d9bb4367506430a6b5a61af3f22c03107d28404bdb44c3db7d615baa697f3b8513bf39c48c32b9897d387dc229
+  data.tar.gz: 638fb4221ed2c5c743a13f950f7dadc1bcd24582e168c9d16a9002b192123d6d504e15bb7591753b8cf924ccb5171cbde5d874c6e7ae71bbc011c1c9aa2b97f0

data/lib/ej/core.rb

@@ -148,8 +148,8 @@ module Ej
     end
 
     def copy(source, dest, query, per_size, scroll, dest_index, slice_max)
-      source_client = Elasticsearch::Client.new hosts: source
-      dest_client = Elasticsearch::Client.new hosts: dest
+      source_client = Elasticsearch::Client.new transport: Util.get_transport(Util.parse_hosts(source))
+      dest_client = Elasticsearch::Client.new transport: Util.get_transport(Util.parse_hosts(dest))
 
       parallel_array = slice_max ? slice_max.times.to_a : [0]
       Parallel.map(parallel_array, :in_processes=>parallel_array.size) do |slice_id|

data/lib/ej/util.rb

@@ -19,5 +19,33 @@ module Ej
     def self.get_sources(results)
       results.hits.hits.map { |result| result._source }
     end
+
+    def self.get_transport(hosts)
+      transport = ::Elasticsearch::Transport::Transport::HTTP::Faraday.new(
+        {
+          hosts: hosts,
+          options: {
+            reload_connections: true,
+            reload_on_failure: false,
+            retry_on_failure: 5,
+            transport_options: {
+              headers: { 'Content-Type' => 'application/json' },
+              request: { timeout: 300 }
+            }
+          }
+        }
+      )
+      return transport
+    end
+
+    def self.parse_hosts(host_string, user = nil, password = nil)
+      host, port = (host_string || DEFAULT_HOST), DEFAULT_PORT
+      if !host_string.nil? && host_string.include?(":")
+        host, port = host_string.split(':')
+      end
+
+      hosts = [{ host: host, port: port.to_i, user: user, password: password }]
+      return hosts
+    end
   end
 end

data/lib/ej/values.rb

@@ -12,26 +12,8 @@ module Ej
     end
 
     def get_client(host_string, index, user, password)
-      host, port = (host_string || DEFAULT_HOST), DEFAULT_PORT
-      if !host_string.nil? && host_string.include?(":")
-        host, port = host_string.split(':')
-      end
-
-      hosts = [{ host: host, port: port, user: user, password: password }]
-      transport = ::Elasticsearch::Transport::Transport::HTTP::Faraday.new(
-        {
-          hosts: hosts,
-          options: {
-            reload_connections: true,
-            reload_on_failure: false,
-            retry_on_failure: 5,
-            transport_options: {
-              request: { timeout: 300 }
-            }
-          }
-        }
-      )
-      ::Elasticsearch::Client.new transport: transport, index: index, logger: @logger
+      hosts = Util.parse_hosts(host_string, user, password)
+      ::Elasticsearch::Client.new transport: Util.get_transport(hosts), index: index, logger: @logger
     end
   end
 end

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.1.12'
+  VERSION = '0.2.0'
 end

data/spec/util_spec.rb

@@ -31,6 +31,13 @@ describe Ej::Util do
     Util.generate_id('%s_%s', {"id" => 1, "name" => "rspec"}, ['id', 'name']).should == '1_rspec'
   end
 
+  it "parse hosts" do
+    Util.parse_hosts(nil).should == [{ host: 'localhost', port: 9200, user: nil, password: nil }]
+    Util.parse_hosts("localhost").should == [{ host: 'localhost', port: 9200, user: nil, password: nil }]
+    Util.parse_hosts("localhost:9100").should == [{ host: 'localhost', port: 9100, user: nil, password: nil }]
+    Util.parse_hosts("localhost:9100", 'user', 'password').should == [{ host: 'localhost', port: 9100, user: 'user', password: 'password' }]
+  end
+
   after do
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler