spiderfw 0.5.7 → 0.5.9

data/lib/spiderfw/model/storage/db/db_schema.rb

@@ -24,6 +24,7 @@ module Spider; module Model; module Storage; module Db
             @sequences = {}
             @pass = {}
             @foreign_key_constraints = []
+            @order = []
         end
         
         # Returns the main table name.
@@ -74,6 +75,8 @@ module Spider; module Model; module Storage; module Db
         
         # Returns table_name + '.' + #foreign_key_field
         def qualified_foreign_key_field(element_name, key_name)
+            f = foreign_key_field(element_name, key_name)
+            return f.expression if f.is_a?(FieldExpression)
             return @table.name + '.' + foreign_key_field(element_name, key_name).name
         end
         
@@ -95,13 +98,24 @@ module Spider; module Model; module Storage; module Db
         def set_column(element_name, field)
             field = Field.new(@table, field[:name], field[:type], field[:attributes] || {}) if field.is_a?(Hash)
             @columns[element_name] = field
+            @order << field
         end
         
         # Sets a foreign key to the primary key of an element.
         def set_foreign_key(element_name, element_key, field)
-            field = Field.new(@table, field[:name], field[:type], field[:attributes] || {}) if field.is_a?(Hash)
+            if field.is_a?(Hash)
+                field[:attributes] ||= {}
+                field[:attributes][:expression] ||= field[:expression]
+                if field[:attributes][:expression]
+                    field[:name] = "#{@table}_#{element_name}_#{element_key}".upcase
+                    field = FieldExpression.new(@table, field[:name], field[:type], field[:attributes] || {})
+                else
+                    field = Field.new(@table, field[:name], field[:type], field[:attributes] || {}) 
+                end
+            end
             @foreign_keys[element_name] ||= {}
             @foreign_keys[element_name][element_key] = field
+            @order << field
         end
         
         def set_foreign_key_constraint(name, table, keys, options={})
@@ -133,7 +147,7 @@ module Spider; module Model; module Storage; module Db
         #   }}
         def get_schemas
             schemas = {}
-            schemas[@table.name] = {:columns => {}, :attributes => {}}
+            schemas[@table.name] = {:columns => {}, :attributes => {}, :fields_order => @order}
             @columns.each do |element, column|
                 schemas[@table.name][:columns][column.name] = {:type => column.type, :attributes => column.attributes}
             end
@@ -179,8 +193,8 @@ module Spider; module Model; module Storage; module Db
     end
     
     class Field
-        attr_reader :name, :table
-        attr_accessor :type
+        attr_reader :table
+        attr_accessor :name, :type
         attr_accessor :attributes
         
         def initialize(table, name, type, attributes={})
@@ -212,6 +226,21 @@ module Spider; module Model; module Storage; module Db
         
     end
     
+    class FieldExpression < Field
+        attr_reader :expression
+        
+        def initialize(table, name, type, attributes={})
+            super
+            @expression = attributes[:expression]
+        end
+        
+        
+        def to_s
+            "#{@expression} AS #{@name}"
+        end
+        
+    end
+    
     class ForeignKeyConstraint
         attr_reader :name, :table, :fields, :options
         

data/lib/spiderfw/model/storage/db/db_storage.rb

@@ -96,7 +96,7 @@ module Spider; module Model; module Storage; module Db
         end
         
         # Instantiates a new connection with current connection params.
-        def connect()
+        def connect
             return self.class.get_connection(*@connection_params)
             #Spider::Logger.debug("#{self.class.name} in thread #{Thread.current} acquired connection #{@conn}")
         end
@@ -163,6 +163,10 @@ module Spider; module Model; module Storage; module Db
             return self.class.capabilities[:transactions]
         end
         
+        def transactions_enabled?
+            @configuration['enable_transactions'] && supports_transactions?
+        end
+        
         def start_transaction
             return savepoint("point#{curr[:savepoints].length}") if in_transaction?
             curr[:transaction_nesting] += 1
