etcd-discovery 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22d9ff32c7372703f77f239c45b9a35fa1ec569
-  data.tar.gz: 80e47d7f2a449ff8b2bf25b8b8f7a2e69f38a5b2
+  metadata.gz: 163c6cc3af01710f2998906408bcc4b90e88820c
+  data.tar.gz: 149f5d852f18ccdeec8660049083e5b5fc532765
 SHA512:
-  metadata.gz: 2ad41dc2d9a4b5c3baa848db55fa3943f326d3999ca4b94b18ebdcb0acc0cf20c27b609faa7dc03a920f746fce44be5814a41f2c3ea8318edffd28ac1c1dcb9a
-  data.tar.gz: f7552e575cf892c624814f8b75557c4c486ad192369f59c873a117aa463f577622b59e5fb1237699e1b4a18e650930a4dc45430d5202ad744b2996541f898eb3
+  metadata.gz: a5af9928c529cdf705473a1dcf650e0286343456546a5cb55c6ad23f1c0210b349f5f2b0305550c8c491dfe383c8e76e00faea5dbf28fbda332d0ea489d21575
+  data.tar.gz: fbfcfce924f3ec3b739134128dfa987698209fbb52adce68cd32a7340d56981f10ce5e0195f6ab557892a5a43365e5f182ddf436ca1a9bc3e2200a7acf85db20

data/lib/etcd-discovery/host.rb

@@ -1,41 +1,37 @@
-class Hash
-  def capitalize_keys
-    new_hash = {}
-    self.each do |k,v|
-      new_hash[k.to_s.capitalize] = v
-    end
-    return new_hash
+module EtcdDiscovery
+  class InvalidHost < RuntimeError
   end
-end
 
-module EtcdDiscovery
   class Host
-    attr_accessor :hostname, :port, :user, :password
+    attr_accessor :attributes
 
     def initialize(arg)
       if arg.is_a? Etcd::Node
-        params = JSON.parse arg.value
+        @attributes = JSON.parse arg.value
       elsif arg.is_a? Hash
-        params = arg.capitalize_keys
+        @attributes = arg
       else
         raise TypeError, "requires a Etcd::Node or a Hash, not a #{arg.class}"
       end
-      @hostname = params['Name']
-      @port = params['Port']
-      @user = params['User']
-      @password = params['Password']
-
-      if @hostname.nil? or @hostname.empty?
-        @hostname = Socket.gethostname
+      if !attributes.has_key? 'name' or !attributes.has_key? 'port'
+        raise InvalidHost, "attributes 'name' and 'port' should be defined"
       end
+      @user = params['user'] || ""
+      @password = params['password'] || ""
+      @scheme = params['scheme'] || "http"
     end
 
     def to_json
-      {"Name" => @hostname, "Port" => @port, "User" => @user, "Password" => @password}.to_json
+      attributes.to_json
     end
 
     def to_uri
-      URI("http://#{user}:#{password}@#{hostname}:#{port}")
+      a = attributes # Shorten name
+      URI("#{a['scheme']}://#{a['user']}:#{a['password']}@#{a['name']}:#{a['port']}")
+    end
+
+    def to_s
+      self.to_uri.to_s
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Léo Unbekandt