spiderfw 0.5.10 → 0.5.11

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

@@ -3,6 +3,7 @@
     <tpl:asset type="js" src="js/jquery/plugins/treeview/jquery.treeview.sortable.js" />
     <tpl:asset type="css" src="js/jquery/plugins/treeview/jquery.treeview.css" />
     <tpl:asset type="css" src="css/list.css" />
+    <tpl:asset type="js" src="js/plugins/sortable.js" />
     <tpl:asset type="js" src="js/list.js" />
 	<div sp:if="@searchable" class="search_box">
 		<form action="{ @request[:path] }" method="get">

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

@@ -78,7 +78,7 @@ module Spider; module Components
         def run
             @elements ||= choose_elements
             @scene.sortable = {}
-            @model.elements_array.each{ |el| @scene.sortable[el.name] = @model.mapper.mapped?(el) ? true : false }
+            @model.elements_array.each{ |el| @scene.sortable[el.name] = @model.mapper.sortable?(el) ? true : false }
             @scene.labels = {}
             @elements.each do |el|
                 @scene.labels[el] = @model.elements[el].label

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

@@ -1,9 +1,6 @@
 <div class="{ @widget[:css_class] }">
     <tpl:asset type="css" src="css/table.css" />
 	<tpl:asset type="js" src="widgets/table.js" />
-    <div sp:if="!@rows || @rows.length < 1" class="no_result">
-        Nessun elemento
-    </div>
     <table sp:if="@rows && @rows.length > 0" class="{ @widget[:css_class] }">
         <thead>
             <tr class="heading_row">
@@ -44,4 +41,7 @@
             </tr>
         </tfoot>
     </table>
+    <div sp:if="!@rows || @rows.length < 1" class="no_result">
+        _(No element)
+    </div>
 </div>

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

@@ -2,35 +2,83 @@ require 'apps/core/components/widgets/menu/menu'
 
 module Spider; module Components
     
-    class Tabs < Spider::Components::Switcher
+    class Tabs < Spider::Widget
         tag 'tabs'
         
-        def parse_runtime_content(doc)
-            doc = super
+        def init
+            @tabs = []
+            @tabs_labels = {}
+        end
+        
+        def add_tab(id, label)
+            @tabs << id
+            @tabs_labels[id] = label
+        end
+        
+        def prepare
+            super
+            @active_tab ||= @tabs.first
+            @scene << {
+                :active_tab => @active_tab,
+                :tabs => @tabs,
+                :tabs_labels => @tabs_labels
+            }
+        end
+        
+        def self.parse_content(doc)
+            content, overrides = super
+            doc = Hpricot(content)
+            tabs = []
+            tabs_override = '<tpl:override search="#tabs_content">'
             doc.search('tab').each do |tab|
-                t = nil
-                if (tab.attributes['src'])
-                    t = {:src => tab.attributes['src']}
-                elsif (tab.attributes['widget'])
-                    t = {:widget => tab.attributes[:widget]}
-                end
-                add
-                mods << const_get_full(mod.innerText)
+                tab_id = tab.get_attribute('id')
+                tabs_override += '<div sp:if="@active_tab == \''+tab_id+'\'>'
+                tabs_override += '<sp:parent-context>'
+                tabs_override += tab.innerHTML
+                tabs_override += '</sp:parent-context>'
+                tabs_override += '</div>'
+                tab.innerHTML = ''
             end
-            doc.search('admin:app').each do |app_tag|
-                except = []
-                if (app_tag.attributes['except'])
-                    except = app_tag.attributes['except'].split(',').map{ |e| e.strip }
-                end
-                app = const_get_full(app_tag.innerText.strip)
-                mods += app.models.select{ |m|
-                    !m.attributes[:sub_model] && m.mapper.class.write? && !except.include?(m.name.split('::')[-1])
-                }.sort{ |a, b| a.name <=> b.name }
+            tabs_override += '</tpl:override>'
+            debugger
+            overrides << Hpricot(tabs_override).root
+            return doc.to_s, overrides
+        end
+        
+        def parse_runtime_content(doc, src_path='')
+            doc = super
+            return doc if !doc.children || doc.children.empty?
+            doc.search('tab').each do |tab|
+                tab_id = tab.get_attribute('id')
+                label = tab.get_attribute('label')
+                add_tab(tab_id, label)
             end
