spiderfw 0.6.23 → 0.6.24

data/CHANGELOG

@@ -1,5 +1,14 @@
+= 0.6.24
+== 24 February, 2012
+* Use Rack instead of custom adapters for all servers
+* Use Pry for spider console if available
+* Input widgets are no longer wrapped in divs
+* #before and #after are no longer executed for static files
+* Various fixes, some api documentation
+
+
 = 0.6.23
-== 6 February, 2011
+== 6 February, 2012
 * Config options can now have a Proc for :choices; new :fallback param to reuse other config
 * Added new-link, edit-link attributes to Crud
 * Added Twitter Bootstrap 2 to core components

data/README.rdoc

@@ -4,7 +4,7 @@ Spider is a Model-View-Controller application framework, mainly intended for Web
 
 Its main features are:
 
-* A model layer that is easy to use, yet flexible enough to adapt to legacy schemas. 
+* A Model layer that is easy to use, yet flexible enough to adapt to legacy schemas. 
   Models are defined in Ruby: schemas are autogenerated, but can be specified manually when needed.
   Direct sql is almost never used, but you can embed custom sql behaviour per model for each storage.
   

data/VERSION

@@ -1 +1 @@
-0.6.23
+0.6.24

data/apps/config_editor/_init.rb

@@ -11,5 +11,4 @@ Spider::Template.register_namespace('config_editor', Spider::ConfigEditor)
 
 
 require 'apps/config_editor/controllers/config_editor_controller'
-require 'apps/config_editor/widgets/edit/edit'
-require 'apps/config_editor/widgets/edit_bool/edit_bool'
+require 'apps/config_editor/widgets/edit/edit'

data/apps/config_editor/controllers/config_editor_controller.rb

@@ -75,13 +75,7 @@ module Spider; module ConfigEditor
         end
         
         def create_edit_widget(key, option)
-            wclass = case option[:params][:type].name
-            when 'Spider::Bool', 'Spider::DataTypes::Bool'
-                EditBool
-            else
-                Edit
-            end
-            w = wclass.new(@request, @response, @scene)
+            w = Edit.new(@request, @response, @scene)
             w.attributes[:name] = key
             w.attributes[:option] = option
             w.widget_init

data/apps/core/admin/controllers/admin_controller.rb

@@ -49,7 +49,7 @@ module Spider; module Admin
                 end
                 url = self.class.http_url(short_name)
                 @scene.apps << {
-                    :icon => app[:module].pub_url+'/'+app[:options][:icon],
+                    :icon => app[:options][:icon] ? app[:module].pub_url+'/'+app[:options][:icon] : nil,
                     :url => self.class.http_url(short_name),
                     :name => app[:module].full_name,
                     :description => app[:module].description,

data/apps/core/admin/public/css/sass/admin.css

@@ -23,27 +23,31 @@ body:after {
   background-position: 0 0;
 }
 
-/* line 17, ../../sass/admin.scss */
-#admin form.form-horizontal input,
+/* line 14, ../../sass/admin.scss */
+#admin form.form-horizontal .help-block {
+  max-width: 550px;
+}
+/* line 22, ../../sass/admin.scss */
+#admin form.form-horizontal input[type="text"],
 #admin form.form-horizontal textarea,
 #admin form.form-horizontal select,
 #admin form.form-horizontal .uneditable-input {
   width: 300px;
 }
-/* line 21, ../../sass/admin.scss */
+/* line 26, ../../sass/admin.scss */
 #admin form.form-horizontal select {
   width: 310px;
 }
-/* line 25, ../../sass/admin.scss */
+/* line 30, ../../sass/admin.scss */
 #admin form.form-horizontal input.btn {
   width: auto;
 }
-/* line 29, ../../sass/admin.scss */
+/* line 34, ../../sass/admin.scss */
 #admin form.form-horizontal .form-actions {
   padding-left: 250px;
 }
 
-/* line 39, ../../sass/admin.scss */
+/* line 44, ../../sass/admin.scss */
 #header {
   padding-bottom: 10px;
   background: url('../../img/css/header_bg.png?1321971233') repeat-x scroll center top;
