spiderfw 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/apps/core/components/assets.rb

@@ -62,9 +62,13 @@ Spider::Template.define_named_asset 'jquery-ui-selectable', [
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-sortable', [
-    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.sortable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.sortable.js', Spider::Components],
 ], :depends => ['jquery-ui-core']
 
+Spider::Template.define_named_asset 'jquery-ui-nestedSortable', [
+    [:js, 'js/jquery/plugins/jquery.ui.nestedSortable.js', Spider::Components],
+], :depends => ['jquery-ui-sortable']
+
 Spider::Template.define_named_asset 'jquery-ui-accordion', [
     [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.accordion.js', Spider::Components]
 ], :depends => ['jquery-ui-core']

data/apps/core/components/public/js/jquery/plugins/jquery.ui.nestedSortable.js

@@ -0,0 +1,356 @@
+/*
+ * jQuery UI Nested Sortable
+ * v 1.3.4 / 28 apr 2011
+ * http://mjsarfatti.com/sandbox/nestedSortable
+ *
+ * Depends:
+ *	 jquery.ui.sortable.js 1.8+
+ *
+ * License CC BY-SA 3.0
+ * Copyright 2010-2011, Manuele J Sarfatti
+ */
+
+(function($) {
+
+	$.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+
+		options: {
+			tabSize: 20,
+			disableNesting: 'ui-nestedSortable-no-nesting',
+			errorClass: 'ui-nestedSortable-error',
+			listType: 'ol',
+			maxLevels: 0,
+			noJumpFix: 0
+		},
+
+		_create: function(){
+			if (this.noJumpFix == false)
+				this.element.height(this.element.height());
+			this.element.data('sortable', this.element.data('nestedSortable'));
+			return $.ui.sortable.prototype._create.apply(this, arguments);
+		},
+
+
+
+		_mouseDrag: function(event) {
+
+			//Compute the helpers position
+			this.position = this._generatePosition(event);
+			this.positionAbs = this._convertPositionTo("absolute");
+
+			if (!this.lastPositionAbs) {
+				this.lastPositionAbs = this.positionAbs;
+			}
+
+			//Do scrolling
+			if(this.options.scroll) {
+				var o = this.options, scrolled = false;
+				if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+
+					if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+						this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+					else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+						this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+
+					if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+						this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+					else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+						this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+
+				} else {
+
+					if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+						scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+					else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+						scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+
+					if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+						scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+					else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+						scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+
+				}
+
+				if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+					$.ui.ddmanager.prepareOffsets(this, event);
+			}
+
+			//Regenerate the absolute position used for position checks
+			this.positionAbs = this._convertPositionTo("absolute");
+
+			//Set the helper position
+			if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+			if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+
+			//Rearrange
+			for (var i = this.items.length - 1; i >= 0; i--) {
+
+				//Cache variables and intersection, continue if no intersection
+				var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+				if (!intersection) continue;
+
+				if(itemElement != this.currentItem[0] //cannot intersect with itself
+					&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+					&&	!$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+					&& (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
+					//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+				) {
+
+					this.direction = intersection == 1 ? "down" : "up";
+
+					if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+						this._rearrange(event, item);
+					} else {
+						break;
+					}
+
+					// Clear emtpy ul's/ol's
+					this._clearEmpty(itemElement);
+
+					this._trigger("change", event, this._uiHash());
+					break;
+				}
+			}
+
+			var parentItem = (this.placeholder[0].parentNode.parentNode && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length) ? $(this.placeholder[0].parentNode.parentNode) : null;
+			var level = this._getLevel(this.placeholder);
+			var childLevels = this._getChildLevels(this.helper);
+			var previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
+			if (previousItem != null) {
+				while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
+					if (previousItem[0].previousSibling) {
+						previousItem = $(previousItem[0].previousSibling);
+					} else {
+						previousItem = null;
+						break;
+					}
+				}
+			}
+
+			newList = document.createElement(o.listType);
+
+			this.beyondMaxLevels = 0;
+
+			// If the item is moved to the left, send it to its parent level
+			if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
+				parentItem.after(this.placeholder[0]);
+				this._clearEmpty(parentItem[0]);
+				this._trigger("change", event, this._uiHash());
+			}
+			// If the item is below another one and is moved to the right, make it a children of it
+			else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
+				this._isAllowed(previousItem, level+childLevels+1);
+				if (!previousItem.children(o.listType).length) {
+					previousItem[0].appendChild(newList);
+				}
+				previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+				this._trigger("change", event, this._uiHash());
+			}
+			else {
+				this._isAllowed(parentItem, level+childLevels);
+			}
+
+			//Post events to containers
+			this._contactContainers(event);
+
+			//Interconnect with droppables
+			if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+			//Call callbacks
+			this._trigger('sort', event, this._uiHash());
+
+			this.lastPositionAbs = this.positionAbs;
+			return false;
+
+		},
+
+		_mouseStop: function(event, noPropagation) {
+
+			// If the item is in a position not allowed, send it back
+			if (this.beyondMaxLevels) {
+				var parent = this.placeholder.parent().closest(this.options.items);
+				
+				for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
+					parent = parent.parent().closest(this.options.items);
+				}
+
+				this.placeholder.removeClass(this.options.errorClass);
+				parent.after(this.placeholder);
+				this._trigger("change", event, this._uiHash());
+			}
+
+			$.ui.sortable.prototype._mouseStop.apply(this, arguments);
+
+		},
+
+		serialize: function(o) {
+
+			var items = this._getItemsAsjQuery(o && o.connected);
+			var str = []; o = o || {};
+
+			$(items).each(function() {
+				var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				var pid = ($(o.item || this).parent(o.listType).parent('li').attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				if(res) str.push((o.key || res[1]+'['+(o.key && o.expression ? res[1] : res[2])+']')+'='+(pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
+			});
+
+			if(!str.length && o.key) {
+				str.push(o.key + '=');
+			}
+
+			return str.join('&');
+
+		},
+
+		toHierarchy: function(o) {
+
+			o = o || {};
+			var sDepth = o.startDepthCount || 0;
+			var ret = [];
+
+			$(this.element).children('li').each(function() {
+				var level = _recursiveItems($(this));
+				ret.push(level);
+			});
+
+			return ret;
+
+			function _recursiveItems(li) {
+				var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				if (id != null) {
+					var item = {"id" : id[2]};
+					if ($(li).children(o.listType).children('li').length > 0) {
+						item.children = [];
+						$(li).children(o.listType).children('li').each(function () {
+							var level = _recursiveItems($(this));
+							item.children.push(level);
+						});
+					}
+					return item;
+				}
+			}
+        },
+
+		toArray: function(o) {
+
+			o = o || {};
+			var sDepth = o.startDepthCount || 0;
+			var ret = [];
+			var left = 2;
+
+			ret.push({"item_id": 'root', "parent_id": 'none', "depth": sDepth, "left": '1', "right": ($('li', this.element).length + 1) * 2});
+
+			$(this.element).children('li').each(function () {
+				left = _recursiveArray(this, sDepth + 1, left);
+			});
+
+			function _sortByLeft(a,b) {
+				return a['left'] - b['left'];
+			}
+			ret = ret.sort(_sortByLeft);
+
+			return ret;
+
+			function _recursiveArray(item, depth, left) {
+
+				right = left + 1;
+
+				if ($(item).children(o.listType).children('li').length > 0) {
+					depth ++;
+					$(item).children(o.listType).children('li').each(function () {
+						right = _recursiveArray($(this), depth, right);
+					});
+					depth --;
+				}
+
+				id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
+
+				if (depth === sDepth + 1) pid = 'root';
+				else {
+					parentItem = ($(item).parent(o.listType).parent('li').attr('id')).match(o.expression || (/(.+)[-=_](.+)/));
+					pid = parentItem[2];
+				}
+
+				if (id != null) {
+						ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+				}
+
+				return left = right + 1;
+			}
+
+		},
+
+		_clear: function(event, noPropagation) {
+
+			$.ui.sortable.prototype._clear.apply(this, arguments);
+
+			// Clean last empty ul/ol
+			for (var i = this.items.length - 1; i >= 0; i--) {
+				var item = this.items[i].item[0];
+				this._clearEmpty(item);
+			}
+			return true;
+
+		},
+
+		_clearEmpty: function(item) {
+
+			if (item.children[1] && item.children[1].children.length == 0) {
+				item.removeChild(item.children[1]);
+			}
+
+		},
+
+		_getLevel: function(item) {
+
+			var level = 1;
+
+			if (this.options.listType) {
+					var list = item.closest(this.options.listType);
+					while (!list.is('.ui-sortable')/* && level < this.options.maxLevels*/) {
+							level++;
+							list = list.parent().closest(this.options.listType);
+					}
+			}
+
+			return level;
+		},
+
+		_getChildLevels: function(parent, depth) {
+			var self = this,
+			    o = this.options,
+			    result = 0;
+			depth = depth || 0;
+
+			$(parent).children(o.listType).children(o.items).each(function (index, child) {
+					result = Math.max(self._getChildLevels(child, depth + 1), result);
+			});
+
+			return depth ? result + 1 : result;
+		},
+
+		_isAllowed: function(parentItem, levels) {
+			var o = this.options
+			// Are we trying to nest under a no-nest or are we nesting too deep?
+			if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
+				if (o.maxLevels < levels && o.maxLevels != 0) {
+					this.placeholder.addClass(o.errorClass);
+					this.beyondMaxLevels = levels - o.maxLevels;
+				} else {
+					this.placeholder.removeClass(o.errorClass);
+					this.beyondMaxLevels = 0;
+				}
+			} else {
+				this.placeholder.addClass(o.errorClass);
+				if (o.maxLevels < levels && o.maxLevels != 0) {
+					this.beyondMaxLevels = levels - o.maxLevels;
+				} else {
+					this.beyondMaxLevels = 1;
+				}
+			}
+		}
+
+	}));
+
+	$.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
+})(jQuery);

data/apps/core/components/public/js/plugins/sortable.js

@@ -100,6 +100,7 @@ Spider.Sortable = Spider.Plugin.extend({
             return;
         }
         var pos = this.findLiPosition(ui.item);
+        if (pos == -1) return;
         return this.acceptFromSender(ui.sender, ui.item, pos);
     },
 

data/apps/core/components/public/js/spider.js

@@ -460,11 +460,16 @@ Spider.defineWidget = function(name, parent, w){
         if (!curr[parts[i]]) curr[parts[i]] = function(){};
         curr = curr[parts[i]];
     }
-	if (parent) parent = Spider.widgetClasses[parent];
-	else parent = Spider.Widget;
-    var widget = parent.extend(w);
     var last = parts[parts.length-1];
-    if (curr[last]) widget = curr[last].extend(widget);
+    var widget;
+    if (curr[last]){
+        widget = curr[last].extend(w);
+    } 
+    else{
+        if (parent) parent = Spider.widgetClasses[parent];
+    	else parent = Spider.Widget;
+    	widget = parent.extend(w);
+    }
 	curr[last] = widget;
 	Spider.widgetClasses[name] = widget;
 	if (w.autoInit){
@@ -744,9 +749,13 @@ $.extend(Spider.Widget.prototype, Spider.EventTarget);
 var translations = {};
 
 function _(s){
+    var str = s;
     var tr = translations[s];
-    if (tr) return tr;
-    return s;
+    if (tr) str = tr;
+    for (var i=1; i<arguments.length; i++){
+        str = str.replace('%s', arguments[i]);
+    }
+    return str;
 }
 
 if(!window.console) {

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

@@ -4,8 +4,10 @@ module Spider; module Forms
         attr_accessor :element, :form, :errors
         i_attr_accessor :name
         is_attribute :value
+        is_attr_accessor :default
         is_attr_accessor :label
         is_attr_accessor :required, :type => Spider::DataTypes::Bool
+
         
         
         def init
@@ -43,6 +45,7 @@ module Spider; module Forms
         end
         
         def format_value
+            @value ||= @default
             @value.respond_to?(:format) ? @value.format : @value
         end
         
@@ -87,6 +90,7 @@ module Spider; module Forms
         end
         
         def check
+            #debugger
             if required? && !has_value?
                 add_error( _("%s is required") % self.label )
             end

data/blueprints/app/.dirs

@@ -0,0 +1,5 @@
+controllers
+models
+public
+views
+widgets

data/blueprints/home/.dirs

@@ -0,0 +1,7 @@
+apps
+config
+public
+tmp
+var/cache
+var/log
+var/sessions

data/blueprints/home/.gitignore

@@ -0,0 +1,2 @@
+tmp
+var

data/blueprints/home/public/.gitignore

@@ -0,0 +1 @@
+_c/*

data/blueprints/home/tmp/.gitignore

@@ -0,0 +1,3 @@
+# Ignore everything in here apart from the .gitignore file
+*
+!.gitignore

data/blueprints/home/var/.gitignore

@@ -0,0 +1,7 @@
+# Ignore everything in here apart from the .gitignore file
+*
+!.gitignore
+!cache/.gitignore
+!log/.gitignore
+!sessions/.gitignore
+

data/blueprints/home/var/cache/.gitignore

@@ -0,0 +1,3 @@
+# Ignore everything in here apart from the .gitignore file
+*
+!.gitignore

data/blueprints/home/var/log/.gitignore

@@ -0,0 +1,3 @@
+# Ignore everything in here apart from the .gitignore file
+*
+!.gitignore

data/blueprints/home/var/sessions/.gitignore

@@ -0,0 +1,3 @@
+# Ignore everything in here apart from the .gitignore file
+*
+!.gitignore

data/lib/spiderfw/cmd/cmd.rb

@@ -71,6 +71,7 @@ module Spider; module CommandLine
             end
             cmd_name ||= 'help'
             if !@cmd.main_command.commands[cmd_name]
+                $SPIDER_CMD = true
                 require 'spiderfw'
                 if Spider.apps_by_short_name[cmd_name] && Spider.apps_by_short_name[cmd_name].const_defined?(:Cmd)
                     app_cmd = Spider.apps_by_short_name[cmd_name].const_get(:Cmd).new

data/lib/spiderfw/controller/helpers/widget_helper.rb

@@ -10,6 +10,7 @@ module Spider; module Helpers
             scene = super
             if (self.is_a?(Widget))
                 scene.widget = widget_to_scene(self)
+                scene.widget[:shown_id] = attributes[:keep_id] ? self.local_id : self.full_id
             end
             scene.widgets = {}
             if (@widgets)

data/lib/spiderfw/controller/spider_controller.rb

@@ -6,7 +6,7 @@ module Spider
         
         
         def self.pub_path
-            $SPIDER_PATH+'/public'
+            File.join($SPIDER_PATH, 'public')
         end
         
         def self.pub_url

data/lib/spiderfw/http/server.rb

@@ -42,6 +42,7 @@ module Spider; module HTTP
             }
             
             start = lambda{
+                $SPIDER_WEB_SERVER = true
                 require 'spiderfw'
                 require 'spiderfw/controller/http_controller'
                 
@@ -108,17 +109,21 @@ module Spider; module HTTP
                 Process.detach(forked)
             else
                 Spider.init_base
+                spawner_started = true
                 if Spider.conf.get('webserver.respawn_on_change')
                     Spider.start_loggers
                     begin
-                        Bundler.require :default, Spider.runmode.to_sym
+                        begin
+                            Bundler.require :default, Spider.runmode.to_sym
+                        rescue
+                        end
+                        spawner = Spawner.new({'spawn' => start})
+                        spawner.run('spawn')
                     rescue
+                        Spider.logger.error("Install 'fssm' gem to enable respawning")
                     end
-                    spawner = Spawner.new({'spawn' => start})
-                    spawner.run('spawn')
-                else
-                    start.call
                 end
+                start.call unless spawner_started
             end
         end
         

data/lib/spiderfw/i18n/javascript_parser.rb

@@ -6,7 +6,7 @@ module Spider; module I18n
     module JavascriptParser
         module_function
         
-        GettextRegexp = /\W_\(['"]([^\)'"]+)['"](,\s*[^\)]\s*)*\)/
+        GettextRegexp = /\W_\(['"]([^\)'"]+)['"](,\s*[^\)]+\s*)*\)/
         
         
 

data/lib/spiderfw/model/mappers/mapper.rb

@@ -762,6 +762,7 @@ module Spider; module Model
             res = path.empty? ? obj : obj.all_children(path)
             raise RuntimeError, "Broken object path" if (obj && !path.empty? &&  res.length < 1)
             res = QuerySet.new(@model, res) unless res.is_a?(QuerySet)
+            res = res.select{ |obj| obj.primary_keys_set? }
             return res
         end
         

data/lib/spiderfw/model/mixins/tree.rb

@@ -44,11 +44,13 @@ module Spider; module Model
                attributes[:tree_left] ||= :"#{name}_left"
                attributes[:tree_right] ||= :"#{name}_right"
                attributes[:tree_depth] ||= :"#{name}_depth"
+               attributes[:tree_position] ||= :"#{name}_position"
                choice(attributes[:reverse], self, attributes[:reverse_attributes])
                element(name, self, attributes)
-               element(attributes[:tree_left], Fixnum, :hidden => true, :tree_element => name)
+               element(attributes[:tree_left], Fixnum, :hidden => true, :tree_element => name, :order => true)
                element(attributes[:tree_right], Fixnum, :hidden => true, :tree_element => name)
                element(attributes[:tree_depth], Fixnum, :unmapped => true, :hidden => true, :tree_element => name)
+               element(attributes[:tree_position], Fixnum, :unmapped => true, :hidden => true, :tree_element => name)
 #               sequence(name)
                qs_module ||= Module.new
                
@@ -92,7 +94,8 @@ module Spider; module Model
                    define_method("#{name}_all") do
                        qs = QuerySet.static(self)
                        self.send("#{name}_roots").each do |root|
-                           qs += root.tree_all(name)
+                           ta = root.tree_all(name)
+                           qs += ta if ta
                        end
                        return qs
                    end
@@ -146,6 +149,23 @@ module Spider; module Model
                        
                    end
                end
+               
+               define_method(attributes[:tree_position]) do
+                   i = instance_variable_get("@#{attributes[:tree_position]}")
+                   return i if i
+                   element = self.class.elements[name]
+                   left_el = element.attributes[:tree_left]
+                   right_el = element.attributes[:tree_right]
+                   parent_el = element.attributes[:reverse]
+                   parent = self.get(parent_el)
+                   return nil unless parent
+                   cnt = 0
+                   parent.get(name).each do |sub|
+                       cnt += 1
+                       return cnt if sub == self
+                   end
+                   return nil
+               end
 
            end
            
@@ -167,12 +187,25 @@ module Spider; module Model
 
             def before_save(obj, mode)
                 @model.elements_array.select{ |el| el.attributes[:association] == :tree }.each do |el|
-                    if (mode == :update)
+                    unless obj.element_modified?(el.attributes[:reverse]) || obj.element_modified?(el.attributes[:tree_position])
+                        next 
+                    end
+                    if mode == :update
                         tree_remove(el, obj)
                     end
                     parent = obj.get(el.attributes[:reverse])
-                    if (parent)
-                        tree_insert_node_under(el, obj, parent)
+                    if parent
+                        sub = parent.get(el.name)
+                        if obj.element_modified?(el.attributes[:tree_position]) && sub.length > 0
+                            pos = obj.get(el.attributes[:tree_position]) 
+                            if pos == 1
+                                tree_insert_node_first(el, obj, parent)
+                            else
+                                tree_insert_node_right(el, obj, sub[pos-2])
+                            end
+                        else
+                            tree_insert_node_under(el, obj, parent)
+                        end
                     else
                         tree_insert_node(el, obj)
                     end

data/lib/spiderfw/model/mixins/versioned.rb

@@ -124,6 +124,7 @@ module Spider; module Model
                               vmod.remove_element(elh[:attributes][:tree_left])
                               vmod.remove_element(elh[:attributes][:tree_right])
                               vmod.remove_element(elh[:attributes][:tree_depth])
+                              vmod.remove_element(elh[:attributes][:tree_position])
                               vmod.tree(el.name, elh[:attributes])
                           else
                               vmod.send(elh[:method], el.name, el.type.version_model, elh[:attributes])

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

@@ -1,5 +1,9 @@
 require 'oci8'
 
+# The default mapping to BigDecimal doesn't seem to work (as of ruby-oci8 2.0.4), reverting to Float until it's fixed
+OCI8::BindType::Mapping[:number_unknown_prec] = OCI8::BindType::Float
+OCI8::BindType::Mapping[:number_no_prec_setting] = OCI8::BindType::Float
+
 module Spider; module Model; module Storage; module Db; module Connectors
 
     module OCI8

data/lib/spiderfw/spider.rb

@@ -626,7 +626,13 @@ module Spider
                     Debugger.start
                 end
             rescue LoadError, RuntimeError => exc
-                Spider.logger.warn(exc.message)
+                msg = _('Unable to start debugger. Ensure ruby-debug is installed (or set debugger.start to false).')
+                if Spider.logger
+                    Spider.logger.warn(exc.message)
+                    Spider.logger.warn(msg) 
+                else
+                    puts msg
+                end
             end
         end
         

data/lib/spiderfw/templates/blocks/html.rb

@@ -37,7 +37,7 @@ module Spider; module TemplateBlocks
                     if options[:owner_class]
                         cl += " wdgt-#{options[:owner_class].name.gsub('::', '-')}"
                     end
-                    @el.set_attribute('id', "{ @widget[:full_id] }")
+                    @el.set_attribute('id', "{ @widget[:shown_id] }")
                     cl += ' ' unless cl.empty?
                     cl += '{ @widget[:css_classes] }'
                 end

data/lib/spiderfw/templates/layout.rb

@@ -15,6 +15,7 @@ module Spider
         end
         
         def render(*args)
+            $PUB_URL = Spider::HomeController.pub_url
             prepare_assets unless @assets_prepared
             super
         end
@@ -107,7 +108,11 @@ module Spider
                 end
                 if ass[:gettext] && type == :js
                     msg_path = asset_gettext_messages_file(ass[:path])
-                    js_messages += JSON.parse(File.read(msg_path))
+                    if File.exists?(msg_path)
+                        js_messages += JSON.parse(File.read(msg_path))
+                    else
+                        Spider.logger.warn("Javascript Gettext file #{msg_path} not found")
+                    end
                 end
             end
             assets[:js].each do |ass|

data/lib/spiderfw/templates/template.rb

@@ -296,6 +296,10 @@ module Spider
                             w_templates = $2.split('|')
                         end
                         klass = Spider::Template.get_registered_class(w)
+                        unless klass
+                            Spider.logger.warn("tpl:assets requested non existent widget #{w}")
+                            next
+                        end
                         w_templates ||= [klass.default_template]
                         w_templates.each do |wt| 
                             t = klass.load_template(wt)
@@ -377,6 +381,9 @@ module Spider
                     parse_asset(nmdass[:type], nmdass[:src], nmdass)
                 }.flatten
             end
+            if attributes[:profiles]
+                ass[:profiles] = attributes[:profiles].split(/,\s*/).map{ |p| p.to_sym }
+            end
             if attributes[:app] == :runtime
                 ass[:runtime] = src
                 return [ass]
@@ -406,9 +413,13 @@ module Spider
             ass[:path] = res.path if res
             base_url = nil
             if controller.respond_to?(:pub_url)
-                if src[0].chr == '/' && !(controller <= Spider::HomeController)
+                if src[0].chr == '/' 
+                    if controller <= Spider::HomeController
+                        src = src[(1+controller.pub_path.length)..-1]
+                    else
                     # strips the app path from the src. FIXME: should probably be done somewhere else
-                    src = src[(2+controller.app.relative_path.length)..-1]
+                        src = src[(2+controller.app.relative_path.length)..-1]
+                    end
                 end
                 base_url = controller.pub_url+'/'
                 
@@ -438,9 +449,6 @@ module Spider
             [:gettext, :media, :if_ie_lte, :cdn].each do |key|
                 ass[key] = attributes[key] if attributes.key?(key)
             end
-            if attributes[:profiles]
-                ass[:profiles] = attributes[:profiles].split(/,\s*/).map{ |p| p.to_sym }
-            end
             return [ass]
         end
         
@@ -505,7 +513,7 @@ module Spider
                     ass_src = ass.get_attribute('src')
                     if ass_src && ass_src[0].chr != '/'
                         # ass.set_attribute('src', "/#{ext_app.relative_path}/#{ass_src}")
-                        ass.set_attribute('app', ext_app.relative_path)
+                        ass.set_attribute('app', ext_app.relative_path) if ass.get_attribute('app').blank?
                     end
                 end
                 @overrides += orig_overrides

data/lib/spiderfw/widget/widget.rb

@@ -238,6 +238,8 @@ module Spider
         i_attribute :use_template
         attribute :"sp:target-only"
         attribute :class
+        # shows the widget's local id in the html instead of the full id
+        attribute :keep_id, :type => Spider::Bool, :default => false
         
         default_asset 'jquery'
         default_asset 'spider'

data/spider.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
       'spider.gemspec'] \
       + Dir.glob('apps/**/*') \
       + Dir.glob('bin/*') \
-      + Dir.glob('blueprints/**/*') \
+      + Dir.glob('blueprints/**/*', File::FNM_DOTMATCH) \
       + Dir.glob('data/**/*') \
       + Dir.glob('lib/**/*.rb') \
       + Dir.glob('views/**/*')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 +02:00
+date: 2011-06-28 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -462,6 +462,7 @@ files:
 - apps/core/components/public/js/jquery/plugins/jquery.form.js
 - apps/core/components/public/js/jquery/plugins/jquery.json.js
 - apps/core/components/public/js/jquery/plugins/jquery.query-2.1.6.js
+- apps/core/components/public/js/jquery/plugins/jquery.ui.nestedSortable.js
 - apps/core/components/public/js/jquery/plugins/jquery.url.js
 - apps/core/components/public/js/jquery/plugins/treeview/changelog.txt
 - apps/core/components/public/js/jquery/plugins/treeview/images/ajax-loader.gif
@@ -963,15 +964,31 @@ files:
 - apps/worker/models/job.rb
 - apps/worker/worker.rb
 - bin/spider
+- blueprints/.DS_Store
+- blueprints/app/.dirs
 - blueprints/app/__APP__.appspec
 - blueprints/app/_init.rb
 - blueprints/app/controllers/__APP___controller.rb
+- blueprints/app/models/.gitignore
+- blueprints/app/public/.gitignore
 - blueprints/app/views/__APP__.layout.shtml
 - blueprints/app/views/index.shtml
+- blueprints/app/widgets/.gitignore
+- blueprints/home/.dirs
+- blueprints/home/.DS_Store
+- blueprints/home/.gitignore
+- blueprints/home/apps/.gitignore
 - blueprints/home/config/config.yml
 - blueprints/home/Gemfile.disabled
 - blueprints/home/init.rb
+- blueprints/home/public/.gitignore
 - blueprints/home/spider.gemfile
+- blueprints/home/tmp/.gitignore
+- blueprints/home/var/.gitignore
+- blueprints/home/var/cache/.gitignore
+- blueprints/home/var/log/.gitignore
+- blueprints/home/var/sessions/.gitignore
+- blueprints/install/.DS_Store
 - blueprints/install/config.ru
 - data/locale/it/LC_MESSAGES/spider.mo
 - data/locale/it/LC_MESSAGES/spider_auth.mo