-            @models ||= []
-            @models += mods
             return doc
         end
+        
+        
+        # def self.compile_block(el, id, attributes, options)
+        #     init_params = Spider::TemplateBlocks::Widget.attributes_to_init_params(attributes)
+        #     init = "w = add_widget('#{id}', #{self}.new(@request, @response), {#{init_params.join(', ')}}, '', nil)\n"
+        #     c = "yield :#{id}\n"
+        #     tabs_content = []
+        #     el.search('tab').each do |tab|
+        #         tab_id = tab.get_attribute('id')
+        #         label = tab.get_attribute('label')
+        #         init += "w.add_tab('#{tab_id}', '#{label}')\n"
+        #         raise TemplateCompileError, "Tabs widget #{id} has a tab without a label attribute" unless label
+        #         tab_c, tab_init = Spider::TemplateBlocks.compile_content(tab, c, init, options)
+        #         init += "if scene[:active_tab] == '#{tab_id}'\n"
+        #         init += tab_init
+        #         init += "end\n"
+        #         c += "debugger\n"
+        #         c += "if self[:active_tab] == '#{tab_id}'\n"
+        #         c += tab_c
+        #         c += "end\n"
+        #         
+        #     end
+        #     return [init, c]
+        # end
 
         
     end

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

@@ -1,2 +1,8 @@
-<tpl:extend src="SPIDER/apps/core/components/widgets/menu/menu.shtml">
-</tpl:extend>
+<div class="tabs">
+    <ul>
+        <li sp:each="@tabs |tab_id|">
+            <a href="#aaa">{ @tabs_labels[tab_id] }</a>
+        </li>
+    </ul>
+    <div id="tabs_content"></div>
+</div>

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

@@ -1,4 +1,7 @@
-require 'ftools'
+begin
+    require 'ftools'
+rescue LoadError
+end
 
 module Spider; module Forms
     

data/lib/spiderfw.rb

@@ -380,7 +380,8 @@ module Spider
                 if (path[0].chr == '/')
                     first_part = path[1..-1].split('/')[0]
                     Spider.apps_by_path.each do |p, a|
-                        if first_part == p
+                        if path.index(p) == 1 # FIXME: breaks something
+                        #if first_part == p
                             app = a
                             path = path[p.length+2..-1]
                             break
@@ -392,6 +393,7 @@ module Spider
                     app = owner_class.app if (owner_class && owner_class.app)
                 end
                 return Resource.new(cur_path+'/'+path, owner_class) if cur_path && File.exist?(cur_path+'/'+path) # !app
+                raise "Can't find owner app for resource #{path}" unless app
                 search_locations = [["#{Spider.paths[:root]}/#{resource_rel_path}/#{app.relative_path}", @home]]
                 if app.respond_to?("#{resource_type}_path")
                     search_locations << [app.send("#{resource_type}_path"), app]

data/lib/spiderfw/config/configuration.rb

@@ -219,6 +219,7 @@ module Spider
                 self[key]
             end
         end
+
         
         # FIXME: temporarely allows old behaviour 
         def config(key=nil)
@@ -273,7 +274,8 @@ module Spider
         
         def to_hash
             h = {}
-            @values.each do |k, v|
+            self.options.each do |k|
+                v = self[k]
                 if v.is_a?(self.class)
                     v = v.to_hash
                     next if v.empty?

data/lib/spiderfw/controller/controller.rb

@@ -113,6 +113,14 @@ module Spider
                 return res ? res.path : nil
             end
             
+            def url=(url)
+                @url = url
+            end
+            
+            def url
+                @url || ''
+            end
+            
             
         end
         

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

