nitro 0.24.0 → 0.25.0

data/lib/nitro/scaffold.rb

@@ -1,7 +1,7 @@
 require 'mega/orm_support'
 
 require 'nitro/compiler'
-require 'nitro/mixin/form'
+require 'nitro/helper/form'
 
 module Nitro
 
@@ -15,8 +15,8 @@ module Scaffolding
 
   def self.append_features(base) # :nodoc: 
     super
-    base.send :include, FormMixin
-    base.extend(ClassMethods)
+    base.helper :form
+    base.extend ClassMethods
   end
 
   def self.class_to_name(klass)
@@ -59,13 +59,13 @@ module Scaffolding
 
       # Add methods to the scaffolded class.
   
-      unless klass.respond_to? :to_href
+      unless klass.instance_methods.include? 'to_href'
         klass.send(:define_method, :to_href) do
           "#{name}/#{@oid}"
         end
       end
 
-      unless klass.respond_to? :to_edit_link
+      unless klass.instance_methods.include? 'to_edit_link'
         klass.send(:define_method, :to_edit_link) do |base|
           %{<a href="#{base}/#{name}/#{@oid}">#{self}</a>&nbsp;(<a href="#{base}/edit#{suffix}/#{@oid}">edit</a>, <a href="#{base}/delete#{suffix}/#{@oid}">del</a>)}
         end
@@ -137,7 +137,7 @@ module Scaffolding
             oid = oid.to_s # in case oid is a StringIO (multipart).
             obj = request.fill(#{klass}[oid], :assign_relations => true, :force_boolean => true)
           else
-            obj = request.fill(#{klass}.new, :assign_relations => true)
+            obj = request.fill(#{klass}.create, :assign_relations => true)
           end
           unless obj.valid?
             session[:ERRORS] = obj.errors

data/lib/nitro/server/runner.rb

@@ -17,6 +17,9 @@ module Nitro
 #
 # You can implement your own, custom version of the Runner
 # to run your custom web applications.
+#--
+# FIXME: Rename/Reimplement this class.
+#++
 
 class Runner
 
@@ -194,6 +197,15 @@ class Runner
       when :live
         setup_live
     end
+    
+    # Special setup for distributed sessions.
+=begin    
+    if defined?(Session) and defined?(DRbObject)
+      if Session.store.is_a?(DRbObject)
+        system('ruby ' + File.join(Nitro::LibPath, 'session', 'drbserver.rb') + ' --address #{Session.drb_address} --port #{Session.drb_port} --daemon')
+      end
+    end
+=end    
   end
 
   # Setup in debug mode.

data/lib/nitro/session/drbserver.rb

@@ -8,10 +8,14 @@ require 'nitro/session'
 
 # A distributes session store implemented as
 # a simple DRb server.
+#--
+# TODO: add daemonize support.
+#++
 
 address = '127.0.0.1'
 port = 9069
 debug = false
+daemon = false
 
 parser = OptionParser.new do |opts|
 
@@ -30,7 +34,11 @@ parser = OptionParser.new do |opts|
   opts.on('-D', '--debug', 'Run in debug mode.') do |p|
     debug = true
   end
-  
+
+  opts.on('-d', '--daemon', 'Run as daemon.') do |p|
+    daemon = true
+  end
+
   opts.on_tail('-h', '--help', 'Show this message.') do
     puts opts
     exit
@@ -63,6 +71,13 @@ if debug
   
 end
 
+puts "Drb session server listening at druby://#{address}:#{port}."
+
+if daemon
+  require 'daemons/daemonize'
+  Daemonize.daemonize()
+end
+
 DRb.start_service("druby://#{address}:#{port}", sessions)
 DRb.thread.join
 

data/proto/public/js/builder.js

@@ -0,0 +1,97 @@
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// See scriptaculous.js for full license.
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+    
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    var element = parentElement.firstChild || null;
+      
+    // see if browser added wrapping tags
+    if(element && (element.tagName != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+    
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+    
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array)) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            parentElement.innerHTML = "<" +elementName + " " +
+              attrs + "></" + elementName + ">";
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1]) 
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+            }
+        } 
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return element;
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute=='className' ? 'class' : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML() + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e)
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children)) 
+         element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  }
+}

data/proto/public/js/controls.js

@@ -184,7 +184,10 @@ Autocompleter.Base.prototype = {
         this.show();
         this.active = true;
       }
-    } else this.hide();
+    } else {
+      this.active = false;
+      this.hide();
+    }
   },
   
   markPrevious: function() {
@@ -425,6 +428,15 @@ Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {
 //
 // see documentation on http://wiki.script.aculo.us/scriptaculous/show/Ajax.InPlaceEditor
 
+// Use this if you notice weird scrolling problems on some browsers,
+// the DOM might be a bit confused when this gets called so do this
+// waits 1 ms (with setTimeout) until it does the activation
+Field.scrollFreeActivate = function(field) {
+  setTimeout(function() {
+    Field.activate(field);
+  }, 1);
+}
+
 Ajax.InPlaceEditor = Class.create();
 Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99";
 Ajax.InPlaceEditor.prototype = {
@@ -490,7 +502,7 @@ Ajax.InPlaceEditor.prototype = {
       Event.observe(this.options.externalControl, 'mouseout', this.mouseoutListener);
     }
   },
-  enterEditMode: function() {
+  enterEditMode: function(evt) {
     if (this.saving) return;
     if (this.editing) return;
     this.editing = true;
@@ -501,11 +513,12 @@ Ajax.InPlaceEditor.prototype = {
     Element.hide(this.element);
     this.createForm();
     this.element.parentNode.insertBefore(this.form, this.element);
-    Field.focus(this.editField);
+    Field.scrollFreeActivate(this.editField);
     // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
-      Event.stop(arguments[0]);
+    if (evt) {
+      Event.stop(evt);
     }
+    return false;
   },
   createForm: function() {
     this.form = document.createElement("form");

data/proto/public/js/dragdrop.js

@@ -233,8 +233,8 @@ Draggable.prototype = {
       this.originalTop  = this.currentTop();
     }
 
-    //if(this.options.zindex)
-      //this.element.style.zIndex = this.originalZ;
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
 
     if(this.options.endeffect) 
       this.options.endeffect(this.element);
@@ -280,7 +280,7 @@ Draggable.prototype = {
           style.position = "relative";
         
         if(this.options.zindex) {
-          this.options.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+          this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
           style.zIndex = this.options.zindex;
         }
 
@@ -355,8 +355,8 @@ var Sortable = {
       hoverclass:  null,
       ghosting:    false,
       format:      null,
-      onChange:    function() {},
-      onUpdate:    function() {}
+      onChange:    Prototype.emptyFunction,
+      onUpdate:    Prototype.emptyFunction
     }, arguments[1] || {});
 
     // clear any old sortable with same element
@@ -472,7 +472,10 @@ var Sortable = {
 
   onEmptyHover: function(element, dropon) {
     if(element.parentNode!=dropon) {
+      var oldParentNode = element.parentNode;
       dropon.appendChild(element);
+      Sortable.options(oldParentNode).onChange(element);
+      Sortable.options(dropon).onChange(element);
     }
   },
 

data/proto/public/js/effects.js

@@ -4,7 +4,182 @@
 //  Mark Pilgrim (http://diveintomark.org/)
 //  Martin Bialasinki
 // 
-// See scriptaculous.js for full license.
+// See scriptaculous.js for full license.  
+
+/* ------------- element ext -------------- */  
+ 
+// converts rgb() and #xxx to #xxxxxx format,  
+// returns self (or first argument) if not convertable  
+String.prototype.parseColor = function() {  
+  color = "#";  
+  if(this.slice(0,4) == "rgb(") {  
+    var cols = this.slice(4,this.length-1).split(',');  
+    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
+  } else {  
+    if(this.slice(0,1) == '#') {  
+      if(this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
+      if(this.length==7) color = this.toLowerCase();  
+    }  
+  }  
+  return(color.length==7 ? color : (arguments[0] || this));  
+}  
+
+Element.collectTextNodesIgnoreClass = function(element, ignoreclass) {  
+  var children = $(element).childNodes;  
+  var text     = "";  
+  var classtest = new RegExp("^([^ ]+ )*" + ignoreclass+ "( [^ ]+)*$","i");  
+ 
+  for (var i = 0; i < children.length; i++) {  
+    if(children[i].nodeType==3) {  
+      text+=children[i].nodeValue;  
+    } else {  
+      if((!children[i].className.match(classtest)) && children[i].hasChildNodes())  
+        text += Element.collectTextNodesIgnoreClass(children[i], ignoreclass);  
+    }  
+  }  
+ 
+  return text;
+}
+
+Element.setContentZoom = function(element, percent) {  
+  element = $(element);  
+  element.style.fontSize = (percent/100) + "em";   
+  if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);  
+}
+
+Element.getOpacity = function(element){  
+  var opacity;  
+  if (opacity = Element.getStyle(element, "opacity"))  
+    return parseFloat(opacity);  
+  if (opacity = (Element.getStyle(element, "filter") || '').match(/alpha\(opacity=(.*)\)/))  
+    if(opacity[1]) return parseFloat(opacity[1]) / 100;  
+  return 1.0;  
+}
+
+Element.setOpacity = function(element, value){  
+  element= $(element);  
+  var els = element.style;  
+  if (value == 1){  
+    els.opacity = '0.999999';  
+    if(/MSIE/.test(navigator.userAgent))  
+      els.filter = Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'');  
+  } else {  
+    if(value < 0.00001) value = 0;  
+    els.opacity = value;  
+    if(/MSIE/.test(navigator.userAgent))  
+      els.filter = Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +  
+        "alpha(opacity="+value*100+")";  
+  }   
+}  
+ 
+Element.getInlineOpacity = function(element){  
+  element= $(element);  
+  var op;  
+  op = element.style.opacity;  
+  if (typeof op != "undefined" && op != "") return op;  
+  return "";  
+}  
+ 
+Element.setInlineOpacity = function(element, value){  
+  element= $(element);  
+  var els = element.style;  
+  els.opacity = value;  
+}  
+ 
+/*--------------------------------------------------------------------------*/  
+ 
+Element.Class = {  
+    // Element.toggleClass(element, className) toggles the class being on/off  
+    // Element.toggleClass(element, className1, className2) toggles between both classes,  
+    //   defaulting to className1 if neither exist  
+    toggle: function(element, className) {  
+      if(Element.Class.has(element, className)) {  
+        Element.Class.remove(element, className);  
+        if(arguments.length == 3) Element.Class.add(element, arguments[2]);  
+      } else {  
+        Element.Class.add(element, className);  
+        if(arguments.length == 3) Element.Class.remove(element, arguments[2]);  
+      }  
+    },  
+ 
+    // gets space-delimited classnames of an element as an array  
+    get: function(element) {  
+      return $(element).className.split(' ');  
+    },  
+ 
+    // functions adapted from original functions by Gavin Kistner  
+    remove: function(element) {  
+      element = $(element);  
+      var removeClasses = arguments;  
+      $R(1,arguments.length-1).each( function(index) {  
+        element.className =  
+          element.className.split(' ').reject(  
+            function(klass) { return (klass == removeClasses[index]) } ).join(' ');  
+      });  
+    },  
+ 
+    add: function(element) {  
+      element = $(element);  
+      for(var i = 1; i < arguments.length; i++) {  
+        Element.Class.remove(element, arguments[i]);  
+        element.className += (element.className.length > 0 ? ' ' : '') + arguments[i];  
+      }  
+    },  
+ 
+    // returns true if all given classes exist in said element  
+    has: function(element) {  
+      element = $(element);  
+      if(!element || !element.className) return false;  
+      var regEx;  
+      for(var i = 1; i < arguments.length; i++) {  
+        if((typeof arguments[i] == 'object') &&  
+          (arguments[i].constructor == Array)) {  
+          for(var j = 0; j < arguments[i].length; j++) {  
+            regEx = new RegExp("(^|\\s)" + arguments[i][j] + "(\\s|$)");  
+            if(!regEx.test(element.className)) return false;  
+          }  
+        } else {  
+          regEx = new RegExp("(^|\\s)" + arguments[i] + "(\\s|$)");  
+          if(!regEx.test(element.className)) return false;  
+        }  
+      }  
+      return true;  
+    },  
+ 
+    // expects arrays of strings and/or strings as optional paramters  
+    // Element.Class.has_any(element, ['classA','classB','classC'], 'classD')  
+    has_any: function(element) {  
+      element = $(element);  
+      if(!element || !element.className) return false;  
+      var regEx;  
+      for(var i = 1; i < arguments.length; i++) {  
+        if((typeof arguments[i] == 'object') &&  
+          (arguments[i].constructor == Array)) {  
+          for(var j = 0; j < arguments[i].length; j++) {  
+            regEx = new RegExp("(^|\\s)" + arguments[i][j] + "(\\s|$)");  
+            if(regEx.test(element.className)) return true;  
+          }  
+        } else {  
+          regEx = new RegExp("(^|\\s)" + arguments[i] + "(\\s|$)");  
+          if(regEx.test(element.className)) return true;  
+        }  
+      }  
+      return false;  
+    },  
+ 
+    childrenWith: function(element, className) {  
+      var children = $(element).getElementsByTagName('*');  
+      var elements = new Array();  
+ 
+      for (var i = 0; i < children.length; i++)  
+        if (Element.Class.has(children[i], className))  
+          elements.push(children[i]);  
+ 
+      return elements;  
+    }  
+}  
+ 
+/*--------------------------------------------------------------------------*/
 
 var Effect = {
   tagifyText: function(element) {
@@ -81,6 +256,9 @@ Effect.Transitions.full = function(pos) {
 
 Effect.Queue = {
   effects:  [],
+  _each: function(iterator) {
+    this.effects._each(iterator);
+  },
   interval: null,
   add: function(effect) {
     var timestamp = new Date().getTime();
@@ -117,6 +295,7 @@ Effect.Queue = {
     this.effects.invoke('loop', timePos);
   }
 }
+Object.extend(Effect.Queue, Enumerable);
 
 Effect.Base = function() {};
 Effect.Base.prototype = {
@@ -342,6 +521,8 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
     this.start(options);
   },
   setup: function() {
+    // Prevent executing on elements not in the layout flow
+    if(this.element.style.display=='none') { this.cancel(); return; }
     // Disable background image during the effect
     this.oldBgImage = this.element.style.backgroundImage;
     this.element.style.backgroundImage = "none";
@@ -572,7 +753,7 @@ Effect.SlideDown = function(element) {
     },  
     afterUpdateInternal: function(effect) { 
       effect.element.firstChild.style.bottom = 
-        (effect.originalHeight - effect.element.clientHeight) + 'px'; },
+        (effect.dims[0] - effect.element.clientHeight) + 'px'; },
     afterFinishInternal: function(effect) { 
       Element.undoClipping(effect.element); 
       Element.undoPositioned(effect.element.firstChild);
@@ -599,7 +780,7 @@ Effect.SlideUp = function(element) {
     },  
     afterUpdateInternal: function(effect) { 
      effect.element.firstChild.style.bottom = 
-       (effect.originalHeight - effect.element.clientHeight) + 'px'; },
+       (effect.dims[0] - effect.element.clientHeight) + 'px'; },
     afterFinishInternal: function(effect) { 
         Element.hide(effect.element);
         Element.undoClipping(effect.element); 
@@ -697,7 +878,7 @@ Effect.Grow = function(element) {
                els.top = oldTop;
                els.left = oldLeft;
                els.height = oldHeight;
-               els.width = originalWidth;
+               els.width = originalWidth + 'px';
                Element.setInlineOpacity(el, oldOpacity);
              }
            }, options)