yup 0.0.8 → 0.1.0

data/.travis.yml

@@ -0,0 +1,21 @@
+before_install:
+  - sudo apt-get install libdb-dev
+language: ruby
+rvm:
+  - ree-1.8.7
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+notifications:
+  recipients:
+    - d.sukhonin@gmail.com
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/Gemfile

@@ -2,16 +2,17 @@ source "http://rubygems.org"
 
 gem "eventmachine"
 gem "em-http-request"
-gem "http_request.rb"
 gem "http_parser.rb"
 gem "tuple"
 gem "yajl-ruby"
 
 group :development do
   gem "bdb"
-  gem "yard", "~> 0.6.0"
-  gem "minitest", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "yard",      "~> 0.6.0"
+  gem "minitest",  ">= 0"
+  gem "bundler",   "~> 1.0"
+  gem "jeweler",   "~> 1.8.4"
+  gem "simplecov", ">= 0"
+  gem "simplecov-rcov", ">= 0"
+  gem "travis-lint"
 end

data/Gemfile.lock

@@ -1,27 +1,43 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.3.2)
     bdb (0.2.6.5)
       tuple (>= 0.1.2)
-    em-http-request (0.3.0)
-      addressable (>= 2.0.0)
-      escape_utils
-      eventmachine (>= 0.12.9)
-    escape_utils (0.2.3)
-    eventmachine (0.12.10)
+    cookiejar (0.3.0)
+    em-http-request (1.0.3)
+      addressable (>= 2.2.3)
+      cookiejar
+      em-socksify
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (>= 0.5.3)
+    em-socksify (0.2.1)
+      eventmachine (>= 1.0.0.beta.4)
+    eventmachine (1.0.0)
     git (1.2.5)
-    http_parser.rb (0.5.1)
-    http_request.rb (1.1.11)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    hashr (0.0.22)
+    http_parser.rb (0.5.3)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    minitest (2.5.0)
-    rake (0.9.2)
-    rcov (0.9.10)
+      rdoc
+    json (1.7.5)
+    minitest (4.2.0)
+    multi_json (1.3.7)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
+    travis-lint (1.4.0)
+      hashr (>= 0.0.19)
     tuple (0.1.2)
-    yajl-ruby (0.8.3)
+    yajl-ruby (1.1.0)
     yard (0.6.8)
 
 PLATFORMS
@@ -29,14 +45,15 @@ PLATFORMS
 
 DEPENDENCIES
   bdb
-  bundler (~> 1.0.0)
+  bundler (~> 1.0)
   em-http-request
   eventmachine
   http_parser.rb
-  http_request.rb
-  jeweler (~> 1.5.2)
+  jeweler (~> 1.8.4)
   minitest
-  rcov
+  simplecov
+  simplecov-rcov
+  travis-lint
   tuple
   yajl-ruby
   yard (~> 0.6.0)

data/README.rdoc

@@ -1,18 +1,21 @@
 = yup daemon
 
-This is the small daemon for transparent asynchronous delegating HTTP requests when response is known or unimportant.
+{<img src="https://secure.travis-ci.org/neglectedvalue/yup.png" alt="Build Status" />}[http://travis-ci.org/neglectedvalue/yup]
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/neglectedvalue/yup]
 
-When a http request is arrived the yup daemon (yupd) answers to the client configured answer (by default 200 OK). Then the yupd forwards the http request to the specified host and retries if a timeout error was happend.
+This is the small daemon to forward HTTP requests when response is known or unimportant.
+
+When a http request is arrived the yup daemon (yupd), it answers 200 OK (customizable). Then the yupd forwards the http request to the specified host and retries if a timeout error was happend.
 
 == Non-persistent queue
-By default, nonpersistent queue is used. A limit (the option --watermark) at which new requests will be dropped.
+By default, nonpersistent queue is used. A limit (the option --watermark) at which new concurrent requests will be dropped.
 
 == Persistent queue
 If you want use persistent queue you need to specify the option --persistent with a path to a database.
 
 == One of use cases
 
-For example we can have a rails app which send exceptions to an errbit by the gem hoptoad_notifier. We know the errbit can be not available by network issues or some else reasons, but we do not want lose exceptions. To resolve this problem we can start yupd on the same host with the rails app:
+For example we can have a rails app which send exceptions to an Errbit by the gem airbrake. We know the errbit can be not available by network issues or some else reasons, but we do not want to lose exceptions. To resolve this problem we can start yupd on the same host with the rails app:
     yupd --listen localhost:8081 --status-code 201 --persistent /var/db/yupd-errbit errbit.host.somewhere
 
 Reconfiguration of hoptoad_notifier is very ease:
@@ -22,25 +25,11 @@ Reconfiguration of hoptoad_notifier is very ease:
       config.api_key = "api_key_for_your_app"
     end
 
-Now problem of availability of errbit is assigned to the yupd.
-
-== Roadmap to 0.1
-
-* More better documentation
-* Daemonize
-* Preforking
-* A configurable map of different delegating rules
-* Tests...
+Now problem of availability errbit is assigned to the yupd.
 
 == Contributing to yup
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+Feel free to contribute.
 
 == Copyright
 

data/Rakefile

@@ -15,14 +15,10 @@ Jeweler::Tasks.new do |gem|
   gem.name = "yup"
   gem.homepage = "http://github.com/neglectedvalue/yup"
   gem.license = "MIT"
-  gem.summary = "Asynchronous HTTP delegate"
+  gem.summary = "HTTP forwarder"
   gem.description = "Just answers 200 (or specified) to a client and asynchronously forwards HTTP request to a configured host"
   gem.email = "d.sukhonin@gmail.com"
   gem.authors = ["Denis Sukhonin"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -33,13 +29,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'yard'

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.1.0

data/bin/yupd

@@ -8,18 +8,20 @@ require 'yup'
 
 def usage
   puts <<-EOF
+yup #{Yup::VERSION}
+
 Usage: #{$0} [OPTION] ... FORWARD_TO_HOST
 
 Options:
   -h, --help                 Show help
   --listen <host:port>, -l   Listen on an address (default localhost:8080)
   --status-code <code>       Send status code to a client on request (default 200)
-  --resend-delay <seconds>   Resend failed requests in seconds (default 5.0)
+  --resend-delay <seconds>   Resend failed requests in seconds (default 60.0)
   --watermark <number>       Maximum of concurrent requests (default 100)
   --loglevel <level>         Logging severity (default fatal).
                              Available log levels: fatal, error, warn, info, debug.
   --persistent <path>        Use persistent queue.
-  --timeout <seconds>        Timeout for answer from FORWARD_TO_HOST
+  --timeout <seconds>        Timeout for answer from FORWARD_TO_HOST (default 60.0)
 
 Examples:
   yupd --listen 0.0.0.0:8081 --status-code 201 errbit.host.somewhere
@@ -70,7 +72,7 @@ opts.each do |opt, arg|
   when '--persistent'
     config[:persistent] = arg || "/tmp/queue"
   when '--timeout'
-    config[:timeout] = arg.to_i
+    config[:timeout] = arg.to_f
   end
 end
 
@@ -87,7 +89,6 @@ Yup.watermark    = config[:watermark] if config.has_key?(:watermark)
 Yup.resend_delay = config[:resend_delay] if config.has_key?(:resend_delay)
 
 if config.has_key?(:persistent)
-  # Yup::State.repair_if_need(config[:persistent])
   Yup.run_with_state(config)
 else
   Yup.run(config)

data/lib/yup.rb

@@ -4,11 +4,12 @@ require 'logger'
 require 'yajl'
 require 'tmpdir'
 
+require 'yup/version'
 require 'yup/request_forwarder'
 require 'yup/request_handler'
 
 module Yup
-  @@resend_delay = 5.0
+  @@resend_delay = 60.0
   def self.resend_delay; @@resend_delay end
   def self.resend_delay=(seconds); @@resend_delay = seconds end
 
@@ -25,10 +26,10 @@ module Yup
     port = config[:listen_port] || 8080
     status_code = config[:status_code] || 200
     forward_to  = config[:forward_to]
-    timeout     = config[:timeout] || 10
+    timeout     = config[:timeout] || 60
 
-    EventMachine.run do
-      EventMachine.start_server(host, port, RequestHandler, forward_to, status_code, nil, timeout)
+    EM.run do
+      EM.start_server(host, port, RequestHandler, forward_to, status_code, nil, timeout)
       logger.info { "listening on #{host}:#{port}" }
     end
   end
@@ -41,7 +42,7 @@ module Yup
     status_code = config[:status_code] || 200
     forward_to  = config[:forward_to]
     dbpath      = config[:persistent]
-    timeout     = config[:timeout]
+    timeout     = config[:timeout] || 60
     feedback_channel = File.join(Dir.tmpdir, "yupd-#{$$}-feedback")
     state            = Yup::State.new(dbpath, forward_to, feedback_channel)
 
@@ -60,12 +61,12 @@ module Yup
       Signal.trap("INT", &db_closer)
     end
 
-    EventMachine.run do
-      EventMachine.start_server(host, port, RequestHandler, forward_to, status_code, state, timeout)
-      logger.info { "Listening on #{host}:#{port}" }
-
-      EventMachine.start_unix_domain_server(feedback_channel, State::FeedbackHandler, state)
+    EM.run do
+      EM.start_unix_domain_server(feedback_channel, State::FeedbackHandler, state)
       logger.info { "Feedback through #{feedback_channel}" }
+
+      EM.start_server(host, port, RequestHandler, forward_to, status_code, state, timeout)
+      logger.info { "Listening on #{host}:#{port}" }
     end
   end
 end

data/lib/yup/request_forwarder.rb

@@ -1,5 +1,4 @@
 require 'em-http-request'
-require 'http_request'
 
 module Yup
   class RequestForwarder
@@ -10,40 +9,56 @@ module Yup
       @body        = body
       @forward_to  = forward_to
       @timeout     = timeout
+      @logger      = Yup.logger.clone
 
-      @logger = Yup.logger
+      @headers.merge!(
+        'Host'       => @forward_to,
+        'Connection' => 'Close')
     end
 
-    def run
+    def perform
       http_method = @http_method.to_sym
       http_url    = "http://#{@forward_to}#{@request_url}"
       http = EventMachine::HttpRequest.
-        new(http_url).
+        new(http_url,
+            :inactivity_timeout => @timeout).
         send(http_method,
-             :timeout => @timeout,
-             :head => @headers.merge('Host' => @forward_to),
+             :head => @headers,
              :body => @body)
 
+      @logger.progname = "Yup::RequestForwarder (##{http.__id__.to_s(36)} received at #{Time.now.to_s})"
+
       http.callback do
         Yup.watermark += 1
 
         if http.response_header.status / 100 == 2
-          @logger.info '--- SUCCESS'
+          log_response(http)
+          @logger.info "Success"
         else
-          @logger.info '--- FAIL'
-          @logger.debug { http.inspect }
-          @logger.debug { http.response_header.inspect }
-          @logger.debug { http.response.inspect }
+          log_response(http)
+          @logger.info "Fail; will not retry"
         end
       end
 
       http.errback do
-        @logger.info '--- ERROR'
-        @logger.debug { http.inspect }
-        @logger.debug { http.response_header.inspect }
-        @logger.debug { http.response.inspect }
+        log_response(http)
+        @logger.info "Error: #{http.error}; will retry after #{Yup.resend_delay} seconds"
 
-        EventMachine.add_timer(Yup.resend_delay) { self.run }
+        EventMachine.add_timer(Yup.resend_delay, &self.method(:retry))
+      end
+    end
+
+    def retry
+      self.perform
+    end
+
+  private
+    def log_response(http)
+      @logger.info { "HTTP request: #{@http_method.upcase} #{@request_url} HTTP/1.1" }
+      if http.response_header.http_status
+        @logger.info  { "HTTP response: HTTP/#{http.response_header.http_version} #{http.response_header.http_status} #{http.response_header.http_reason}" }
+        @logger.debug { "HTTP response headers" + (http.response_header.empty? ? " is empty" : "\n" + http.response_header.inspect) }
+        @logger.debug { "HTTP response body"    + (http.response.empty? ? " is empty" : "\n" + http.response.inspect) }
       end
     end
   end
@@ -53,11 +68,12 @@ module Yup
       def initialize(state, forward_to, timeout)
         @state      = state
         @forward_to = forward_to
-        @timeout = timeout
+        @timeout    = timeout
+        @logger     = Yup.logger.clone
+        @logger.progname = "Yup::State::RequestForwarder"
 
-        @logger = Yup.logger
-        @yajl   = Yajl::Parser.new(:symbolize_keys => true)
-        @yajl.on_parse_complete = method(:make_request)
+        @yajl = Yajl::Parser.new(:symbolize_keys => true)
+        @yajl.on_parse_complete = self.method(:make_request)
       end
 
       def run_loop
@@ -73,44 +89,85 @@ module Yup
 
       def make_request(req)
         begin
-          http_method, request_url, headers, body = req
+          @http_method, @request_url, headers, body = req
           headers = Hash[headers.to_a.flatten.map(&:to_s)]
+          headers["Host"]       = @forward_to
+          headers["Connection"] = "Close"
+
+          req = "#{@http_method.upcase} #{@request_url} HTTP/1.1\r\n"
+          headers.each do |k, v|
+            req << "#{k}: #{v}\r\n"
+          end
+          req << body if !body.empty?
+          req << "\r\n"
+          raw_response = send_data(req.to_s, @forward_to)
+
+          response_body = ""
+          http = Http::Parser.new()
+          http.on_body = proc do |chunk|
+            response_body << chunk
+          end
+          http << raw_response
 
-          http_method = http_method.to_sym
-          http_url    = "http://#{@forward_to}#{request_url}"
-          http = HttpRequest.
-            send(http_method,
-                 :url => http_url,
-                 :headers => headers.merge('Host' => @forward_to),
-                 :parameters => body,
-                 :timeout => timeout)
-
-          if http.code_2xx?
-            @logger.info '--- SUCCESS'
+          if http.status_code / 100 == 2
+            log_response(raw_response, response_body, http)
+            @logger.info "Success"
           else
-            @logger.info '--- FAIL'
-            @logger.debug { http.inspect }
-            @logger.debug { http.response_header.inspect }
-            @logger.debug { http.response.inspect }
+            log_response(raw_response, response_body, http)
+            @logger.info "Fail; will not retry"
           end
-        rescue Exception => e
-          @logger.info '--- ERROR'
-          @logger.debug { e }
 
-          @state.to_feedback(Yajl::Encoder.encode([http_method.downcase, request_url, headers, body]))
+        rescue Exception, Timeout::Error => e
+          log_response(raw_response, response_body, http)
+          @logger.info "Error: #{e.message}; will retry after #{Yup.resend_delay} seconds"
+
+          @state.to_feedback(Yajl::Encoder.encode([@http_method.downcase, @request_url, headers, body]))
 
           sleep Yup.resend_delay
         end
       end
+
+    private
+      def log_response(raw_response, body, http)
+        @logger.info { "HTTP request: #{@http_method.upcase} #{@request_url} HTTP/1.1" }
+        if raw_response && !raw_response.empty?
+          @logger.info  { "HTTP response: #{raw_response.lines.first.chomp}" }
+          @logger.debug { "HTTP response headers" + (http.headers.empty? ? " is empty" : "\n" + http.headers.inspect) }
+          @logger.debug { "HTTP response body"    + (body.empty? ? " is empty" : "\n" + body.inspect) }
+        end
+      end
+
+      def send_data(data, host)
+        host, port = host.split(":")
+        addr = Socket.getaddrinfo(host, nil)
+        sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+
+        secs   = Integer(@timeout)
+        usecs  = Integer((@timeout - secs) * 1_000_000)
+        optval = [secs, usecs].pack("l_2")
+        sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval)
+        sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval)
+
+        resp = Timeout::timeout(@timeout) do
+          sock.connect(Socket.pack_sockaddr_in(port, addr[0][3]))
+          sock.write(data)
+          sock.read()
+        end
+        return resp
+      ensure
+        sock.close()
+      end
     end
 
     class FeedbackHandler < EM::Connection
       def initialize(state)
         @state      = state
 
-        @logger = Yup.logger
         @yajl   = Yajl::Parser.new(:symbolize_keys => true)
         @yajl.on_parse_complete = method(:on_message)
+
+        @logger = Yup.logger.clone
+        @logger.progname = "Yup::State::FeedbackHandler"
       end
 
       def receive_data(data)

data/lib/yup/request_handler.rb

@@ -11,8 +11,10 @@ module Yup
       @state       = state
       @timeout     = timeout
 
-      @logger = Yup.logger
       @chunks = []
+
+      @logger = Yup.logger.clone
+      @logger.progname = "Yup::RequestHandler"
     end
 
     def post_init
@@ -32,12 +34,15 @@ module Yup
     end
 
     def on_message_complete
-      @logger.info  "-- got request"
-      @logger.info  { "HTTP version     : " + @parser.http_version.join('.') }
-      @logger.info  { "HTTP method      : " + @parser.http_method }
-      @logger.info  { "HTTP request_url : " + @parser.request_url }
-      @logger.debug { "HTTP headers     : " + @parser.headers.inspect }
-      @logger.debug { "HTTP body        : " + @body }
+      @logger.info  {
+        "Processing a new request: #{@parser.http_method} #{@parser.request_url} HTTP/#{@parser.http_version.join('.')}"
+      }
+      @logger.debug {
+        "HTTP headers" + (@parser.headers.empty? ? " is empty" : "\n" + @parser.headers.inspect)
+      }
+      @logger.debug {
+        "HTTP body"    + (@body.empty? ? " is empty" : "\n" + @body)
+      }
 
       send_answer
       shedule_request
@@ -49,6 +54,12 @@ module Yup
       resp.status = @status_code
       resp['Server'] = 'yupd'
       send_data resp.to_s
+      close_connection_after_writing
+
+      @logger.info {
+        port, ip = Socket.unpack_sockaddr_in(get_peername)
+        "Sent the answer #{@status_code} to a client #{ip}:#{port}"
+      }
     end
 
     def shedule_request
@@ -57,12 +68,11 @@ module Yup
       else
         unless Yup.watermark.zero?
           Yup.watermark -= 1
-
-          EventMachine.next_tick do
-            RequestForwarder.new(@parser.http_method.downcase, @parser.request_url, @parser.headers, @body, @forward_to, @timeout).run
+          EM.next_tick do
+            RequestForwarder.new(@parser.http_method.downcase, @parser.request_url, @parser.headers, @body, @forward_to, @timeout).perform
           end
         else
-          @logger.error "-- watermark is reached, drop"
+          @logger.error "Watermark is reached, drop the request"
         end
       end
     end

data/lib/yup/state.rb

@@ -5,6 +5,8 @@ rescue LoadError
   puts "Install bdb gem to use a persistent queue."
 end
 
+require "timeout"
+
 module Yup
   class State
     RE_LEN = 1000
@@ -22,6 +24,10 @@ module Yup
       @name = name
       @feedback_channel = feedback_channel
 
+      @logger = Yup.logger.clone
+      @logger.progname = "Yup::State"
+
+      FileUtils.mkdir_p(@path)
       @env   = Bdb::Env.new(0)
       @env   = @env.open(@path, Bdb::DB_CREATE | Bdb::DB_INIT_MPOOL | Bdb::DB_INIT_CDB, 0)
       @queue = @env.db
@@ -30,7 +36,7 @@ module Yup
     end
 
     def push(data)
-      Yup.logger.debug { "Pushing \"#{data}\"" }
+      @logger.debug { "Push: #{data}" }
       i = 0
       until (chunk = data.slice(i, RE_LEN)).nil?
         @queue.put(nil, "", chunk, Bdb::DB_APPEND)
@@ -40,12 +46,12 @@ module Yup
 
     def bpop
       data = @queue.get(nil, "", nil, Bdb::DB_CONSUME_WAIT)
-      Yup.logger.debug { "Bpoping \"#{data}\"" }
+      @logger.debug { "Bpoped: #{data.strip}" }
       data
     end
 
     def to_feedback(data)
-      Yup.logger.debug { "Pushing to the feedback channel \"#{data}\"" }
+      @logger.debug { "Push to the feedback channel: #{data.strip}" }
       sock = UNIXSocket.new(@feedback_channel)
       sock.send(data, 0)
       sock.close

data/lib/yup/version.rb

@@ -0,0 +1,3 @@
+module Yup
+  VERSION = File.read("#{File.dirname(__FILE__)}/../../VERSION")
+end

data/test/helper.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] = 'test'
+
 require 'rubygems'
 require 'bundler'
 begin
@@ -9,6 +11,19 @@ rescue Bundler::BundlerError => e
 end
 require 'minitest/unit'
 
+require 'simplecov'
+require 'simplecov-rcov'
+
+class SimpleCov::Formatter::MergedFormatter
+  def format(result)
+    SimpleCov::Formatter::HTMLFormatter.new.format(result)
+    SimpleCov::Formatter::RcovFormatter.new.format(result)
+  end
+end
+
+SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+SimpleCov.start
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'yup'

data/test/test_persistence_yup.rb

@@ -0,0 +1,101 @@
+require 'helper'
+
+require 'tmpdir'
+require 'fileutils'
+require 'yup/state'
+
+class Yup::State::FeedbackHandler
+  alias :on_message_original :on_message
+  def on_message(req)
+    on_message_original(req)
+    $attempts += 1
+  end
+end
+
+class TestPersistenceYup < MiniTest::Unit::TestCase
+  class RequestHandlerMock < Yup::RequestHandler
+  end
+
+  class Service < EM::Connection
+    def post_init
+      @parser = Http::Parser.new(self)
+    end
+
+    def receive_data(data)
+      @parser << data
+    end
+
+    def on_message_complete
+      $service_parser = @parser
+
+      case $attempts
+      when 0
+      when 1
+        send_data "HTTP/1.1 200 OK\r\nServer: test\r\n\r\n"
+        close_connection_after_writing
+      end
+    end
+
+    def unbind
+      if $attempts > 0
+        EM.add_timer(1) do
+          Process.kill("KILL", $pid)
+          EM.stop_event_loop()
+        end
+      end
+    end
+  end
+
+  module Client
+    def connection_completed
+      send_data("GET /foo HTTP/1.0\r\n\r\n")
+    end
+
+    def post_init
+      @parser = Http::Parser.new(self)
+    end
+
+    def receive_data(data)
+      @parser << data
+    end
+
+    def on_message_complete
+      $client_parser = @parser
+    end
+  end
+
+  def test_request_handler
+    $attempts = 0
+
+    dbpath           = Dir.mktmpdir("yupd-db")
+    feedback_channel = File.join(Dir.tmpdir, "yupd-#{$$}-feedback")
+
+    forward_to  = "127.0.0.1:26785"
+    status_code = 200
+    state       = Yup::State.new(dbpath, forward_to, feedback_channel)
+    timeout     = 1
+
+    Yup.resend_delay = 1
+
+    $pid = Process.fork do
+      Yup::State::RequestForwarder.new(state, forward_to, timeout).run_loop
+    end
+
+    EM.run {
+      EM.start_server("127.0.0.1", 26785, Service)
+      EM.start_unix_domain_server(feedback_channel, Yup::State::FeedbackHandler, state)
+      EM.start_server("127.0.0.1", 26784, RequestHandlerMock, forward_to, status_code, state, timeout)
+      EM.connect("127.0.0.1", 26784, Client)
+    }
+
+    assert       $client_parser
+    assert_equal 200,   $client_parser.status_code
+    assert_equal "yupd", $client_parser.headers["Server"]
+    assert       $service_parser
+    assert_equal "/foo", $service_parser.request_url
+  ensure
+    Process.kill("KILL", $pid) if $pid
+    state.close if state
+    FileUtils.remove_entry_secure(dbpath) if dbpath
+  end
+end

data/test/test_yup.rb

@@ -1,11 +1,81 @@
 require 'helper'
 
+class Yup::RequestForwarder
+  alias :retry_original :retry
+  def retry()
+    $attempts += 1
+    retry_original()
+  end
+end
+
 class TestYup < MiniTest::Unit::TestCase
-  def test_request_handler
-    flunk
+  class RequestHandlerMock < Yup::RequestHandler
+  end
+
+  class Service < EM::Connection
+    def post_init
+      @parser = Http::Parser.new(self)
+    end
+
+    def receive_data(data)
+      @parser << data
+    end
+
+    def on_message_complete
+      $service_parser = @parser
+
+      case $attempts
+      when 0
+      when 1
+        send_data "HTTP/1.1 200 OK\r\nServer: test\r\n\r\n"
+      end
+    end
+
+    def unbind
+      if $attempts > 0
+        EM.next_tick { EM.stop_event_loop }
+      end
+    end
   end
 
-  def test_request_forwarder
-    flunk
+  module Client
+    def connection_completed
+      send_data "GET /foo HTTP/1.0\r\n\r\n"
+    end
+
+    def post_init
+      @parser = Http::Parser.new(self)
+    end
+
+    def receive_data(data)
+      @parser << data
+    end
+
+    def on_message_complete
+      $client_parser = @parser
+    end
+  end
+
+  def test_request_handler
+    $attempts = 0
+
+    forward_to  = "127.0.0.1:16785"
+    status_code = 200
+    state       = nil
+    timeout     = 1
+
+    Yup.resend_delay = 1
+
+    EM.run {
+      EM.start_server("127.0.0.1", 16785, Service)
+      EM.start_server("127.0.0.1", 16784, RequestHandlerMock, forward_to, status_code, state, timeout)
+      EM.connect("127.0.0.1", 16784, Client)
+    }
+
+    assert       $client_parser
+    assert_equal 200,   $client_parser.status_code
+    assert_equal "yupd", $client_parser.headers["Server"]
+    assert       $service_parser
+    assert_equal "/foo", $service_parser.request_url
   end
 end

data/yup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "yup"
-  s.version = "0.0.8"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Denis Sukhonin"]
-  s.date = "2012-06-29"
+  s.date = "2012-11-09"
   s.description = "Just answers 200 (or specified) to a client and asynchronously forwards HTTP request to a configured host"
   s.email = "d.sukhonin@gmail.com"
   s.executables = ["yupd"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -30,7 +31,9 @@ Gem::Specification.new do |s|
     "lib/yup/request_forwarder.rb",
     "lib/yup/request_handler.rb",
     "lib/yup/state.rb",
+    "lib/yup/version.rb",
     "test/helper.rb",
+    "test/test_persistence_yup.rb",
     "test/test_yup.rb",
     "yup.gemspec"
   ]
@@ -38,11 +41,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
-  s.summary = "Asynchronous HTTP delegate"
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_yup.rb"
-  ]
+  s.summary = "HTTP forwarder"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -50,43 +49,46 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
-      s.add_runtime_dependency(%q<http_request.rb>, [">= 0"])
       s.add_runtime_dependency(%q<http_parser.rb>, [">= 0"])
       s.add_runtime_dependency(%q<tuple>, [">= 0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<bdb>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov-rcov>, [">= 0"])
+      s.add_development_dependency(%q<travis-lint>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<em-http-request>, [">= 0"])
-      s.add_dependency(%q<http_request.rb>, [">= 0"])
       s.add_dependency(%q<http_parser.rb>, [">= 0"])
       s.add_dependency(%q<tuple>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<bdb>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<simplecov-rcov>, [">= 0"])
+      s.add_dependency(%q<travis-lint>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<em-http-request>, [">= 0"])
-    s.add_dependency(%q<http_request.rb>, [">= 0"])
     s.add_dependency(%q<http_parser.rb>, [">= 0"])
     s.add_dependency(%q<tuple>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<bdb>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<simplecov-rcov>, [">= 0"])
+    s.add_dependency(%q<travis-lint>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yup
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: http_request.rb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,9 +170,41 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis-lint
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -214,6 +230,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -225,7 +242,9 @@ files:
 - lib/yup/request_forwarder.rb
 - lib/yup/request_handler.rb
 - lib/yup/state.rb
+- lib/yup/version.rb
 - test/helper.rb
+- test/test_persistence_yup.rb
 - test/test_yup.rb
 - yup.gemspec
 homepage: http://github.com/neglectedvalue/yup
@@ -243,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2903462913094353804
+      hash: 2564994728519902623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -255,7 +274,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Asynchronous HTTP delegate
-test_files:
-- test/helper.rb
-- test/test_yup.rb
+summary: HTTP forwarder
+test_files: []