spiderfw 0.6.1 → 0.6.2

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

@@ -6,6 +6,7 @@ module Spider; module Forms
         is_attr_accessor :multiple
         is_attr_accessor :blank_option, :type => TrueClass, :default => nil
         is_attr_accessor :condition
+        attribute :tree_element, :default => nil
         attr_accessor :data
         
         def widget_init(action='')
@@ -37,20 +38,32 @@ module Spider; module Forms
         end
         
         def run
-            
             @scene.data = @data || @model.all
-            if (@condition)
+            if @condition
                 @scene.data.condition = @condition
             end
             conn_cond = connection_condition
-            if (conn_cond == false)
+            if conn_cond == false
                 @scene.data = Spider::Model::QuerySet.static(@model)
-            elsif (conn_cond)
+            elsif conn_cond && !conn_cond.empty?
                 @scene.data.condition.and(conn_cond)
             end
             @scene.values = {}
             @scene.selected = {}
-            if (@value)
+            if @model || (@scene.data.is_a?(QuerySet) && @scene.data.autoload?)
+                tree_el = nil
+                if attributes[:tree_element]
+                    tree_el = @model.elements[attributes[:tree_element]]
+                else
+                    tree_el = @model.elements_array.select{ |el| el.association == :tree }.first
+                end
+                if tree_el
+                    @scene.data = @scene.data.model.send("#{tree_el.name}_all", @scene.data.condition)
+                    @scene.data.reject!{ |obj| obj == @form.obj } if @form && @form.obj
+                    @scene.tree_depth = tree_el.attributes[:tree_depth]
+                end
+            end
+            if @value
                 val = @multiple ? @value : [@value]
                 val.each do |v|
                     @scene.selected[@model.primary_keys.map{|k| v.get(k) }.join(',')] = true

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

@@ -5,6 +5,9 @@
 	<tpl:asset type="css" app="core/components" src="js/jquery/plugins/bsmselect/css/jquery.bsmselect.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">
+        <tpl:pass sp:if="@tree_depth">
+            { "-"*(@data[i].get(@tree_depth)||0) }
+        </tpl:pass>
         { @data[i].to_s }
     </option>
 </select>

data/apps/master/po/master.pot