@@ -51,27 +55,27 @@ body:after {
   position: relative;
   border-bottom: 2px solid #555555;
 }
-/* line 46, ../../sass/admin.scss */
+/* line 51, ../../sass/admin.scss */
 #header #header_top {
   overflow: hidden;
   *zoom: 1;
 }
-/* line 50, ../../sass/admin.scss */
+/* line 55, ../../sass/admin.scss */
 #header h1 {
   font-size: 27px;
   color: #444444;
 }
-/* line 55, ../../sass/admin.scss */
+/* line 60, ../../sass/admin.scss */
 #header #main_title {
   float: left;
   margin-top: 8px;
   margin-left: 40px;
 }
-/* line 60, ../../sass/admin.scss */
+/* line 65, ../../sass/admin.scss */
 #header #main_title h1 {
   margin-bottom: 8px;
 }
-/* line 64, ../../sass/admin.scss */
+/* line 69, ../../sass/admin.scss */
 #header #admin_controls {
   font-size: .95em;
   float: right;
@@ -79,21 +83,21 @@ body:after {
   margin-right: 30px;
   color: white;
 }
-/* line 71, ../../sass/admin.scss */
+/* line 76, ../../sass/admin.scss */
 #header #admin_controls a {
   color: white;
 }
-/* line 75, ../../sass/admin.scss */
+/* line 80, ../../sass/admin.scss */
 #header #admin_controls .welcome {
   margin-right: 6px;
 }
-/* line 79, ../../sass/admin.scss */
+/* line 84, ../../sass/admin.scss */
 #header #admin_controls .logout_link {
   background-position: right;
   padding-right: 25px;
   margin-left: 6px;
 }
-/* line 88, ../../sass/admin.scss */
+/* line 93, ../../sass/admin.scss */
 #header #app_buttons {
   height: 68px;
   min-width: 200px;
@@ -121,11 +125,11 @@ body:after {
 #header #app_buttons {
   *display: inline;
 }
-/* line 99, ../../sass/admin.scss */
+/* line 104, ../../sass/admin.scss */
 #header #app_buttons a {
   color: #222222;
 }
-/* line 103, ../../sass/admin.scss */
+/* line 108, ../../sass/admin.scss */
 #header #app_buttons div {
   width: 55px;
   height: 55px;
@@ -135,7 +139,7 @@ body:after {
   float: left;
   background-color: #EEEEEE;
 }
-/* line 112, ../../sass/admin.scss */
+/* line 117, ../../sass/admin.scss */
 #header #app_buttons div img {
   margin-left: auto;
   margin-right: auto;
@@ -143,40 +147,40 @@ body:after {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
   opacity: 0.8;
 }
-/* line 119, ../../sass/admin.scss */
+/* line 124, ../../sass/admin.scss */
 #header #app_buttons div span.name {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=90);
   opacity: 0.9;
   display: block;
   font-size: 0.8em;
 }
-/* line 126, ../../sass/admin.scss */
+/* line 131, ../../sass/admin.scss */
 #header #app_buttons a.active div {
   border: 1px solid #DDDD00;
 }
-/* line 128, ../../sass/admin.scss */
+/* line 133, ../../sass/admin.scss */
 #header #app_buttons a.active div img {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
   opacity: 0.7;
 }
-/* line 131, ../../sass/admin.scss */
+/* line 136, ../../sass/admin.scss */
 #header #app_buttons a.active div span.name {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
   opacity: 0.8;
 }
 
-/* line 139, ../../sass/admin.scss */
+/* line 144, ../../sass/admin.scss */
 #admin-switcher-menu .section_title {
   font-size: 14px;
   line-height: 36px;
 }
 
-/* line 149, ../../sass/admin.scss */
+/* line 154, ../../sass/admin.scss */
 #spider-admin .container-fluid .content {
   background-color: white;
 }
 
-/* line 156, ../../sass/admin.scss */
+/* line 161, ../../sass/admin.scss */
 #container, .spider-admin-container {
   background: url('../../img/css/side_bg.png?1321971233') repeat-y;
   position: relative;
@@ -188,7 +192,7 @@ body:after {
   overflow: hidden;
   *zoom: 1;
 }
-/* line 166, ../../sass/admin.scss */
+/* line 171, ../../sass/admin.scss */
 #container #sidebar, #container > .spider-admin-sidebar, .spider-admin-container #sidebar, .spider-admin-container > .spider-admin-sidebar {
   position: absolute;
   top: 0;
@@ -196,27 +200,27 @@ body:after {
   width: 220px;
   padding: 20px 10px;
 }
-/* line 173, ../../sass/admin.scss */
+/* line 178, ../../sass/admin.scss */
 #container #sidebar li.active a, #container > .spider-admin-sidebar li.active a, .spider-admin-container #sidebar li.active a, .spider-admin-container > .spider-admin-sidebar li.active a {
   text-decoration: underline;
 }
-/* line 177, ../../sass/admin.scss */
+/* line 182, ../../sass/admin.scss */
 #container #sidebar li, #container > .spider-admin-sidebar li, .spider-admin-container #sidebar li, .spider-admin-container > .spider-admin-sidebar li {
   margin-bottom: 1px;
 }
-/* line 182, ../../sass/admin.scss */
+/* line 187, ../../sass/admin.scss */
 #container #content, #container > .spider-admin-content, .spider-admin-container #content, .spider-admin-container > .spider-admin-content {
   margin-left: 240px;
 }
 
-/* line 187, ../../sass/admin.scss */
+/* line 192, ../../sass/admin.scss */
 .crud .table {
   width: auto;
   min-width: 400px;
 }
 
 @media screen and (max-width: 500px) {
-  /* line 196, ../../sass/admin.scss */
+  /* line 201, ../../sass/admin.scss */
   #header #main_title {
     font-size: 10px;
   }

data/apps/core/admin/public/sass/admin.scss