@@ -191,12 +195,14 @@ module Spider; module Model; module Storage; module Db
         end
         
         def commit
+            return false unless transactions_enabled?
             raise StorageException, "Commit without a transaction" unless in_transaction?
             return curr[:savepoints].pop unless curr[:savepoints].empty?
             commit!
         end
         
         def commit_or_continue
+            return false unless transactions_enabled?
             raise StorageException, "Commit without a transaction" unless in_transaction?
             if curr[:transaction_nesting] == 1
                 commit
@@ -473,12 +479,16 @@ module Spider; module Model; module Storage; module Db
             condition = query[:condition]
             return ['', []] unless (condition && condition[:values])
             bind_vars = []
+            condition[:values].reject!{ |v| v.is_a?(Hash) && v[:values].empty? }
             mapped = condition[:values].map do |v|
                 if (v.is_a? Hash) # subconditions
                     # FIXME: optimize removing recursion
+                    
                     sql, vals = sql_condition({:condition => v})
                     bind_vars += vals
-                    !sql.empty? ? "(#{sql})" : nil
+                    sql = nil if sql.empty?
+                    sql = "(#{sql})" if sql && v[:values].length > 1
+                    sql
                 elsif (v[2].is_a? Spider::QueryFuncs::Expression)
                     sql_condition_value(v[0], v[1], v[2].to_s, false)
                 else