@@ -0,0 +1,408 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Spider::Master 0.1\n"
+"POT-Creation-Date: 2011-05-09 17:37+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: controllers/master_controller.rb:50 views/customers.shtml:3
+#: views/index.shtml:2 views/master.layout.shtml:20
+msgid "Customers"
+msgstr ""
+
+#: controllers/master_controller.rb:81
+msgid "No customer"
+msgstr ""
+
+#: controllers/master_controller.rb:83
+msgid "User can't access this customer"
+msgstr ""
+
+#: controllers/master_controller.rb:102
+msgid "User can't list customers"
+msgstr ""
+
+#: models/scout_plugin_instance.rb:21
+msgid "Ok"
+msgstr ""
+
+#: models/scout_plugin_instance.rb:22
+msgid "Error"
+msgstr ""
+
+#: models/scout_plugin_instance.rb:23
+msgid "Alert"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:8
+msgid "Peak trigger"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:9
+msgid "Plateau trigger"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:10
+msgid "Trend trigger"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:15
+msgid "Up"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:16
+msgid "Down"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:17
+msgid "Either"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:22 views/trigger_edit.shtml:76
+msgid "yesterday's average"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:23 views/trigger_edit.shtml:79
+msgid "previous 7-day average"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:24 views/trigger_edit.shtml:82
+msgid "preceding window"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:27
+msgid "normal"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:28
+msgid "fired"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:93 models/scout_plugin_trigger.rb:101
+#: models/scout_plugin_trigger.rb:230
+msgid "%d minutes"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:111
+msgid "Alert me when %s exceeds %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:113
+msgid ""
+"Alert me when %s goes %s more than %s over the preceding %s (relative to "
+"%s), \n"
+"                as long as the value is at least %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:119
+msgid "Alert me when %s stays above %s for %s or more"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:224
+msgid "%s exceeded %s, increasing to %s at %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:232
+msgid ""
+"%s went %s more than %s over the preceding %s minutes with respect to %s, "
+"and is now %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:241
+msgid ""
+"%s exceeded %s, increasing to %s at %s, and is still continuing at %s as of "
+"%s"
+msgstr ""
+
+#: views/admin.layout.shtml:5
+msgid "\"Administration\""
+msgstr ""
+
+#: views/customer.shtml:6
+msgid "New customer"
+msgstr ""
+
+#: views/customer.shtml:8 views/servant.shtml:6
+msgid "Edit"
+msgstr ""
+
+#: views/customer.shtml:21 views/index.shtml:3 views/master.layout.shtml:21
+msgid "Servants"
+msgstr ""
+
+#: views/customer.shtml:21 views/customer.shtml:32 views/customers.shtml:3
+#: views/plugin_instance.shtml:33
+msgid "Add"
+msgstr ""
+
+#: views/customer.shtml:32
+msgid "Installations"
+msgstr ""
+
+#: views/installation.shtml:3
+msgid "Back to customer"
+msgstr ""
+
+#: views/installation.shtml:6
+msgid "New installation for %s"
+msgstr ""
+
+#: views/installation.shtml:9 views/plugin_edit.shtml:10
+msgid "Name"
+msgstr ""
+
+#: views/installation.shtml:16
+msgid "Installation \"%s\" for %s"
+msgstr ""
+
+#: views/installation.shtml:18
+msgid "Edit installation"
+msgstr ""
+
+#: views/installation.shtml:20
+msgid "Apps"
+msgstr ""
+
+#: views/installation.shtml:28
+msgid "Save"
+msgstr ""
+
+#: views/installation.shtml:32
+msgid "Targets"
+msgstr ""
+
+#: views/master.layout.shtml:19
+msgid "Home"
+msgstr ""
+
+#: views/plugin_data.shtml:13
+msgid "Compare"
+msgstr ""
+
+#: views/plugin_data.shtml:22
+msgid "Show in same scale"
+msgstr ""
+
+#: views/plugin_edit.shtml:3
+msgid "Edit plugin \"%s\""
+msgstr ""
+
+#: views/plugin_edit.shtml:4
+msgid "Back to plugin details"
+msgstr ""
+
+#: views/plugin_edit.shtml:15
+msgid "Settings"
+msgstr ""
+
+#: views/plugin_edit.shtml:28
+msgid "Advanced options"
+msgstr ""
+
+#: views/plugin_edit.shtml:30
+msgid "Interval"
+msgstr ""
+
+#: views/plugin_edit.shtml:34
+msgid "Timeout"
+msgstr ""
+
+#: views/plugin_edit.shtml:38
+msgid "Update"
+msgstr ""
+
+#: views/plugin_instance.shtml:5
+msgid "Edit settings"
+msgstr ""
+
+#: views/plugin_instance.shtml:8
+msgid "Last report"
+msgstr ""
+
+#: views/plugin_instance.shtml:19
+msgid "Field"
+msgstr ""
+
+#: views/plugin_instance.shtml:20
+msgid "Value"
+msgstr ""
+
+#: views/plugin_instance.shtml:24
+msgid "@labels[key]"
+msgstr ""
+
+#: views/plugin_instance.shtml:33
+msgid "Triggers"
+msgstr ""
+
+#: views/plugin_instance.shtml:38
+msgid "edit"
+msgstr ""
+
+#: views/servant.shtml:14 views/trigger_edit.shtml:8
+msgid "Customer"
+msgstr ""
+
+#: views/servant.shtml:23 views/servants.shtml:4
+msgid "New servant"
+msgstr ""
+
+#: views/servant.shtml:23
+msgid "for customer %s"
+msgstr ""
+
+#: views/servant.shtml:31
+msgid "Sites"
+msgstr ""
+
+#: views/servant.shtml:32
+msgid "New site"
+msgstr ""
+
+#: views/servant.shtml:33
+msgid "Add existing site"
+msgstr ""
+
+#: views/servant.shtml:39 views/servant.shtml:62
+msgid "Remove"
+msgstr ""
+
+#: views/servant.shtml:44
+msgid "Plugins"
+msgstr ""
+
+#: views/servant.shtml:47
+msgid "Add plugin"
+msgstr ""
+
+#: views/servant.shtml:70
+msgid "Servant %s"
+msgstr ""
+
+#: views/servant.shtml:73
+msgid "Last check"
+msgstr ""
+
+#: views/servant.shtml:78
+msgid "Manage resources"
+msgstr ""
+
+#: views/servant.shtml:81
+msgid "Resources"
+msgstr ""
+
+#: views/servant.shtml:94
+msgid "System details"
+msgstr ""
+
+#: views/site_edit.shtml:3
+msgid "Edit Site %s"
+msgstr ""
+
+#: views/site_edit.shtml:4
+msgid "Create new Site for %s"
+msgstr ""
+
+#: views/site_edit.shtml:7
+msgid "Choose site type"
+msgstr ""
+
+#: views/trigger_edit.shtml:3
+msgid "Edit Trigger %s"
+msgstr ""
+
+#: views/trigger_edit.shtml:4
+msgid "New Trigger for plugin %s"
+msgstr ""
+
+#: views/trigger_edit.shtml:12
+msgid "Servant"
+msgstr ""
+
+#: views/trigger_edit.shtml:16
+msgid "Plugin"
+msgstr ""
+
+#: views/trigger_edit.shtml:20 views/trigger_edit.shtml:24
+msgid "Data series"
+msgstr ""
+
+#: views/trigger_edit.shtml:30
+msgid "Trigger type"
+msgstr ""
+
+#: views/trigger_edit.shtml:32
+msgid "peak"
+msgstr ""
+
+#: views/trigger_edit.shtml:33
+msgid "plateau"
+msgstr ""
+
+#: views/trigger_edit.shtml:34
+msgid "trend"
+msgstr ""
+
+#: views/trigger_edit.shtml:42 views/trigger_edit.shtml:52
+msgid "Max Value"
+msgstr ""
+
+#: views/trigger_edit.shtml:48
+msgid "Duration"
+msgstr ""
+
+#: views/trigger_edit.shtml:49
+msgid "minutes"
+msgstr ""
+
+#: views/trigger_edit.shtml:58
+msgid "Trigger"
+msgstr ""
+
+#: views/trigger_edit.shtml:61
+msgid "Alert me to changes going"
+msgstr ""
+
+#: views/trigger_edit.shtml:63
+msgid "up"
+msgstr ""
+
+#: views/trigger_edit.shtml:64
+msgid "down"
+msgstr ""
+
+#: views/trigger_edit.shtml:65
+msgid "up or down"
+msgstr ""
+
+#: views/trigger_edit.shtml:69
+msgid "during the span of"
+msgstr ""
+
+#: views/trigger_edit.shtml:73
+msgid "relative to"
+msgstr ""
+
+#: views/trigger_edit.shtml:89
+msgid "when change is at least"
+msgstr ""
+
+#: views/trigger_edit.shtml:93
+msgid "Minimum Value"
+msgstr ""
+
+#: views/trigger_edit.shtml:98
+msgid "Submit"
+msgstr ""