@@ -11,7 +11,12 @@ $sidebar_color: #DFDFDF;
 #admin {
     form.form-horizontal {
 
-        input,
+        .help-block {
+            max-width: 550px;    
+        }
+        
+
+        input[type="text"],
         textarea,
         select,
         .uneditable-input {

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

@@ -1,10 +1,10 @@
 <div class="{ @widget[:css_class] }">
     <tpl:assets widgets="core:table,forms:form" />
     <tpl:asset type="css" src="css/crud.css" />
-    <div sp:if="@saved" class="flash">
+    <div sp:if="@saved" class="alert alert-success">
         Salvataggio effettuato
     </div>
-    <div sp:if="@deleted" class="flash">
+    <div sp:if="@deleted" class="alert alert-success">
         Cancellazione effettuata
     </div>
     <core:confirm id="ask_delete" sp:if="@ask_delete">

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

@@ -179,21 +179,21 @@ module Spider; module Components
                     return list
                 end
             else
-                format_value(element.type, row[el])
+                format_value(element.type, row[el], element.attributes)
             end
         end
 
-        def format_value(type, value)
+        def format_value(type, value, attributes={})
             if type <= Spider::Bool
-                return row[el] ? _('Yes') : _('No')
+                return value ? _('Yes') : _('No')
             elsif !value
                 return ''
             elsif type <= Date || type <= Time
                 return Spider::I18n.localize_date_time(@request.locale, value, :short)
             elsif type <= Float || type <= BigDecimal
                 str = Spider::I18n.localize_number(@request.locale, value)
-                if element.attributes[:currency]
-                    str = "&#{element.attributes[:currency]}; #{str}"
+                if attributes[:currency]
+                    str = "&#{attributes[:currency]}; #{str}"
                 end
                 return str
             elsif value.respond_to?(:format)

data/apps/core/forms/tags/element_row.erb

@@ -6,14 +6,19 @@
 %>
 <forms:row error_condition="<%=error_condition%>" required="<%=required%>" element="<%=@attributes['element']%>">
     <forms:element_label element="<%=@attributes['element']%>" required="<%=required%>" inputs_hash="<%=inputs_hash%>"/>
-    <sp:run obj="@<%=inputs_hash%>[<%=@attributes['element']%>]" widget="<%=@attributes['element']%>">
-      <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="required" value="<%=(@attributes['required']=='true')? 'true' : ''%>" />
-      <%
-        (@attributes.keys - tag_attrs).each do |k|
-      %>
-      <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="<%=k%>" value="<%=@attributes[k]%>" />
-      <%
-        end
-      %>
-    </sp:run>
+    <div class="controls">
+      <sp:run obj="@<%=inputs_hash%>[<%=@attributes['element']%>]" widget="<%=@attributes['element']%>">
+        <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="required" value="<%=(@attributes['required']=='true')? 'true' : ''%>" />
+        <%
+          (@attributes.keys - tag_attrs).each do |k|
+        %>
+        <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="<%=k%>" value="<%=@attributes[k]%>" />
+        <%
+          end
+        %>
+      </sp:run>
+      <p sp:if="!@model.elements[<%=@attributes['element']%>].attributes[:description].blank?" class="help-block">
+        { @model.elements[<%=@attributes['element']%>].attributes[:description] }
+      </p>
+    </div>
 </forms:row>

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

@@ -84,6 +84,7 @@ module Spider; module Forms
                     @model = @obj.class
                 end
             end
+            @scene.model = @model
             if (@elements.is_a?(String))
                 @elements = @elements.split(',').map{ |e| @model.elements[e.strip.to_sym] }.reject{ |i| i.nil? }
                 @requested_elements = @elements
@@ -147,30 +148,42 @@ module Spider; module Forms
         
         def load_widgets(template=@template)
             super
-            if (@action == :sub)
-                @crud = Spider::Components::Crud.new(@request, @response)
-                @crud.id = "crud_#{@sub_element.name.to_s}"
-                @crud.model = @sub_element.model
-                add_widget(@crud)
-                @scene.crud = @crud
-                @obj = load
-                cond = {}
-                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}")
+            if @action == :sub
+                if @sub_element.multiple?
+                    @crud = Spider::Components::Crud.new(@request, @response)
+                    @crud.id = "crud_#{@sub_element.name.to_s}"
+                    @crud.model = @sub_element.model
+                    add_widget(@crud)
+                    @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}")
+                        end
+                    else
+                        @model.primary_keys.each do |key|
+                            cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
+                        end
                     end
-                else
-                    @model.primary_keys.each do |key|
-                        cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
+                    @crud.fixed = cond
+                    sub_elements = []
+                    #sub_elements += @sub_element.model.primary_keys.map{ |k| k.name }
+                    @sub_element.model.elements_array.each do |el|
+                        sub_elements << el.name unless el.integrated? || el.model == @model
                     end
+                    @crud.attributes[:table_elements] = sub_elements
+                # else
+                #     @crud = Spider::Forms::Form.new(@request, @response)
+                #     @form.id = "crud_#{@sub_element.name.to_s}"
+                #     @form.model = @sub_element.model
+                #     add_widget(@crud)
+                #     @scene.crud = @crud
+                #     @obj.load
+                #     debugger
+                #     @form.pk = @obj.get(@sub_element).id
                 end
-                @crud.fixed = cond
-                sub_elements = []
-                #sub_elements += @sub_element.model.primary_keys.map{ |k| k.name }
-                @sub_element.model.elements_array.each do |el|
-                    sub_elements << el.name unless el.integrated? || el.model == @model
-                end
-                @crud.attributes[:table_elements] = sub_elements
             else
                 create_inputs
             end
@@ -250,7 +263,7 @@ module Spider; module Forms
                     if ([:choice, :multiple_choice, :state, :multiple_state].include?(el.association) && !el.extended?)
                         widget_type = el.type.attributes[:estimated_size] && el.type.attributes[:estimated_size] > 30 ? 
                             SearchSelect : Select
