webroar 0.2.4 → 0.2.5

data/src/admin_panel/public/stylesheets/calendar_date_select/silver.css

@@ -0,0 +1,133 @@
+.calendar_date_select {
+  color:white;
+  border:#777 1px solid;
+  display:block;
+  width:195px;
+  z-index: 1000;
+}
+/* this is a fun ie6 hack to get drop downs to stay behind the popup window.  This should always be just underneath .calendar_date_select */
+iframe.ie6_blocker {
+  position: absolute;
+  z-index: 999;
+}
+
+.calendar_date_select thead th {
+  font-weight:bold;
+  background-color: #000;
+  border-top:1px solid #777;
+  border-bottom:2px solid #333;
+  color: white !important;
+}
+
+.calendar_date_select .cds_buttons {
+  text-align:center;
+  padding:5px 0px;
+  background-color: #555;
+}
+
+.calendar_date_select .cds_footer {
+  background-color: black;
+  padding:3px;
+  font-size:12px;
+  text-align:center;
+}
+
+.calendar_date_select table {
+  margin: 0px;
+  padding: 0px;
+}
+
+
+.calendar_date_select .cds_header {
+  background-color: #ccc;
+  border-bottom: 2px solid #aaa;
+  text-align:center;
+}
+
+.calendar_date_select .cds_header span {
+  font-size:15px;
+  color: black;
+  font-weight: bold;
+}
+
+.calendar_date_select select { font-size:11px;}
+
+.calendar_date_select .cds_header a:hover {
+  color: white;
+}
+.calendar_date_select .cds_header a {
+  width:22px;
+  height:20px;
+  text-decoration: none;
+  font-size:14px;
+  color:black !important;
+}
+
+.calendar_date_select .cds_header a.prev {
+  float:left;
+}
+.calendar_date_select .cds_header a.next {
+  float:right;
+}
+.calendar_date_select .cds_header a.close {
+  float:right;
+  display:none;
+}
+
+.calendar_date_select .cds_header select.month {
+  width:90px;
+}
+
+.calendar_date_select .cds_header select.year {
+  width:61px;
+}
+
+.calendar_date_select .cds_buttons a {
+  color: white;
+  font-size: 9px;
+}
+.calendar_date_select td {
+  font-size:12px;
+  width: 24px;
+  height: 21px;
+  text-align:center;
+  vertical-align: middle;
+  background-color: #666666;
+}
+.calendar_date_select td.weekend {
+  background-color: #606060;
+}
+
+.calendar_date_select td div {
+  color: #fff;
+}
+.calendar_date_select td div.other {
+  color: #888;
+}
+.calendar_date_select td.selected div {
+  color:black;
+}
+
+.calendar_date_select tbody td {
+  border-bottom: 1px solid #555;
+}
+.calendar_date_select td.selected {
+  background-color:white;
+}
+
+.calendar_date_select td:hover {
+  background-color:#ccc;
+}
+
+.calendar_date_select td.today {
+  border: 1px dashed #999;
+}
+
+.calendar_date_select td.disabled div {
+  color: #454545;
+}
+
+
+.fieldWithErrors .calendar_date_select {
+  border: 2px solid red;
+}

data/src/head/wr_config.h

@@ -81,7 +81,7 @@
 // File to store Server process id
 #define WR_PID_FILE  "/var/run/webroar.pid"
 #define WR_SERVER "WebROaR"
-#define WR_VERSION "0.2.4"
+#define WR_VERSION "0.2.5"
 #define WR_MIME_TYPE_PATH "/conf/mime_type.yml"
 #define WR_CONF_PATH "/conf/config.yml"
 #define WR_SERVER_INTERNAL_CONF_PATH "/conf/server_internal_config.yml"

data/src/ruby_lib/analyzer/db_connect.rb

@@ -20,9 +20,9 @@ ADMIN_PANEL_ROOT = File.join(WEBROAR_ROOT, 'src', 'admin_panel').freeze
 #$LOAD_PATH.unshift("#{File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activerecord', 'lib')}")
 #$LOAD_PATH.unshift("#{File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activesupport', 'lib')}")
 #require File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activerecord', 'lib', 'active_record')
-gem 'activesupport', '=2.3.2'
-gem 'activerecord', '=2.3.2'
-require 'activerecord'
+gem 'activesupport', '>= 2.3.5'
+gem 'activerecord', '>= 2.3.5'
+require 'active_record'
 
 module Webroar
   module Analyzer

data/src/ruby_lib/mailer/smtpmail.rb

@@ -22,9 +22,9 @@
 #$LOAD_PATH.unshift("#{File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'actionmailer', 'lib')}")
 #require File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'actionmailer', 'lib', 'action_mailer')
 
-gem 'actionpack', '=2.3.2'
-gem 'actionmailer', '=2.3.2'
-require 'actionmailer' 
+gem 'actionpack', '>= 2.3.5'
+gem 'actionmailer', '>= 2.3.5'
+require 'action_mailer' 
 require 'yaml'
 
 module Email

data/src/ruby_lib/ruby_interface/version.rb

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

data/src/ruby_lib/webroar_app_loader.rb

@@ -15,66 +15,71 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'ruby_interface', 'ruby_interface')
-
-#turn it on to see the Ruby exception
-$DEBUG = $g_options['debug']
+begin
+  require File.join(File.expand_path(File.dirname(__FILE__)), 'ruby_interface', 'ruby_interface')
+  
+  #turn it on to see the Ruby exception
+  $DEBUG = $g_options['debug']
 =begin
-$g_options = Hash.new
-$g_options["root"]="/home/dshah/work/rails_workspace/test2.3"
-#$g_options["root"]="/home/dharmarth/work/merb_workspace/iBlogs-activerecord"
-$g_options["app_type"]="rails"
-$g_options["app_name"]="Planning Poker"
-$g_options["prefix"] = "/test"
-$g_options["app_profiling"]="no"
-$g_options["webroar_root"] = "/home/dshah/workspace/webroar"
+  $g_options = Hash.new
+  $g_options["root"]="/home/dshah/work/rails_workspace/test2.3"
+  #$g_options["root"]="/home/dharmarth/work/merb_workspace/iBlogs-activerecord"
+  $g_options["app_type"]="rails"
+  $g_options["app_name"]="Planning Poker"
+  $g_options["prefix"] = "/test"
+  $g_options["app_profiling"]="no"
+  $g_options["webroar_root"] = "/home/dshah/workspace/webroar"
 =end
-
-module Webroar
-  class AdapterLoader
-    ADAPTER_FILES.each { |f|
-      if f.include?("#{$g_options["app_type"]}.rb")
-        require f
-        break
-      end
-    }
-    ADAPTER = Adapter.get($g_options["app_type"])
-    $app = ADAPTER.new($g_options)
-    $app = Webroar::Deflater.new($app)
-    
-    #left over for debugging  
-    #    STDIN.reopen('/dev/null')     
-    #    STDOUT.reopen("/home/dshah/workspace/webroar/webroar_prof", "a")        
-    #    STDOUT.sync = true
-    #    STDERR.reopen(STDOUT)
-    #    STDERR.sync = true
-    #    puts '...........file opened..............'
-    require File.join(File.dirname(__FILE__), 'profiler', 'message_dispatcher') #to send pid of worker
-    if $pid_sent
-      require File.join(File.dirname(__FILE__), 'exception_tracker', 'webroar_exception.rb')
-    else
-      Webroar.log_info("Exception notification would not work.")
-    end
-    if $g_options["app_profiling"] == "yes"
+  
+  module Webroar
+    class AdapterLoader
+      ADAPTER_FILES.each { |f|
+        if f.include?("#{$g_options["app_type"]}.rb")
+          require f
+          break
+        end
+      }
+      ADAPTER = Adapter.get($g_options["app_type"])
+      $app = ADAPTER.new($g_options)
+      $app = Webroar::Deflater.new($app)
+      
+      #left over for debugging  
+      #    STDIN.reopen('/dev/null')     
+      #    STDOUT.reopen("/home/dshah/workspace/webroar/webroar_prof", "a")        
+      #    STDOUT.sync = true
+      #    STDERR.reopen(STDOUT)
+      #    STDERR.sync = true
+      #    puts '...........file opened..............'
+      require File.join(File.dirname(__FILE__), 'profiler', 'message_dispatcher') #to send pid of worker
       if $pid_sent
-        require File.expand_path(File.join($g_options["webroar_root"], 'src', 'ruby_lib', 'profiler', 'webroar_profiling.rb'))     
+        require File.join(File.dirname(__FILE__), 'exception_tracker', 'webroar_exception.rb')
       else
-        Webroar.log_info("Profiling did not started.")
+        Webroar.log_info("Exception notification would not work.")
+      end
+      if $g_options["app_profiling"] == "yes"
+        if $pid_sent
+          require File.expand_path(File.join($g_options["webroar_root"], 'src', 'ruby_lib', 'profiler', 'webroar_profiling.rb'))     
+        else
+          Webroar.log_info("Profiling did not started.")
+        end
       end
-    end
-    
-    # Taken from Mongrel cgi_multipart_eof_fix
-    # Ruby 1.8.5 has a security bug in cgi.rb, we need to patch it.
-    version = RUBY_VERSION.split('.').map { |i| i.to_i }      
-    if version[0] <= 1 && version[1] <= 8 && version[2] <= 5 && RUBY_PLATFORM !~ /java/
-      begin
-        require 'cgi_multipart_eof_fix'
-      rescue LoadError
-        Webroar.log_info "!! Ruby 1.8.5 is not secure please install cgi_multipart_eof_fix:"
-        Webroar.log_info "   gem install cgi_multipart_eof_fix"
+      
+      # Taken from Mongrel cgi_multipart_eof_fix
+      # Ruby 1.8.5 has a security bug in cgi.rb, we need to patch it.
+      version = RUBY_VERSION.split('.').map { |i| i.to_i }      
+      if version[0] <= 1 && version[1] <= 8 && version[2] <= 5 && RUBY_PLATFORM !~ /java/
+        begin
+          require 'cgi_multipart_eof_fix'
+        rescue LoadError
+          Webroar.log_info "!! Ruby 1.8.5 is not secure please install cgi_multipart_eof_fix:"
+          Webroar.log_info "   gem install cgi_multipart_eof_fix"
+        end
       end
-    end
-  end #AdapterLoader
-end #Webroar
-Webroar.log_info("Application loaded successfully")
+    end #AdapterLoader
+  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)
+  raise
+end

data/src/worker/wkr_http.c

@@ -230,102 +230,6 @@ err:
   return retval;
 }
 
-#if RUBY_VERSION < 190
-/* Exception handling code for Ruby script, loaded from embedded interpreter is
-   based on code given at http://zzz.zggg.com/perl_ruby_multithreading_embedding.html
-*/
-static inline void show_error_pos() {
-  LOG_FUNCTION
-  ID this_func = rb_frame_last_func();
-  if (ruby_sourcefile) {
-    if (this_func) {
-      LOG_INFO("show_error_pos() %s:%s:in %s", ruby_sourcefile,ruby_sourceline,rb_id2name(this_func));
-    } else {
-      LOG_INFO("show_error_pos() %s:%s", ruby_sourcefile,ruby_sourceline);
-    }
-  }
-}
-
-static inline void show_exception_info() {
-  LOG_FUNCTION
-  if (NIL_P(ruby_errinfo))
-    return;
-
-  VALUE errat = rb_funcall(ruby_errinfo, rb_intern("backtrace"), 0);
-  if (!NIL_P(errat)) {
-    VALUE mesg = RARRAY_PTR(errat)[0];
-
-    if (NIL_P(mesg)) {
-      show_error_pos();
-    } else {
-      LOG_INFO("%s",RSTRING_PTR(mesg));
-    }
-  }
-
-  VALUE eclass = CLASS_OF(ruby_errinfo);
-
-  char* einfo;
-  int elen;
-  int state;
-  VALUE estr = rb_protect(rb_obj_as_string, ruby_errinfo, &state);
-  if (state) {
-    einfo = "";
-    elen = 0;
-  } else {
-    einfo = RSTRING_PTR(estr);
-    elen = RSTRING_LEN(estr);
-  }
-
-  if (eclass == rb_eRuntimeError && elen == 0) {
-    LOG_INFO(": unhandled exception");
-  } else {
-    VALUE epath;
-    epath = rb_class_path(eclass);
-    if (elen == 0) {
-      LOG_INFO("%s: ",RSTRING_PTR(epath));
-    } else {
-      char* tail  = 0;
-      int len = elen;
-
-      if ((RSTRING_PTR(epath))[0] == '#')
-        epath = 0;
-
-      if (tail = strchr(einfo, '\n')) {
-        len = tail - einfo;
-        tail++;
-      }
-      LOG_INFO("%s: ", einfo);
-      if (epath) {
-        LOG_INFO(" (%s",RSTRING_PTR(epath));
-      }
-
-      if (tail) {
-        LOG_INFO("%s",tail);
-      }
-    }
-  }
-
-  if (!NIL_P(errat)) {
-    const int TRACE_HEAD = 8;
-    const int TRACE_TAIL = 5;
-    const int TRACE_MAX = TRACE_HEAD + TRACE_TAIL + 5;
-
-    long len =  RARRAY_LEN(errat);
-    int i = 1;
-    for (i = 1; i < len; ++i) {
-      if (TYPE(RARRAY_PTR(errat)[i]) == T_STRING) {
-        LOG_INFO("  from %s ",RSTRING_PTR(RARRAY_PTR(errat)[i]));
-      }
-
-      if (i == TRACE_HEAD && len > TRACE_MAX) {
-        LOG_INFO("   ... %d ld levels... ",len - TRACE_HEAD - TRACE_TAIL);
-        i = len - TRACE_TAIL;
-      }
-    }
-  }
-}
-#endif
-
 /** Load rack adapter */
 int load_rack_adapter(wkr_tmp_t *tmp) {
   LOG_FUNCTION
@@ -364,54 +268,18 @@ int load_rack_adapter(wkr_tmp_t *tmp) {
   LOG_DEBUG(DEBUG,"setting debug true");
   rb_hash_aset(g_options,rb_str_new("debug",5),Qtrue);
 #else
-
   LOG_DEBUG(DEBUG,"setting debug false");
   rb_hash_aset(g_options,rb_str_new("debug",5),Qfalse);
 #endif
 
   rb_gv_set("g_options",g_options);
 
-#if RUBY_VERSION < 190
-
-  rb_load_protect(rb_str_new2(tmp->script_path.str), 0, &state);
-  //free(path);
-  LOG_DEBUG(DEBUG,"state=%d",state);
-  if (state) {
-    switch (state) {
-    case 0x1: // TAG_RETURN
-      LOG_INFO("unexpected return");
-      show_error_pos();
-      break;
-    case 0x2: // TAG_BREAK
-      LOG_INFO("unexpected break");
-      show_error_pos();
-      break;
-    case 0x3: // TAG_NEXT
-      LOG_INFO("unexpected next");
-      show_error_pos();
-      break;
-    case 0x4: // TAG_RETRY
-      LOG_INFO("retry outside of rescue clause");
-      show_error_pos();
-      break;
-    case 0x5: // TAG_REDO
-      LOG_INFO("unexpected redo");
-      show_error_pos();
-      break;
-    case 0x6: // TAG_RAISE
-    case 0x8: // TAG_FATAL
-      show_exception_info();
-      break;
-    default:
-      LOG_INFO("unknown long jump status ");
-    }
-    // TODO: No magic numbers please
-    return -1;
+  rb_protect(RUBY_METHOD_FUNC(rb_require), (VALUE)tmp->script_path.str, &state);
+  LOG_DEBUG(DEBUG, "state=%d", state);
+  if ( state != 0 ) {
+    LOG_ERROR(FATAL, "Some problem occurred while loading application.");
+    return -1; 
   }
-#else
-  rb_require(tmp->script_path.str);
-#endif
-
   return 0;
 }
 

data/src/worker/wkr_main.c

@@ -223,6 +223,7 @@ static inline wkr_tmp_t* parse_args(int argc, char **argv) {
 
   if(tmp->log_file.str){
     initialize_logger(tmp->log_file.str);
+    redirect_standard_io();
 #ifdef L_DEBUG
       set_log_severity(DEBUG);
 #else
@@ -303,8 +304,7 @@ int main(int argc, char **argv) {
   w = worker_new(loop, tmp);
   if(w==NULL)
     goto err;
-  worker = w;
-  redirect_standard_io();
+  worker = w;  
   
   LOG_DEBUG(DEBUG,"control path = %s, Application baseuri = %s",
             w->tmp->ctl_path.str,  w->tmp->resolver.str);

data/tasks/gem.rake

@@ -45,15 +45,16 @@ spec = Gem::Specification.new do |s|
   
   s.required_ruby_version = '>= 1.8.5'
 
-  s.add_dependency 'rails', '= 2.3.2'
+  s.add_dependency 'rails', '>= 2.3.5'
   s.add_dependency 'calendar_date_select', '>= 1.15'  
-  s.add_dependency 'rack', '>= 0.9.1'
+  s.add_dependency 'rack', '>= 1.0.1'
   s.add_dependency 'rake', '>= 0.8.1'  
   s.add_dependency 'rspec', '>=1.2.2'
   s.add_dependency 'sqlite3-ruby', '>=1.2.3'
   s.add_dependency 'starling-starling', '>=0.10.0'
   
-  s.files = FileList['Rakefile',    
+  s.files = FileList['Rakefile',
+    'README',
     'CHANGELOG',
     'COPYING',
     File.join('bin', 'webroar'),

data/tasks/test.rake

@@ -28,6 +28,7 @@ REPORT_DIR = File.join(WEBROAR_ROOT,'report')
 TEST_DIR = File.join(WEBROAR_ROOT, 'test')
 DEBUG_LOG_DIR = File.join(TEST_DIR,'debug_log')
 ALL_SPECS = FileList[File.join(SPEC_DIR,'*_spec.rb')].exclude("conditional_spec.rb")
+#ALL_SPECS = FileList[File.join(SPEC_DIR,'access_log_spec.rb')]
 #ALL_SPECS = FileList[File.join(SPEC_DIR,'*_spec.rb')].exclude(
 #File.join(SPEC_DIR,'host_name_spec.rb'),
 #File.join(SPEC_DIR,'connection_keep_alive_spec.rb'),
@@ -130,7 +131,7 @@ desc "Executes functional test"
 task :spec => :test_setup
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = ALL_SPECS
-  t.spec_opts << "--format specdoc:#{TEST_RESULT}"
+  t.spec_opts << "--format specdoc"
 end
 
 
@@ -397,7 +398,8 @@ task :all_test do
   if(test_flag==1)
     t = Rake::Task[:spec]
     puts "Executing functional tests ..."
-    begin
+    begin      
+      ENV["SPEC_OPTS"] = "--format specdoc:#{TEST_RESULT}"
       t.invoke()
     rescue Exception => e
       File.open(exception_log,"a") do |f|

data/test/spec/test_app/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+# RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')