create_custom_attributes 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3116f92a168ab1d124c5bbf6c8fd1226291f1969
-  data.tar.gz: a579b89c34f3563af99247cb60d6b738d7b5d1f0
+  metadata.gz: 05a8198fbc2cce5bbbd6f04e176b7185fcfb0076
+  data.tar.gz: 4af787babaaea1d564c7238b7e8669772153ecd1
 SHA512:
-  metadata.gz: c1128e995802e6629d894e0f22bb4092d148cc7809b747887edf7bafa01b5855823f0eefe18d9896fdc74c61a7db48a4df5808dd14e853998a5961486c8ce231
-  data.tar.gz: 63398f39caeef362bcad56e0e1e07946a90d6450e7ffdf2ba66e6356342ee37044706f8bd05d0eca57afbf5e9e57423352d90c11390093c26cf2f146f0b68c7d
+  metadata.gz: 2cd13b036d2ce5280b34d75590592df4bbf3351364f2a5b6e933e43a1b84ebd10c04f44962324f9512949bb15f7867414538b7668e0574de9efbdea83f8b3685
+  data.tar.gz: 949c544b636f033e569a215d4396139310fdcf2483deb573f837b650dd3c8211aea2372714a4cd858d960856956c2083cb82b09a140f06cb98689d2620bd2a10

data/lib/custom_attributes.rb

@@ -28,7 +28,7 @@ module CustomAttributes
   @config = {
     search_user: ENV["ELASTICSEARCH_USER"] || 'elastic',
     search_pass: ENV["ELASTICSEARCH_PASSWORD"] || 'changeme',
-    search_host: ENV["ELASTICSEARCH_HOST"] || 'localhost:9200',
+    search_host: ENV["ELASTICSEARCH_HOST"] || 'http://localhost:9200',
     search_index_prefix: ENV["ELASTICSEARCH_INDEX_PREFIX"] || 'es'
   }
 
@@ -47,6 +47,16 @@ module CustomAttributes
 
   def self.after_configuration
     # Set up ElasticSearch
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: "http://#{@config[:search_user]}:#{@config[:search_pass]}@#{@config[:search_host]}"
+    uri = URI(@config[:search_host])
+
+    if @config[:search_user].present? && @config[:search_pass].present?
+      host = "#{uri.scheme}://#{@config[:search_user]}:#{@config[:search_pass]}@#{uri.host}"
+    else
+      host = uri.host
+    end
+
+    host = "#{host}:#{uri.port}" if uri.port.present?
+
+    Elasticsearch::Model.client = Elasticsearch::Client.new host: host
   end
 end

data/lib/custom_attributes/version.rb

@@ -1,3 +1,3 @@
 module CustomAttributes
-  VERSION = '0.5.23'.freeze
+  VERSION = '0.5.24'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: create_custom_attributes
 version: !ruby/object:Gem::Version
-  version: 0.5.23
+  version: 0.5.24
 platform: ruby
 authors:
 - Daniel Grützmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails