webroar 0.2.5 → 0.2.6

data/src/ruby_lib/ruby_interface/constants.rb

@@ -84,6 +84,7 @@ module Webroar
   Set_Cookie = 'Set-Cookie'.freeze
   LF = "\n".freeze
   
+  READ_CHUNK_SIZE = 4096
   HTTP_STATUS_CODES = {
     100  => 'Continue',
     101  => 'Switching Protocols',

data/src/ruby_lib/ruby_interface/deflater.rb

@@ -1,109 +1,46 @@
-# Deflater based on Rack:Deflater. 
-# We need to override as, we would not like to repeate encoding process and, change the Content-Length header if encoding is done.
-# 
-require "zlib"
-require "stringio"
-require "time"  # for Time.httpdate
+# WebROaR - Ruby Application Server - http://webroar.in/
+# Copyright (C) 2009  Goonj LLC
+#
+# This file is part of WebROaR.
+#
+# WebROaR is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# WebROaR is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
-module Webroar
+require 'rubygems'
+require 'rack'
+
+module Webroar  
+  
+  class Deflater < Rack::Deflater
   
-  class Deflater
     def initialize(app)
       @app = app
+      super
     end
     
     def call(env)
-      status, headers, body = @app.call(env)
-      
-      # Skip compressing empty entity body responses and responses with
-      # no-transform set.
-      if ::Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
-        headers['Cache-Control'].to_s =~ /\bno-transform\b/
-        return [status, headers, body]
-      end
-      
-      # Skip compressing entity body responses if already compressed.    
-      if headers.has_key?(Content_Encoding) 
-        return [status, headers, body]
-      end
-      
       # Skip compressing entity body if user agent is IE6
       # refer http://schroepl.net/projekte/mod_gzip/browser.htm and 
       # http://support.microsoft.com/default.aspx?scid=kb;en-us;Q313712
       # for problem details
       # 
       if env['HTTP_USER_AGENT'] =~ /MSIE 6.0/
-        return [status, headers, body]
-      end
-      
-      request = ::Rack::Request.new(env)
-      
-      encoding = ::Rack::Utils.select_best_encoding(%w(gzip deflate identity),
-      request.accept_encoding)
-      
-      # Set the Vary HTTP header.
-      vary = headers["Vary"].to_s.split(",").map { |v| v.strip }
-      unless vary.include?("*") || vary.include?("Accept-Encoding")
-        headers["Vary"] = vary.push("Accept-Encoding").join(",")
-      end
-      
-      case encoding
-      when "gzip"
-        mtime = if headers.has_key?("Last-Modified") 
-          Time.httpdate(headers["Last-Modified"]) 
-        else 
-          Time.now
-        end              
-        body = self.class.gzip(body, mtime)
-        # Here changing the content length
-        headers[Content_Length] = Webroar::Utils.calculate_content_length(body)
-        [status,
-        headers.merge("Content-Encoding" => "gzip"),
-        body]
-      when "deflate"
-        body = self.class.deflate(body)
-        # Here changing content length
-        headers[Content_Length] = Webroar::Utils.calculate_content_length(body)
-        [status,
-        headers.merge("Content-Encoding" => "deflate"),
-        body]
-      when "identity"
-        [status, headers, body]
-      when nil
-        # Requested encoding not fouud, returning plain response.
-        [status, headers, body]
-      end
-    end
-    
-    def self.gzip(body, mtime)
-      io = StringIO.new
-      gzip = Zlib::GzipWriter.new(io)
-      gzip.mtime = mtime
-      
-      # TODO: Add streaming
-      body.each { |part| gzip << part }
-      
-      gzip.close
-      return io.string
+        @app.call(env)
+      else       
+        super        
+      end  
     end
     
-    DEFLATE_ARGS = [
-    Zlib::DEFAULT_COMPRESSION,
-    # drop the zlib header which causes both Safari and IE to choke
-    -Zlib::MAX_WBITS,
-    Zlib::DEF_MEM_LEVEL,
-    Zlib::DEFAULT_STRATEGY
-    ]
-    
-    # Loosely based on Mongrel's Deflate handler
-    def self.deflate(body)
-      deflater = Zlib::Deflate.new(*DEFLATE_ARGS)
-      
-      # TODO: Add streaming
-      body.each { |part| deflater << part }
-      
-      return deflater.finish
-    end
   end
   
 end

data/src/ruby_lib/ruby_interface/logger.rb

@@ -19,15 +19,15 @@
 module Webroar
 
   def self.log_info(message)
-    Webroar::log( "Info", 5, message)
+    Webroar::log_message( "Info", 5, message)
   end
 
   def self.log_error(message, level = 4)
-    Webroar::log( "Error", level, message)
+    Webroar::log_message( "Error", level, message)
   end
   
   def self.log_debug(message)
-    Webroar::log( "Debug", 1, message)
+    Webroar::log_message( "Debug", 1, message)
   end
 
 end

data/src/ruby_lib/ruby_interface/request_handler.rb

@@ -27,7 +27,7 @@ module Webroar
       return false if headers.has_key?(Content_Length)
       return false if (100..199).include?(status) || status == 204 || status == 304
       return false if headers.has_key?(Transfer_Encoding) && headers[Transfer_Encoding] =~ /\bchunked\b/i
-      return false unless body.kind_of?(String) || body.kind_of?(Array)
+      return false unless body.kind_of?(String) || body.respond_to?(:each)
       true
     end
     
@@ -35,12 +35,20 @@ module Webroar
       begin
         app = $app
         status, headers, body = app.call(client.env)
-      rescue
-        raise if $DEBUG
+      rescue Exception => e
+        error = e.class.to_s + '-' + e.to_s + "\n" + e.backtrace.join("\n").to_s
+        Webroar.log_error(error)
         status = 500
-        headers = {Content_Type => TEXT_PLAIN}
-        body = InternalServerError
-        Webroar.log_debug("Webroar:ProcessClient:Process() inside 500 error")
+        headers = {Content_Type => 'text/html'}
+        body = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n\
+                <html><head>\r\n\
+                <title>Internal Server Error</title>\r\n\
+                </head><body>\r\n\
+                <h1>Internal Server Error</h1>\r\n\
+                <p>The server encountered an unexpected condition which prevented it from fulfilling the request.</p>\r\n\
+                <br><br><hr>#{SERVER}\
+                </body></html>"
+                
       end # begin
       
       status = status.to_i
@@ -49,7 +57,8 @@ module Webroar
         headers[Content_Length] = "0"
       else
         # Content-Length header checking and calculation according to Thin 
-        headers[Content_Length] = Webroar::Utils.calculate_content_length(body) if need_content_length?([status,headers,body])
+        # if body responding to 'each', accumulating body content into an Array
+        headers[Content_Length], actual_content = Webroar::Utils.calculate_content_length(body) if need_content_length?([status,headers,body])
       end
       
       if !client.keep_alive?          
@@ -65,10 +74,16 @@ module Webroar
       client.write_headers(headers, status, content_length)
       
       if(content_length > 0) 
-        client.write_body(body)
+        if actual_content
+          client.write_body(actual_content)
+        else
+          client.write_body(body)  
+        end        
       end
+      body.close if body.respond_to?(:close)
     rescue => e
       Webroar.log_error("WebROaR Error! #{e.class}  #{e.message}\n #{e.backtrace.join("\n")}")
+      body.close if body.respond_to?(:close)
       return
     ensure
     end # self.process

data/src/ruby_lib/ruby_interface/utils.rb

@@ -20,16 +20,27 @@ module Webroar
   class Utils
     class << self
       def calculate_content_length(body)
-        case body
-        when String
+        if body.respond_to?(:to_path)
+          #TODO: Some files(e.g. /proc) doesn't provide size info. We may have to figure out
+          # by reading entire content.  
+          if filesize = File.size?(body.to_path)  
+            filesize.to_s
+          else
+            "0"
+          end
+        elsif body.kind_of?(String)
           # See http://redmine.ruby-lang.org/issues/show/203
-           (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
-        when Array
-          bytes = 0
+          (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
+        else
+          # TODO: Yup, this is a ugly hack, accumulating body content at wrong place - only for little performance
+          # and DRYing up the things. 
+          bytes = 0 
+          body_content = []
           body.each do |p|
             bytes += p.respond_to?(:bytesize) ? p.bytesize : p.size
+            body_content << p
           end
-          bytes.to_s
+          [bytes.to_s, body_content]
         end
       end
     end

data/src/ruby_lib/ruby_interface/version.rb

@@ -21,7 +21,7 @@ module Webroar
   module VERSION #:nodoc:
     MAJOR    = "0"
     MINOR    = "2"
-    TINY     = "5"
+    TINY     = "6"
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
   end

data/src/ruby_lib/webroar_app_loader.rb

@@ -79,7 +79,7 @@ begin
   end #Webroar
   Webroar.log_info("Application loaded successfully")
 rescue Exception => e
-  error = e.to_s + "\n" + e.backtrace.join("\n").to_s
-  Webroar.log_error(error)
+  error = e.class.to_s + '-' + e.to_s + "\n" + e.backtrace.join("\n").to_s
+  Webroar::log_message( "Error", 5, error)
   raise
 end

data/src/worker/wkr_http.c

@@ -146,9 +146,9 @@ VALUE req_env(VALUE _, VALUE rb_req) {
   return hash;
 }
 
-/** Logging 'Ruby' messsage */
-VALUE log(VALUE _, VALUE message_type, VALUE severity, VALUE log_message) {
-  a_log(StringValuePtr(message_type), FIX2INT(severity), StringValuePtr(log_message));
+/** Logging 'Ruby' message */
+VALUE log_message(VALUE _, VALUE message_type, VALUE severity, VALUE message) {
+  a_log(StringValuePtr(message_type), FIX2INT(severity), StringValuePtr(message));
   return Qnil;
 }
 
@@ -168,7 +168,7 @@ void init_ruby_interface(http_t *h) {
   mObj = rb_define_module("Webroar");
   cReq = rb_define_class_under(mObj, "Client", rb_cObject);
   cRequestHandler = rb_define_class_under(mObj, "RequestHandler", rb_cObject);
-  rb_define_singleton_method(mObj, "log", log, 3);
+  rb_define_singleton_method(mObj, "log_message", log_message, 3);
   rb_define_singleton_method(mObj, "read_request", read_request, 2);
   rb_define_singleton_method(mObj, "client_env", req_env, 1);
   rb_define_singleton_method(mObj, "client_write_headers", req_write_headers, 4);
@@ -234,8 +234,8 @@ err:
 int load_rack_adapter(wkr_tmp_t *tmp) {
   LOG_FUNCTION
 
-  int state = 0, path_length=0;
-  char *path;
+  int state = 0;
+  
   LOG_DEBUG(DEBUG,"load_rack_adapter() Application path is = %s",tmp->path.str);
   // TODO: Keys are being setup as strings. Doesn't allow standard symbol based access in ruby script.
   VALUE g_options=rb_hash_new();

data/src/worker/wkr_http_response.c

@@ -34,7 +34,11 @@ http_resp_t* http_resp_new() {
   rsp->bytes_write = 0;
   rsp->resp_code = 0;
   rsp->scgi = NULL;
+#ifdef _POSIX_C_SOURCE
+  rsp->file = 0;
+#else
   rsp->file = NULL;
+#endif
 
   return rsp;
 }
@@ -112,14 +116,14 @@ int http_resp_process(http_resp_t *rsp) {
 void http_resp_file_write_cb(struct ev_loop* loop, struct ev_io* watcher, int revent) {
   LOG_FUNCTION
   wkr_t *w = (wkr_t*) watcher->data;
-  http_resp_t *rsp = w->http->resp;
-
-  ssize_t sent;
 
   LOG_DEBUG(DEBUG, "http_resp_file_write_cb() conn id=%d, Request id=%d",
           w->http->conn_id, w->http->req_id);
 
   if (revent & EV_WRITE) {
+#ifndef _POSIX_C_SOURCE
+  http_resp_t *rsp = w->http->resp;
+  ssize_t sent;
 
     if (rsp->file) {
       char buffer[WR_REQ_BODY_MAX_SIZE];
@@ -153,6 +157,7 @@ void http_resp_file_write_cb(struct ev_loop* loop, struct ev_io* watcher, int re
       ev_io_init(watcher, http_req_header_cb, w->req_fd, EV_READ);
       ev_io_start(loop, watcher);
     }
+#endif    
   }
 }
 
@@ -292,8 +297,6 @@ void http_resp_scgi_write_cb(struct ev_loop* loop, struct ev_io* watcher, int re
   wkr_t *w = (wkr_t*) watcher->data;
   http_resp_t *rsp = w->http->resp;
 
-  ssize_t sent;
-
   LOG_DEBUG(DEBUG, "http_resp_scgi_write_cb() conn id=%d, Request id=%d",
           w->http->conn_id, w->http->req_id);
 

data/src/worker/wkr_main.c

@@ -222,7 +222,7 @@ static inline wkr_tmp_t* parse_args(int argc, char **argv) {
   }
 
   if(tmp->log_file.str){
-    initialize_logger(tmp->log_file.str);
+    initialize_logger(tmp->log_file.str, WR_SERVER, WR_VERSION);
     redirect_standard_io();
 #ifdef L_DEBUG
       set_log_severity(DEBUG);
@@ -281,7 +281,7 @@ void idle_cb (struct ev_loop *loop, struct ev_idle *w, int revents) {
 }
 
 int main(int argc, char **argv) {
-  int port, retval = 0;
+  int retval = 0;
   wkr_t* w = NULL;
 
   if(argc == 1) {
@@ -340,7 +340,7 @@ int main(int argc, char **argv) {
   signal(SIGHUP, sigproc); /* catch hangup signal */
   signal(SIGINT, sigproc);
   signal(SIGTERM, sigproc);
-  signal(SIGCHLD, SIG_IGN);
+//  signal(SIGCHLD, SIG_IGN);
   signal(SIGTSTP, SIG_IGN);
   signal(SIGTTOU, SIG_IGN);
   signal(SIGTTIN, SIG_IGN);  

data/src/worker/wkr_static.c

@@ -218,11 +218,11 @@ static long int get_default_expires(node_t *root) {
 static int create_dictionary(const char *mapping_file, long int expires) {
   node_t *root = yaml_parse(mapping_file), *node;
   static_file_t *ext;
-  int index, i;
+  int index;
 
   // Initialize map with NULL value
-  for (i = 0; i < MAP_SIZE; i++) {
-    map[i] = NULL;
+  for (index = 0; index < MAP_SIZE; index++) {
+    map[index] = NULL;
   }
 
   if (root == NULL) {
@@ -345,7 +345,6 @@ void http_resp_304(http_t *h, const char *path, struct stat *buf) {
 void http_resp_403(http_t *h, const char *path, struct stat *buf) {
   LOG_FUNCTION
   char str[WR_LONG_LONG_STR_LEN], current_date[WR_STR_LEN];
-  time_t t;
   const char *conn_header = scgi_header_value_get(h->req->scgi, HTTP_HEADER_CONNECTION);
   int len;
 
@@ -367,7 +366,6 @@ void http_resp_403(http_t *h, const char *path, struct stat *buf) {
 void http_resp_404(http_t *h, const char *path, struct stat *buf) {
   LOG_FUNCTION
   char str[WR_LONG_LONG_STR_LEN], current_date[WR_STR_LEN];
-  time_t t;
   const char *conn_header = scgi_header_value_get(h->req->scgi, HTTP_HEADER_CONNECTION);
   int len;
   
@@ -395,7 +393,7 @@ void send_static_worker_pid(char *root_path) {
   root = yaml_parse(file_name);
   if(root == NULL) {
     LOG_ERROR(SEVERE, "Could not parse server_internal_config.yml file. PID can not be sent to analyzer");
-    return 0;  
+    return;  
   } else {
     char *host = NULL, *port = NULL, *queue_name = NULL;
     wr_msg_queue_server_t *msg_queue_server = NULL;
@@ -448,7 +446,6 @@ err:
 int static_module_init(char *root_path) {
   LOG_FUNCTION
   node_t *root;
-  char *node_value;
   char file_name[100];
   long int expires;
 
@@ -491,7 +488,7 @@ void static_module_free() {
 }
 
 /* Serve static file content */
-int static_file_process(http_t *h) {
+void static_file_process(http_t *h) {
   LOG_FUNCTION
   wkr_t *w = h->wkr;
   short resp_code;

data/src/worker/wkr_static.h

@@ -35,6 +35,6 @@ int static_module_init(char *root_path);
 void static_module_free();
 
 /* Serve the static file content */
-int static_file_process(http_t *h);
+void static_file_process(http_t *h);
 
 #endif /*WKR_STATIC_H_*/

data/test/spec/content_encoding_spec.rb

@@ -49,4 +49,18 @@ describe 'Content-Encoding' do
     body.should =~ /ok/
   end
   
+  it "should return plain text when asked for deflate encoded content and User-Agent is MSIE 6.0" do
+    request = "GET /test_app/test/content_encoding HTTP/1.1\r\nHost: localhost\r\nAccept-Encoding: deflate\r\nUser-Agent: MSIE 6.0\r\n\r\n"
+    @conn.write request
+    status, headers, body = parse_response @conn.read
+    body.should =~ /ok/
+  end
+  
+  it "should return plain text when asked for gzip encoded content and User-Agent is MSIE 6.0" do
+    request = "GET /test_app/test/content_encoding HTTP/1.1\r\nHost: localhost\r\nAccept-Encoding: gzip\r\nUser-Agent: MSIE 6.0\r\n\r\n"
+    @conn.write request
+    status, headers, body = parse_response @conn.read
+    body.should =~ /ok/
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webroar
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Aditya Babbar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +05:30
+date: 2009-12-23 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -190,21 +190,6 @@ files:
 - src/admin_panel/public/javascripts/builder.js
 - src/admin_panel/public/javascripts/ui.slider_old.js
 - src/admin_panel/public/javascripts/jquery-1.3.2.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_euro_24hr.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_american.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_euro_24hr_ymd.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_iso_date.js
-- src/admin_panel/public/javascripts/calendar_date_select/calendar_date_select.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_finnish.js
-- src/admin_panel/public/javascripts/calendar_date_select/locale/fi.js
-- src/admin_panel/public/javascripts/calendar_date_select/locale/pl.js
-- src/admin_panel/public/javascripts/calendar_date_select/locale/de.js
-- src/admin_panel/public/javascripts/calendar_date_select/locale/ru.js
-- src/admin_panel/public/javascripts/calendar_date_select/locale/pt.js
-- src/admin_panel/public/javascripts/calendar_date_select/locale/fr.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_italian.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_hyphen_ampm.js
-- src/admin_panel/public/javascripts/calendar_date_select/format_db.js
 - src/admin_panel/public/javascripts/ui.core.js
 - src/admin_panel/public/javascripts/prototype.js
 - src/admin_panel/public/javascripts/effects.js
@@ -219,17 +204,11 @@ files:
 - src/admin_panel/public/stylesheets/netscape/style.css
 - src/admin_panel/public/stylesheets/safari/login.css
 - src/admin_panel/public/stylesheets/safari/style.css
-- src/admin_panel/public/stylesheets/calendar_date_select/default.css
-- src/admin_panel/public/stylesheets/calendar_date_select/plain.css
-- src/admin_panel/public/stylesheets/calendar_date_select/red.css
-- src/admin_panel/public/stylesheets/calendar_date_select/silver.css
-- src/admin_panel/public/stylesheets/calendar_date_select/blue.css
 - src/admin_panel/public/dispatch.fcgi
 - src/admin_panel/public/404.html
 - src/admin_panel/public/favicon.ico
 - src/admin_panel/public/open-flash-chart.swf
 - src/admin_panel/public/dispatch.cgi
-- src/admin_panel/public/blank_iframe.html
 - src/admin_panel/public/images/bar.gif
 - src/admin_panel/public/images/logout.gif
 - src/admin_panel/public/images/bullet.gif
@@ -268,7 +247,6 @@ files:
 - src/admin_panel/public/images/home_up.gif
 - src/admin_panel/public/images/exceptions_ad.gif
 - src/admin_panel/public/images/analytics_dn.gif
-- src/admin_panel/public/images/calendar_date_select/calendar.gif
 - src/admin_panel/public/images/tit_analytics_ad.gif
 - src/admin_panel/public/images/close.gif
 - src/admin_panel/public/images/setting_up.gif

data/src/admin_panel/public/blank_iframe.html

@@ -1,2 +0,0 @@
-<!-- Nothing here; part of the calendar_date_select plugin -->
-<html><head></head><body></body></html>