spiderfw 0.5.3 → 0.5.4

data/apps/core/components/public/js/jquery/plugins/asmselect/jquery.asmselect.css

@@ -0,0 +1,64 @@
+.asmContainer {
+	/* container that surrounds entire asmSelect widget */
+}
+
+.asmSelect {
+	/* the newly created regular 'select' */
+	display: inline; 
+}
+
+.asmOptionDisabled {
+	/* disabled options in new select */
+	color: #999; 
+}
+
+.asmHighlight {
+	/* the highlight span */
+	padding: 0;
+	margin: 0 0 0 1em;
+}
+
+.asmList {
+	/* html list that contains selected items */
+	margin: 1em 8em 2em 8em; 
+	position: relative;
+	display: block;
+	padding-left: 0; 
+	list-style: none;
+	clear: both;
+}
+
+.asmListItem {
+	/* li item from the html list above */
+	position: relative; 
+	margin-left: 0;
+	padding-left: 0;
+	list-style: none;
+	background: #ddd;
+	border: 1px solid #bbb; 
+	width: 100%; 
+	margin: 0 0 -1px 0; 
+	line-height: 1em;
+}
+
+.asmListItem:hover {
+	background-color: #e5e5e5;
+}
+
+.asmListItemLabel {
+	/* this is a span that surrounds the text in the item, except for the remove link */
+	padding: 5px; 
+	display: block;
+}
+
+.asmListSortable .asmListItemLabel {
+	cursor: move; 
+}
+
+.asmListItemRemove {
+	/* the remove link in each list item */
+	position: absolute;
+	right: 0; 
+	top: 0;
+	padding: 5px; 
+}

data/apps/core/components/public/js/jquery/plugins/asmselect/jquery.asmselect.js

@@ -0,0 +1,407 @@
+/*
+ * Alternate Select Multiple (asmSelect) 1.0.4a beta - jQuery Plugin
+ * http://www.ryancramer.com/projects/asmselect/
+ * 
+ * Copyright (c) 2009 by Ryan Cramer - http://www.ryancramer.com
+ * 
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ */
+
+(function($) {
+
+	$.fn.asmSelect = function(customOptions) {
+
+		var options = {
+
+			listType: 'ol',						// Ordered list 'ol', or unordered list 'ul'
+			sortable: false, 					// Should the list be sortable?
+			highlight: false,					// Use the highlight feature? 
+			animate: false,						// Animate the the adding/removing of items in the list?
+			addItemTarget: 'bottom',				// Where to place new selected items in list: top or bottom
+			hideWhenAdded: false,					// Hide the option when added to the list? works only in FF
+			debugMode: false,					// Debug mode keeps original select visible 
+
+			removeLabel: 'remove',					// Text used in the "remove" link
+			highlightAddedLabel: 'Added: ',				// Text that precedes highlight of added item
+			highlightRemovedLabel: 'Removed: ',			// Text that precedes highlight of removed item
+
+			containerClass: 'asmContainer',				// Class for container that wraps this widget
+			selectClass: 'asmSelect',				// Class for the newly created <select>
+			optionDisabledClass: 'asmOptionDisabled',		// Class for items that are already selected / disabled
+			listClass: 'asmList',					// Class for the list ($ol)
+			listSortableClass: 'asmListSortable',			// Another class given to the list when it is sortable
+			listItemClass: 'asmListItem',				// Class for the <li> list items
+			listItemLabelClass: 'asmListItemLabel',			// Class for the label text that appears in list items
+			removeClass: 'asmListItemRemove',			// Class given to the "remove" link
+			highlightClass: 'asmHighlight'				// Class given to the highlight <span>
+
+			};
+
+		$.extend(options, customOptions); 
+
+		return this.each(function(index) {
+
+			var $original = $(this); 				// the original select multiple
+			var $container; 					// a container that is wrapped around our widget
+			var $select; 						// the new select we have created
+			var $ol; 						// the list that we are manipulating
+			var buildingSelect = false; 				// is the new select being constructed right now?
+			var ieClick = false;					// in IE, has a click event occurred? ignore if not
+			var ignoreOriginalChangeEvent = false;			// originalChangeEvent bypassed when this is true
+
+			function init() {
+
+				// initialize the alternate select multiple
+
+				// this loop ensures uniqueness, in case of existing asmSelects placed by ajax (1.0.3)
+				while($("#" + options.containerClass + index).size() > 0) index++; 
+
+				$select = $("<select></select>")
+					.addClass(options.selectClass)
+					.attr('name', options.selectClass + index)
+					.attr('id', options.selectClass + index); 
+
+				$selectRemoved = $("<select></select>"); 
+
+				$ol = $("<" + options.listType + "></" + options.listType + ">")
+					.addClass(options.listClass)
+					.attr('id', options.listClass + index); 
+
+				$container = $("<div></div>")
+					.addClass(options.containerClass) 
+					.attr('id', options.containerClass + index); 
+
+				buildSelect();
+
+				$select.change(selectChangeEvent)
+					.click(selectClickEvent); 
+
+				$original.change(originalChangeEvent)
+					.wrap($container).before($select).before($ol);
+
+				if(options.sortable) makeSortable();
+
+				if($.browser.msie && $.browser.version < 8) $ol.css('display', 'inline-block'); // Thanks Matthew Hutton
+			}
+
+			function makeSortable() {
+
+				// make any items in the selected list sortable
+				// requires jQuery UI sortables, draggables, droppables
+
+				$ol.sortable({
+					items: 'li.' + options.listItemClass,
+					handle: '.' + options.listItemLabelClass,
+					axis: 'y',
+					update: function(e, data) {
+
+						var updatedOptionId;
+
+						$(this).children("li").each(function(n) {
+
+							$option = $('#' + $(this).attr('rel')); 
+
+							if($(this).is(".ui-sortable-helper")) {
+								updatedOptionId = $option.attr('id'); 
+								return;
+							}
+
+							$original.append($option); 
+						}); 
+
+						if(updatedOptionId) triggerOriginalChange(updatedOptionId, 'sort'); 
+					}
+
+				}).addClass(options.listSortableClass); 
+			}
+
+			function selectChangeEvent(e) {
+				
+				// an item has been selected on the regular select we created
+				// check to make sure it's not an IE screwup, and add it to the list
+
+				if($.browser.msie && $.browser.version < 7 && !ieClick) return;
+				var id = $(this).children("option:selected").slice(0,1).attr('rel'); 
+				addListItem(id); 	
+				ieClick = false; 
+				triggerOriginalChange(id, 'add'); // for use by user-defined callbacks
+			}
+
+			function selectClickEvent() {
+
+				// IE6 lets you scroll around in a select without it being pulled down
+				// making sure a click preceded the change() event reduces the chance
+				// if unintended items being added. there may be a better solution?
+
+				ieClick = true; 
+			}
+
+			function originalChangeEvent(e) {
+
+				// select or option change event manually triggered
+				// on the original <select multiple>, so rebuild ours
+
+				if(ignoreOriginalChangeEvent) {
+					ignoreOriginalChangeEvent = false; 
+					return; 
+				}
+
+				$select.empty();
+				$ol.empty();
+				buildSelect();
+
+				// opera has an issue where it needs a force redraw, otherwise
+				// the items won't appear until something else forces a redraw
+				if($.browser.opera) $ol.hide().fadeIn("fast");
+			}
+
+			function buildSelect() {
+
+				// build or rebuild the new select that the user
+				// will select items from
+
+				buildingSelect = true; 
+
+				// add a first option to be the home option / default selectLabel
+				$select.prepend("<option>" + $original.attr('title') + "</option>"); 
+
+				$original.children("option").each(function(n) {
+
+					var $t = $(this); 
+					var id; 
+
+					if(!$t.attr('id')) $t.attr('id', 'asm' + index + 'option' + n); 
+					id = $t.attr('id'); 
+
+					if($t.is(":selected")) {
+						addListItem(id); 
+						addSelectOption(id, true); 						
+					} else {
+						addSelectOption(id); 
+					}
+				});
+
+				if(!options.debugMode) $original.hide(); // IE6 requires this on every buildSelect()
+				selectFirstItem();
+				buildingSelect = false; 
+			}
+
+			function addSelectOption(optionId, disabled) {
+
+				// add an <option> to the <select>
+				// used only by buildSelect()
+
+				if(disabled == undefined) var disabled = false; 
+
+				var $O = $('#' + optionId); 
+				var $option = $("<option>" + $O.text() + "</option>")
+					.val($O.val())
+					.attr('rel', optionId);
+
+				if(disabled) disableSelectOption($option); 
+
+				$select.append($option); 
+			}
+
+			function selectFirstItem() {
+
+				// select the firm item from the regular select that we created
+
+				$select.children(":eq(0)").attr("selected", true); 
+			}
+
+			function disableSelectOption($option) {
+
+				// make an option disabled, indicating that it's already been selected
+				// because safari is the only browser that makes disabled items look 'disabled'
+				// we apply a class that reproduces the disabled look in other browsers
+
+				$option.addClass(options.optionDisabledClass)
+					.attr("selected", false)
+					.attr("disabled", true);
+
+				if(options.hideWhenAdded) $option.hide();
+				if($.browser.msie) $select.hide().show(); // this forces IE to update display
+			}
+
+			function enableSelectOption($option) {
+
+				// given an already disabled select option, enable it
+
+				$option.removeClass(options.optionDisabledClass)
+					.attr("disabled", false);
+
+				if(options.hideWhenAdded) $option.show();
+				if($.browser.msie) $select.hide().show(); // this forces IE to update display
+			}
+
+			function addListItem(optionId) {
+
+				// add a new item to the html list
+
+				var $O = $('#' + optionId); 
+
+				if(!$O) return; // this is the first item, selectLabel
+
+				var $removeLink = $("<a></a>")
+					.attr("href", "#")
+					.addClass(options.removeClass)
+					.prepend(options.removeLabel)
+					.click(function() { 
+						dropListItem($(this).parent('li').attr('rel')); 
+						return false; 
+					}); 
+
+				var $itemLabel = $("<span></span>")
+					.addClass(options.listItemLabelClass)
+					.html($O.html()); 
+
+				var $item = $("<li></li>")
+					.attr('rel', optionId)
+					.addClass(options.listItemClass)
+					.append($itemLabel)
+					.append($removeLink)
+					.hide();
+
+				if(!buildingSelect) {
+					if($O.is(":selected")) return; // already have it
+					$O.attr('selected', true); 
+				}
+
+				if(options.addItemTarget == 'top' && !buildingSelect) {
+					$ol.prepend($item); 
+					if(options.sortable) $original.prepend($O); 
+				} else {
+					$ol.append($item); 
+					if(options.sortable) $original.append($O); 
+				}
+
+				addListItemShow($item); 
+
+				disableSelectOption($("[rel=" + optionId + "]", $select));
+
+				if(!buildingSelect) {
+					setHighlight($item, options.highlightAddedLabel); 
+					selectFirstItem();
+					if(options.sortable) $ol.sortable("refresh"); 	
+				}
+
+			}
+
+			function addListItemShow($item) {
+
+				// reveal the currently hidden item with optional animation
+				// used only by addListItem()
+
+				if(options.animate && !buildingSelect) {
+					$item.animate({
+						opacity: "show",
+						height: "show"
+					}, 100, "swing", function() { 
+						$item.animate({
+							height: "+=2px"
+						}, 50, "swing", function() {
+							$item.animate({
+								height: "-=2px"
+							}, 25, "swing"); 
+						}); 
+					}); 
+				} else {
+					$item.show();
+				}
+			}
+
+			function dropListItem(optionId, highlightItem) {
+
+				// remove an item from the html list
+
+				if(highlightItem == undefined) var highlightItem = true; 
+				var $O = $('#' + optionId); 
+
+				$O.attr('selected', false); 
+				$item = $ol.children("li[rel=" + optionId + "]");
+
+				dropListItemHide($item); 
+				enableSelectOption($("[rel=" + optionId + "]", options.removeWhenAdded ? $selectRemoved : $select));
+
+				if(highlightItem) setHighlight($item, options.highlightRemovedLabel); 
+
+				triggerOriginalChange(optionId, 'drop'); 
+				
+			}
+
+			function dropListItemHide($item) {
+
+				// remove the currently visible item with optional animation
+				// used only by dropListItem()
+
+				if(options.animate && !buildingSelect) {
+
+					$prevItem = $item.prev("li");
+
+					$item.animate({
+						opacity: "hide",
+						height: "hide"
+					}, 100, "linear", function() {
+						$prevItem.animate({
+							height: "-=2px"
+						}, 50, "swing", function() {
+							$prevItem.animate({
+								height: "+=2px"
+							}, 100, "swing"); 
+						}); 
+						$item.remove(); 
+					}); 
+					
+				} else {
+					$item.remove(); 
+				}
+			}
+
+			function setHighlight($item, label) {
+
+				// set the contents of the highlight area that appears
+				// directly after the <select> single
+				// fade it in quickly, then fade it out
+
+				if(!options.highlight) return; 
+
+				$select.next("#" + options.highlightClass + index).remove();
+
+				var $highlight = $("<span></span>")
+					.hide()
+					.addClass(options.highlightClass)
+					.attr('id', options.highlightClass + index)
+					.html(label + $item.children("." + options.listItemLabelClass).slice(0,1).text()); 
+					
+				$select.after($highlight); 
+
+				$highlight.fadeIn("fast", function() {
+					setTimeout(function() { $highlight.fadeOut("slow"); }, 50); 
+				}); 
+			}
+
+			function triggerOriginalChange(optionId, type) {
+
+				// trigger a change event on the original select multiple
+				// so that other scripts can pick them up
+
+				ignoreOriginalChangeEvent = true; 
+				$option = $("#" + optionId); 
+
+				$original.trigger('change', [{
+					'option': $option,
+					'value': $option.val(),
+					'id': optionId,
+					'item': $ol.children("[rel=" + optionId + "]"),
+					'type': type
+				}]); 
+			}
+
+			init();
+		});
+	};
+
+})(jQuery); 

data/apps/core/components/public/js/jquery/plugins/autogrow/jquery.autogrow.js

@@ -0,0 +1,132 @@
+/* 
+ * Auto Expanding Text Area (1.2.2)
+ * by Chrys Bader (www.chrysbader.com)
+ * chrysb@gmail.com
+ *
+ * Special thanks to:
+ * Jake Chapa - jake@hybridstudio.com
+ * John Resig - jeresig@gmail.com
+ *
+ * Copyright (c) 2008 Chrys Bader (www.chrysbader.com)
+ * Licensed under the GPL (GPL-LICENSE.txt) license. 
+ *
+ *
+ * NOTE: This script requires jQuery to work.  Download jQuery at www.jquery.com
+ *
+ */
+ 
+(function(jQuery) {
+		  
+	var self = null;
+ 
+	jQuery.fn.autogrow = function(o)
+	{	
+		return this.each(function() {
+			new jQuery.autogrow(this, o);
+		});
+	};
+	
+
+    /**
+     * The autogrow object.
+     *
+     * @constructor
+     * @name jQuery.autogrow
+     * @param Object e The textarea to create the autogrow for.
+     * @param Hash o A set of key/value pairs to set as configuration properties.
+     * @cat Plugins/autogrow
+     */
+	
+	jQuery.autogrow = function (e, o)
+	{
+		this.options		  	= o || {};
+		this.dummy			  	= null;
+		this.interval	 	  	= null;
+		this.line_height	  	= this.options.lineHeight || parseInt(jQuery(e).css('line-height'));
+		this.min_height		  	= this.options.minHeight || parseInt(jQuery(e).css('min-height'));
+		this.max_height		  	= this.options.maxHeight || parseInt(jQuery(e).css('max-height'));;
+		this.textarea		  	= jQuery(e);
+		
+		if(this.line_height == NaN)
+		  this.line_height = 0;
+		
+		// Only one textarea activated at a time, the one being used
+		this.init();
+	};
+	
+	jQuery.autogrow.fn = jQuery.autogrow.prototype = {
+    autogrow: '1.2.2'
+  };
+	
+ 	jQuery.autogrow.fn.extend = jQuery.autogrow.extend = jQuery.extend;
+	
+	jQuery.autogrow.fn.extend({
+						 
+		init: function() {			
+			var self = this;			
+			this.textarea.css({overflow: 'hidden', display: 'block'});
+			this.textarea.bind('focus', function() { self.startExpand() } ).bind('blur', function() { self.stopExpand() });
+			this.checkExpand();	
+		},
+						 
+		startExpand: function() {				
+		  var self = this;
+			this.interval = window.setInterval(function() {self.checkExpand()}, 400);
+		},
+		
+		stopExpand: function() {
+			clearInterval(this.interval);	
+		},
+		
+		checkExpand: function() {
+			
+			if (this.dummy == null)
+			{
+				this.dummy = jQuery('<div></div>');
+				this.dummy.css({
+												'font-size'  : this.textarea.css('font-size'),
+												'font-family': this.textarea.css('font-family'),
+												'width'      : this.textarea.css('width'),
+												'padding'    : this.textarea.css('padding'),
+												'line-height': this.line_height + 'px',
+												'overflow-x' : 'hidden',
+												'position'   : 'absolute',
+												'top'        : 0,
+												'left'		 : -9999
+												}).appendTo('body');
+			}
+			
+			// Strip HTML tags
+			var html = this.textarea.val().replace(/(<|>)/g, '');
+			
+			// IE is different, as per usual
+			if ($.browser.msie)
+			{
+				html = html.replace(/\n/g, '<BR>new');
+			}
+			else
+			{
+				html = html.replace(/\n/g, '<br>new');
+			}
+			
+			if (this.dummy.html() != html)
+			{
+				this.dummy.html(html);	
+				
+				if (this.max_height > 0 && (this.dummy.height() + this.line_height > this.max_height))
+				{
+					this.textarea.css('overflow-y', 'auto');	
+				}
+				else
+				{
+					this.textarea.css('overflow-y', 'hidden');
+					if (this.textarea.height() < this.dummy.height() + this.line_height || (this.dummy.height() < this.textarea.height()))
+					{	
+						this.textarea.animate({height: (this.dummy.height() + this.line_height) + 'px'}, 100);	
+					}
+				}
+			}
+		}
+						 
+	 });
+})(jQuery);

data/apps/core/components/widgets/admin/admin.rb

@@ -40,6 +40,7 @@ module Spider; module Components
                 @scene.username = @request.user.to_s
             else
                 @scene.username = _("guest")
+                @scene.guest = true
             end
             super
         end

data/apps/core/components/widgets/admin/admin.shtml

@@ -6,7 +6,7 @@
 	    </div>
 	    <div class="tools">
 	        Benvenuto, { @username }.
-	        <a href="{ @logout_url }">Logout</a>
+	        <a href="{ @logout_url }" sp:if="!@guest">Logout</a>
 	    </div>
     </div>
     <div class="current_section">

data/apps/core/components/widgets/list/list.rb

@@ -229,7 +229,7 @@ module Spider; module Components
         def parse_runtime_content(doc, src_path='')
             doc = super
             return doc if doc.children.empty?
-            doc.root.xpath('sublist', Template.xml_namespaces).each do |sl|
+            doc.root.children_of_type('sublist').each do |sl|
                 raise ArgumentError, "Sublist of #{@id} does not have an id" unless sl['id']
                 @requested_sublists ||= []
                 @requested_sublists << sl

data/apps/core/forms/public/select.js

@@ -2,6 +2,14 @@ Spider.defineWidget('Spider.Forms.Select', 'Spider.Forms.Input', {
 	
 	autoInit: true,
 	
+	ready: function(){
+		if (this.el.is('select[multiple]')) this.el.asmSelect({
+			removeLabel: 'togli',
+			highlightAddedLabel: 'Aggiunto: ',
+			highlightRemovedLabel: 'Tolto: '
+		});
+	},
+	
 	onConnectedChange: function(connected, val){
 		var params = {};
 		params[connected] = val;

data/apps/core/forms/public/text_area.js

@@ -0,0 +1,8 @@
+Spider.defineWidget('Spider.Forms.TextArea', 'Spider.Forms.Input', {
+	
+	autoInit: true,
+	
+	ready: function(){
+		this.el.autogrow();
+	}    
+});

data/apps/core/forms/widgets/inputs/select/select.rb

@@ -6,7 +6,6 @@ module Spider; module Forms
         is_attr_accessor :multiple
         is_attr_accessor :blank_option, :type => TrueClass, :default => true
         is_attr_accessor :condition
-        is_attr_accessor :show_element
         attr_accessor :data
         
         def widget_init(action='')
@@ -42,7 +41,6 @@ module Spider; module Forms
                 @scene.data.condition.and(conn_cond)
             end
             @scene.values = {}
-            @scene.strings = {}
             debug("SELECT VALUE:")
             debug(@value)
             @scene.selected = {}
@@ -54,18 +52,9 @@ module Spider; module Forms
             end
             @scene.data.each_index do |i|
                 @scene.values[i] = @model.primary_keys.map{|k| @scene.data[i][k] }.join(',')
-                @scene.strings[i] = format_string(@scene.data[i])
             end
             super
         end
-        
-        def format_string(obj)
-            if (@show_element)
-                return obj.get(@show_element).to_s
-            else
-                return obj.to_s
-            end
-        end
 
         
         def value=(val)

data/apps/core/forms/widgets/inputs/select/select.shtml

@@ -1,6 +1,8 @@
 <select name="{ @value_param }" sp:attr-if="@multiple,multiple" class="">
 	<tpl:asset type="js" src="input.js" />
 	<tpl:asset type="js" src="select.js" />
+	<tpl:asset type="js" app="core/components" src="js/jquery/plugins/asmselect/jquery.asmselect.js" if="@multiple" />
+	<tpl:asset type="css" app="core/components" src="js/jquery/plugins/asmselect/jquery.asmselect.css" if="@multiple" />
     <option sp:if="@blank_option"> </option>
     <option sp:each_index="@data |i|" value="{ @values[i] }" sp:attr-if="@selected[values[i]],selected">
         { @data[i].to_s }

data/apps/core/forms/widgets/inputs/text_area/text_area.rb

@@ -3,7 +3,7 @@ module Spider; module Forms
     class TextArea < Input
         tag 'textarea'
         is_attr_accessor :rows, :type => Fixnum, :default => 6
-        is_attr_accessor :cols, :type => Fixnum, :default => 40
+        is_attr_accessor :cols, :type => Fixnum, :default => 80
 
     end
     

data/apps/core/forms/widgets/inputs/text_area/text_area.shtml

@@ -1 +1,2 @@
-<textarea name="{ @name }" rows="{ @rows }" cols="{ @cols }">{ @value }</textarea>
+<textarea name="{ @name }" rows="{ @rows }" cols="{ @cols }"><tpl:asset type="js" src="text_area.js" />
+<tpl:asset type="js" app="core/components" src="js/jquery/plugins/autogrow/jquery.autogrow.js" />{ @value }</textarea>

data/lib/spiderfw/cmd/commands/test.rb

@@ -30,11 +30,6 @@ class TestCommand < CmdParse::Command
         
         self_cmd = CmdParse::Command.new('self', false)
         self_cmd.short_desc = _("Run framework tests")
-        self_cmd.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--files", _("Run only files containing the given string (or strings, comma separated)"), "-f"){ |f|
-                @files = f
-            }
-        end
         self_cmd.set_execution_block do
             require 'test/unit/collector/dir'
             require 'test/unit'

data/lib/spiderfw/cmd/commands/webserver.rb

@@ -40,6 +40,7 @@ class WebServerCommand < CmdParse::Command
             raise "Can't use cgi mode with SSL" if @ssl && @cgi
             @port ||= Spider.conf.get('webserver.port')
             @server_name ||= Spider.conf.get('http.server')
+            @pid_file = Spider.paths[:var]+'/run/server.pid'
             puts _("Using webserver %s") % @server_name if $verbose
             puts _("Listening on port %s") % @port if $verbose
             server = Spider::HTTP.const_get(servers[@server_name]).new
@@ -62,6 +63,10 @@ class WebServerCommand < CmdParse::Command
                     server.shutdown
                     ssl_server.shutdown if ssl_server
                     Spider.shutdown
+                    begin
+                        File.unlink(@pid_file)
+                    rescue Errno::ENOENT
+                    end
                 }
                 trap('TERM', &do_shutdown)
                 trap('INT', &do_shutdown)
@@ -71,12 +76,11 @@ class WebServerCommand < CmdParse::Command
             }
             if (@daemonize)
                 forked = Spider.fork do
-                    File.new(Spider.paths[:var]+'/run/server.pid', w) do |f|
+                    File.open(@pid_file, 'w') do |f|
                         f.write(Process.pid)
                     end
                     $0 = 'spider-server'
                     start.call
-                    @runner.join
                 end
                 Process.detach(forked)
             else

data/lib/spiderfw/controller/session/memory_session.rb

@@ -9,43 +9,42 @@ module Spider
             
             def setup
                 unless @sessions
-                    @sync ||= Sync.new
+                    @mutex ||= Mutex.new
                     @sessions ||= Hash.new
                 end
                 super
             end
         
             def []=(sid, data)
-                @sync.lock(Sync::EX)
-                @sessions[sid] = {
-                    :data => data,
-                    :mtime => Time.now
+                @mutex.synchronize {
+                    @sessions[sid] = {
+                        :data => data,
+                        :mtime => Time.now
+                    }
                 }
-                @sync.lock(Sync::UN)
             end
         
             def [](sid)
                 check_purge
-                @sync.lock(Sync::SH)
-                sess = @sessions[sid] ? @sessions[sid][:data] : nil
-                @sync.lock(Sync::UN)
-                sess
+                @mutex.synchronize{
+                    @sessions[sid] ? @sessions[sid][:data] : nil
+                }
             end
             
             def purge(life)
-                @sync.lock(Sync::EX)
-                @sessions.each do |sid, session|
-                    if (session[:mtime] + life < Time.now)
-                        @sessions.delete(sid)
+                @mutex.synchronize{
+                    @sessions.each do |sid, session|
+                        if (session[:mtime] + life < Time.now)
+                            @sessions.delete(sid)
+                        end
                     end
-                end
-                @sync.lock(Sync::UN)
+                }
             end
             
             def delete(sid)
-                @sync.lock(Sync::EX)
-                @sessions.delete(sid)
-                @sync.lock(Sync::UN)
+                @mutex.synchronize{
+                    @sessions.delete(sid)
+                }
             end
             
         end

data/lib/spiderfw/model/base_model.rb

@@ -196,6 +196,8 @@ module Spider; module Model
                     parts = attributes[:integrated_from].split('.')
                     attributes[:integrated_from] = @elements[parts[0].to_sym]
                     attributes[:integrated_from_element] = parts[1].to_sym if parts[1]
+                elsif (attributes[:integrated_from].is_a?(Symbol))
+                    attributes[:integrated_from] = @elements[attributes[:integrated_from]]
                 end
                 if (!attributes[:integrated_from_element])
                     attributes[:integrated_from_element] = name
@@ -503,6 +505,11 @@ module Spider; module Model
         # this will not have the desired effect; remove and redefine the element instead.
         def self.element_attributes(element_name, attributes)
             elements[element_name].attributes.merge!(attributes)
+            if attributes[:primary_key] && !@primary_keys.include?(elements[element_name])
+                @primary_keys << elements[element_name]
+            elsif !attributes[:primary_key]
+                @primary_keys.delete(elements[element_name])
+            end
         end
         
         # Defines a multiple element. Equivalent to calling
@@ -982,6 +989,12 @@ module Spider; module Model
             end
             if (values)
                 if (values.is_a? Hash)
+                    values.keys.select{ |k| 
+                        k = k.name if k.is_a?(Element)
+                        self.class.elements[k.to_sym] && self.class.elements[k.to_sym].primary_key? 
+                    }.each do |k|
+                        set!(k, values[k])
+                    end
                     values.each do |key, val|
                         set!(key, val)
                     end

data/lib/spiderfw/model/identity_mapper.rb

@@ -26,13 +26,15 @@ module Spider; module Model
         def get(model, values)
             @objects[model] ||= {}
             pks = {}
+            has_pks = false
             model.primary_keys.each do |k| 
                 # dereference integrated primary keys
                 pks[k.name] = (k.integrated? && values[k.integrated_from.name]) ? 
                     values[k.integrated_from.name].get(k.integrated_from_element) :
                     values[k.name]
-                raise IdentityMapperException, "Can't get without all primary keys" unless pks[k.name]
+                has_pks = true if pks[k.name]
             end
+            raise IdentityMapperException, "Can't get without all primary keys" unless has_pks
             pks.extend(HashComparison)
             obj = (@objects[model][pks] ||= model.new(pks))
             pks.each{ |k, v| obj.element_loaded(k) }

data/lib/spiderfw/model/storage/db/adapters/oci8.rb

@@ -111,7 +111,7 @@ module Spider; module Model; module Storage; module Db
                 return value.to_datetime if type == DateTime
                 return value.to_date # FIXME: check what is returned, here we espect an OCI8::Date
             when 'Spider::DataTypes::Text'
-                value =  value ? value.read : ''
+                value = value.read if value.respond_to?(:read)
             end
             return super(type, value)
         end
@@ -245,7 +245,7 @@ module Spider; module Model; module Storage; module Db
                      #   end
                      transformed = "O#{replace_cnt += 1}"
                      replaced_fields[field.to_s] = transformed
-                     if (field.type == 'CLOB')
+                     if (field.is_a?(Spider::Model::Storage::Db::Field) && field.type == 'CLOB')
                          field = "CAST(#{field} as varchar2(100))"
                      end
                      query[:keys] << "#{field} AS #{transformed}"

data/lib/spiderfw/model/storage/db/db_connection_pool.rb

@@ -17,6 +17,7 @@ module Spider; module Model; module Storage; module Db
             @retry = Spider.conf.get('storage.db.pool.retry')
             @connections = []
             @free_connections = []
+            @thread_connections = {}
             # if Spider.runmode == 'devel'
             #     Thread.new do
             #         loop do
@@ -38,12 +39,16 @@ module Spider; module Model; module Storage; module Db
         def get_connection
             Thread.current[:db_connections] ||= {}
             @connection_mutex.synchronize do
+                #Spider.logger.debug("DB Pool (#{Thread.current}): trying to get connection")
                 if conn = Thread.current[:db_connections][@connection_params]
-                    # Spider.logger.debug("DB Pool (#{Thread.current}): returning thread connection #{conn}")
+                    #Spider.logger.debug("DB Pool (#{Thread.current}): returning thread connection #{conn}")
                     @free_connections.delete(conn)
                     conn
                 else
-                    Thread.current[:db_connections][@connection_params] = _checkout
+                    conn = _checkout
+                    Thread.current[:db_connections][@connection_params] = conn
+                    @thread_connections[Thread.current.object_id] = [conn, Time.now]
+                    conn
                 end
             end
         end
@@ -56,10 +61,11 @@ module Spider; module Model; module Storage; module Db
         
         def release(conn)
             @connection_mutex.synchronize do
-                # Spider.logger.debug("DB Pool (#{Thread.current}): releasing #{conn}")
+                #Spider.logger.debug("DB Pool (#{Thread.current}): releasing #{conn}")
                 @free_connections << conn
-                @queue.signal
                 Thread.current[:db_connections].delete(@connection_params)
+                @thread_connections.delete(Thread.current.object_id)
+                @queue.signal
             end
         end
         
@@ -79,6 +85,9 @@ module Spider; module Model; module Storage; module Db
         
         private
         
+        def _release
+        end
+        
         def _checkout
             # Spider.logger.debug("DB Pool (#{Thread.current}): checkout (max: #{@max_size})")
             1.upto(@retry) do
@@ -89,18 +98,54 @@ module Spider; module Model; module Storage; module Db
                     else
                         Spider.logger.debug "#{Thread.current} WAITING FOR CONNECTION, #{@queue.count_waiters} IN QUEUE"
                         unless @queue.wait(@timeout)
-                            raise StorageException, "Unable to get a db connection in #{@timeout} seconds" if @timeout
+                            clear_stale_connections
+                            create_new_connection if @free_connections.empty? && @connections.length < @max_size
+                            if @free_connections.empty?
+                                Spider.logger.error "#{Thread.current} GOT TIRED WAITING, #{@queue.count_waiters} IN QUEUE"
+                                raise StorageException, "Unable to get a db connection in #{@timeout} seconds" if @timeout
+                            end
                         end
                     end
                 else
                     # Spider.logger.debug("DB Pool (#{Thread.current}): had free connection")
                 end
                 conn = @free_connections.pop
-                if @provider.connection_alive?(conn)
-                    # Spider.logger.debug("DB Pool (#{Thread.current}): returning #{conn} (#{@free_connections.length} free)")
+                while conn && !@provider.connection_alive?(conn)
+                    Spider.logger.warn("DB Pool (#{Thread.current}): connection #{conn} dead")
+                    remove_connection(conn)
+                    conn = nil
+                    conn = @free_connections.pop unless @free_connections.empty?
+                end
+                if conn
+                    #Spider.logger.debug("DB Pool (#{Thread.current}): returning #{conn} (#{@free_connections.length} free)")
                     return conn
-                else
-                    remove(conn)
+                end
+            end
+            raise StorageException, "#{Thread.current} unable to get a connection after #{@retry} retries."
+        end
+        
+        def clear_stale_connections
+            @connection_mutex.synchronize do
+                keys = Set.new(@thread_connections.keys)
+                Thread.list.each do |thread|
+                    keys.delete(thread.object_id) if thread.alive?
+                end
+                keys.each do |thread_id|
+                    conn, time = @thread_connections[thread_id]
+                    Spider.logger.error("Thread #{thread_id} died without releasing connection #{conn} (acquired at #{time})")
+                    if @provider.connection_alive?(conn)
+                        @free_connections << conn
+                    else
+                        remove_connection(conn)
+                    end
+                    @thread_connections.delete(thread_id)
+                end
+                @thread_connections.each do |thread_id, conn_data|
+                    conn, time = conn_data
+                    diff = Time.now - time
+                    if diff > 60
+                        Spider.logger.warn("Thread #{thread_id} has been holding connection #{conn} for #{diff} seconds.")
+                    end
                 end
             end
         end

data/spider.gemspec

@@ -2,7 +2,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name     = "spiderfw"
-  s.version  = "0.5.3"
+  s.version  = "0.5.4"
   s.date     = "2010-02-18"
   s.summary  = "A (web) framework"
   s.email    = "abmajor7@gmail.com"
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.default_executable = 'spider'
   s.add_dependency("cmdparse", ["> 2.0.0"])
   s.add_dependency("gettext", ["> 2.0.0"])
-  s.add_dependency("hpricot", ["> 0.8"])
+  s.add_dependency("hpricot", ["= 0.6"])
   s.add_dependency("json", ["> 1.1"])
   s.add_dependency("uuid", ["> 2.0"])
   s.add_dependency("rufus-scheduler", ["> 1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -38,9 +38,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "0.6"
     version: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -367,6 +367,9 @@ files:
 - apps/core/components/public/js/jquery/jquery-ui/index.html
 - apps/core/components/public/js/jquery/jquery-ui/js/jquery-1.3.2.min.js
 - apps/core/components/public/js/jquery/jquery-ui/js/jquery-ui-1.7.2.custom.min.js
+- apps/core/components/public/js/jquery/plugins/asmselect/jquery.asmselect.css
+- apps/core/components/public/js/jquery/plugins/asmselect/jquery.asmselect.js
+- apps/core/components/public/js/jquery/plugins/autogrow/jquery.autogrow.js
 - apps/core/components/public/js/jquery/plugins/jquery-autocomplete/changelog.txt
 - apps/core/components/public/js/jquery/plugins/jquery-autocomplete/jquery.autocomplete.css
 - apps/core/components/public/js/jquery/plugins/jquery-autocomplete/jquery.autocomplete.js
@@ -511,6 +514,7 @@ files:
 - apps/core/forms/public/input.js
 - apps/core/forms/public/search_select.js
 - apps/core/forms/public/select.js
+- apps/core/forms/public/text_area.js
 - apps/core/forms/tags/element_label.erb
 - apps/core/forms/tags/element_row.erb
 - apps/core/forms/tags/row.erb