@@ -9,8 +9,8 @@ module Spider; module ControllerMixins
         
         def self.included(klass)
             klass.extend(ClassMethods)
-            klass.route('public/', :serve_static)
-            klass.route('w/', :serve_widget_static)
+            klass.route('public/', :serve_static, :do => lambda{ @serving_static = true })
+            klass.route('w/', :serve_widget_static, :do => lambda{ @serving_static = true })
             if (klass < Visual)
                 klass.no_layout('public')
                 klass.no_layout('serve_static')
@@ -75,6 +75,14 @@ module Spider; module ControllerMixins
             mode = Spider.conf.get('static_content.mode')
             raise Spider::Controller::NotFound.new(full_path) unless File.exist?(full_path)
             stat = File.lstat(full_path)
+            if @request.env['HTTP_IF_MODIFIED_SINCE']
+                if_modified = Time.httpdate(@request.env['HTTP_IF_MODIFIED_SINCE'])
+                if stat.mtime <= if_modified
+                    debug("Not modified #{full_path}")
+                    raise HTTPStatus.new(Spider::HTTP::NOT_MODIFIED) 
+                    return
+                end
+            end
             if File.directory?(full_path)
                 ct = "httpd/unix-directory"
             else
@@ -104,6 +112,10 @@ module Spider; module ControllerMixins
             return scene
         end
         
+        def serving_static?
+            @serving_static
+        end
+        
     end
     
     

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

@@ -61,12 +61,13 @@ module Spider; module ControllerMixins
             @visual_params ||= {}
         end
         
-        def init_widgets(template)
+        def init_widgets(template, layout=nil)
             widget_target = @request.params['_wt']
             widget_execute = @request.params['_we']
             if (widget_target && !@rendering_error)
                 first, rest = widget_target.split('/', 2)
-                @_widget = find_widget(first)
+                @_widget = template.find_widget(first)
+                @_widget = layout.find_widget(first) if !@_widget && layout
                 raise Spider::Controller::NotFound.new("Widget #{widget_target}") unless @_widget
                 @_widget.is_target = true unless rest
                 @_widget.set_action(widget_execute) if widget_execute
@@ -74,6 +75,7 @@ module Spider; module ControllerMixins
                 @_widget.widget_target = rest
             end
             template.do_widgets_before
+            layout.do_widgets_before if layout
             if @_widget
                 @_widget.execute
                 done
@@ -82,7 +84,7 @@ module Spider; module ControllerMixins
         
         def execute(action='', *params)
             @visual_params = @executed_format_params
-            @is_target = false if @request.params['_wt']
+            @is_target = false if @request.params['_wt'] && !self.is_a?(Spider::Widget)
             if (self.is_a?(Widget) && @is_target && @request.params['_wp'])
                 params = @request.params['_wp']
             elsif (@visual_params.is_a?(Hash) && @visual_params[:params])
@@ -91,7 +93,7 @@ module Spider; module ControllerMixins
             end
             super(action, *params)
             return unless @visual_params.is_a?(Hash)
-            @template = init_template if !@template && @visual_params[:template]
+            @template = get_template if !@template && @visual_params[:template]
             init_widgets(@template) if @template
             if @visual_params[:call]
                 send(@visual_params[:call], *params)
@@ -138,7 +140,7 @@ module Spider; module ControllerMixins
         end
         
         
-        def init_template(path=nil, scene=nil, options={})
+        def get_template(path=nil, scene=nil, options={})
             return @template if @template && @loaded_template_path == path
             scene ||= @scene
             scene ||= get_scene
@@ -149,14 +151,15 @@ module Spider; module ControllerMixins
                 options = format_params.merge(options)
             end
             template = load_template(path)
-            do_template_init(template, options)            
+            init_template(template, options)            
             @template = template
             @loaded_template_path = path
 
             return template
         end
         
