hatetepe 0.6.0.pre → 0.6.0.pre.1

data/README.md

@@ -1,6 +1,9 @@
-# Hatetepe
+# Hatetepe, the HTTP toolkit [![Build Status](https://travis-ci.org/lgierth/hatetepe.png?branch=master)](https://travis-ci.org/lgierth/hatetepe) [![Code Climate](https://codeclimate.com/github/lgierth/hatetepe.png)](https://codeclimate.com/github/lgierth/hatetepe)
 
-The HTTP toolkit
+General purpose toolkit for HTTP clients and servers.
+
+Note: The `master` branch contains the latest development effort. Look at the
+`0.5.x` branch for stable releases.
 
 ## Installation
 
@@ -27,9 +30,8 @@ TODO: Write usage instructions here
   - Unit tests
   - Method/Status semantics (GET/HEAD/204/etc.)
   - Host header
+  - Date header
   - Documentation
-  - Replace into hatetepe-dev
-  - Deprecate hatetepe-0.5
 - Future
   - SSL support
   - Webmachine adapter

data/bin/hatetepe

@@ -1,20 +1,16 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'ap'
 require 'hatetepe'
 
 class RequestHandler
   def initialize(config, server, connection)
   end
 
-  def serve(request)
-    request.finished.then do
-      puts "#{request.http_method.upcase} #{request.uri}"
-      response = build_response
-      request.served.fulfill(response)
-      response.finished.fulfill
-    end
+  def serve(request, served)
+    puts "#{request.http_method.upcase} #{request.uri}"
+    response = build_response
+    served.fulfill(response)
   end
 
   def build_response

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 10
-total_score: 160
+threshold: 8
+total_score: 147

data/config/reek.yml

@@ -1,6 +1,6 @@
 ---
 Attribute:
-  enabled: true
+  enabled: false
   exclude: []
 BooleanParameter:
   enabled: true
@@ -19,13 +19,13 @@ DataClump:
 DuplicateMethodCall:
   enabled: true
   exclude: []
-  max_calls: 1
+  max_calls: 2
   allow_calls: []
 FeatureEnvy:
-  enabled: true
+  enabled: false
   exclude: []
 IrresponsibleModule:
-  enabled: true
+  enabled: false
   exclude: []
 LongParameterList:
   enabled: true
@@ -33,7 +33,7 @@ LongParameterList:
   max_params: 2
   overrides:
     initialize:
-      max_params: 3
+      max_params: 4
 LongYieldList:
   enabled: true
   exclude: []
@@ -41,7 +41,7 @@ LongYieldList:
 NestedIterators:
   enabled: true
   exclude: []
-  max_allowed_nesting: 1
+  max_allowed_nesting: 2
   ignore_iterators: []
 NilCheck:
   enabled: true
@@ -53,7 +53,7 @@ RepeatedConditional:
 TooManyInstanceVariables:
   enabled: true
   exclude: []
-  max_instance_variables: 3
+  max_instance_variables: 4
 TooManyMethods:
   enabled: true
   exclude: []
@@ -62,7 +62,7 @@ TooManyStatements:
   enabled: true
   exclude:
   - each
-  max_statements: 2
+  max_statements: 5
 UncommunicativeMethodName:
   enabled: true
   exclude: []
@@ -85,7 +85,8 @@ UncommunicativeParameterName:
   - !ruby/regexp /^.$/
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
-  accept: []
+  accept:
+  - _
 UncommunicativeVariableName:
   enabled: true
   exclude: []
@@ -93,11 +94,14 @@ UncommunicativeVariableName:
   - !ruby/regexp /^.$/
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
-  accept: []
+  accept:
+  - a
+  - e
+  - _
 UnusedParameters:
   enabled: true
   exclude: []
 UtilityFunction:
-  enabled: true
+  enabled: false
   exclude: []
   max_helper_calls: 0

data/lib/hatetepe.rb

@@ -9,10 +9,10 @@ require 'hatetepe/version'
 
 require 'hatetepe/errors'
 require 'hatetepe/support/handlers'
-require 'hatetepe/support/keep_alive'
 require 'hatetepe/support/message'
 
 require 'hatetepe/promise'
+require 'hatetepe/body'
 require 'hatetepe/request'
 require 'hatetepe/response'
 

data/lib/hatetepe/body.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+module Hatetepe
+  class Body
+    include Promise::Attribute
+    promise :closed
+
+    def self.build(arg)
+      if arg.is_a?(Body)
+        arg
+      else
+        body = new(arg.to_str)
+        body.closed.fulfill
+        body
+      end
+    end
+
+    def initialize(string = '')
+      @io = StringIO.new(string)
+
+      closed.on_progress { |str| @io.write(str) }
+    end
+
+    # don't optimize the sync call, we don't wanna search in @io.string
+    # because search time increases with its size.
+    def gets(*args)
+      closed.sync
+      @io.gets(*args)
+    end
+
+    def read(length = nil, buffer = nil)
+      closed.sync unless optimized_read?(length)
+      @io.read(length, buffer)
+    end
+
+    def rewind
+      closed.sync
+      @io.rewind
+    end
+
+    def each(&block)
+      yield_string(&block)
+      closed.on_progress(&block)
+      closed.sync
+    end
+
+    def to_s
+      closed.sync
+      @io.string
+    end
+
+    private
+
+    def optimized_read?(length)
+      length && length < (@io.length - pos)
+    end
+
+    def yield_string(&block)
+      block.call(@io.string) unless @io.string.empty?
+    end
+  end
+end

data/lib/hatetepe/client.rb