@@ -541,7 +551,11 @@ module Spider; module Model; module Storage; module Db
             }
             values = []
             sql = joins.map{ |join|
-                sql_on = join[:keys].map{ |from_f, to_f| "#{from_f} = #{to_f}"}.join(' AND ')
+                to_t = join[:as] || join[:to]
+                sql_on = join[:keys].map{ |from_f, to_f|
+                    to_field = to_f.is_a?(FieldExpression) ? to_f : "#{to_t}.#{to_f.name}"
+                    "#{from_f} = #{to_field}"
+                }.join(' AND ')
                 if (join[:condition])
                     condition_sql, condition_values = sql_condition({:condition => join[:condition]})
                     sql_on += " and #{condition_sql}"
@@ -556,9 +570,14 @@ module Spider; module Model; module Storage; module Db
         end
         
         # Returns SQL for the ORDER part.
-        def sql_order(query)
+        def sql_order(query, replacements={})
             return '' unless query[:order]
-            return query[:order].map{|o| "#{o[0]} #{o[1]}"}.join(' ,')
+            replacements ||= {}
+            return query[:order].map{|o| 
+                repl = replacements[o[0].to_s]
+                ofield = repl ? repl : o[0]
+                "#{ofield} #{o[1]}"
+            }.join(' ,')
         end
         
         # Returns the LIMIT and OFFSET SQL.
@@ -572,7 +591,7 @@ module Spider; module Model; module Storage; module Db
         # Returns SQL and values for an insert statement.
         def sql_insert(insert)
             curr[:last_query_type] = :insert
-            sql = "INSERT INTO #{insert[:table]} (#{insert[:values].keys.join(', ')}) " +
+            sql = "INSERT INTO #{insert[:table]} (#{insert[:values].keys.map{ |k| k.name }.join(', ')}) " +
                   "VALUES (#{insert[:values].values.map{'?'}.join(', ')})"
             return [sql, insert[:values].values]
         end
@@ -599,7 +618,7 @@ module Spider; module Model; module Storage; module Db
         # Returns the COLUMN = val, ... part of an update statement.
         def sql_update_values(update)
             update[:values].map{ |k, v| 
-                v.is_a?(Spider::QueryFuncs::Expression) ? "#{k} = #{v}" : "#{k} = ?"
+                v.is_a?(Spider::QueryFuncs::Expression) ? "#{k.name} = #{v}" : "#{k.name} = ?"
             }.join(', ')
         end
         
@@ -650,7 +669,7 @@ module Spider; module Model; module Storage; module Db
                 sqls += sql_alter_field(table_name, field[:name], field[:type], field[:attributes])
             end
             if (alter_attributes[:primary_keys] && !alter_attributes[:primary_keys].empty?)
-                sqls << sql_drop_primary_key(table_name) if (!current[:primary_keys].empty? && current[:primary_keys] != alter_attributes[:primary_keys])
+                sqls << sql_drop_primary_key(table_name) if (current[:primary_keys] && !current[:primary_keys].empty? && current[:primary_keys] != alter_attributes[:primary_keys])
                 sqls << sql_create_primary_key(table_name, alter_attributes[:primary_keys])
             end
             if (alter_attributes[:foreign_key_constraints])

data/lib/spiderfw/requires.rb

@@ -7,7 +7,9 @@ require 'spiderfw/utils/monkey/class'
 require 'spiderfw/utils/monkey/symbol'
 require 'spiderfw/utils/monkey/time'
 require 'spiderfw/utils/monkey/date_time'
+require 'spiderfw/utils/monkey/numeric'
 require 'spiderfw/utils/monkey/exception'
+require 'spiderfw/utils/monkey/nil_class'
 require 'spiderfw/utils/multi_level_hash'
 require 'spiderfw/utils/thread_out'
 require 'spiderfw/utils/inflector'

data/lib/spiderfw/tag/tag.rb

@@ -15,7 +15,7 @@ module Spider
         end
         
         def initialize(el)
-            @attributes = el.attributes
+            @attributes = el.attributes.to_hash
             @content = el.innerHTML
         end
         

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

@@ -6,17 +6,23 @@ module Spider; module TemplateBlocks
     # Adds an attribute if a condition holds
     # Example:
     #   <div sp:attr-if="@my_condition,class,coolDiv"></div>
+    # The attribute's value can be a scene variable, but not an expression: so
+    #  <div sp:attr-if"@my_condition,attr_name,@attr_value" /> is valid, but
+    #  <div sp:attr-if"@my_condition,attr_name,@attr_value_start+@attr_value_end" /> is not
     
     class AttrIf < Block
         
         def compile(options={})
             init = ""
-            attr_if = @el.attributes['sp:attr-if']
+            attr_if = @el.get_attribute('sp:attr-if')
             @el.remove_attribute('sp:attr-if')
             @el.set_attribute("tmp-attr-if", attr_if)
             compiled = Spider::TemplateBlocks.parse_element(@el, @allowed_blocks, @template).compile(options)
             c, init = compiled.run_code, compiled.init_code
             cond, name, val = attr_if.split(',')
+            if val && val.strip[0].chr == '@'
+                val = "'+#{var_to_scene(val)}+'"
+            end
             cond = vars_to_scene(cond)
             full_attr = val ? "#{name}=\"#{val}\"" : "#{name}"
             replace = "'+"+"( (#{cond}) ? '#{full_attr}' : '' )"+"+'"

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

@@ -14,9 +14,9 @@ module Spider; module TemplateBlocks
             rep_type = nil
             rep = nil
             ['sp:each', 'sp:each_index'].each do |name|
-                if (@el.attributes[name])
+                if (@el.has_attribute?(name))
                     rep_type = name[3..-1]
-                    rep = @el.attributes[name]
+                    rep = @el.get_attribute(name)
                     @el.remove_attribute(name)
                     break
                 end
@@ -27,6 +27,7 @@ module Spider; module TemplateBlocks
                 arguments = $2.strip
             end
             c = "#{vars_to_scene(repeated)}.#{rep_type} do |#{arguments}|\n"
+            
             content = Spider::TemplateBlocks.parse_element(@el, @allowed_blocks, @template).compile(options)
             content.run_code.each_line do |line|
                 c += '  '+line
@@ -34,7 +35,11 @@ module Spider; module TemplateBlocks
             c += '   $out << "\n"'
             c += "\n"
             c += "end\n"
-            init += content.init_code if content.init_code
+            if content.init_code && !content.init_code.strip.empty?
+                init = "#{vars_to_scene(repeated, '@scene')}.#{rep_type} do |#{arguments}|\n"
+                init += content.init_code 
+                init += "end\n"
+            end
             return CompiledBlock.new(init, c)
         end
         

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

@@ -8,7 +8,7 @@ module Spider; module TemplateBlocks
             c = ""
             init = ""
             start = get_start(options)
-            c += "$out << '#{start}'\n"
+            c += start
             is_root = options[:root]
             options.delete(:root)
             c += "unless self[:widget][:target_only] && !self[:widget][:is_target]\n" if (options[:mode] == :widget && is_root)
@@ -21,40 +21,30 @@ module Spider; module TemplateBlocks
         
         def get_start(options)
             if options[:mode] == :widget
-                cl = @el.attributes['class'] || ''
-                if @el.attributes['id']
+                cl = @el.get_attribute('class') || ''
+                if @el.has_attribute?('id')
                     cl += ' ' unless cl.empty?
-                    cl += "id-#{@el.attributes['id']}"
-                    @el.raw_attributes.delete('id')
+                    cl += "id-#{@el.get_attribute('id')}"
+                    @el.remove_attribute('id')
                 end
                 if (options[:root])
                     cl += " widget"
                     if options[:owner_class]
                         cl += " wdgt-#{options[:owner_class].name.gsub('::', '-')}"
                     end
-                    @el.raw_attributes['id'] =  "{ @widget[:full_id] }"
+                    @el.set_attribute('id', "{ @widget[:full_id] }")
                     cl += ' ' unless cl.empty?
                     cl += '{ @widget[:css_classes] }'
                 end
-                @el.raw_attributes['class'] = cl
+                @el.set_attribute('class', cl)
             end
-            start = "<"+@el.name
-            @el.attributes.each do |key, val|
+            start = "$out << '<"+@el.name
+            @el.attributes.to_hash.each do |key, val|
                 start += " #{key}=\""
-                rest = scan_vars(val) do |text, code|
-                    start += text+"'+("+vars_to_scene(code)+").to_s+'"
-                end
-                start += rest
-#                start += replace_vars(val)
-                # if (val =~ /(.*)\{ (.+) \}(.*)/)
-                #     start += $1+"'+"+var_to_scene($2)+".to_s+'"+$3
-                # else
-                #     start += val
-                # end
-                start += '"'
+                start += compile_text(val)
+                start += "\""
             end
-            #start += " /" unless @el.etag
-            start += ">"
+            start += ">'\n"
             return start
         end
         

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

@@ -7,9 +7,9 @@ module Spider; module TemplateBlocks
         def compile(options={})
             c = ""
             init = ""
-            if (@el.attributes['obj'])
-                c_scene_obj = var_to_scene(@el.attributes['obj'])
-                i_scene_obj = var_to_scene(@el.attributes['obj'], 'scene')
+            if (@el.has_attribute?('obj'))
+                c_scene_obj = var_to_scene(@el.get_attribute('obj'))
+                i_scene_obj = var_to_scene(@el.get_attribute('obj'), 'scene')
                 init += "#{i_scene_obj}.request = @request\n"
                 init += "#{i_scene_obj}.response = @response\n"
                 c += "#{c_scene_obj}.render(self)\n"

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

@@ -4,21 +4,57 @@ module Spider; module TemplateBlocks
     
     class Run < Block
         
+        def escape_runtime_content(html)
+            html.strip.gsub("'", "\\\\'")
+        end
+        
         def compile(options={})
             c = ""
-            init = nil
-            runtime_contents = @el.children_of_type('tpl:runtime-content')
-            if (@el.attributes['obj'])
-                scene_obj = var_to_scene(@el.attributes['obj'])
-                runtime_contents.each do |rc|
-                    content = rc.innerHTML.strip
-                    content.gsub!("'", "\\\\'")
-                    condition = ""
-                    if (rc.attributes['for'])
-                        condition = " if #{scene_obj}.local_id.to_s == '#{rc.attributes['for']}'"
+            init = ""
+            runtime_contents = @el.children ? @el.children_of_type('tpl:runtime-content') : []
+            run_attributes = @el.attributes.to_hash
+            if @el.has_attribute?('obj')
+                scene_obj = var_to_scene(run_attributes.delete('obj'))
+                widget_id = run_attributes.delete('widget')
+                if widget_id
+                    runtime_content_obj = "@widgets[#{widget_id}]" 
+                else
+                    runtime_content_obj = scene_obj
+                end
+                # runtime_contents.each do |rc|
+                #     content = escape_runtime_content(rc.innerHTML)
+                #     condition = ""
+                #     if (rc.has_attribute?('for'))
+                #         condition = " if #{runtime_content_obj}.local_id.to_s == '#{rc.get_attribute('for')}'"
+                #     end
+                #     parse_runtime = "#{runtime_content_obj}.parse_runtime_content_xml('<sp:widget-content>#{content}</sp:widget-content>')#{condition}\n"
+                #     if widget_id
+                #         init += parse_runtime
+                #     else
+                #         c += parse_runtime
+                #     end
+                #     @el.children.delete(rc)
+                # end
+                # unless @el.innerHTML.strip.empty?
+                #     content = escape_runtime_content(@el.innerHTML)
+                #     parse_runtime = "#{runtime_content_obj}.parse_runtime_content_xml('<sp:widget-content>#{content}</sp:widget-content>')\n"
+                #     if widget_id
+                #         init += parse_runtime
+                #     else
+                #         c += parse_runtime
+                #     end
+                # end
+                if widget_id && @el.children
+                    attributes = @el.children_of_type('sp:attribute')
+                    init += "@owner.widget_attributes[#{widget_id}] ||= {}\n" if attributes.length > 0
+                    attributes.each do |at|
+                        attr_name = at.get_attribute('name').gsub("'", "\\\\'")
+                        attr_value = at.get_attribute('value').gsub("'", "\\\\'")
+
+                        init += "@owner.widget_attributes[#{widget_id}][:#{attr_name}] = '#{attr_value}'\n"
                     end
-                    c += "#{scene_obj}.parse_runtime_content_xml('#{content}')#{condition}\n"
                 end
+                @el.innerHTML = ''
                 c += "#{scene_obj}.render if (#{scene_obj})\n"
             end
             return CompiledBlock.new(init, c)

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

@@ -6,11 +6,11 @@ module Spider; module TemplateBlocks
         
         def compile(options={})
             init = ""
-            cond = vars_to_scene(@el.attributes['sp:tag-if'])
+            cond = vars_to_scene(@el.get_attribute('sp:tag-if'))
             @el.remove_attribute('sp:tag-if')
             html = HTML.new(@el, @template)
             c = "if (#{cond})\n"
-            c += "  $out <<  '#{html.get_start(options)}'\n"
+            c += html.get_start(options)
             c += "end\n"
             c, init = html.compile_content(c, init, options)
             tag_end = html.get_end

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

@@ -3,7 +3,7 @@ require 'strscan'
 
 module Spider; module TemplateBlocks
     ExpressionOutputRegexp = /\{\s([^\s].*?)\s\}/
-    GettextRegexp = /_\((.+)?\)(\s%\s(\S+)(,\s\S+)?)?/
+    GettextRegexp = /_\(([^\)]+)?\)(\s%\s([^\s,]+)(,\s*\S+\s*\])?)?/
     ERBRegexp = /(<%(.+)?%>)/
     
     class Text < Block
