ebb 0.3.1 → 0.3.2

data/lib/ebb.rb

@@ -10,12 +10,16 @@ module Ebb
   def self.running?
     FFI::server_open?
   end
+
+  def self.ssl?
+    @@secure
+  end
   
   def self.stop_server()
     @running = false
   end
   
-  def self.start_server(app, options={})
+  def self.set_options(options)
     if options.has_key?(:fileno)
       fd = options[:fileno].to_i
       FFI::server_listen_on_fd(fd)
@@ -31,6 +35,7 @@ module Ebb
       log.puts "Ebb is listening at http://0.0.0.0:#{port}/"
     end
 
+    @@secure = false
     if options.has_key?(:ssl_cert) and options.has_key?(:ssl_key)
       unless FFI.respond_to?(:server_set_secure)
         log.puts "ebb compiled without ssl support. get gnutls" 
@@ -39,16 +44,25 @@ module Ebb
         key_file = options[:ssl_key]
         if FileTest.readable?(cert_file) and FileTest.readable?(cert_file)
           FFI::server_set_secure(cert_file, key_file);
+          @@secure = true
         else 
           log.puts "error opening certificate or key file"
         end
       end
     end
 
+    unless options[:docroot].nil?
+      @@docroot = options[:docroot]
+      raise "#{@@docroot} not a directory"unless File.directory?(@@docroot)
+    end
+  end
+
+  def self.start_server(app, options={})
+    set_options(options)
     log.puts "Ebb PID #{Process.pid}"
     
-    @running = true
     Connection.reset_responses
+    @running = true
     trap('INT')  { stop_server }
 
     while @running
@@ -68,7 +82,6 @@ module Ebb
     res = req.response
     req.connection.responses << res
 
-    # p req.env
     status = headers = body = nil
     catch(:async) do 
       status, headers, body = app.call(req.env)
@@ -157,16 +170,26 @@ module Ebb
 
     def call(status, headers, body)
       @head = "HTTP/1.1 #{status} #{HTTP_STATUS_CODES[status.to_i]}\r\n"
-      headers.each { |field, value| @head << "#{field}: #{value}\r\n" }
-      @head << "\r\n"
+
+      # Hack to be compatible with frameworks who return Strings.
+      if body.kind_of?(String)
+        headers["Content-Length"] = body.length.to_s
+        body = [body]
+      end
 
       # XXX i would prefer to do
       # @chunked = true unless body.respond_to?(:length)
-      @chunked = true if headers["Transfer-Encoding"] == "chunked"
+      if headers["Transfer-Encoding"] == "chunked" or 
+         !headers.has_key?("Content-Length") 
+      then
+        headers["Transfer-Encoding"] = "chunked"
+        @chunked = true 
+      end
       # I also don't like this
       @last = true if headers["Connection"] == "close"
 
-      # Note: not setting Content-Length. do it yourself.
+      headers.each { |field, value| @head << "#{field}: #{value}\r\n" }
+      @head << "\r\n"
       
       body.each do |chunk| 
         write(chunk) 
@@ -257,25 +280,34 @@ module Ebb
   
   class Request
     attr_accessor :connection
+
+    BASE_ENV = {
+      'SERVER_NAME' => '0.0.0.0',
+      'SCRIPT_NAME' => '',
+      'SERVER_SOFTWARE' => Ebb::VERSION_STRING,
+      'SERVER_PROTOCOL' => 'HTTP/1.1',
+      'rack.version' => [0, 1],
+      'rack.errors' => STDERR,
+      'rack.multiprocess' => false,
+      'rack.run_once' => false
+    }
     
     def env
       @env ||= begin
-        @env_ffi.update(
-          'SERVER_NAME' => '0.0.0.0',
-          'SCRIPT_NAME' => '',
-          'SERVER_SOFTWARE' => Ebb::VERSION_STRING,
-          'SERVER_PROTOCOL' => 'HTTP/1.1',
-          'rack.version' => [0, 1],
-          'rack.errors' => STDERR,
-          'rack.url_scheme' => 'http',
-          'rack.multiprocess' => false,
-          'rack.run_once' => false,
-
+        env = BASE_ENV.merge(@env_ffi)
+        env.update(
           'rack.input' => self,
           'async.callback' => response,
-          'CONTENT_LENGTH' => @env_ffi.delete('HTTP_CONTENT_LENGTH'),
-          'CONTENT_TYPE' => @env_ffi.delete('HTTP_CONTENT_TYPE')
+          'rack.url_scheme' => Ebb.ssl? ? 'https' : 'http'
         )
+        env["HTTP_HOST"] ||= BASE_ENV["SERVER_NAME"]
+        if env.has_key?('HTTP_CONTENT_LENGTH')
+          env['CONTENT_LENGTH'] = env.delete('HTTP_CONTENT_LENGTH')
+        end
+        if env.has_key?('HTTP_CONTENT_TYPE')
+          env['CONTENT_TYPE'] = env.delete('HTTP_CONTENT_TYPE')
+        end
+        env
       end
     end
 

data/lib/ebb/version.rb

@@ -1,4 +1,4 @@
 module Ebb
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
   VERSION_STRING = "Ebb #{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebb
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - ry dahl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-19 00:00:00 +02:00
+date: 2008-08-20 00:00:00 +02:00
 default_executable: 
 dependencies: []