etzetera 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73fc2315ad20e1c55f18abc038a91a8c421db23b
-  data.tar.gz: 3da9c93725f944bd2e25e6cc6027fe73f82f3ec9
+  metadata.gz: 38612bce2ee17586f79f5cfd8d8c33c756e64092
+  data.tar.gz: dd6df3080f822e663f1c1fef03cafdfb569849d5
 SHA512:
-  metadata.gz: c3dceaf0c0abc8f3cee6498f4dedd4fe7e7a74fae42295f3c1d819e5cc5718e0e49b9efdfbcb0ddde838665f4acbfc661c0dafb5837ce58c6f72b336e82e8cda
-  data.tar.gz: f2db07d363b48dc409b3b4e9a3fb3797a5f649aeb48404931dd2c16d23d294d8647337b41ab081b879d32912f44372f70ed05a80eca6803a03fa2cc181a8ec4a
+  metadata.gz: 891492fc076d758d6745758615cd7bd61131dcdb3e09b0d65fec6dfe615013b66f11299a0989494bd76e9e4a767629a41f6ab11d77b263d58afd5e0a108cd58e
+  data.tar.gz: f3340a534150032db397a562fe4dec957335eb4d649bce6a14f6df5b98dd149698b272cd6299bae51a3a4ef8970e1faa3252bbf3f858ffdb7bcfeadf15462b0d

data/lib/etzetera/client.rb

@@ -1,10 +1,11 @@
 require 'celluloid/io'
-require 'time'
 require 'multi_json'
 
 module Etzetera
   class Client
+    include Celluloid::Logger
     include Celluloid::IO
+
     API_VERSION   = 'v2'.freeze
     KEYS_PREFIX   = "/#{API_VERSION}/keys".freeze
     LOCK_PREFIX   = "/mod/#{API_VERSION}/lock/".freeze
@@ -22,16 +23,15 @@ module Etzetera
       def_opts = default_options.dup
 
       opts = {}
-      opts[:headers]            = {:accept => 'application/json'}
-      opts[:response]           = :object
-      opts[:socket_class]       = Celluloid::IO::TCPSocket
-      opts[:ssl_socket_class]   = Celluloid::IO::SSLSocket
+      opts[:headers]          = {:accept => 'application/json'}
+      opts[:response]         = :object
+      opts[:socket_class]     = Celluloid::IO::TCPSocket
+      opts[:ssl_socket_class] = Celluloid::IO::SSLSocket
 
       @etcd_opts = {}
       @etcd_opts[:election_timeout]   = def_opts.delete(:election_timeout) {|key| 200}
       @etcd_opts[:heartbeat_interval] = def_opts.delete(:heartbeat_interval) {|key| 50}
 
-
       @default_options = ::HTTP::Options.new(opts.merge(def_opts))
     end
 
@@ -61,15 +61,15 @@ module Etzetera
     end
 
     def create(key, form, params = {})
-      request(:put, KEYS_PREFIX, key, form: form, :params => params.merge({:prevExist => false}))
+      request(:put, KEYS_PREFIX, key, :form => form, :params => params.merge({:prevExist => false}))
     end
 
     def update(key, form, params = {})
-      request(:put, KEYS_PREFIX, key, form: form, :params => params.merge({:prevExist => true}))
+      request(:put, KEYS_PREFIX, key, :form => form, :params => params.merge({:prevExist => true}))
     end
 
     def mkdir(dir)
-      request(:put, KEYS_PREFIX, dir, :params => {dir: true})
+      request(:put, KEYS_PREFIX, dir, :params => {:dir => true})
     end
 
     def dir(dir, params = {})
@@ -131,37 +131,47 @@ module Etzetera
       client  = ::HTTP::Client.new(opts)
       server  = servers.first
       retries = servers.count - 1
-      request = nil
+      req = nil
+
       begin
-        request = client.request(verb, "#{server}#{prefix}#{path}")
-        MultiJson.load(request.body)
+        req = client.request(verb, "#{server}#{prefix}#{path}")
+        response = MultiJson.load(req.body)
+        unless response['errorCode']
+          response
+        else
+          abort Error::CODES[response['errorCode']].new(response['message'])
+        end
       rescue IOError => e
         abort e if retries < 1
 
+        #sleep (@etcd_opts[:election_timeout] / 1000.0)
+
         old_server  = server
         new_servers = servers.dup
         new_servers.delete(old_server)
-        # Would be nice if you could get the host:port combination of the new leader via etcd.
-        # Or maybe i haven't looked good enough ^^
+        # Would be nice if you could get the host:port combination of the new leader directly.
         server = new_servers.sample
 
         servers.swap!(servers.index(old_server), servers.index(server))
 
         retries -= 1
 
-        #sleep (@etcd_opts[:election_timeout] / 1000.0)
         retry
+        # etcd is inconsistent in the way it handles http responses
+        # instead of adopting their buggy behaviour (all 5** errors are text, 4** errors are json,
+        # but both respond with text/plain content-type) i just use exceptions for flow control :<
       rescue MultiJson::LoadError => e
-        if request.code.between?(200, 299)
-          request.body.to_s
-        elsif request.code.between?(300, 399)
-          if request.headers['Location']
-            request(verb, request.headers['Location'], opts)
+        if req.code.between?(200, 299)
+          req.body.to_s
+        elsif req.code.between?(300, 399)
+          if req.headers['Location']
+            debug req.headers['Location']
+            request(verb, '', req.headers['Location'], opts)
           end
-        elsif request.code.between?(400, 499)
-          abort Error::HttpClientError.new("#{request.reason}\n#{request.body.to_s}")
-        elsif request.code.between?(500, 599)
-          abort Error::HttpServerError.new("#{request.reason}\n#{request.body.to_s}")
+        elsif req.code.between?(400, 499)
+          abort Error::HttpClientError.new("#{req.reason}\n\t#{req.body}")
+        elsif req.code.between?(500, 599)
+          abort Error::HttpServerError.new("#{req.reason}\n\t#{req.body}")
         else
           abort Error::EtzeteraError.new(e)
         end

data/lib/etzetera/version.rb

@@ -1,3 +1,3 @@
 module Etzetera
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etzetera
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Hendrik
@@ -31,7 +31,7 @@ cert_chain:
   fESaRa24pr3CGd0AyltcRbKGfNpZfj1zfqWXrDUJj0Y1sOASd8+UZPmBFS2feJqy
   het/fGFD7akMwHXIlNxNsg==
   -----END CERTIFICATE-----
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -128,3 +128,4 @@ signing_key:
 specification_version: 4
 summary: etcd ruby client
 test_files: []
+has_rdoc: