spiderfw 0.6.26.pre1 → 0.6.26

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

@@ -1,150 +1,150 @@
 Spider.defineWidget('Spider.Forms.SearchSelect', 'Spider.Forms.Input', {
-	
-	autoInit: true,
-	
-	startup: function(){
-		this.removed = [];
-		this.added = [];
-		this._super();
-	},
-	
-	ready: function(){
-		var w = this;
-		this.multiple = this.el.is('.multiple');
-		for (var i=0; i<this.removed.length; i++){
-			this.removeValue(this.removed[i]);
-		}
-		// Convert delete checkboxses
-		$('.delete_action', this.el).each(function(){ 
-			var $this = $(this);
-			$('input[type=checkbox]', $this).remove();
-			var key = $this.getDataObjectKey();
-			var textSpan = $('.action_text', $this);
-			var a = $('<a href="#" />').text(textSpan.text());
-			a.attr('class', $this.attr('class'));
-			a.click(function(e){
-				w.removed.push(key);
-				e.preventDefault();
-				w.removeValue(key);
-			});
-			textSpan.replaceWith(a);
-			
-		});
-		// Convert change checkboxes
-		$('.change_action', this.el).each(function(){
-			var $this = $(this);
-			$('input[type=checkbox]', $this).remove();
-			var textSpan = $('.action_text', $this);
-			var a = $('<a href="#" />').text(textSpan.text());
-			a.attr('class', $this.attr('class'));
-			a.click(function(e){
-				e.preventDefault();
-				w.reload({clear: true});
-			});
-			textSpan.replaceWith(a);
-		});
-		// var showTable = $('<a href="#" class="show_table"><span class="action_text">Tabella</span></a>').appendTo($('.add_box', this.el));
-		// 		showTable.click(function(e){
-		// 			e.preventDefault();
-		// 			var table = $('.search_table', w.el).spiderWidget();
-		// 			if (table.el.is(':hidden')){
-		// 				table.el.show();
-		// 				$(this).addClass('open');
-		// 				table.reload({}, function(e){
-		// 					$('tr.row', this.el).click(function(e){
-		// 						
-		// 					});
-		// 				});
-		// 			}
-		// 			else{
-		// 				$(this).removeClass('open');
-		// 				table.el.hide();
-		// 			}
-		// 		});
-		$('.add_box input[type=text]', this.el).attr('name', 'autocomplete-box').autocomplete({
-		    source: function(request, response){
+    
+    autoInit: true,
+    
+    startup: function(){
+        this.removed = [];
+        this.added = [];
+        this._super();
+    },
+    
+    ready: function(){
+        var w = this;
+        this.multiple = this.el.is('.multiple');
+        for (var i=0; i<this.removed.length; i++){
+            this.removeValue(this.removed[i]);
+        }
+        // Convert delete checkboxses
+        $('.delete_action', this.el).each(function(){
+            var $this = $(this);
+            $('input[type=checkbox]', $this).remove();
+            var key = $this.getDataObjectKey();
+            var textSpan = $('.action_text', $this);
+            var a = $('<a href="#" />').text(textSpan.text());
+            a.attr('class', $this.attr('class'));
+            a.click(function(e){
+                w.removed.push(key);
+                e.preventDefault();
+                w.removeValue(key);
+            });
+            textSpan.replaceWith(a);
+            
+        });
+        // Convert change checkboxes
+        $('.change_action', this.el).each(function(){
+            var $this = $(this);
+            $('input[type=checkbox]', $this).remove();
+            var textSpan = $('.action_text', $this);
+            var a = $('<a href="#" />').text(textSpan.text());
+            a.attr('class', $this.attr('class'));
+            a.click(function(e){
+                e.preventDefault();
+                w.reload({clear: true});
+            });
+            textSpan.replaceWith(a);
+        });
+        // var showTable = $('<a href="#" class="show_table"><span class="action_text">Tabella</span></a>').appendTo($('.add_box', this.el));
+        //      showTable.click(function(e){
+        //          e.preventDefault();
+        //          var table = $('.search_table', w.el).spiderWidget();
+        //          if (table.el.is(':hidden')){
+        //              table.el.show();
+        //              $(this).addClass('open');
+        //              table.reload({}, function(e){
+        //                  $('tr.row', this.el).click(function(e){
+        //
+        //                  });
+        //              });
+        //          }
+        //          else{
+        //              $(this).removeClass('open');
+        //              table.el.hide();
+        //          }
+        //      });
+        $('.add_box input[type=text]', this.el).attr('name', 'autocomplete-box').autocomplete({
+            source: function(request, response){
                 var url = w.backend.urlForMethod('jquery_autocomplete');
                 var current = [];
                 var vl = $('.values_list', w.el).spiderWidget();
                 if (vl) current = vl.keys();
-				var params = {};
-				for (var i=0; i<current.length; i++){
-					params['not['+i+']'] = current[i];
-				}
+                var params = {};
+                for (var i=0; i<current.length; i++){
+                    params['not['+i+']'] = current[i];
+                }
                 var data = {};
                 $.extend(data, params, {
                     q: request.term
                 });
-				$.ajax({
-				    // try to leverage ajaxQueue plugin to abort previous requests
-    				mode: "abort",
-    				// limit abortion to this input
-					port: "autocomplete" + w.fullId,
-					dataType: 'json',
-					url: url,
+                $.ajax({
+                    // try to leverage ajaxQueue plugin to abort previous requests
+                    mode: "abort",
+                    // limit abortion to this input
+                    port: "autocomplete" + w.fullId,
+                    dataType: 'json',
+                    url: url,
                     data: data,
-    				success: function(data) {
+                    success: function(data) {
                         response(data);
-    				}
+                    }
                 });
-		    },
-		    select: function(e, ui){
-		        var w = $(this).parentWidget();
-		        var data = ui.item;
-    			if (!data) return;
-    			if (w.multiple){
-    				w.added.push(data.value);
-    				for (var i=0; i<this.removed; i++){
-    					if (this.removed[i] == data.value) this.removed.splice(i, 1);
-    				}
-    				w.reload({add: w.added});
-    			}
-    			else{
-    				$('input[type=hidden].hidden-val', w.el).val(data.value);
-    			}
-    			w.trigger('change', w.val());
+            },
+            select: function(e, ui){
+                var w = $(this).parentWidget();
+                var data = ui.item;
+                if (!data) return;
+                if (w.multiple){
+                    w.added.push(data.value);
+                    for (var i=0; i<this.removed; i++){
+                        if (this.removed[i] == data.value) this.removed.splice(i, 1);
+                    }
+                    w.reload({add: w.added});
+                }
+                else{
+                    $('input[type=hidden].hidden-val', w.el).val(data.value);
+                }
+                w.trigger('change', w.val());
                 $(e.target).val(data.label);
                 return false;
-		    },
-		    focus: function(e, ui){
+            },
+            focus: function(e, ui){
                 if (ui.item) $(e.target).val(ui.item.label);
                 else $(e.target).val('');
                 return false;
-		    }
-			
-		});
-	},
-	
-	addValue: function(keys, desc){
-		// var h = $('input[type=hidden]:last', this.el);
-		// h.clone.val(keys).insertAfter(h);
-		// $('.values_list', this.el).spiderWidget().reload({add})
-	},
-	
-	removeValue: function(key){
-		for (var i=0; i<this.added; i++){
-			if (this.added[i] == key) this.added.splice(i, 1);
-		}
-		$('input[type=hidden][value='+key+']', this.el).remove();
-		$('.values_list li', this.el).each(function(){
-			var $this = $(this);
-			if ($this.getDataObjectKey() == key) $this.remove();
-		});
-	},
-	
-	changed: function(){
-		
-	},
-	
-	val: function(){
-		if (this.multiple){
-			var v = [];
-			$('input[type=hidden].hidden-val', this.el).each(function(){
-				v.push($(this).val());
-			});
-			return v;
-		}
-		else return $('input[type=hidden].hidden-val', this.el).val();
-	}
+            }
+            
+        });
+    },
+    
+    addValue: function(keys, desc){
+        // var h = $('input[type=hidden]:last', this.el);
+        // h.clone.val(keys).insertAfter(h);
+        // $('.values_list', this.el).spiderWidget().reload({add})
+    },
+    
+    removeValue: function(key){
+        for (var i=0; i<this.added; i++){
+            if (this.added[i] == key) this.added.splice(i, 1);
+        }
+        $('input[type=hidden][value='+key+']', this.el).remove();
+        $('.values_list li', this.el).each(function(){
+            var $this = $(this);
+            if ($this.getDataObjectKey() == key) $this.remove();
+        });
+    },
+    
+    changed: function(){
+        
+    },
+    
+    val: function(){
+        if (this.multiple){
+            var v = [];
+            $('input[type=hidden].hidden-val', this.el).each(function(){
+                v.push($(this).val());
+            });
+            return v;
+        }
+        else return $('input[type=hidden].hidden-val', this.el).val();
+    }
     
 });

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

@@ -1,27 +1,27 @@
 Spider.defineWidget('Spider.Forms.Select', 'Spider.Forms.Input', {
-	
-	autoInit: true,
-	
-	ready: function(){
+    
+    autoInit: true,
+    
+    ready: function(){
         var sel = this.el;
-		if (sel.is('select[multiple]')){
+        if (sel.is('select[multiple]')){
             sel.attr('title', 'Aggiungi...');
-		    sel.bsmSelect({
+            sel.bsmSelect({
                 removeLabel: 'togli',
                 highlightAddedLabel: 'Aggiunto: ',
                 highlightRemovedLabel: 'Tolto: ',
                 addItemTarget: 'bottom'
-    		});
+            });
             $('.bsmSelect option:first', sel.parent()).addClass('bsmSelectTitle')
                 .attr("selected", false)
-				.attr("disabled", true);
-		} 
-	},
-	
-	onConnectedChange: function(connected, val){
-		var params = {};
-		params[connected] = val;
-		this.reload({connected: params});
-	}
+                .attr("disabled", true);
+        }
+    },
+
+    onConnectedChange: function(connected, val){
+        var params = {};
+        params[connected] = val;
+        this.reload({connected: params});
+    }
     
 });

data/apps/core/forms/widgets/form/form.rb

@@ -27,8 +27,12 @@ module Spider; module Forms
         i_attribute :widget_types
         i_attribute :read_only
         i_attribute :disabled
-        attribute :save_submit_text, :default => lambda{ _('Save') }
-        attribute :insert_submit_text, :default => lambda{ _('Insert') }
+        attribute :save_submit_text, :default => lambda{ 
+            Spider::GetText.in_domain(Spider::Forms.gettext_domain) { _('Save')  } 
+        }
+        attribute :insert_submit_text, :default => lambda{ 
+            Spider::GetText.in_domain(Spider::Forms.gettext_domain) { _('Insert')  } 
+        }
         is_attribute :show_submit_and_new, :default => false
         is_attribute :show_submit_and_stay, :default => false
         is_attribute :show_additional_buttons, :default => false
@@ -157,7 +161,6 @@ module Spider; module Forms
                     @scene.crud = @crud
                     @obj = load
                     cond = {}
-                    debugger
                     if @sub_element.integrated?
                         @sub_element.integrated_from.model.primary_keys.each do |key|
                             cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get("#{@sub_element.integrated_from.name}.#{key.name}")
@@ -191,8 +194,7 @@ module Spider; module Forms
         
         def run
             #Spider::Logger.debug("FORM EXECUTING")
-            if (@obj)
-                
+            if @obj && @pk
                 @scene.form_desc = @model.label.downcase+' '+ (@obj.to_s || '')
                 if (@action == :sub)
                     
@@ -202,8 +204,10 @@ module Spider; module Forms
                 @scene.submit_text = @attributes[:insert_submit_text]
             end
             @scene.obj = obj
-            @scene.submit_and_new_text = @attributes[:submit_and_new_text] % @scene.submit_text
-            @scene.submit_and_stay_text = @attributes[:submit_and_stay_text] % @scene.submit_text
+            Spider::GetText.in_domain(Spider::Forms.gettext_domain){
+                @scene.submit_and_new_text = @attributes[:submit_and_new_text] % @scene.submit_text
+                @scene.submit_and_stay_text = @attributes[:submit_and_stay_text] % @scene.submit_text
+            }
             @scene.submit_buttons = @save_actions.keys
             @scene.enctype = 'multipart/form-data' if @multipart
             super

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

@@ -17,7 +17,7 @@ module Spider; module Forms
             when :date then Date
             when :time then Time
             else 
-                DateTime
+                ::DateTime
             end
             begin
                 return klass.lparse(val, :short)

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

@@ -1,4 +1,4 @@
-<sp:template>
+<div>
     <tpl:asset type="js" src="ckeditor/ckeditor.js" compressed="true" copy_dir="true"/>
     <tpl:asset type="js" src="ckeditor/adapters/jquery.js" compressed="true" />
     <tpl:asset name="jquery" />
@@ -11,4 +11,4 @@
     <div class="css" style="display:none">{ @css }</div>
     <div class="options" style="display:none">{ @options }</div>
     <textarea name="{ @name }" id="input" rows="{ @rows }" cols="{ @cols }">{ @value }</textarea>
-</sp:template>
+</div>

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

@@ -92,7 +92,9 @@ module Spider; module Forms
         def check
             #debugger
             if required? && !has_value?
-                add_error( _("%s is required") % self.label )
+                Spider::GetText.in_domain(self.class.app.gettext_domain){
+                    add_error( _("%s is required") % self.label )    
+                }
             end
         end
         

data/apps/messenger/lib/backends/mobyt.rb

@@ -0,0 +1,11 @@
+module Spider::Messenger
+
+    class Mobyt
+
+        def self.parametri(username, password, from, to, testo)
+
+        end
+
+    end
+
+end

data/apps/messenger/test/features/sms_mobyt.feature

@@ -0,0 +1,24 @@
+# language: it
+
+Funzionalità: invio SMS con Mobyt
+
+
+    Scenario: invio SMS semplice
+        Dato che lo username per l'invio è "aaaa"
+        E che la password per l'invio è "bbbb"
+        Quando invio un SMS con i seguenti dati:
+            | to              | from             | testo           |
+            | +39123456789    | mittente-prova   | Ciao            |
+        Allora la libreria Mobyt deve ritornare i seguenti parametri:
+            | operation | TEXT                               |
+            | from      | mittente-prova                     |
+            | data      | Ciao                               |
+            | id        | aaaa                               |
+            | qty       | a                                  |
+            | password  |                                    |
+            | ticket    | 3ad6bd5c1d3ea7b021b3f7ddad2398bd   |
+
+    Scenario: invio SMS multiplo
+
+    Scenario: invio SMS UTF8
+

data/apps/messenger/test/features/step_definitions/sms_mobyt.rb

@@ -0,0 +1,21 @@
+Dato /^che lo username per l.invio è "([^\"]*)"$/ do |username|
+    @username = username
+end
+
+
+Dato /^che la password per l.invio è "([^\"]*)"$/ do |password|
+  @password = password
+end
+
+Quando /^invio un SMS con i seguenti dati:$/ do |table|
+    dati = table.hashes
+    @risultato = Spider::Messenger::Mobyt.parametri(@username, @password, dati['from'], dati['to'], dati['testo'])
+end
+
+
+Allora /^la libreria Mobyt deve ritornare i seguenti parametri:$/ do |table|
+    dati = table.rows_hash
+    dati.each do |key, value|
+        @risultato[key].should eq value
+    end
+end

data/apps/messenger/views/index.shtml

@@ -2,7 +2,7 @@
     _(Queues):
     <ul>
         <li sp:each="@queues |name|">
-            <a href="{ @controller[:url] }/{ name }">{ @queue_info[name][:label] }</a>:
+            <a href="{ @controller[:request_url] }/{ name }">{ @queue_info[name][:label] }</a>:
             <ul>
                 <li>_(Sent messages): <span class="label success">{ @queue_info[name][:sent] }</span></li>
                 <li>_(Queued messages): <span class="label warning">{ @queue_info[name][:queued] }</span></li>
@@ -10,4 +10,4 @@
             </ul>
         </li>
     </ul>
-</div>
+</div>

data/apps/soap/controllers/soap_controller.rb

@@ -14,10 +14,13 @@ module Spider
         include Soap
         include HTTPMixin
         
-        options[:allow_content_encoding_gzip] = true
 
         class <<self
             attr_accessor :soap_methods, :soap_types
+
+            def soap_options
+                @options ||= {:allow_content_encoding_gzip => true}
+            end
             
             # Returns the currently used soap registry
             def soap_registry
@@ -219,7 +222,7 @@ module Spider
         end
 
         def encode_gzip?
-            self.class.options[:allow_content_encoding_gzip] and defined?(::Zlib) and
+            self.class.soap_options[:allow_content_encoding_gzip] and defined?(::Zlib) and
             @request.env['HTTP_ACCEPT_ENCODING'] and
             @request.env['HTTP_ACCEPT_ENCODING'].split(/,\s*/).include?('gzip')
         end

data/lib/spiderfw/app.rb

@@ -71,6 +71,8 @@ module Spider
             attr_reader :gettext_extensions
             # @return [Array] Additional GetText parasers to use
             attr_reader :gettext_parsers
+            # @return [String] Gettext domain of the app. Defaults to the app short name
+            attr_reader :gettext_domain
             
 
             # Initializes missing variables to default variables.
@@ -98,6 +100,7 @@ module Spider
                 @gettext_parsers ||= []
                 @gettext_dirs ||= ['lib','bin','controllers','models','views','widgets','public']
                 @gettext_extensions ||= ['rb','rhtml','shtml','js']
+                @gettext_domain ||= @short_name
                 
                 find_tags
             end
@@ -228,6 +231,16 @@ module Spider
                 end
             end
 
+            # @return [String] The path to the apps' container (the home or the Spider lib)
+            def base_path
+                if Spider.paths[:apps] && @path.index(Spider.paths[:apps])
+                    Spider.paths[:apps]
+                else
+                    $SPIDER_PATH
+                end
+            end
+
+
             def route_path(action='')
                 path = Spider::ControllerMixins::HTTPMixin.reverse_proxy_mapping('/'+@route_url)
                 action = action[1..-1] if action[0].chr == '/'

data/lib/spiderfw/config/configuration.rb

@@ -76,7 +76,10 @@ module Spider
             end
             return key.to_s
         end
-        
+ 
+        # Sets a configuration value
+        # @param [String] key
+        # @param [Object] val
         def set(key, val)
             first, rest = key.split('.', 2)
             if rest

data/lib/spiderfw/config/options/spider.rb

@@ -1,7 +1,7 @@
 module Spider
 
     config_option('runmode', "production, test, devel", :default => 'devel', :choices => ['production', 'test', 'devel'],
-        :action => Proc.new{ |option| $SPIDER_RUNMODE = option }
+        :action => Proc.new{ |option| $SPIDER_RUNMODE ||= option }
     )
     
     config_option('apps', _('Apps to load'), :type => Array, :yaml_style => :inline)

data/lib/spiderfw/controller/http_controller.rb

@@ -172,6 +172,8 @@ module Spider
                 Spider.logger.error("Not found: #{exc.path}")
             elsif exc.is_a?(Spider::Controller::Forbidden)
                 Spider.logger.warn("Forbidden: #{exc.message}")
+            elsif exc.is_a?(Errno::EPIPE)
+                Spider.logger.warn("Broken pipe")
             else
                 super
             end

data/lib/spiderfw/http/adapters/rack.rb

@@ -111,7 +111,7 @@ module Spider; module HTTP
                     end
                     controller.call_after(path)
                     controller_done = true
-                rescue => exc
+                rescue Exception => exc
                     Spider.logger.error(exc)
                     controller.ensure if controller
                     controller = nil

data/lib/spiderfw/i18n/cldr.rb

@@ -73,7 +73,7 @@ module Spider; module I18n
             time_format = @cldr.calendar.timeformats[options[:calendar].to_sym][format.to_s].dup
             date_format = @cldr.calendar.dateformats[options[:calendar].to_sym][format.to_s].dup
             if (options[:return] == :datetime)
-                dt_f = @cldr.calendar.datetimeformats[options[:calendar].to_s][format.to_s]
+                dt_f = @cldr.calendar.datetimeformats[options[:calendar].to_sym][format.to_s]
                 format_string = dt_f.sub('{1}', date_format).sub('{0}', time_format)
                 klass = DateTime
             elsif (options[:return] == :date)

data/lib/spiderfw/model/base_model.rb

@@ -2180,6 +2180,7 @@ module Spider; module Model
         def insert!
             mapper.insert(self)
             after_save
+            self
         end
         
         # Updates the object in the storage
@@ -2190,11 +2191,13 @@ module Spider; module Model
                 before_save
                 update!
             end
+            self
         end
         
         def update!
             mapper.update(self)
             after_save
+            self
         end
         
         def unit_of_work_available?
@@ -2209,11 +2212,13 @@ module Spider; module Model
                 before_delete
                 delete!
             end
+            nil
         end
         
         def delete!
             mapper.delete(self)
             after_delete
+            nil
         end
         
         def before_delete

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

@@ -1414,7 +1414,9 @@ module Spider; module Model
             @msg
         end
         def message
-            _(self.class.msg) % @element.label
+            Spider::GetText.in_domain('spider') do
+                _(self.class.msg) % @element.label
+            end
         end
         def to_s
             self.class.name.to_s + " " + message