spiderfw 0.6.16 → 0.6.17

data/CHANGELOG

@@ -1,4 +1,13 @@
+= 0.6.17
+== 13 September, 2011
+* AppManager rewrite, with setup tasks; Migrations
+* Experimental SASS support
+* CLDR 0.1.6; added Spider::I18n.list
+* InlineModels can now be compared with their primary key
+* Various bugfixes and enhancements
+
 = 0.6.16
+== 22 August, 2011
 * Bugfixes
 
 = 0.6.15

data/Rakefile

@@ -4,16 +4,19 @@ require 'pathname'
 
 def check_app_path(full, partial)
     p = Pathname.new(full)
-    rel = p.relative_path_from(Pathname.new(Spider.paths[:core_apps]))
-    return true if rel.to_s == partial
-    rel = p.relative_path_from(Pathname.new(Spider.paths[:apps]))
+    rel = p.relative_path_from(Pathname.new($SPIDER_PATHS[:core_apps]))
+    return true if partial == "spider" && !rel.to_s.blank?
     return true if rel.to_s == partial
+    if Spider.paths[:apps]
+        rel = p.relative_path_from(Pathname.new(Spider.paths[:apps]))
+        return true if rel.to_s == partial
+    end
     return false
 end
 
 desc "Update pot/po files. To update a single app, call rake updatepo[app_relative_path], where app_relative_path is the path relative to the apps folder (or 'spider')."
 task :updatepo, [:app] do |t, args|
-    require 'spiderfw'
+    require 'spiderfw/spider'
     require 'spiderfw/i18n/shtml_parser'
     require 'spiderfw/i18n/javascript_parser'
     require 'gettext/tools'
@@ -40,7 +43,7 @@ desc "Create mo-files. To create for a single app, call rake makemo[app_relative
 task :makemo, [:app] do |t, args|
     require 'gettext/tools'
     GetText.create_mofiles(:verbose => true) if !args[:app] || args[:app] == 'spider'
-    require 'spiderfw'
+    require 'spiderfw/spider'
     apps = Spider.find_all_apps
     apps.each do |path|
         next if args[:app] && !check_app_path(path, args[:app])

data/VERSION

@@ -1 +1 @@
-0.6.16
+0.6.17

data/apps/core/auth/po/it/spider_auth.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Auth 0.1\n"
-"POT-Creation-Date: 2011-05-09 17:37+0200\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
 "PO-Revision-Date: 2010-11-02 18:13+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: controllers/mixins/auth_helper.rb:65
+#: controllers/mixins/auth_helper.rb:66
 msgid "Please login first"
 msgstr "Per favore, esegui il login"
 
@@ -48,7 +48,7 @@ msgstr "Ultima login"
 msgid "Login count"
 msgstr "Numero login"
 
-#: models/mixins/rbac_provider.rb:68
+#: models/mixins/rbac_provider.rb:66
 msgid "%s permissions"
 msgstr "Permessi %s"
 

data/apps/core/auth/po/spider_auth.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Auth 0.1\n"
-"POT-Creation-Date: 2011-05-09 17:37+0200\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
 "PO-Revision-Date: 2009-06-30 16:58+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: controllers/mixins/auth_helper.rb:65
+#: controllers/mixins/auth_helper.rb:66
 msgid "Please login first"
 msgstr ""
 
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Login count"
 msgstr ""
 
-#: models/mixins/rbac_provider.rb:68
+#: models/mixins/rbac_provider.rb:66
 msgid "%s permissions"
 msgstr ""
 

data/apps/core/components/po/it/spider_components.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Components 0.1\n"
-"POT-Creation-Date: 2011-05-09 17:37+0200\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
 "PO-Revision-Date: 2010-11-29 12:51+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,19 +20,19 @@ msgstr ""
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: widgets/admin/admin.rb:37
+#: widgets/admin/admin.rb:47
 msgid "Manage Data"
 msgstr "Gestisci i Dati"
 
-#: widgets/admin/admin.rb:42
+#: widgets/admin/admin.rb:52
 msgid "guest"
 msgstr "ospite"
 
-#: widgets/crud/crud.rb:95
+#: widgets/crud/crud.rb:116
 msgid "Cancel"
 msgstr "Annulla"
 
-#: widgets/crud/crud.rb:96
+#: widgets/crud/crud.rb:117
 msgid "Ok"
 msgstr "Ok"
 
@@ -44,11 +44,11 @@ msgstr "Vai"
 msgid "Clear"
 msgstr "Pulisci"
 
-#: widgets/table/table.rb:150 public/js/utils.js:14
+#: widgets/table/table.rb:152 public/js/utils.js:14
 msgid "Yes"
 msgstr "Sì"
 
-#: widgets/table/table.rb:150 public/js/utils.js:19
+#: widgets/table/table.rb:152 public/js/utils.js:19
 msgid "No"
 msgstr "No"
 

data/apps/core/components/po/spider_components.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Components 0.1\n"
-"POT-Creation-Date: 2011-05-09 17:37+0200\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
 "PO-Revision-Date: 2009-06-30 16:58+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,19 +21,19 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: widgets/admin/admin.rb:37
+#: widgets/admin/admin.rb:47
 msgid "Manage Data"
 msgstr ""
 
-#: widgets/admin/admin.rb:42
+#: widgets/admin/admin.rb:52
 msgid "guest"
 msgstr ""
 
-#: widgets/crud/crud.rb:95
+#: widgets/crud/crud.rb:116
 msgid "Cancel"
 msgstr ""
 
-#: widgets/crud/crud.rb:96
+#: widgets/crud/crud.rb:117
 msgid "Ok"
 msgstr ""
 
@@ -45,11 +45,11 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: widgets/table/table.rb:150 public/js/utils.js:14
+#: widgets/table/table.rb:152 public/js/utils.js:14
 msgid "Yes"
 msgstr ""
 
-#: widgets/table/table.rb:150 public/js/utils.js:19
+#: widgets/table/table.rb:152 public/js/utils.js:19
 msgid "No"
 msgstr ""
 

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

@@ -201,7 +201,7 @@ Spider.Widget = Class.extend({
 			w.setLoading();
 			var submitName = $this.attr('name');
 			var submitValue = $this.val();
-			form.ajaxSubmit({
+			var formOptions = {
 				dataType: 'html',
 				semantic: !isForm,
 				beforeSubmit: function(data, form, options){
@@ -216,7 +216,9 @@ Spider.Widget = Class.extend({
 					if (options.onLoad) options.onLoad(form);
 					w.trigger('ajaxifyLoad', form);
 				}
-			});
+			};
+            if (!isForm) formOptions.type = 'POST';
+			form.ajaxSubmit(formOptions);
 		});
 	},
 	

data/apps/core/forms/po/it/spider_forms.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2011-05-09 17:37+0200\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
 "PO-Revision-Date: 2010-11-29 12:52+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgstr "%s e rimani"
 msgid "%s is not a valid date"
 msgstr "%s non è una data valida"
 
-#: widgets/inputs/input/input.rb:91
+#: widgets/inputs/input/input.rb:95
 msgid "%s is required"
 msgstr "Il campo %s è obbligatorio"
 

data/apps/core/forms/po/spider_forms.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2011-05-09 17:37+0200\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
 "PO-Revision-Date: 2009-06-30 17:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "%s is not a valid date"
 msgstr ""
 
-#: widgets/inputs/input/input.rb:91
+#: widgets/inputs/input/input.rb:95
 msgid "%s is required"
 msgstr ""
 

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

@@ -348,7 +348,6 @@ module Spider; module Forms
                     end
 #                    obj.set(element_name, @inputs[element_name].prepare_value(@data[element_name.to_s]))
                 rescue FormatError => exc
-#                    debugger
                     add_error(exc.message, element_name, exc)
                 end
             end
@@ -414,9 +413,8 @@ module Spider; module Forms
             @errors[element_name] ||= []
             if @inputs[element_name]
                 @inputs[element_name].add_error(message) 
-            else
-                @errors[element_name] << message
             end
+            @errors[element_name] << message
         end
         
         def is_new?
@@ -454,7 +452,8 @@ module Spider; module Forms
         
         def self.parse_content(doc)
             overrides = []
-            overrides += doc.search('form:fields').to_a
+            form_fields = doc.search('form:fields').to_a
+            overrides += form_fields
             doc.search('form:fields').remove
             overrides.each{ |o| parse_override(o) }
             runtime, soverrides = super(doc)
@@ -462,12 +461,27 @@ module Spider; module Forms
             overrides.each do |ov|
                 ov['search'] = '.fields' if (ov.name == 'tpl:inline-override')
             end
+            if form_fields.length > 0
+                inputs = []
+                form_fields.each do |ff|
+                    ff.search('sp:run').each do |run|
+                        obj = run.get_attribute('obj')
+                        if obj =~ /@inputs\[:(.+)\]/
+                            inputs << $1
+                        end
+                    end
+                end
+                rtdoc = Hpricot::XML(runtime)
+                if rtdoc.search("sp:attribute[@name=elements]").length < 1
+                    rtdoc.root.innerHTML += "<sp:attribute name=\"elements\" value=\"#{inputs.join(',')}\" />"
+                    runtime = rtdoc.to_s
+                end
+            end
             return [runtime, overrides]
         end
         
         def self.parse_override(el)
-
-            if (el.name == 'form:fields')
+            if el.name == 'form:fields'
                 el.name = 'tpl:override-content'
                 el['search'] = '.fields'
             end

data/apps/master/_init.rb

@@ -30,5 +30,4 @@ require 'apps/master/controllers/scout_controller'
 require 'apps/master/lib/site_type'
 require 'apps/master/plugins/site_types/spider/spider'
 
-Spider.home.controller.route 'clients', Spider::Master::ScoutController
 

data/apps/master/master.rb

@@ -1,6 +1,10 @@
 module Spider
    
    module Master
+      
+       def self.app_init
+          Spider.home.controller.route 'clients', Spider::Master::ScoutController
+       end
        
        def self.scout_plugins
            path = Spider.conf.get('master.scout_plugins_path')

data/apps/master/po/it/master.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Master 0.1\n"
-"POT-Creation-Date: 2011-07-05 18:34+0200\n"
-"PO-Revision-Date: 2011-07-05 18:39+0100\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
+"PO-Revision-Date: 2011-09-13 15:35+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -16,26 +16,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: controllers/master_controller.rb:51
+#: controllers/master_controller.rb:54
 #: views/customers.shtml:3
-#: views/index.shtml:2
 #: views/master.layout.shtml:20
 msgid "Customers"
 msgstr "Clienti"
 
-#: controllers/master_controller.rb:82
+#: controllers/master_controller.rb:85
 msgid "No customer"
 msgstr "Nessun cliente"
 
-#: controllers/master_controller.rb:84
+#: controllers/master_controller.rb:87
 msgid "User can't access this customer"
 msgstr "L'utente non è autorizzato a vedere questo cliente"
 
-#: controllers/master_controller.rb:103
+#: controllers/master_controller.rb:106
 msgid "User can't list customers"
 msgstr "L'utente non è autorizzato a vedere la lista cliente"
 
+#: controllers/master_controller.rb:147
+msgid "Install or update gems"
+msgstr "Installa o aggiorna gemme"
+
+#: controllers/master_controller.rb:148
+msgid "Install or update apps"
+msgstr "Insalla o aggiorna applicazioni"
+
+#: models/installation.rb:5
+#: views/installation.shtml:9
+#: views/plugin_edit.shtml:10
+msgid "Name"
+msgstr "Nome"
+
 #: models/scout_plugin_instance.rb:21
+#: views/installation.shtml:67
 msgid "Ok"
 msgstr "Ok"
 
@@ -137,12 +151,12 @@ msgid "New customer"
 msgstr "Nuovo cliente"
 
 #: views/customer.shtml:8
+#: views/installation.shtml:21
 #: views/server.shtml:6
 msgid "Edit"
 msgstr "Modifica"
 
 #: views/customer.shtml:21
-#: views/index.shtml:3
 #: views/master.layout.shtml:21
 msgid "Servers"
 msgstr "Server"
@@ -166,35 +180,50 @@ msgstr "Torna al cliente"
 msgid "New installation for %s"
 msgstr "Nuova installazione per %s"
 
-#: views/installation.shtml:9
-#: views/plugin_edit.shtml:10
-msgid "Name"
-msgstr "Nome"
+#: views/installation.shtml:20
+msgid "Installation \"%s\""
+msgstr "Installazione \"%s\""
 
-#: views/installation.shtml:16
-msgid "Installation \"%s\" for %s"
-msgstr "Installazione \"%s\" per %s"
+#: views/installation.shtml:25
+msgid "Last check-in"
+msgstr "Ultimo check-in"
 
-#: views/installation.shtml:18
-msgid "Edit installation"
-msgstr "Modifica installazione"
+#: views/installation.shtml:27
+msgid "Next check-in"
+msgstr "Prossimo check-in"
 
-#: views/installation.shtml:20
+#: views/installation.shtml:35
+#: views/installation.shtml:37
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: views/installation.shtml:28
-msgid "Save"
-msgstr "Salva"
+#: views/installation.shtml:45
+#: views/installation.shtml:47
+msgid "Configuration"
+msgstr "Configurazione"
 
-#: views/installation.shtml:32
-msgid "Targets"
-msgstr "Destinazioni"
+#: views/installation.shtml:51
+#: views/installation.shtml:53
+msgid "Logs"
+msgstr "Log"
+
+#: views/installation.shtml:57
+#: views/installation.shtml:59
+msgid "Commands"
+msgstr "Comandi"
+
+#: views/installation.shtml:59
+msgid "Add command"
+msgstr "Aggiungi comando"
 
 #: views/master.layout.shtml:19
 msgid "Home"
 msgstr "Home"
 
+#: views/master.layout.shtml:22
+msgid "Installs"
+msgstr "Installazioni"
+
 #: views/plugin_data.shtml:13
 msgid "Compare"
 msgstr "Confronta"
@@ -420,6 +449,14 @@ msgstr "Valore Minimo"
 msgid "Submit"
 msgstr "Salva"
 
+#~ msgid "Installation \"%s\" for %s"
+#~ msgstr "Installazione \"%s\" per %s"
+#~ msgid "Edit installation"
+#~ msgstr "Modifica installazione"
+#~ msgid "Save"
+#~ msgstr "Salva"
+#~ msgid "Targets"
+#~ msgstr "Destinazioni"
 #~ msgid "plugin %s for %s"
 #~ msgstr "plugin %s per %s"
 

data/apps/master/po/master.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Master 0.1\n"
-"POT-Creation-Date: 2011-07-05 18:34+0200\n"
+"POT-Creation-Date: 2011-09-13 14:25+0200\n"
 "PO-Revision-Date: 2011-05-09 17:31+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,24 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: controllers/master_controller.rb:51 views/customers.shtml:3
-#: views/index.shtml:2 views/master.layout.shtml:20
+#: controllers/master_controller.rb:54 views/customers.shtml:3
+#: views/master.layout.shtml:20
 msgid "Customers"
 msgstr ""
 
-#: controllers/master_controller.rb:82
+#: controllers/master_controller.rb:85
 msgid "No customer"
 msgstr ""
 
-#: controllers/master_controller.rb:84
+#: controllers/master_controller.rb:87
 msgid "User can't access this customer"
 msgstr ""
 
-#: controllers/master_controller.rb:103
+#: controllers/master_controller.rb:106
 msgid "User can't list customers"
 msgstr ""
 
-#: models/scout_plugin_instance.rb:21
+#: controllers/master_controller.rb:147
+msgid "Install or update gems"
+msgstr ""
+
+#: controllers/master_controller.rb:148
+msgid "Install or update apps"
+msgstr ""
+
+#: models/installation.rb:5 views/installation.shtml:9
+#: views/plugin_edit.shtml:10
+msgid "Name"
+msgstr ""
+
+#: models/scout_plugin_instance.rb:21 views/installation.shtml:67
 msgid "Ok"
 msgstr ""
 
@@ -134,11 +147,11 @@ msgstr ""
 msgid "New customer"
 msgstr ""
 
-#: views/customer.shtml:8 views/server.shtml:6
+#: views/customer.shtml:8 views/installation.shtml:21 views/server.shtml:6
 msgid "Edit"
 msgstr ""
 
-#: views/customer.shtml:21 views/index.shtml:3 views/master.layout.shtml:21
+#: views/customer.shtml:21 views/master.layout.shtml:21
 msgid "Servers"
 msgstr ""
 
@@ -159,34 +172,46 @@ msgstr ""
 msgid "New installation for %s"
 msgstr ""
 
-#: views/installation.shtml:9 views/plugin_edit.shtml:10
-msgid "Name"
+#: views/installation.shtml:20
+msgid "Installation \"%s\""
 msgstr ""
 
-#: views/installation.shtml:16
-msgid "Installation \"%s\" for %s"
+#: views/installation.shtml:25
+msgid "Last check-in"
 msgstr ""
 
-#: views/installation.shtml:18
-msgid "Edit installation"
+#: views/installation.shtml:27
+msgid "Next check-in"
 msgstr ""
 
-#: views/installation.shtml:20
+#: views/installation.shtml:35 views/installation.shtml:37
 msgid "Apps"
 msgstr ""
 
-#: views/installation.shtml:28
-msgid "Save"
+#: views/installation.shtml:45 views/installation.shtml:47
+msgid "Configuration"
+msgstr ""
+
+#: views/installation.shtml:51 views/installation.shtml:53
+msgid "Logs"
 msgstr ""
 
-#: views/installation.shtml:32
-msgid "Targets"
+#: views/installation.shtml:57 views/installation.shtml:59
+msgid "Commands"
+msgstr ""
+
+#: views/installation.shtml:59
+msgid "Add command"
 msgstr ""
 
 #: views/master.layout.shtml:19
 msgid "Home"
 msgstr ""
 
+#: views/master.layout.shtml:22
+msgid "Installs"
+msgstr ""
+
 #: views/plugin_data.shtml:13
 msgid "Compare"
 msgstr ""

data/apps/messenger/_init.rb

@@ -21,28 +21,9 @@ require 'apps/messenger/messenger'
 require 'apps/messenger/controllers/messenger_controller'
 require 'apps/messenger/controllers/mixins/messenger_helper'
 
-available_backends = {}
-base = File.join(Spider::Messenger.path, 'backends')
-Dir.new(base).each do |type|
-    next if type[0].chr == '.'
-    type_dir = File.join(base, type)
-    next unless File.directory?(type_dir)
-    available_backends[type.to_sym] = []
-    Dir.new(type_dir).each do |bcknd|
-        next if bcknd[0].chr == '.'
-        name = File.basename(bcknd, '.rb')
-        available_backends[type.to_sym] << name
-    end
-end
-available_backends.each do |type, backends|
-    Spider.config_option("messenger.#{type}.backends")[:params][:choices] = backends
-    Spider.config_option("messenger.#{type}.backend")[:params][:choices] = backends
-end
-
-
-Spider.conf.get('messenger.email.backends').each do |backend|
+(Spider.conf.get('messenger.email.backends') || []).each do |backend|
     require File.join('apps/messenger/backends/email/', backend)
 end
-Spider.conf.get('messenger.sms.backends').each do |backend|
+(Spider.conf.get('messenger.sms.backends') || []).each do |backend|
     require File.join('apps/messenger/backends/sms/', backend)
 end