spiderfw 0.5.10 → 0.5.11

data/lib/spiderfw/templates/blocks/widget.rb

@@ -4,14 +4,9 @@ module Spider; module TemplateBlocks
     
     class Widget < Block
         
-        def compile(options={})
-            klass = Spider::Template.get_registered_class(@el.name)
+        def self.attributes_to_init_params(attributes)
             init_params = []
-            id = @el.get_attribute('id')
-            raise TemplateCompileError, "Widget #{@el.name} does not have an id" unless id
-            template_attr = @el.get_attribute('template')
-            @el.remove_attribute('template')
-            @el.attributes.to_hash.each do |key, val|
+            attributes.each do |key, val|
                 if (!val.empty? && val[0].chr == '@')
                     sval = var_to_scene(val, 'scene')
                 elsif (!val.empty? && val[0].chr == '$')
@@ -23,6 +18,21 @@ module Spider; module TemplateBlocks
                 init_key = "\"#{init_key}\"" unless key =~ /^[\w\d]+$/
                 init_params << ":#{init_key} => #{sval}"
             end
+            init_params
+        end
+        
+        def compile(options={})
+            klass = Spider::Template.get_registered_class(@el.name)
+            init_params = []
+            id = @el.get_attribute('id')
+            raise TemplateCompileError, "Widget #{@el.name} does not have an id" unless id
+            template_attr = @el.get_attribute('template')
+            @el.remove_attribute('template')
+            if klass.respond_to?(:compile_block)
+                init, c = klass.compile_block(@el, id, @el.attributes.to_hash, options)
+                return CompiledBlock.new(init, c)
+            end
+            init_params = self.class.attributes_to_init_params(@el.attributes.to_hash)
 
             html = ""
             @el.each_child do |ch|

data/lib/spiderfw/templates/layout.rb

@@ -8,6 +8,15 @@ module Spider
             super
             @template = @template.is_a?(Template) ? @template : Template.new(@template)
             @template.init(scene) unless @template.init_done?
+            
+        end
+        
+        def render(*args)
+            prepare_assets unless @assets_prepared
+            super
+        end
+        
+        def prepare_assets
             @template_assets = {:css => [], :js => []}
             seen = {}
             all_assets.each do |res|
@@ -17,7 +26,8 @@ module Spider
                 @template_assets[res[:type].to_sym] << res[:src]
             end
             @content[:yield_to] = @template
-            scene.assets = @template_assets
+            @scene.assets = @template_assets
+            @assets_prepared = true
         end
         
         @@named_layouts = {}

data/lib/spiderfw/templates/template.rb

@@ -243,6 +243,7 @@ module Spider
             else
                 owner_class = (@owner ? @owner.class : @owner_class )
             end
+            raise "Asset type not given for #{src}" unless type
             res = Spider.find_resource(type.to_sym, src, @path, [owner_class, @definer_class])
             controller = nil
             if (res && res.definer)
@@ -252,6 +253,10 @@ module Spider
             end
             ass[:path] = res.path if res
             if controller.respond_to?(:pub_url)
+                if src[0].chr == '/'
+                    # strips the app path from the src. FIXME: should probably be done somewhere else
+                    src = src[(2+controller.app.relative_path.length)..-1]
+                end
                 ass[:src] = controller.pub_url + '/' + src
             else
                 ass[:src] = src
@@ -274,6 +279,8 @@ module Spider
             doc = open(path){ |f| Hpricot.XML(f) }
             root = doc.root
             overrides = []
+            orig_overrides = @overrides
+            @overrides = []
             if root.children
                 override_tags.each do |tag|
                     overrides += root.children_of_type('tpl:'+tag)
@@ -282,7 +289,11 @@ module Spider
             overrides.each{ |o| o.set_attribute('class', 'to_delete') }
             root.search('.to_delete').remove
             add_overrides overrides
+            @overrides += orig_overrides
             if (root.name == 'tpl:extend')
+
+                orig_overrides = @overrides
+                @overrides = []
                 ext_src = root.get_attribute('src')
                 ext_app = root.get_attribute('app')
                 ext_widget = root.get_attribute('widget')
@@ -290,6 +301,7 @@ module Spider
                     ext_widget = Spider::Template.get_registered_class(ext_widget)
                     ext_src ||= ext_widget.default_template
                     ext_owner = ext_widget
+                    ext_app = ext_widget.app
                 elsif ext_app
                     ext_app = Spider.apps_by_path[ext_app]
                     ext_owner = ext_widget
@@ -303,6 +315,13 @@ module Spider
                 @dependencies << ext
                 tpl = Template.new(ext)
                 root = get_el(ext)
+                root.children_of_type('tpl:asset').each do |ass|
+                    ass_src = ass.get_attribute('src')
+                    unless ass_src[0].chr == '/'
+                        ass.set_attribute('src', "/#{ext_app.relative_path}/#{ass_src}")
+                    end
+                end
+                @overrides += orig_overrides
                 if (assets && !assets.empty?)
                     assets.each do |ass|
                         root.innerHTML += ass.to_html
@@ -377,6 +396,7 @@ module Spider
                     apply_widget_proc(widget, wp)
                 end
             end
+            widget
         end
         
         def find_widget(path)
@@ -410,7 +430,7 @@ module Spider
         # Calls the run method on all widget instances.
         def run_widgets
             @widgets.each do |id, w|
-                w.run unless w.did_run?
+                w.run if w.run? && !w.did_run?
             end
             
         end
@@ -450,12 +470,22 @@ module Spider
             #     t.join
             # else
             scene.instance_eval("def __run_template\n"+@compiled.run_code+"end\n", @compiled.cache_path+'/run.rb', 0)
-            scene.__run_template do |widget|
-                @content[widget].render if @content[widget]
+            scene.__run_template do |yielded|
+                if yielded == :_parent
+                    @owner.parent.template.run_block
+                else
+                    @content[yielded].render if @content[yielded]
+                end
             end
             # end
         end
         
+        def run_block
+            @scene.__run_block do |yielded, block|
+                @content[yielded].render if @content[yielded]
+            end
+        end
+        
         # Alias for #render.
         def run
             render(@scene)
@@ -506,6 +536,9 @@ module Spider
         
         # Applies an override to an (Hpricot) element.
         def apply_override(el, override)
+            if override.is_a?(Proc)
+                return override.call(el)
+            end
             search_string = override.get_attribute('search')
             override.name = 'tpl:override-content' if override.name == 'tpl:inline-override'
             if (search_string)

data/lib/spiderfw/templates/template_blocks.rb

@@ -28,10 +28,12 @@ module Spider
                 block = :Run
             elsif el.name == 'sp:yield'
                 block = :Yield
-            elsif el.name == 'sp:pass' || el.name == 'sp:template'
+            elsif el.name == 'sp:pass' || el.name == 'tpl:pass' || el.name == 'sp:template'
                 block = :Pass
             elsif el.name == 'sp:debugger'
                 block = :Debugger
+            elsif el.name == 'sp:parent-context'
+                block = :ParentContext
             elsif Spider::Template.registered?(el.name)
                 klass = Spider::Template.get_registered_class(el.name)
                 if klass < ::Spider::Widget
@@ -47,7 +49,34 @@ module Spider
             return block
         end
         
+        def self.parse_content(el, allowed_blocks=nil, template=nil)
+            content_blocks = []
+            last_block = nil
+            el.each_child do |ch|
+                #Spider.logger.debug "TRAVERSING CHILD #{ch}"
+                # Gives the preceding block the chance to "eat" the next elements
+                next if (last_block && last_block.get_following(ch))
+                last_block = TemplateBlocks.parse_element(ch, allowed_blocks, template)
+                content_blocks << last_block if (last_block)
+            end
+            return content_blocks
+        end
+        
+        def self.compile_content(el, c='', init='', options={})
+            c ||= ""
+            init ||= ""
+            blocks = self.parse_content(el, options[:allowed_blocks], options[:template])
+            blocks.each do |block|
+                compiled = block.compile(options)
+                next unless compiled
+                c += compiled.run_code if (compiled.run_code)
+                init += compiled.init_code if (compiled.init_code)
+            end
+            return [c, init]
+        end
+        
         class Block
+            attr_reader :el, :template, :allowed_blocks
             
             def initialize(el, template=nil, allowed_blocks=nil)
                 @el = el
@@ -57,34 +86,13 @@ module Spider
             end
             
             def parse_content(el)
-                content_blocks = []
-                last_block = nil
-                el.each_child do |ch|
-                    #Spider.logger.debug "TRAVERSING CHILD #{ch}"
-                    # Gives the preceding block the chance to "eat" the next elements
-                    next if (last_block && last_block.get_following(ch))
-                    last_block = TemplateBlocks.parse_element(ch, @allowed_blocks, @template)
-                    content_blocks << last_block if (last_block)
-                end
-                return content_blocks
+                TemplateBlocks.parse_content(el, @allowed_blocks, @template)
             end
             
             def compile_content(c='', init='', options={})