@@ -37,6 +37,7 @@ module Spider; module TemplateBlocks
         end
         
         
+        
     end
     
     

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

@@ -7,13 +7,15 @@ module Spider; module TemplateBlocks
         def compile(options={})
             klass = Spider::Template.get_registered_class(@el.name)
             init_params = []
-            id = @el.attributes['id']
+            id = @el.get_attribute('id')
             raise TemplateCompileError, "Widget #{@el.name} does not have an id" unless id
-            template_attr = @el.attributes['template']
+            template_attr = @el.get_attribute('template')
             @el.remove_attribute('template')
-            @el.attributes.each do |key, val|
+            @el.attributes.to_hash.each do |key, val|
                 if (!val.empty? && val[0].chr == '@')
                     sval = var_to_scene(val, 'scene')
+                elsif (!val.empty? && val[0].chr == '$')
+                    sval = val[1..-1]
                 else
                     sval = '"'+val+'"'
                 end

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

@@ -6,7 +6,7 @@ module Spider; module TemplateBlocks
         
         def compile(options={})
             init = nil
-            to = @el.attributes['to'] || 'yield_to'
+            to = @el.get_attribute('to') || 'yield_to'
             #c = "self[:yield_to][:controller].send(self[:yield_to][:action], *self[:yield_to][:arguments])\n"
             c = "yield :#{to}\n"
             return CompiledBlock.new(init, c)