-        def do_template_init(template, options={})
+        def init_template(template, options={})
+            prepare_template(template) unless template.owner # if called directly
             template.init(scene)
             if (@request.params['_action'])
                 template._widget_action = @request.params['_action']
@@ -166,17 +169,10 @@ module Spider; module ControllerMixins
             end
             return template
         end
-        
-        def render_layout(path, content={})
-            layout = self.class.load_layout(path)
-            layout.request = @request
-            layout.render(content)
-        end
-        
+                
         def init_layout(layout)
             l = layout.is_a?(Layout) ? layout : self.class.load_layout(layout)
-            l.owner = self
-            l.request = request
+            prepare_template(l)
             return l
         end
         
@@ -189,21 +185,25 @@ module Spider; module ControllerMixins
             if (path.is_a?(Spider::Template))
                 template = path
             else
-                template = init_template(path, scene, options)
+                template = get_template(path, scene, options)
             end
-            init_widgets(template)
-            return template if done?
+            layout = nil
             chosen_layouts = options[:layout] || @layout
             chosen_layouts = [chosen_layouts] if chosen_layouts && !chosen_layouts.is_a?(Array)
             if (chosen_layouts)
                 t = template
-                l = nil
+                layout = nil
                 (chosen_layouts.length-1).downto(0) do |i|
-                    l = init_layout(chosen_layouts[i])
-                    l.template = t
-                    t = l
+                    layout = init_layout(chosen_layouts[i])
+                    layout.template = t
+                    t = layout
                 end
-                l.render(scene)
+            end
+            layout.init(scene) if layout
+            init_widgets(template, layout)
+            return template if done?
+            if layout
+                layout.render(scene)
             else
                 template.render(scene)
             end
@@ -265,7 +265,7 @@ module Spider; module ControllerMixins
                     @scene.backtrace = build_backtrace(exc)
                     client_editor = Spider.conf.get('client.text_editor')
                     prefix = 'txmt://open?url=' if client_editor == 'textmate'
-                    @scene.exception = "#{exc.class.name}: #{exc.message}"
+                    @scene.exception = "#{exc.class.name}: #{CGI.escapeHTML(exc.message)}"
                     cnt = 0
                     @scene.backtrace.each do |tr|
                         tr[:index] = cnt

data/lib/spiderfw/controller/page_controller.rb

@@ -1,4 +1,5 @@
 require 'spiderfw/controller/controller'
+require 'spiderfw/controller/mixins/visual'
 
 module Spider
 
@@ -19,6 +20,8 @@ module Spider
                 if (@widgets[$1])
                     return Route.new(:path => path, :dest => @widgets[$1], :action => $2)
                 end
+            elsif (path =~ /_h\/(.+)/) # Route back to home
+                return Route.new(:path => path, :dest => Spider::HomeController, :action => $1)
             end
             return super
         end

data/lib/spiderfw/controller/request.rb

@@ -2,7 +2,7 @@ module Spider
     
     class Request
         attr_accessor :action, :params, :cookies, :env, :protocol,
-                      :format, :extension, :session, :user_id, :server, :request_time, :controller_path,
+                      :format, :session, :user_id, :server, :request_time, :controller_path,
                       :locale, :misc
                       
         BUFSIZE = 1024*4
@@ -14,6 +14,9 @@ module Spider
             @env = env
             @locale = Locale.current[0]
             @misc = {}
+            @params = {}
+            @action = ""
+            @session = {}
         end
         
         def body=(b)

data/lib/spiderfw/controller/session.rb

@@ -41,8 +41,13 @@ module Spider
             @sid = sid || generate_sid
         end
         
-        def delete
-            self.class.delete(@sid)
+        def delete(key=nil)
+            if key
+                restore unless @restored
+                @data.delete(key)
+            else
+                self.class.delete(@sid)
+            end
         end
         
         def generate_sid
@@ -61,10 +66,6 @@ module Spider
             @data[key] = val
         end
         
-        def delete(key)
-            restore unless @restored
-            @data.delete(key)
-        end
         
         def persist
             return unless @restored