etzetera 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b906687f396131b310efde4ea7de4bd162bcf4f
-  data.tar.gz: 391ea748349c13765056bef8b778bfb6930ec3f7
+  metadata.gz: 8b4e2c26fd128ba900ac46cd4164bf0ff33cc860
+  data.tar.gz: 941f5e9dc5e869aa0ee375c9f855ddc258afbe8e
 SHA512:
-  metadata.gz: 54341e3866f703c11c54bbb27c26a15fcf8d6c81c6c0a388541b91be09eecbe1e28dd5e783c6cabee551080b716ad2ca13a7bbe3a1f189221833db7febc55680
-  data.tar.gz: 0227b6cb5ac9ccf9344877070586b620bcb1cb9ed44534b639488379b497843d7cb7b30bde0bd697cb0d10aa0248df61132e4197a9e0dbf4ac754ba341c9372e
+  metadata.gz: 9279230c0f3162832c37bd85e08c9a8867094cb63f10624d015e5a98c01d81e3f67e1f4fe0683325eab64a2d27c79046292afee851107e74d264eb9962f18185
+  data.tar.gz: 8493e5af5b0bb162ef7c640e75ce5e727f85b41323be08b66524cb9eb1ee1d3adee46f6485eb8dd521dbff9bc8235562304ffc37355b818935c1f1a9ebbed013

data/lib/etzetera/client.rb

@@ -1,32 +1,27 @@
 require 'celluloid/io'
-require 'http'
 require 'multi_json'
 
 module Etzetera
   class Client
     include Celluloid::IO
-
     API_ENDPOINT = 'v2'.freeze
 
-    execute_block_on_receiver :wait
-
-    attr_accessor :servers, :consistent
+    attr_accessor :servers
 
-    def initialize(servers = ['http://127.0.0.1:4001'],
-      consistent = true,
-      default_options = {})
+    def initialize(servers = ['http://127.0.0.1:4001'], default_options = {})
 
-      self.servers            = servers
-      self.consistent         = consistent
+      self.servers = servers
 
       opts = {}
-      opts[:follow]           = true
-      opts[:headers]          = {:accept => 'application/json'}
-      opts[:response]         = :object
-      opts[:socket_class]     = Celluloid::IO::TCPSocket
-      opts[:ssl_socket_class] = Celluloid::IO::SSLSocket
+      opts[:follow]             = true
+      opts[:headers]            = {:accept => 'application/json'}
+      opts[:response]           = :object
+      opts[:election_timeout]   = 200
+      opts[:heartbeat_interval] = 50
+      opts[:socket_class]       = Celluloid::IO::TCPSocket
+      opts[:ssl_socket_class]   = Celluloid::IO::SSLSocket
 
-      @default_options = ::HTTP::Options.new(default_options.merge(opts))
+      @default_options = ::HTTP::Options.new(opts.merge(default_options))
     end
 
     def get(key, params = {})
@@ -47,8 +42,9 @@ module Etzetera
       if block_given?
         yield response
       elsif callback
-        sleep 0.5
-        callback.call(response)
+        after(@default_options[:heartbeat_interval] / 1000.0) do
+          callback.call(response)
+        end
       else
         parse_response(response)
       end
@@ -137,6 +133,11 @@ module Etzetera
 
       begin
         request = client.request(verb, "#{server}#{path}")
+        response = MultiJson.load(request.body)
+        if response['errorCode']
+          abort Error::CODES[response['errorCode']].new(response['message'])
+        end
+        parse_response(response)
       rescue IOError => e
         abort e if retries < 1
 
@@ -151,27 +152,16 @@ module Etzetera
 
         retries -= 1
 
-        sleep 0.5
-        retry
-      else
-        response = {}
-        begin
-          response = MultiJson.load(request.body)
-          if response['errorCode']
-            abort Error::CODES[response['errorCode']].new(response['message'])
-          end
-        # Have to rescue here, etcd sends error codes in the 200-399 Range
-        # and even json responses with Content-Type: text/html
-        rescue MultiJson::LoadError => e
-          if 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}")
-          else
-            abort Error::EtzeteraError.new(e)
-          end
+        after(@default_options[:election_timeout] / 1000.0) do
+          retry
+        end
+      rescue MultiJson::LoadError => e
+        if 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}")
         else
-          parse_response(response)
+          abort Error::EtzeteraError.new(e)
         end
       end
     end

data/lib/etzetera/core_ext.rb

@@ -1,6 +1,52 @@
+require 'http'
+
 class Array
   def swap!(a,b)
     self[a], self[b] = self[b], self[a]
     self
   end
 end
+
+if HTTP::VERSION == '0.5.0'
+  module HTTP
+    class Client
+      # Make an HTTP request
+      def request(method, uri, options = {})
+        opts = @default_options.merge(options)
+        host = URI.parse(uri).host
+        opts.headers["Host"] = host
+        headers = opts.headers
+        proxy = opts.proxy
+
+        method_body = body(opts, headers)
+        if opts.params && !opts.params.empty?
+          uri="#{uri}?#{URI.encode_www_form(opts.params)}"
+        end
+
+        request = HTTP::Request.new method, uri, headers, proxy, method_body
+        if opts.follow
+          code = 302
+          while code == 302 or code == 301
+            # if the uri isn't fully formed complete it
+            if not uri.match(/\./)
+              uri = "#{method}://#{host}#{uri}"
+            end
+            host = URI.parse(uri).host
+            opts.headers["Host"] = host
+            method_body = body(opts, headers)
+            request = HTTP::Request.new method, uri, headers, proxy, method_body
+            response = perform request, opts
+            code = response.code
+            uri = response.headers["Location"]
+          end
+        end
+
+        opts.callbacks[:request].each { |c| c.call(request) }
+        response = perform request, opts
+        opts.callbacks[:response].each { |c| c.call(response) }
+
+        format_response method, response, opts.response
+      end
+    end
+  end
+end

data/lib/etzetera/version.rb

@@ -1,3 +1,3 @@
 module Etzetera
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etzetera
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hendrik
@@ -31,7 +31,7 @@ cert_chain:
   fESaRa24pr3CGd0AyltcRbKGfNpZfj1zfqWXrDUJj0Y1sOASd8+UZPmBFS2feJqy
   het/fGFD7akMwHXIlNxNsg==
   -----END CERTIFICATE-----
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io