etcd-discovery 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7089eb535dddfc946e32637321395451c748d86d
-  data.tar.gz: c8e76dedbe3dfb033b3e723f7c371d34dc62a481
+  metadata.gz: 960dc0430e6a20341f0fef6abf70a983809ac5d5
+  data.tar.gz: cec0aeba3b3d129be5f8e39cedd8c7e72803a914
 SHA512:
-  metadata.gz: 4f91a7f283f8a72238aa61134247a8106f5646762a3dc0dcfdb2055df72dbe7803fb814eeae0b7560d71764415d09fda6e408d22a0fdd6917cc7ef5a92ed6031
-  data.tar.gz: 17eed9d65421cf3a8f02c8cbbb56193cd31c293ee6f9a29fc6319e07b542b54b667c069a604413ebce901e959b522224baeaa4e7687563f5274a31bd48d20e7e
+  metadata.gz: 955d3be4ffaabf4e733a940a7e5defa90f1dd4e688477595bd4b2bf67840b416cafe369492af8dd74efa5940234ecdb0757e61db247c7a951f5d103e88e60ee4
+  data.tar.gz: acd4e8b4d6ba5e228064174c379ace5aec37ffdc6080a46b27f65d948e8ff83acc1f981825b391e570f83d732f4be424d5bcec6502887da3964fccf78de37e04

data/lib/etcd-discovery/host.rb

@@ -13,24 +13,23 @@ module EtcdDiscovery
       else
         raise TypeError, "requires a Etcd::Node or a Hash, not a #{arg.class}"
       end
-      if !attributes.has_key?('name') or !attributes.has_key?('port')
-        raise InvalidHost, "attributes 'name' and 'port' should be defined"
+      if !attributes.has_key?('name') or !attributes.has_key?('ports')
+        raise InvalidHost, "attributes 'name' and 'ports' should be defined"
       end
       attributes['user'] = "" if attributes['user'].nil?
       attributes['password'] = "" if attributes['password'].nil?
-      attributes['scheme'] = "http" if attributes['scheme'].nil?
     end
 
     def to_json
       attributes.to_json
     end
 
-    def to_uri
+    def to_uri(scheme = "http")
       a = attributes # Shorten name
       if a['user'].empty?
-        URI("#{a['scheme']}://#{a['name']}:#{a['port']}")
+        URI("#{scheme}://#{a['name']}:#{a['ports'][scheme]}")
       else
-        URI("#{a['scheme']}://#{a['user']}:#{a['password']}@#{a['name']}:#{a['port']}")
+        URI("#{scheme}://#{a['user']}:#{a['password']}@#{a['name']}:#{a['ports'][scheme]}")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Léo Unbekandt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd