ebb 0.1.0 → 0.2.0

data/src/parser.h

@@ -12,14 +12,24 @@
 #include <stddef.h>
 #endif
 
-typedef void (*element_cb)(void *data, const char *at, size_t length);
+enum { MONGREL_CONTENT_LENGTH
+     , MONGREL_CONTENT_TYPE
+     , MONGREL_FRAGMENT
+     , MONGREL_HTTP_VERSION
+     , MONGREL_QUERY_STRING
+     , MONGREL_REQUEST_PATH
+     , MONGREL_REQUEST_METHOD
+     , MONGREL_REQUEST_URI
+     };
+
 typedef void (*field_cb)(void *data, const char *field, size_t flen, const char *value, size_t vlen);
+typedef void (*element_cb)(void *data, int type, const char *at, size_t length);
 
 typedef struct http_parser { 
   int cs;
   int overflow_error;
   size_t body_start;
-  int content_len;
+  size_t content_length;
   size_t nread;
   size_t mark;
   size_t field_start;
@@ -29,14 +39,7 @@ typedef struct http_parser {
   void *data;
 
   field_cb http_field;
-  element_cb request_method;
-  element_cb request_uri;
-  element_cb fragment;
-  element_cb request_path;
-  element_cb query_string;
-  element_cb http_version;
-  element_cb header_done;
-  element_cb content_length;
+  element_cb on_element;
 } http_parser;
 
 void http_parser_init(http_parser *parser);

data/test/basic_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class BasicTest < ServerTest
+module BasicTests
   def test_get_bytes
     [1,10,1000].each do |i|
       response = get("/bytes/#{i}")
@@ -27,3 +27,20 @@ class BasicTest < ServerTest
     end
   end
 end
+
+class BasicTest < ServerTest
+  include BasicTests
+end
+
+class BasicTestFD < ServerTestFD
+  include BasicTests
+end
+
+class BasicTestUnixSocket < ServerTestSocket
+  include BasicTests
+  
+  def test_socket_file_exists
+    assert File.exists?(@socketfile)
+    assert File.readable?(@socketfile)
+  end
+end

data/test/env_test.rb

@@ -35,20 +35,21 @@ end
 class HttpParserTest < ServerTest
   
   def test_parse_simple
-    env = send_request("GET / HTTP/1.1\r\n\r\n")
+    env = send_request("GET / HTTP/1.0\r\n\r\n")
     
     assert_equal 'HTTP/1.1', env['SERVER_PROTOCOL']
     assert_equal '/', env['REQUEST_PATH']
-    assert_equal 'HTTP/1.1', env['HTTP_VERSION']
+    assert_equal 'HTTP/1.0', env['HTTP_VERSION']
     assert_equal '/', env['REQUEST_URI']
     assert_equal 'GET', env['REQUEST_METHOD']    
     assert_nil env['FRAGMENT']
     assert_nil env['QUERY_STRING']
     assert_equal "", env['rack.input']
+    assert_equal '127.0.0.1', env['HTTP_CLIENT_IP']
   end
   
   def test_parse_dumbfuck_headers
-    should_be_good = "GET / HTTP/1.1\r\naaaaaaaaaaaaa:++++++++++\r\n\r\n"
+    should_be_good = "GET / HTTP/1.0\r\naaaaaaaaaaaaa:++++++++++\r\n\r\n"
     env = send_request(should_be_good)
     assert_equal "++++++++++", env["HTTP_AAAAAAAAAAAAA"]
     assert_equal "", env['rack.input']
@@ -62,7 +63,7 @@ class HttpParserTest < ServerTest
   end
 
   def test_fragment_in_uri
-    env = send_request("GET /forums/1/topics/2375?page=1#posts-17408 HTTP/1.1\r\n\r\n")
+    env = send_request("GET /forums/1/topics/2375?page=1#posts-17408 HTTP/1.0\r\n\r\n")
     assert_equal '/forums/1/topics/2375?page=1', env['REQUEST_URI']
     assert_equal 'posts-17408', env['FRAGMENT']
     assert_equal "", env['rack.input']
@@ -91,7 +92,7 @@ class HttpParserTest < ServerTest
     # then that large mangled field values are caught
     10.times do |c|
       req = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
-      #assert drops_request?(req), "large mangled field values are caught"
+      assert drops_request?(req), "large mangled field values are caught"
       ### XXX this is broken! fix me. this test should drop the request.
     end
     

data/test/helper.rb

@@ -25,7 +25,7 @@ class HelperApp
     elsif commands.include?('test_post_length')
       input_body = env['rack.input'].read
       
-      content_length_header = env['HTTP_CONTENT_LENGTH'].to_i
+      content_length_header = env['CONTENT_LENGTH'].to_i
       
       if content_length_header == input_body.length
         body = "Content-Length matches input length"
@@ -84,3 +84,55 @@ class ServerTest < Test::Unit::TestCase
     assert true
   end
 end
+
+class ServerTestFD < ServerTest
+  def setup
+    @tcp_server = TCPServer.new('0.0.0.0', TEST_PORT);
+    Thread.new { Ebb.start_server(HelperApp.new, :fileno => @tcp_server.fileno) }
+    sleep 0.1 until Ebb.running?
+  end
+
+  def teardown
+    super
+    @tcp_server = nil
+  end
+end
+
+class ServerTestSocket < ServerTest
+  def get(path)
+    socket = UNIXSocket.open(@socketfile)
+    socket.write("GET #{path} HTTP/1.0\r\n\r\n")
+    response = ""
+    while chunk = socket.read(100)
+      response << chunk
+    end
+    body = response.split("\r\n\r\n")[1]
+    env = JSON.parse(body)
+  ensure
+    socket.close if socket
+  end
+  
+  def post(path, data)
+    socket = UNIXSocket.open(@socketfile)
+    socket.write("POST #{path} HTTP/1.0\r\nContent-Length: #{data.length}\r\n\r\n#{data}")
+    response = ""
+    while chunk = socket.read(100)
+      response << chunk
+    end
+    body = response.split("\r\n\r\n")[1]
+    env = JSON.parse(body)
+  ensure
+    socket.close if socket
+  end
+  
+  def setup
+    @socketfile = '/tmp/ebb_unittest.sock'
+    Thread.new { Ebb.start_server(HelperApp.new, :unix_socket => @socketfile) }
+    sleep 0.1 until Ebb.running?
+  end
+
+  def teardown
+    super
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebb
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - ry dahl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-18 00:00:00 +01:00
+date: 2008-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,6 @@ files:
 - ruby_lib/rack/adapter
 - ruby_lib/rack/adapter/rails.rb
 - benchmark/application.rb
-- benchmark/bench_results.rb
 - benchmark/server_test.rb
 - bin/ebb_rails
 - test/basic_test.rb
@@ -85,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ebb
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: A Web Server

data/benchmark/bench_results.rb

@@ -1,58 +0,0 @@
-# supply the benchmark dump file as an argumetn to this program
-require 'rubygems'
-require 'google_chart'
-require 'server_test'
-
-class Array
-  def max
-    inject(first) { |m, i| i > m ? i : m } 
-  end
-  
-  def min
-    inject(first) { |m, i| i < m ? i : m }
-  end
-end
-
-
-
-colors = %w{F74343 444130 7DA478 E4AC3D 1F479E}
-data_x = []
-data_y = []
-results = ServerTestResults.open(ARGV[0])
-
-response_chart = GoogleChart::LineChart.new('500x300', Time.now.strftime('%Y.%m.%d'), true)
-servers = results.servers.sort_by do |x,y|
-  results.data(x).map { |d| d[1] }.mean
-end.reverse
-
-cmap = {}
-results.servers.sort.each { |x| cmap[x] = colors.shift }
-
-servers.each do |server|
-  data = results.data(server).sort
-  data_x += data.map { |d| d[0] }
-  data_y += data.map { |d| d[1] }
-end
-
-servers.each do |server|
-  data = results.data(server).sort
-  data.map! { |d| [d[0]-data_x.min, d[1]-data_y.min]}
-  response_chart.data(server, data, cmap[server])
-end
-
-label = case results.benchmark
-when "response_size"
-  "kilobytes served"
-when "wait_fib", "concurrency"
-  "concurrency"
-when "post_size"
-  "kilobytes uploaded"
-when "wait", "wait_fib"
-  "seconds waited every 10 requests"
-end
-
-response_chart.axis(:y, :range => [data_y.min,data_y.max])
-response_chart.axis(:y, :labels => ['req/s'], :positions => [50])
-response_chart.axis(:x, :range => [data_x.min,data_x.max])
-response_chart.axis(:x, :labels => [label], :positions => [50])
-puts response_chart.to_url