data/apps/messenger/po/it/spider_messenger.po

@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Messenger 0.1\n"
-"POT-Creation-Date: 2010-11-29 12:48+0100\n"
+"POT-Creation-Date: 2011-05-09 17:37+0200\n"
 "PO-Revision-Date: 2010-11-29 12:53+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +20,7 @@ msgstr ""
 msgid "From"
 msgstr "Mittente"
 
-#: models/email.rb:8
-#: models/sms.rb:7
+#: models/email.rb:8 models/sms.rb:7
 msgid "To"
 msgstr "Destinatario"
 
@@ -100,18 +100,14 @@ msgstr "Testo"
 msgid "Queues"
 msgstr "Code"
 
-#: views/index.shtml:7
-#: views/queue.shtml:2
+#: views/index.shtml:7 views/queue.shtml:2
 msgid "Sent messages"
 msgstr "Messaggi inviati"
 
-#: views/index.shtml:8
-#: views/queue.shtml:4
+#: views/index.shtml:8 views/queue.shtml:4
 msgid "Queued messages"
 msgstr "Messaggi in coda"
 
-#: views/index.shtml:9
-#: views/queue.shtml:6
+#: views/index.shtml:9 views/queue.shtml:6
 msgid "Failed messages"
 msgstr "Messaggi falliti"
-