-                c ||= ""
-                init ||= ""
-                blocks = parse_content(@el)
-                blocks.each do |block|
-                    compiled = block.compile(options)
-                    next unless compiled
-                    # if (compiled.run_code =~ /nil/)
-                    #     Spider::Logger.debug("NIL BLOCK")
-                    #     Spider::Logger.debug(block)
-                    #     Spider::Logger.debug(compiled.run_code)
-                    # end
-                    c += compiled.run_code if (compiled.run_code)
-                    init += compiled.init_code if (compiled.init_code)
-                end
-                return [c, init]
+                options[:allowed_blocks] ||= @allowed_blocks
+                options[:template] ||= @template
+                TemplateBlocks.compile_content(@el, c, init, options)
             end
             
             def get_following(el)
@@ -206,3 +214,5 @@ require 'spiderfw/templates/blocks/tag'
 require 'spiderfw/templates/blocks/widget'
 require 'spiderfw/templates/blocks/run'
 require 'spiderfw/templates/blocks/debugger'
+require 'spiderfw/templates/blocks/parent_context'
+

data/lib/spiderfw/utils/annotations.rb

@@ -109,6 +109,7 @@ module Annotations
             if (@annotations)
                 @annotations.each do |method, vals|
                     vals.each do |k, args|
+                        args = [args] unless args.is_a?(Array)
                         subclass.annotate(method, k, *args)
                     end
                 end
@@ -161,7 +162,7 @@ module Annotations
             end
         end
         
-        # Defines an annotation. The given block will be called whenever the name annotation
+        # Defines an annotation. The given block will be called whenever the "name" annotation
         # is encountered; it will be passed the current Class, the annotated Method, and the annotation arguments.
         def define_annotation(name, &proc)
             @defined_annotations ||= {}

data/lib/spiderfw/utils/thread_out.rb

@@ -21,4 +21,19 @@ module ThreadOut #:nodoc:
       self.write(stuff)
   end
   
+  def self.output_to(io)
+      if block_given?
+          prev_out = Thread.current[:stdout]
+          Thread.current[:stdout] = io
+          yield
+          Thread.current[:stdout] = prev_out
+      else
+          Thread.current[:stdout] = io
+      end
+  end
+  
+  def output_to(io, &proc)
+      self.class.output_to(io, &proc)
+  end
+  
 end

data/lib/spiderfw/widget/widget.rb

@@ -26,6 +26,7 @@ module Spider
             def inherited(subclass)
                 subclass.instance_variable_set(:@attributes, attributes.clone)
                 subclass.instance_variable_set(:@scene_attributes, @scene_attributes.clone) if @scene_attributes
+                super
             end
             
             def attribute(name, params={})
@@ -56,6 +57,11 @@ module Spider
                 attr_reader(name)
             end
             
+            def s_attribute(name, params={})
+                attribute(name, params)
+                attr_to_scene(name)
+            end
+            
             def i_attr_accessor(name, params={})
                 params[:instance_attr] = true
                 i_attribute(name, params)
@@ -209,9 +215,14 @@ module Spider
             locale = @request.locale.language
             include_js = [
                 '/js/jquery/jquery-1.4.2.js', '/js/inheritance.js', '/js/spider.js', '/js/jquery/plugins/jquery.query-2.1.6.js',
-                '/js/jquery/jquery-ui/development-bundle/ui/jquery-ui-1.7.2.custom.js', #'/js/jquery/jquery-ui/development-bundle/ui/jquery-ui-1.7.2.custom.min.js'
-                "/js/jquery/jquery-ui/development-bundle/ui/i18n/ui.datepicker-#{locale}.js", '/js/jquery/plugins/jquery.form.js'
+                '/js/jquery/plugins/jquery.form.js',
+                '/js/plugins/plugin.js'
             ]
+            # include_js << [
+            #     '/js/jquery/jquery-ui/development-bundle/ui/jquery-ui-1.7.2.custom.js',
+            #     #'/js/jquery/jquery-ui/development-bundle/ui/jquery-ui-1.7.2.custom.min.js',
+            #     "/js/jquery/jquery-ui/development-bundle/ui/i18n/ui.datepicker-#{locale}.js"
+            # ]
             include_css = [
                 '/css/spider.css', '/js/jquery/jquery-ui/css/smoothness/jquery-ui-1.7.2.custom.css', 
             ]
@@ -264,19 +275,27 @@ module Spider
         end
         
         def widget_before(action='')
-            return unless active?
             Spider.logger.debug("Widget #{self} widget_before(#{action})")
             widget_init(action)
             prepare
+            prepare_scene(@scene)
             @before_done = true
         end
         
         
         def active?
+            
             return @active unless @active.nil?
