nitro 0.26.0 → 0.27.0

data/lib/nitro/server.rb

@@ -111,20 +111,16 @@ class Server
     unless options.is_a?(Hash)
       options = { :controller => options }
     end
-    
+
     runner = Runner.new
     runner.setup_options
     runner.setup_mode
     runner.daemonize if runner.daemon  
-    
+
     server = Server.new
     server.start(options)
-    
-    unless $NITRO_NO_INVOKE 
-      runner.invoke(server)
-    else
-      Logger.info 'Running in console mode.'
-    end
+     
+    runner.invoke(server) unless $NITRO_NO_INVOKE
     
     return server
   end

data/lib/nitro/server/runner.rb

@@ -3,6 +3,9 @@ require 'optparse'
 require 'glue/configuration'
 require 'nitro/compiler'
 
+#require 'nano/kernel/autoreload'
+require 'glue/autoreload'
+
 module Nitro
 
 # The Runner is a helper class that encapsulates a web 
@@ -216,7 +219,6 @@ class Runner
   def setup_debug
     $DBG = true
     Compiler.reload = true
-    require 'nano/kernel/autoreload'
     autoreload(3)
     Caching.caching_enabled = false
     
@@ -226,6 +228,7 @@ class Runner
   def setup_stage
     $DBG = false
     Compiler.reload = true
+    autoreload(3)    
     Logger.set(Logger.new('log/app.log'))
     
     load_external_configuration(:stage)    
@@ -233,7 +236,14 @@ class Runner
 
   def setup_live
     $DBG = false
-    Compiler.reload = false 
+    
+    # Enable the reloading even on live apps by default.
+    # But have a longer thread sleep time.
+    # If you really need sligthly faster dispatching enable
+    # reloading (Compiler.reload = false)
+
+    Compiler.reload = true
+    autoreload(2 * 60)    
     Logger.set(Logger.new('log/app.log'))
     
     load_external_configuration(:live)        
@@ -244,21 +254,26 @@ class Runner
   # ...
   
   def invoke(server)
-    if 'fcgi_proc' == ENV['NITRO_INVOKE']
+    case ENV['NITRO_INVOKE']
+    when 'fcgi_proc'
       require 'nitro/adapter/fastcgi'
       FastCGI.start(server)
 
-    elsif 'scgi_proc' == ENV['NITRO_INVOKE']
+    when 'scgi_proc'
       require 'nitro/adapter/scgi'
       Scgi.start(server)
       
-    elsif 'cgi_proc' == ENV['NITRO_INVOKE']
+    when 'cgi_proc'
       require 'nitro/adapter/cgi'
       CgiAdapter.start(server)
       
-    elsif 'irb' == ENV['NITRO_INVOKE']
+    when 'irb'
       $server = server
       
+    when 'acgi_proc'
+      require 'nitro/adapter/acgi'
+      ACGI.start(server)
+      
     else
       invoke_server(server)
     end
@@ -314,6 +329,10 @@ class Runner
         when :cgi
           require 'nitro/adapter/cgi'
           puts "==> Using standard CGI. Please look into using Fast/Scgi"
+        
+        when :acgi
+          require 'nitro/adapter/acgi'
+          puts "==> Launching ACGI."
       end
       
     when :stop
@@ -325,6 +344,9 @@ class Runner
 
       when :apache
         `apachectl -d #{Dir.pwd} -f conf/apache.conf -k stop`
+      
+      when :acgi
+        `public/acgi.cgi stop`
       end
 
     end

data/lib/nitro/session.rb

@@ -27,7 +27,7 @@ module Nitro
 # TODO rehash of the session cookie
 
 class Session < Hash
-  is Expirable
+  include Expirable
 
   # Session id salt.
 
@@ -62,12 +62,8 @@ class Session < Hash
     # * :memcached (not available yet)
 
     def store_type=(store_type)
-      # gmosx: RDoc complains about this, so lets use an
-      # eval, AAAAAAAARGH!
-      # require "nitro/session/#{store_type}"
-      Logger.debug "Using #{store_type} sessions."
-
-      eval %{ require 'nitro/session/#{store_type}' }
+      # gmosx: RDoc friendly. 
+      require 'nitro/session/' + store_type.to_s
     end
     alias_method :set_store_type, :store_type=
 
@@ -112,10 +108,14 @@ class Session < Hash
   attr_reader :session_id
 
   # Create the session for the given context.
+  # If the hook method 'created' is defined it is called
+  # at the end. Typically used to initialize the session
+  # hash.
 
   def initialize(context = nil)
     @session_id = create_id
     expires_after(Session.keepalive)
+    created if respond_to?(:created)
   end
 
   # Synchronize the session store, by 

data/lib/nitro_and_og.rb

@@ -0,0 +1,2 @@
+require 'nitro'
+require 'og'

data/proto/public/Makefile.acgi

@@ -0,0 +1,40 @@
+ruby=ruby
+
+all : acgi.cgi ipc
+
+acgi.cgi: acgi
+  mv ./acgi ./acgi.cgi
+  chmod 755 ./acgi.cgi
+
+ipc:
+  mkdir  /tmp/acgi_ipc/ > /dev/null 2>&1 || true
+  chmod 777 /tmp/acgi_ipc/ > /dev/null 2>&1 || true
+  mkfifo /tmp/acgi_ipc/server.commands > /dev/null 2>&1 || true
+  mkfifo /tmp/acgi_ipc/server.environment > /dev/null 2>&1 || true
+  mkfifo /tmp/acgi_ipc/server.stdin > /dev/null 2>&1 || true
+  mkfifo /tmp/acgi_ipc/server.stdout > /dev/null 2>&1 || true
+  mkfifo /tmp/acgi_ipc/server.stderr > /dev/null 2>&1 || true
+  touch /tmp/acgi_ipc/client.lock > /dev/null 2>&1 || true
+  touch /tmp/acgi_ipc/server.lock > /dev/null 2>&1 || true
+  chmod 777 /tmp/acgi_ipc/* > /dev/null 2>&1 || true
+  chmod 777 /tmp/acgi_ipc/ > /dev/null 2>&1 || true
+  chmod 777 . > /dev/null 2>&1 || true
+
+clean:
+  rm -f acgi.cgi
+  rm -rf /tmp/acgi_ipc
+
+start:
+  server.cgi start 
+
+stop:
+  server.cgi stop 
+
+restart:
+  server.cgi restart 
+
+pid:
+  server.cgi pid 
+
+status:
+  server.cgi status 

data/proto/public/acgi.c

@@ -0,0 +1,138 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+
+#define BUF_SIZE 8192
+//#define STRING(str) #str
+//#define BUF_FILL_FORMAT "%" STRING(BUF_SIZE) "c"
+#define BUF_FILL_FORMAT "%8192c"
+
+#define IPC_DIR "/tmp/acgi_ipc"
+#define PATH_SEPARATOR "/"
+
+#define   CLIENT_LOCK_PATH         IPC_DIR PATH_SEPARATOR "client.lock"
+#define   SERVER_LOCK_PATH         IPC_DIR PATH_SEPARATOR "server.lock"
+#define   SERVER_ENVIRONMENT_PATH  IPC_DIR PATH_SEPARATOR "server.environment"
+#define   SERVER_STDIN_PATH        IPC_DIR PATH_SEPARATOR "server.stdin"
+#define   SERVER_STDOUT_PATH       IPC_DIR PATH_SEPARATOR "server.stdout"
+#define   SERVER_STDERR_PATH       IPC_DIR PATH_SEPARATOR "server.stderr"
+
+//#define SERVER_RB "nohup ruby ../run.rb </dev/null >/dev/null 2>&1 &"
+#define SERVER_RB "ruby ../run.rb"
+
+static int argc;
+static char **argv;
+static char **env;
+static FILE *fs_client_lock;
+static FILE *fs_server_lock;
+static FILE *fs_environment;
+static FILE *fs_stdin;
+static FILE *fs_stderr;
+static FILE *fs_stdout;
+static struct flock lock;
+static char **e;
+static char buf[BUF_SIZE];
+static int n;
+
+static void
+ensure_server_running ()
+{
+  int ret;
+  char *cmd;
+  fs_server_lock = fopen (SERVER_LOCK_PATH, "w");
+  lock.l_type = F_WRLCK;
+  if(fcntl (fileno (fs_server_lock), F_SETLK, &lock) == 0)
+    {
+      cmd = SERVER_RB;
+      system (cmd);
+      lock.l_type = F_UNLCK;
+      fcntl (fileno (fs_server_lock), F_SETLKW, &lock);
+      flock(fileno(fs_server_lock), (LOCK_UN|LOCK_NB));
+    }
+}
+static void
+aquire_lock ()
+{
+  fs_client_lock = fopen (CLIENT_LOCK_PATH, "w");
+  lock.l_type = F_WRLCK;
+  fcntl (fileno (fs_client_lock), F_SETLKW, &lock);
+}
+static void
+send_env ()
+{
+  fs_environment = fopen (SERVER_ENVIRONMENT_PATH, "w");
+  for (e = env; *e; e++)
+    {
+      fprintf (fs_environment, "%s%c", *e, '\0');
+    }
+  fclose (fs_environment);
+}
+static void
+send_stdin ()
+{
+  buf[0] = n = 0;
+  fs_stdin = fopen (SERVER_STDIN_PATH, "w");
+  while ((n = fscanf (stdin, BUF_FILL_FORMAT, &buf[0])) > 0)
+    {
+      fprintf (fs_stdin, "%*s", n, buf);
+    }
+  fclose (fs_stdin);
+}
+static void
+open_stdout_and_stderr ()
+{
+  fs_stdout = fopen (SERVER_STDOUT_PATH, "r");
+  fs_stderr = fopen (SERVER_STDERR_PATH, "r");
+}
+static void
+receive_stdout ()
+{
+  buf[0] = n = 0;
+  while ((n = fscanf (fs_stdout, BUF_FILL_FORMAT, &buf[0])) > 0)
+    {
+      fprintf (stdout, "%*s", n, buf);
+    }
+  fclose (fs_stdout);
+}
+static void
+receive_stderr ()
+{
+  buf[0] = n = 0;
+  while ((n = fscanf (fs_stderr, BUF_FILL_FORMAT, &buf[0])) > 0)
+    {
+      fprintf (stderr, "%*s", n, buf);
+    }
+  fclose (fs_stderr);
+}
+static void
+release_lock ()
+{
+  lock.l_type = F_UNLCK;
+  fcntl (fileno (fs_client_lock), F_SETLK, &lock);
+}
+
+int
+main (__argc, __argv, __env)
+     int __argc;
+     char **__argv;
+     char **__env;
+{
+  argc = __argc;
+  argv = __argv;
+  env = __env;
+
+  putenv ("ACGI_SERVER=1");
+  putenv ("NITRO_INVOKE=acgi_proc");
+
+  ensure_server_running ();
+  aquire_lock ();
+  send_env ();
+  send_stdin ();
+  open_stdout_and_stderr ();
+  receive_stdout ();
+  receive_stderr ();
+  release_lock ();
+  return 0;
+}

data/proto/public/js/builder.js

@@ -27,7 +27,9 @@ var Builder = {
     // try innerHTML approach
     var parentTag = this.NODEMAP[elementName] || 'div';
     var parentElement = document.createElement(parentTag);
-    parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
     var element = parentElement.firstChild || null;
       
     // see if browser added wrapping tags
@@ -48,8 +50,10 @@ var Builder = {
         } else {
           var attrs = this._attributes(arguments[1]);
           if(attrs.length) {
-            parentElement.innerHTML = "<" +elementName + " " +
-              attrs + "></" + elementName + ">";
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
             element = parentElement.firstChild || null;
             // workaround firefox 1.0.X bug
             if(!element) {

data/proto/public/js/controls.js

@@ -221,8 +221,13 @@ Autocompleter.Base.prototype = {
       this.options.updateElement(selectedElement);
       return;
     }
-
-    var value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+    var value = '';
+    if (this.options.select) {
+      var nodes = document.getElementsByClassName(this.options.select, selectedElement) || [];
+      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
+    } else
+      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+    
     var lastTokenPos = this.findLastToken();
     if (lastTokenPos != -1) {
       var newValue = this.element.value.substr(0, lastTokenPos + 1);
@@ -448,7 +453,9 @@ Ajax.InPlaceEditor.prototype = {
     this.element = $(element);
 
     this.options = Object.extend({
+      okButton: true,
       okText: "ok",
+      cancelLink: true,
       cancelText: "cancel",
       savingText: "Saving...",
       clickToEditText: "Click to edit",
@@ -471,6 +478,7 @@ Ajax.InPlaceEditor.prototype = {
       highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
       highlightendcolor: "#FFFFFF",
       externalControl:  null,
+      submitOnBlur: false,
       ajaxOptions: {}
     }, options || {});
 
@@ -536,16 +544,20 @@ Ajax.InPlaceEditor.prototype = {
       this.form.appendChild(br);
     }
 
-    okButton = document.createElement("input");
-    okButton.type = "submit";
-    okButton.value = this.options.okText;
-    this.form.appendChild(okButton);
+    if (this.options.okButton) {
+      okButton = document.createElement("input");
+      okButton.type = "submit";
+      okButton.value = this.options.okText;
+      this.form.appendChild(okButton);
+    }
 
-    cancelLink = document.createElement("a");
-    cancelLink.href = "#";
-    cancelLink.appendChild(document.createTextNode(this.options.cancelText));
-    cancelLink.onclick = this.onclickCancel.bind(this);
-    this.form.appendChild(cancelLink);
+    if (this.options.cancelLink) {
+      cancelLink = document.createElement("a");
+      cancelLink.href = "#";
+      cancelLink.appendChild(document.createTextNode(this.options.cancelText));
+      cancelLink.onclick = this.onclickCancel.bind(this);
+      this.form.appendChild(cancelLink);
+    }
   },
   hasHTMLLineBreaks: function(string) {
     if (!this.options.handleLineBreaks) return false;
@@ -561,24 +573,32 @@ Ajax.InPlaceEditor.prototype = {
     } else {
       text = this.getText();
     }
+
+    var obj = this;
     
     if (this.options.rows == 1 && !this.hasHTMLLineBreaks(text)) {
       this.options.textarea = false;
       var textField = document.createElement("input");
+      textField.obj = this;
       textField.type = "text";
       textField.name = "value";
       textField.value = text;
       textField.style.backgroundColor = this.options.highlightcolor;
       var size = this.options.size || this.options.cols || 0;
       if (size != 0) textField.size = size;
+      if (this.options.submitOnBlur)
+        textField.onblur = this.onSubmit.bind(this);
       this.editField = textField;
     } else {
       this.options.textarea = true;
       var textArea = document.createElement("textarea");
+      textArea.obj = this;
       textArea.name = "value";
       textArea.value = this.convertHTMLLineBreaks(text);
       textArea.rows = this.options.rows;
       textArea.cols = this.options.cols || 40;
+      if (this.options.submitOnBlur)
+        textArea.onblur = this.onSubmit.bind(this);
       this.editField = textArea;
     }
     
@@ -747,4 +767,4 @@ Form.Element.DelayedObserver.prototype = {
     this.timer = null;
     this.callback(this.element, $F(this.element));
   }
-};
+};