data/lib/spiderfw/templates/template.rb

@@ -204,11 +204,11 @@ module Spider
             el = process_tags(root)
             @overrides.each{ |o| apply_override(root, o) } if (@overrides)
             root.search('tpl:placeholder').remove # remove empty placeholders
-            res =  root.children_of_type('tpl:asset')
+            res =  root.children ? root.children_of_type('tpl:asset') : []
             res_init = ""
             res.each do |r|
                 r.set_attribute('class', 'to_delete')
-                pr = parse_asset(r.attributes['type'], r.attributes['src'], r.attributes)
+                pr = parse_asset(r.get_attribute('type'), r.get_attribute('src'), r.attributes.to_hash)
                 assets << pr
                 res_init += "@assets << { 
                     :type => :#{pr[:type]}, 
@@ -274,16 +274,18 @@ module Spider
             doc = open(path){ |f| Hpricot.XML(f) }
             root = doc.root
             overrides = []
-            override_tags.each do |tag|
-                overrides += root.children_of_type('tpl:'+tag)
+            if root.children
+                override_tags.each do |tag|
+                    overrides += root.children_of_type('tpl:'+tag)
+                end
             end
             overrides.each{ |o| o.set_attribute('class', 'to_delete') }
             root.search('.to_delete').remove
             add_overrides overrides
             if (root.name == 'tpl:extend')