+            return @active = true if @is_target
+            return @active = false if attributes[:"sp:target-only"] == "true"
             @active = (!@request.params['_wt'] || @target_mode)
         end
         
+        def active=(val)
+            
+            @active = val
+        end
+        
         def before_done?
             @before_done
         end
@@ -332,7 +351,7 @@ module Spider
         end
         
         # Instantiates this widget's own subwidgets.
-        def init_widgets
+        def init_widgets(template=@template)
             if (self.class.scene_attributes)
                 self.class.scene_attributes.each do |name|
                     @scene[name] = instance_variable_get("@#{name}")
@@ -340,8 +359,8 @@ module Spider
             end
             template.request = @request
             template.response = @response
-            @template.init(@scene)
-            @template.widgets.each do |name, w|
+            template.init(@scene)
+            template.widgets.each do |name, w|
                 add_widget(w)
             end
             @widgets.each do |id, w| 
@@ -383,7 +402,7 @@ module Spider
         
         def run(action='')
             @widgets.each do |wname, w|
-                w.run
+                w.run if w.run?
             end
             if (@parent)
                 @parent.after_widget(@id.to_sym)
@@ -396,7 +415,7 @@ module Spider
         end
         
         def run?
-            @is_target || (!@target_mode && !attributes[:"sp:target_only"])
+            @is_target || (!@target_mode && !attributes[:"sp:target-only"])
         end
         
         def init_widget_done?
@@ -410,6 +429,7 @@ module Spider
         
         def render
             prepare_scene(@scene)
+            set_scene_vars(@scene)
             @template.render(@scene) unless @target_mode && !@is_target
         end
         
@@ -455,6 +475,10 @@ module Spider
             return p
         end
         
+        def has_params?
+            !params.empty?
+        end
+        
         def session(container=@request.session, klass=Hash)
             s = (container['_w'] ||= klass.new)
             @id_path[0..-2].each{ |id| s = (s[id] ||= klass.new) }
@@ -481,7 +505,7 @@ module Spider
         def add_widget(widget)
             widget.id_path = @id_path + [widget.id]
             widget.parent = self
-            widget.active = true if @is_target || @active
+            # widget.active = true if @is_target || @active
             @widgets[widget.id.to_sym] = widget
             if (@widgets_runtime_content[widget.id.to_sym])
                 @widgets_runtime_content[widget.id.to_sym].each do |content|
@@ -514,7 +538,9 @@ module Spider
             
         
         def parse_runtime_content_xml(xml, src_path=nil)
-            parse_runtime_content(Hpricot(xml), src_path)
+            return if xml.empty?
+            doc = Hpricot(xml)
+            parse_runtime_content(doc, src_path) if doc.children && doc.root && doc.root.children
         end
         
         def parse_runtime_content(doc, src_path=nil)
@@ -613,11 +639,7 @@ module Spider
         
         def prepare_scene(scene)
             scene = super
-            if (self.class.scene_attributes) # Repeat for new instance variables
-                self.class.scene_attributes.each do |name|
-                    @scene[name] = instance_variable_get("@#{name}")
-                end
-            end
+            
             # FIXME: owner_controller should be (almost) always defined
             scene.controller[:request_path] = owner_controller.request_path if owner_controller
             scene.widget[:request_path] = widget_request_path
@@ -631,6 +653,14 @@ module Spider
             return scene
         end
         
+        def set_scene_vars(scene)
+            if (self.class.scene_attributes) # Repeat for new instance variables
+                self.class.scene_attributes.each do |name|
+                    @scene[name] = instance_variable_get("@#{name}")
+                end
+            end
+        end
+        
         def css_class
             return @css_class if @css_class
             supers = self.class.ancestors.select{ |c| c != Spider::Widget && c.subclass_of?(Spider::Widget)}
@@ -665,8 +695,20 @@ module Spider
     
     module WidgetScene
         
+        def widget_target
+            "#{self[:request][:path]}?_wt=#{self[:widget][:id_path].join('/')}"
+        end
+        
         def widget_action(name, *params)
-            "#{self[:request][:path]}?_wt=#{self[:widget][:id_path].join('/')}&_we=#{name}"+(params.map{|p| "&_wp[]=#{p}"}).join('')
+            "#{self.widget_target}&_we=#{name}"+(params.map{|p| "&_wp[]=#{p}"}).join('')
+        end
+        
+        def widget_params(params)
+            "#{self[:request][:path]}?"+params.map{ |k, v| "_w#{self[:widget][:param]}[#{k}]=#{v}"}.join('&')
+        end
+        
+        def widget_param(name)
+            "_w#{self[:widget][:param]}[#{name}]"
         end
         
     end