@@ -13,67 +13,67 @@ module Hatetepe
 
       setup_connection
       setup_handlers
-      notify_handlers(:post_init)
+      notify_handlers(:setup)
     end
 
     def request(http_method, uri)
       request = Request.new(http_method, uri)
-      request.finished.fulfill
-      perform(request)
-      request.served.sync
+      perform(request).sync
     end
 
     def perform(request)
-      @requests << request
+      served = Promise.new
+      @requests << [request, served]
 
-      fiber = Fiber.new do
-        notify_handlers(:perform, request)
-        @connection.serialize(request)
-      end
-      fiber.resume
-    end
-
-    def close
-      @connection.close
+      Fiber.new { perform!(request) }.resume
+      served
     end
 
     def receive(response)
-      unless (request = correlate(response))
-        raise ClientError, 'Unable to correlate with request'
-      end
+      request, served = correlate
+
+      served.fulfill(response)
+      response.closed { finish(request) }
 
-      setup_cleanup(request, response)
       notify_handlers(:receive, request, response)
     end
 
+    def finish(request)
+      @requests.delete_if { |(req, _)| req == request }
+      notify_handlers(:finish, request)
+    end
+
+    def close
+      @connection.close
+    end
+
     def teardown(reason)
-      while (request = @requests.shift)
-        if (response = request.served.value)
-          response.finished.reject(reason)
-        else
-          request.served.reject(reason)
+      @requests.each do |(_, served)|
+        served.reject(reason)
+        if (response = served.value)
+          response.reject_closed(reason)
         end
       end
     end
 
     private
 
+    def perform!(request)
+      notify_handlers(:perform, request)
+      @connection.serialize(request)
+    end
+
+    def correlate
+      tuple = @requests.detect { |(_, served)| served.pending? }
+      raise ClientError, 'Unable to correlate with request' unless tuple
+      tuple
+    end
+
     def setup_connection
       @connection =
         EM.connect(@config[:address], @config[:port], Connection::EventMachine)
       @connection.parse(method(:receive))
       @connection.closed.then(method(:teardown))
     end
-
-    def correlate(response)
-      @requests
-        .detect { |request| request.served.pending? }
-        .tap    { |request| request.served.fulfill(response) if request }
-    end
-
-    def setup_cleanup(request, response)
-      callback = proc { @requests.delete(request) }
-      response.finished.then(callback, callback)
-    end
   end
 end

data/lib/hatetepe/client/keep_alive.rb

@@ -2,58 +2,13 @@
 
 module Hatetepe
   class Client::KeepAlive
-    CONNECTION = 'Connection'.freeze
-
-    include Support::KeepAlive
-
-    def initialize(config, client, connection)
-      @config, @client = config, client
-      @connection = connection
-      @close = nil
-      @requests = []
+    def initialize(*_)
+      @previous = nil
     end
 
     def perform(request)
-      previous_request = current_request
-      @requests << request
-
-      if @close.nil?
-        await_connection_header(request)
-      elsif !@close
-        await_previous_response(previous_request) if previous_request
-      end
-    end
-
-    def receive(request, response)
-      @requests.delete(request)
-    end
-
-    private
-
-    def current_request
-      @requests.first
-    end
-
-    def await_connection_header(request)
-      if current_request == request
-        # first response has the relevant Connection header
-        assume_connection_header
-      else
-        # subsequent requests wait for first response
-        current_request.served.sync
-      end
-    end
-
-    def assume_connection_header
-      current_request.served.then do |response|
-        @close = close_connection?(response.http_version,
-                                   response.headers[CONNECTION])
-      end
-    end
-
-    def await_previous_response(request)
-      response = request.served.sync
-      response.finished.sync
+      @previous, previous = request, @previous
+      previous.closed! if previous
     end
   end
 end

data/lib/hatetepe/client/timeouts.rb

@@ -3,15 +3,15 @@
 module Hatetepe
   # @see EM.heartbeat_interval
   class Client::Timeouts
-    def initialize(config, client, connection)
-      @config, @client = config, client
+    def initialize(config, _, connection)
+      @config = config
       @connection = connection
 
       @config[:timeout]         ||= 2.0
       @config[:connect_timeout] ||= 2.0
     end
 
-    def post_init
+    def setup
       @connection.comm_inactivity_timeout = @config[:timeout]
       @connection.pending_connect_timeout = @config[:connect_timeout]
     end

data/lib/hatetepe/connection/eventmachine.rb

@@ -6,9 +6,9 @@ module Hatetepe
       include Promise::Attribute
       promise :closed
 
-      def initialize(callback = nil)
+      def initialize(callback = proc {})
         @parser = HTTP::Parser.new(self)
-        callback.call(self) if callback
+        callback.call(self)
       end
 
       def parse(block)
@@ -21,16 +21,16 @@ module Hatetepe
       end
 
       def receive_data(data)
-        # ap data
+        # ap [__id__, :receive, data]
         @parser << data
       # rescue => error
       #   $stderr.puts(error.to_s)
-      #   @message.finished.reject(error) if @message
+      #   @message.reject_close(error) if @message
       #   close_connection
       end
 
       # def send_data(data)
-      #   ap data
+      #   ap [__id__, :send, data]
       #   super
       # end
 
@@ -49,12 +49,11 @@ module Hatetepe
       end
 
       def on_body(chunk)
-        @message.body << chunk
-        @message.finished.progress(chunk)
+        @message.body.closed.progress(chunk)
       end
 
       def on_message_complete
-        @message.finished.fulfill
+        @message.close
       end
     end
   end