data/apps/messenger/po/spider_messenger.pot

@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Messenger 0.1\n"
-"POT-Creation-Date: 2010-11-29 12:48+0100\n"
+"POT-Creation-Date: 2011-05-09 17:37+0200\n"
 "PO-Revision-Date: 2009-06-30 16:44+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

data/lib/spiderfw/config/configuration.rb

@@ -93,6 +93,11 @@ module Spider
                     if (@options[key][:params] && @options[key][:params][:type] == :conf)
                         @values[key] ||= Configuration.new(@prefix+".#{key}") # FIXME: needed?
                         val.each do |h_key, h_val|
+                            unless h_val.is_a?(Hash)
+                                # Reference to another subconf item
+                                self[key][h_key] = self[key][h_val]
+                                next
+                            end
                             self[key][h_key] = Configuration.new(@prefix+".#{key}.x")
                             self[key][h_key].hash_key = h_key
                             h_val.each { |k, v| self[key][h_key].set(k, v) }

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

@@ -28,7 +28,7 @@ module Spider
         :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? true : false }
     config_option 'webserver.port', _("Port to use for the http server"), :type => Fixnum, :default => 8080
     config_option 'webserver.force_threads', _("Force threading on non-threaded adapters"), :type => Spider::DataTypes::Bool,
-        :default => Proc.new{ RUBY_VERSION_PARTS[1] == '8' ? true : false }
+        :default => Proc.new{ RUBY_VERSION_PARTS[1] == '8' && !Object.const_defined?(:PhusionPassenger) ? true : false }
     config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
     config_option 'webserver.respawn_on_change', _("Restart the webserver when application code changes"), :type => Spider::Bool,
         :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? true : false }
@@ -54,7 +54,7 @@ module Spider
     
     # Model
     
-    config_option 'storage.pool.size', _("How many connections to open to a connection"), :type => Fixnum, :default => 5
+    config_option 'storage.pool.size', _("How many connections to open to a storage"), :type => Fixnum, :default => 5
     config_option 'storage.pool.timeout', _("Timout in seconds to obtain a connection"), :type => Fixnum, :default => 5
     config_option 'storage.pool.retry', _("How many times to retry acquiring a connection"), :type => Fixnum, :default => 5
     config_option 'storage.shared_connection', _("Use one connection for all threads; use this only when testing!"), 

data/lib/spiderfw/controller/controller.rb

@@ -278,8 +278,11 @@ module Spider
         end
         
         def prepare_scene(scene)
+            req_path = @request.path
+            req_path += 'index' if !req_path.blank? && req_path[-1].chr == '/'
             scene.request = {
-                :path => @request.path
+                :path => @request.path,
+                :page_path => req_path
             }
             scene.controller = {
                 :request_path => request_path,

data/lib/spiderfw/controller/mixins/http_mixin.rb

@@ -40,6 +40,7 @@ module Spider; module ControllerMixins
         
         # Returns the request_path prefixed with http:// and the current host.
         def request_url
+            return request_path unless @request.env['HTTP_HOST']
             'http://'+@request.env['HTTP_HOST']+request_path
         end
         
@@ -94,6 +95,7 @@ module Spider; module ControllerMixins
         def prepare_scene(scene)
             scene = super
             scene.base_url = base_url
+            scene.controller[:request_url] = request_url
             return scene
         end
         

data/lib/spiderfw/create.rb

@@ -38,10 +38,14 @@ module Spider
 
                 cwd = Dir.getwd
                 Dir.chdir(dest_path)
-                repo = Grit::Repo.init(dest_path)
-                repo.add('apps', 'config', 'init.rb', 'public')
-                repo.add('.gitignore')
-                repo.commit_index(_("Created repository"))
+                begin
+                    repo = Grit::Repo.init(dest_path)
+                    repo.add('apps', 'config', 'init.rb', 'public')
+                    repo.add('.gitignore')
+                    repo.commit_index(_("Created repository"))
+                rescue => exc
+                    puts "Unable to init Git repo, please init manually"
+                end
                 Dir.chdir(cwd)
             rescue LoadError
                 puts "Grit not installed, cannot init repo"
@@ -87,4 +91,4 @@ module Spider
         
     end
     
-end
+end