-                ext_src = root.attributes['src']
-                ext_app = root.attributes['app']
-                ext_widget = root.attributes['widget']
+                ext_src = root.get_attribute('src')
+                ext_app = root.get_attribute('app')
+                ext_widget = root.get_attribute('widget')
                 if ext_widget
                     ext_widget = Spider::Template.get_registered_class(ext_widget)
                     ext_src ||= ext_widget.default_template
@@ -297,7 +299,7 @@ module Spider
                     ext_search_paths = ext_owner.template_paths
                 end 
                 ext = self.class.real_path(ext_src, @path, ext_owner, ext_search_paths)
-                assets = root.children_of_type('tpl:asset')
+                assets = root.children ? root.children_of_type('tpl:asset') : []
                 @dependencies << ext
                 tpl = Template.new(ext)
                 root = get_el(ext)
@@ -308,10 +310,10 @@ module Spider
                 end
             else
                 root.search('tpl:include').each do |incl|
-                    src = real_path(incl.attributes['src'])
+                    src = real_path(incl.get_attribute('src'))
                     @dependencies << src
                     incl_el = self.get_el(src)
-                    assets = incl_el.children_of_type('tpl:asset')
+                    assets = incl_el.children ? incl_el.children_of_type('tpl:asset') : []
                     assets_html = ""
                     assets.each{ |ass| assets_html += ass.to_html }
                     incl.swap(assets_html+self.get_el(src).to_html)