-                    elsif @attributes[:show_related] && @pk && el.multiple?
+                    elsif @attributes[:show_related] && @pk
                         @sub_links[el.name] = sub_link(el)
                     end
                 end

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

@@ -1,3 +1,3 @@
-<div class="controls">
+<sp:template>
     <input type="checkbox" name="{ @name }" id="input" value="1" size="{ @size }" sp:attr-if="@value,checked">
-</div>
+</sp:template>

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

@@ -1,6 +1,6 @@
-<div class="controls">
+<sp:template>
     <tpl:asset type="js" src="input.js" />
     <tpl:asset name="jquery-ui-datepicker" />
     <tpl:asset type="js" src="date_time.js" />
     <input type="text" name="{ @name }" id="input" value="{ @formatted_value }" size="{ @size }" class="{ @mode } { @additional_classes.join(' ') }">
-</div>
+</sp:template>

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

@@ -1,4 +1,4 @@
-<div class="controls">
+<sp:template>
     <tpl:asset type="css" src="css/file_input.css" />
     <tpl:asset type="js" src="input.js" />
     <tpl:asset type="js" src="file_input.js" />
@@ -9,4 +9,4 @@
     <div class="change"><span sp:if="@value && !@value.to_s.empty?"><span class="change-label">_(Change)</span>:</span>
         <input type="file" name="{ @name }[file]" id="input" value="{ @value }" size="{ @size }">
     </div>
-</div>
+</sp:template>

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

@@ -1,4 +1,4 @@
-<div class="controls">
+<sp:template>
     <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>
-</div>
+</sp:template>

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

@@ -1,3 +1,3 @@
-<div class="controls">
+<sp:template>
     { @value }
-</div>
+</sp:template>

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

@@ -1,5 +1,5 @@
-<div class="controls">
+<sp:template>
     <input type="password" name="{ @name }[pwd1]" id="input" value="" size="{ @size }"><br>
     <div class="help-block">Ripeti la password:</div>
     <input type="password" name="{ @name }[pwd2]" id="input2" value="" size="{ @size }"><br>
-</div>
+</sp:template>

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

@@ -1,4 +1,4 @@
-<div class="controls{ @multiple ? ' multiple' : '' }">
+<div class="{ @multiple ? ' multiple' : '' }">
     <tpl:asset type="js" name="jquery-ui-autocomplete" />
 	<tpl:asset type="js" src="input.js" />
 	<tpl:asset type="js" src="search_select.js" />

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

@@ -1,4 +1,4 @@
-<div class="controls">
+<sp:template>
     <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/bsmselect/js/jquery.bsmselect.js" if="@multiple" />
@@ -13,4 +13,4 @@
             { @data[i].to_s }
         </option>
     </select>
-</div>
+</sp:template>

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

@@ -1,3 +1,3 @@
-<div class="controls">
+<sp:template>
     <input type="text" id="input" name="{ @name }" value="{ @formatted_value }" size="{ @size }">
-</div>
+</sp:template>

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

@@ -1,5 +1,5 @@
-<div class="controls">
+<sp:template>
     <tpl:asset type="js" src="input.js" /><tpl:asset type="js" src="text_area.js" />
     <tpl:asset type="js" app="core/components" src="js/jquery/plugins/autogrow/jquery.autogrow.js" />
     <textarea name="{ @name }" id="input" rows="{ @rows }" cols="{ @cols }">{ @value }</textarea>
-</div>
+</sp:template>

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

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="time-span-input">
     <input type="text" name="{ @name }[val]" id="input" value="{ @formatted_value }" size="8" >
     <select name="{ @name }[unit]">
         <option value="sec" sp:attr-if="(@unit == 'sec'),selected">_(Seconds)</option>

data/blueprints/home/config.ru

@@ -0,0 +1,8 @@
+require 'spiderfw/init'
+require 'spiderfw/http/adapters/rack'
+if defined?(PhusionPassenger)
+    PhusionPassenger.on_event(:starting_worker_process) do
+        Spider.startup
+    end
+end
+run Spider::HTTP::RackApplication.new