@@ -322,20 +324,20 @@ module Spider
         
         def process_tags(el)
             block = TemplateBlocks.get_block_type(el, true)
-            raise "Bad html in #{@path} at '#{el}', can't parse" if (el == Hpricot::BogusETag)
+            raise "Bad html in #{@path}, can't parse" if el.is_a?(Hpricot::BogusETag)
             if (block == :Tag)
                 sp_attributes = {}
                 # FIXME: should use blocks instead
-                el.attributes.each do |key, value|
+                el.attributes.to_hash.each do |key, value|
                     if (key[0..1] == 'sp')
                         sp_attributes[key] = value
-                        el.raw_attributes.delete(key)
+                        el.remove_attribute(key)
                     end
                 end
                 klass = Spider::Template.get_registered_class(el.name)
                 tag = klass.new(el)
                 res = process_tags(Hpricot(tag.render).root)
-                sp_attributes.each{ |key, value| res.raw_attributes[key] = value }
+                sp_attributes.each{ |key, value| res.set_attribute(key, value) }
                 return res
             else
                 el.each_child do |child|
@@ -480,13 +482,13 @@ module Spider
         
         def add_overrides(overrides)
             overrides.each do |ov|
-                w = ov.attributes['widget']
+                w = ov.get_attribute('widget')
                 if (w)
                     first, rest = w.split('/', 2)
                     if (rest)
-                        ov.raw_attributes['widget'] = rest
+                        ov.set_attribute('widget', rest)
                     else
-                        ov.raw_attributes.delete('widget')
+                        ov.remove_attribute('widget')
                     end
  #                   debugger
                     @widgets_overrides[first] ||= []
@@ -504,7 +506,7 @@ module Spider
         
         # Applies an override to an (Hpricot) element.
         def apply_override(el, override)
-            search_string = override.attributes['search']
+            search_string = override.get_attribute('search')
             override.name = 'tpl:override-content' if override.name == 'tpl:inline-override'
             if (search_string)
                 # # Fix Hpricot bug!
@@ -513,7 +515,7 @@ module Spider
                 # end
                 found = el.parent.search(search_string)
             elsif (override.name == 'tpl:content')
-                found = el.search("tpl:placeholder[@name='#{override.attributes['name']}']")
+                found = el.search("tpl:placeholder[@name='#{override.get_attribute('name')}']")
             else
                 found = [el]
             end
@@ -531,10 +533,10 @@ module Spider
                         f.swap(override.innerHTML)
                         parent.search('tpl:overridden').each{ |o| o.swap(overridden) }
                     elsif (override.name == 'tpl:override-attr')
-                        f.set_attribute(override.attributes["name"], override.attributes["value"])
+                        f.set_attribute(override.get_attribute("name"), override.get_attribute("value"))
                     elsif (override.name == 'tpl:append-attr')
-                        f.set_attribute(override.attributes["name"], \
-                        (f.attributes[override.attributes["name"]] || '')+override.attributes["value"]) 
+                        f.set_attribute(override.get_attribute("name"), \
+                        (f.get_attribute(override.get_attribute("name")) || '')+override.get_attribute("value")) 
                     elsif (override.name == 'tpl:append')
                         f.innerHTML += override.innerHTML
                     elsif (override.name == 'tpl:prepend')
@@ -560,13 +562,14 @@ module Spider
         
         # Assets for the template and contained widgets.
         def all_assets
-            res = assets
+            res = [] 
             seen = {}
             @widgets.each do |id, w|
 #                next if seen[w.class]
                 seen[w.class] = true
                 res += w.assets
             end
+            res += assets
             return res
         end
         
@@ -622,4 +625,4 @@ module Spider
     class TemplateCompileError < RuntimeError
     end
     
-end
+end