spiderfw 0.5.16 → 0.5.17

data/CHANGELOG

@@ -1,3 +1,10 @@
+= 0.5.17
+== 20 December, 2010
+* Better assets compression; assets profiles
+* Bugfixes
+
+
+
 = 0.5.16
 == 07 December, 2010
 * Added app update command

data/VERSION

@@ -1 +1 @@
-0.5.16
+0.5.17

data/apps/core/components/assets.rb

@@ -1,6 +1,7 @@
 Spider::Template.define_named_asset 'jquery', [
-     [:js, 'js/jquery/jquery-1.4.3.js', Spider::Components]
+     [:js, 'js/jquery/jquery-1.4.3.js', Spider::Components, {:cdn => 'https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js'}]
  ]
+
 Spider::Template.define_named_asset 'spider', [
     [:js, 'js/inheritance.js', Spider::Components],
     [:js, 'js/spider.js', Spider::Components],

data/apps/core/components/public/js/spider.js

@@ -199,6 +199,7 @@ Spider.Widget = Class.extend({
 					if (options.before) options.before();
 				},
 				success: function(res){
+				    w.trigger('ajaxifyResponse', form);
 					w.replaceHTML(res);
 					w.removeLoading();
 					if (options.onLoad) options.onLoad(form);
@@ -231,6 +232,7 @@ Spider.Widget = Class.extend({
 				type: 'GET',
 				dataType: 'html',
 				success: function(res){
+                    w.trigger('ajaxifyResponse', a);
 					w.replaceHTML(res);
 					w.removeLoading();
 					if (options.onLoad) options.onLoad(a);

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

@@ -78,8 +78,10 @@ module Spider; module Forms
             @model = const_get_full(@model) if @model.is_a?(String)
             if @model.method_defined?(:to_subclass) # FIXME: this is a quick hack, standardize
                 @obj ||= load
-                @obj = @obj.to_subclass
-                @model = @obj.class
+                if @obj
+                    @obj = @obj.to_subclass
+                    @model = @obj.class
+                end
             end
             if (@elements.is_a?(String))
                 @elements = @elements.split(',').map{ |e| @model.elements[e.strip.to_sym] }.reject{ |i| i.nil? }

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

@@ -4,7 +4,7 @@
     <tpl:asset type="js" src="html_area.js" /><tpl:asset type="js" src="text_area.js" />
     <!--- <tpl:asset type="css" src="jwysiwyg/jquery.wysiwyg.css" />
     <tpl:asset type="js" src="jwysiwyg/jquery.wysiwyg.js" /> -->
-    <tpl:asset type="js" src="ckeditor/ckeditor.js" />
+    <tpl:asset type="js" src="ckeditor/ckeditor.js" compressed="true"/>
     <tpl:asset type="js" src="ckeditor/adapters/jquery.js" />
     <div class="initial_html" style="display:none">{ @initial_html }</div>
     <div class="css" style="display:none">{ @css }</div>

data/lib/spiderfw/cmd/commands/app.rb

@@ -109,6 +109,7 @@ class AppCommand < CmdParse::Command
             opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
                 @no_optional_gems = true
             }
+            opt.on("--ssh-user [USERNAME]", _("SSH user")){ |s| @ssh_user = s }
         end
         install.set_execution_block do |args|
             unless File.exist?('init.rb') && File.directory?('apps')
@@ -121,7 +122,8 @@ class AppCommand < CmdParse::Command
                 begin
                     require 'grit'
                     use_git = true
-                rescue
+                rescue => exc
+                    puts exc.message
                     puts "Grit not available; install Grit for Git support"
                 end
             end
@@ -147,11 +149,13 @@ class AppCommand < CmdParse::Command
                 puts _("The following apps will be installed as a dependency:")
                 puts (deps - apps).inspect
             end
-            Spider::AppManager.install(specs, Dir.pwd, {
+            options = {
                 :use_git => use_git, 
                 :no_gems => @no_gems,
                 :no_optional_gems => @no_optional_gems
-            })
+            }
+            options[:ssh_user] = @ssh_user if @ssh_user
+            Spider::AppManager.install(specs, Dir.pwd, options)
         end
         self.add_command(install)
         

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

@@ -156,6 +156,8 @@ module Spider
         :default => lambda{ Spider.config.get('runmode') == 'production' ? true : false }, :type => Spider::DataTypes::Bool
     config_option 'css.cachebuster', _("Use cache busters for CSS urls"), :type => Symbol,
         :default => :soft, :choices => [false, :soft, :hard, :hardcopy]
+    config_option 'assets.use_cdn', _("Use a Content Delivery Network for assets if defined"), :type => Spider::Bool,
+        :default => lambda{ Spider.config.get('runmode') == 'production' ? true : false }
     
     config_option 'http_proxy', _("Proxy to use for http clients (http://user:pass@host:port)"), :type => String,
         :do => lambda{ |val| ENV['http_proxy'] = val }

data/lib/spiderfw/controller/request.rb

@@ -39,6 +39,7 @@ module Spider
             b = @body.is_a?(String) ? StringIO.new(@body) : @body
             return nil unless b
             if block_given?
+                b.rewind
                 while (buf = b.read(BUFSIZE))
                     yield buf
                 end

data/lib/spiderfw/i18n/cldr.rb

@@ -4,6 +4,7 @@ require 'locale'
 
 module Spider; module I18n
     
+    # Formats: short, medium, full, long
     class CLDR < Provider
                 
         def initialize(locale)

data/lib/spiderfw/model/base_model.rb

@@ -376,6 +376,7 @@ module Spider; module Model
             end
             if (@subclasses)
                 @subclasses.each do |sub|
+                    next if sub == type && attributes[:added_reverse] && sub.elements[attributes[:reverse]].type == self # subclass ref to parent
                     next if sub.elements[name] # if subclass already defined an element with this name, don't overwrite it
                     sub.elements[name] = @elements[name].clone
                     sub.elements_order << name

data/lib/spiderfw/model/condition.rb

@@ -169,10 +169,10 @@ module Spider; module Model
         
         # Sets a comparison.
         def set(field, comparison, value)
-            if (value.is_a?(QuerySet))
+            if value.is_a?(QuerySet)
                 value = value.to_a
             end
-            if (value.is_a?(Array))
+            if value.is_a?(Array) && comparison != 'between'
                 or_cond = self.class.or
                 value.uniq.each do |v|
                     or_cond.set(field, comparison, v)

data/lib/spiderfw/model/mappers/mapper.rb

@@ -253,7 +253,7 @@ module Spider; module Model
         # Elements that are associated to this one externally.
         def association_elements
              els = @model.elements_array.select{ |el| 
-                 mapped?(el) && !el.integrated? && !have_references?(el) && !(el.attributes[:added_reverse] && el.type == @model)
+                 mapped?(el) && !el.integrated? && !have_references?(el) && !(el.attributes[:added_reverse] && el.type <= @model)
              }
              if @unit_of_work_task
                  els = els.select{ |el| el.attributes[:junction] && !el.attributes[:keep_junction] }
@@ -404,6 +404,7 @@ module Spider; module Model
         # Deletes an object, or objects according to a condition.
         # Will not delete with null condition (i.e. all objects) unless force is true
         def delete(obj_or_condition, force=false)
+            
             def prepare_delete_condition(obj)
                 condition = Condition.and
                 @model.primary_keys.each do |key|
@@ -882,6 +883,14 @@ module Spider; module Model
                 condition = @model.prepare_condition(condition)
                 basic_preprocess(condition)
             end
+            if @model.attributes[:integrated_models]
+                @model.attributes[:integrated_models].each do |im, iel|
+                    if im.respond_to?(:prepare_condition)
+                        condition = im.prepare_condition(condition)
+                        basic_preprocess(condition)
+                    end
+                end
+            end
             
             # Utility function to set conditions on 
             def set_pks_condition(condition, el, val, prefix) # :nodoc:

data/lib/spiderfw/model/storage/base_storage.rb

@@ -6,7 +6,7 @@ module Spider; module Model; module Storage
         attr_accessor :instance_name
         
         def self.sequence_sync
-            @sequence_sync ||= Sync.new
+            @sequence_sync ||= ::Sync.new
         end
         
         def self.base_types
@@ -96,7 +96,7 @@ module Spider; module Model; module Storage
                 f.flock File::LOCK_UN
                 f.close
             end
-            self.class.sequence_sync.lock(Sync::UN)
+            self.class.sequence_sync.lock(::Sync::UN)
             return seq
         end
             
@@ -112,4 +112,4 @@ module Spider; module Model; module Storage
     
     
     
-end; end; end
+end; end; end

data/lib/spiderfw/model/storage/db/adapters/oracle.rb

@@ -194,10 +194,10 @@ module Spider; module Model; module Storage; module Db
                  sql = "#{key} #{comp} NULL"
              else
                  if comp.to_s.downcase == 'between'
-                     if (bound_vars)
-                         val0, val1 = value
-                     else
+                     if bound_vars
                          val0 = ":#{(curr[:bind_cnt] += 1)}"; val1 = ":#{(curr[:bind_cnt] += 1)}"
+                     else
+                         val0, val1 = value
                      end
                      sql = "#{key} #{comp} #{val0} AND #{val1}"
                  else
@@ -263,6 +263,10 @@ module Spider; module Model; module Storage; module Db
          ##############################################################
          #   Methods to get information from the db                   #
          ##############################################################
+         
+         def post_execute
+             curr[:bind_cnt] = 0
+         end
 
          def list_tables
              return execute("SELECT TABLE_NAME FROM user_tables ORDER BY table_name").map{ |r| r['TABLE_NAME'] }

data/lib/spiderfw/model/storage/db/connectors/oci8.rb

@@ -149,6 +149,7 @@ module Spider; module Model; module Storage; module Db; module Connectors
                 query_finished
                 cursor.close if cursor
                 release if curr[:conn] && !in_transaction?
+                post_execute
             end
         end
         

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

@@ -92,6 +92,7 @@ module Spider; module Model; module Storage; module Db
         end
         
         def query_finished
+            return unless curr[:query_start] # happens if there was no db connection
             now = Time.now
             diff = now - curr[:query_start]
             diff = 0 if diff < 0 # ??? 

data/lib/spiderfw/patches/hpricot.rb

@@ -0,0 +1,13 @@
+module Hpricot
+    class DocType
+        def output(out, opts = {})
+            out <<
+            if_output(opts) do
+                "<!DOCTYPE #{target}" +
+                (public_id ? " PUBLIC \"#{public_id}\"" : "") +
+                (system_id ? " SYSTEM #{html_quote(system_id)}" : "") + ">"
+            end
+        end
+    end
+
+end

data/lib/spiderfw/setup/app_manager.rb

@@ -11,25 +11,33 @@ module Spider
             pre_setup(specs, options)
             specs.each do |spec|
                 if spec.git_repo && options[:use_git]
-                    git_install(spec, home_path)
+                    git_install(spec, home_path, options)
                 else
-                    pack_install(spec, home_path)
+                    pack_install(spec, home_path, options)
                 end
             end
         end
 
-        def self.git_install(spec, home_path)
+        def self.git_install(spec, home_path, options={})
             require 'grit'
+            if ::File.exist?("apps/#{spec.id}")
+                puts _("%s already installed, skipping") % spec.id
+                return
+            end
             repo = Grit::Repo.new(home_path)
             puts _("Fetching %s from %s") % [spec.app_id, spec.git_repo]
-            `#{Grit::Git.git_binary} submodule add #{spec.git_repo} apps/#{spec.id}`
+            repo_url = spec.git_repo
+            if options[:ssh_user] && repo_url =~ /ssh:\/\/([^@]+@)?(.+)/
+                repo_url = "ssh://#{options[:ssh_user]}@#{$2}"
+            end
+            `#{Grit::Git.git_binary} submodule add #{repo_url} apps/#{spec.id}`
             repo.git.submodule({}, "init")
             repo.git.submodule({}, "update")
             repo.add('.gitmodules', "apps/#{spec.id}")
             repo.commit_index(_("Added app %s") % spec.id) 
         end
 
-        def self.pack_install(spec, home_path)
+        def self.pack_install(spec, home_path, options={})
             require 'rubygems/package'
             client = AppServerClient.new(spec.app_server)
             print _("Fetching %s from server... ") % spec.app_id
@@ -82,14 +90,14 @@ module Spider
             pre_setup(specs, options)
             specs.each do |spec|
                 if spec.git_repo && options[:use_git]
-                    git_update(spec, home_path)
+                    git_update(spec, home_path, options)
                 else
-                    pack_update(spec, home_path)
+                    pack_update(spec, home_path, options)
                 end
             end
         end
         
-        def self.git_update(spec, home_path)
+        def self.git_update(spec, home_path, options={})
             require 'grit'
             home_repo = Grit::Repo.new(home_path)
             app_path = File.join(home_path, "apps/#{spec.id}")
@@ -116,7 +124,7 @@ module Spider
             home_repo.commit_index(_("Updated app %s") % spec.id) 
         end
         
-        def self.pack_update(spec, home_path)
+        def self.pack_update(spec, home_path, options={})
             require 'fileutils'
             require 'date'
             require 'time'

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

@@ -32,7 +32,6 @@ module Spider; module TemplateBlocks
                 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|
@@ -43,7 +42,15 @@ module Spider; module TemplateBlocks
 
             template = nil
             overrides += @template.overrides_for(id)
+            
+            asset_profiles = @el.get_attribute('sp:asset-profiles')
+            if asset_profiles
+                asset_profiles = asset_profiles.split(/,\s*/).map{ |pr| pr.to_sym } 
+                @el.remove_attribute('sp:asset-profiles')
+            end
+            
             template = klass.load_template(template_attr || klass.default_template)
+            template.asset_profiles = asset_profiles if asset_profiles
             if (overrides.length > 0)
                 #template_name = klass.find_template(template_attr)
                 template.add_overrides overrides
@@ -55,12 +62,19 @@ module Spider; module TemplateBlocks
 
             init = ""
             t_param = 'nil'
+            t_options = {}
+            
+            t_options[:asset_profiles] = asset_profiles if asset_profiles
+            
             if (template)
                 # FIXME: the subtemplate shouldn't be loaded at this point
-                init = "t = load_subtemplate('#{id}')\n"
+                init = "t = load_subtemplate('#{id}', #{t_options.inspect})\n"
                 t_param = 't'
             end
             html.gsub!("'", "\\\\'")
+            
+            init_params = self.class.attributes_to_init_params(@el.attributes.to_hash)
+            
             init += "add_widget('#{id}', #{klass}.new(@request, @response), {#{init_params.join(', ')}}, '#{html}', #{t_param})\n"
             c = "yield :\"#{id}\"\n"
             return CompiledBlock.new(init, c)

data/lib/spiderfw/templates/layout.rb

@@ -19,53 +19,93 @@ module Spider
             super
         end
         
+        def only_asset_profiles(*profiles)
+            @only_asset_profiles = profiles
+        end
+        
+        def no_asset_profiles(*profiles)
+            @no_asset_profiles = profiles
+        end
+        
         def prepare_assets
             @template_assets = { :css => [], :js => [] }
+            assets = {:css => [], :js => []}
             seen = {}
-            js = []
-            css = []
-            runtime = []
             js_messages = []
-            all_assets.each do |res|
-                is_runtime = res[:runtime] || res[:if_ie_lte] || res[:media]
-                if is_runtime
-                    rntm = res[:runtime] || res[:src]
-                    next if seen[rntm]
-                    seen[rntm] = true
-                    runtime << res
-                    next
+            use_cdn = Spider.conf.get('assets.use_cdn')
+            compress_assets = {:js => {}, :css => {}}
+            cname = File.basename(@path, '.layout.shtml')
+            cname = File.basename(cname, '.shtml')
+            cname += "-#{@asset_set}" if @asset_set
+            pub_dest = nil
+            all_assets.each do |ass|
+                seen_check = ass[:runtime] || ass[:src]
+                next if !ass[:src] || ass[:src].empty?
+                next if seen[seen_check]
+                seen[seen_check] = true
+                type = ass[:type].to_sym
+                compress_config = case type
+                when :js
+                    'javascript.compress'
+                when :css
+                    'css.compress'
+                end
+                no_compress = @scene.__is_error_page || !Spider.conf.get(compress_config) || \
+                                ass[:runtime] || ass[:if_ie_lte] || ass[:media] || (use_cdn && ass[:cdn])
+                
+                if no_compress
+                    if ass[:runtime]
+                        assets[type] << Spider::Template.runtime_assets[ass[:runtime]].call(@request, @response, @scene)
+                    else
+                        assets[type] << ass
+                    end
+                else
+                    unless pub_dest
+                        pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
+                        FileUtils.mkdir_p(pub_dest)
+                    end
+                    if comp = ass[:compressed_path]
+                        name = File.basename(comp)
+                        unless File.exist?(File.join(pub_dest, name))
+                            File.cp(comp, pub_dest)
+                        end
+                        ass[:src] = Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+name
+                        assets[type] << ass
+                    else
+                        name = ass[:compress] || cname
+                        unless compress_assets[type][name]
+                            cpr = {:name => name, :assets => [], :cpr => true}
+                            assets[type] << cpr
+                            compress_assets[type][name] = cpr
+                        end
+                        compress_assets[type][name][:assets] << ass
+                    end
                 end
-                next if !res[:src] || res[:src].empty?
-                next if seen[res[:src]]
-                seen[res[:src]] = true
-                @template_assets[res[:type].to_sym] ||= []
-                @template_assets[res[:type].to_sym] << res[:src]
-                js << res if Spider.conf.get('javascript.compress') && res[:type].to_sym == :js
-                css << res if Spider.conf.get('css.compress') && res[:type].to_sym == :css
-                if res[:gettext] && res[:type].to_sym == :js
-                    msg_path = asset_gettext_messages_file(res[:path])
+                if ass[:gettext] && type == :js
+                    msg_path = asset_gettext_messages_file(ass[:path])
                     js_messages += JSON.parse(File.read(msg_path))
                 end
             end
-            if Spider.conf.get('javascript.compress') && !@scene.__is_error_page
-                compressed = compress_javascript(js)
-                @template_assets[:js] = compressed.map{ |c|
-                    Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+c
-                }
-            end
-            if Spider.conf.get('css.compress') && !@scene.__is_error_page
-                combined = compress_css(css)
-                @template_assets[:css] = combined.map{ |c|
-                    Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+c
-                }
+            assets[:js].each do |ass|
+                if ass[:cpr]
+                    compressed = compress_javascript(ass)
+                    @template_assets[:js] << Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
+                else
+                    ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
+                    @template_assets[:js] << ass[:src]
+                end
             end
-            runtime.each do |rt|
-                if rt[:runtime]
-                    @template_assets[rt[:type]] << Spider::Template.runtime_assets[rt[:runtime]].call(@request, @response, @scene)
+            assets[:css].each do |ass|
+                if ass[:cpr]
+                    compressed = compress_css(ass)
+                    @template_assets[:css] << Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
                 else
-                    @template_assets[rt[:type]] << rt
+                    ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
+                    is_dyn = ass[:if_ie_lte] || ass[:media]
+                    @template_assets[:css] << (is_dyn ? ass : ass[:src])
                 end
             end
+            
             @content[:yield_to] = @template
             @scene.assets = @template_assets
             @scene.extend(LayoutScene)
@@ -95,7 +135,14 @@ module Spider
         end
         
         def all_assets
-            return @template.assets + self.assets
+            assets = @template.assets + self.assets
+            if @only_asset_profiles
+                assets = assets.select{ |ass| ass[:profiles] && !(ass[:profiles] & @only_asset_profiles).empty? }
+            end
+            if @no_asset_profiles
+                assets = assets.select{ |ass| !ass[:profiles] || (ass[:profiles] & @no_asset_profiles).empty? }
+            end
+            assets
         end
         
         COMPILED_FOLDER = '_c'
@@ -106,188 +153,155 @@ module Spider
             File.join(dir, "#{name}.i18n.json")
         end
         
-        def compress_javascript(assets)
+        def compress_javascript(cpr)
             require 'yui/compressor'
-            res = []
-            compress = {}
-            compressed = []
-            cname = File.basename(@path, '.layout.shtml')
-            cname += "-#{@asset_set}" if @asset_set
-            assets.each do |ass|
-                if ass[:compressed]
-                    compressed << ass[:compressed_path]
-                else
-                    name = ass[:compress] || cname
-                    compress[name] ||= []
-                    compress[name] << ass
-                end
-            end
-            pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
-            FileUtils.mkdir_p(pub_dest)
 
-            compress.each do |name, ass|
-
-                already_compressed = Dir.glob(pub_dest+'/'+name+'.*.js')
-                unless already_compressed.empty?
-                    res << File.basename(already_compressed.first)
-                    next
+            pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
+            name = cpr[:name]
+            
+            already_compressed = Dir.glob(pub_dest+'/'+name+'.*.js')
+            unless already_compressed.empty?
+                return File.basename(already_compressed.first)
+            end
+            
+            tmp_combined = Spider.paths[:tmp]+'/_'+name+'.js'
+            File.open(tmp_combined, 'w') do |f|
+                cpr[:assets].each.each do |a|
+                    f.write IO.read(a[:path])+"\n"
                 end
+            end
                 
-                tmp_combined = Spider.paths[:tmp]+'/_'+name+'.js'
-                File.open(tmp_combined, 'w') do |f|
-                    ass.each do |a|
-                        f.write IO.read(a[:path])+"\n"
-                    end
-                end
-                version = 0
-                curr = Dir.glob(pub_dest+"/._#{name}.*.js")
-                unless curr.empty?
-                    curr.each do |f|
-                        name = File.basename(f)
-                        if name =~ /(\d+)\.js$/
-                            version = $1.to_i if $1.to_i > version
-                            File.unlink(f)
-                        end
+                
+            version = 0
+            curr = Dir.glob(pub_dest+"/._#{name}.*.js")
+            unless curr.empty?
+                curr.each do |f|
+                    name = File.basename(f)
+                    if name =~ /(\d+)\.js$/
+                        version = $1.to_i if $1.to_i > version
+                        File.unlink(f)
                     end
                 end
-                version += 1
-                compiled_name = "#{name}.#{version}.js"
-                combined = "#{pub_dest}/._#{compiled_name}"
+            end
+            version += 1
+            compiled_name = "#{name}.#{version}.js"
+            combined = "#{pub_dest}/._#{compiled_name}"
 
-                dest = "#{pub_dest}/#{compiled_name}"
-                File.cp(tmp_combined, combined)
-                File.unlink(tmp_combined)
-                compressor = YUI::JavaScriptCompressor.new("charset" => "UTF-8")
-                io = open(combined, 'r')
-                cjs = compressor.compress(io)
-                open(dest, 'w') do |f|
-                    f << cjs
-                end
-                res << compiled_name
+            dest = "#{pub_dest}/#{compiled_name}"
+            File.cp(tmp_combined, combined)
+            File.unlink(tmp_combined)
+            compressor = YUI::JavaScriptCompressor.new("charset" => "UTF-8")
+            io = open(combined, 'r')
+            cjs = compressor.compress(io)
+            open(dest, 'w') do |f|
+                f << cjs
             end
+            return compiled_name
             
-            compressed.uniq.each do |comp|
-                name = File.basename(comp)
-                unless File.exist?("#{pub_dest}/#{name}")
-                    File.cp(comp, pub_dest)
-                end
-                res << name
-            end
-            res
         end
         
-        def compress_css(assets)
-            res = []
-            combine = {}
-            cname = File.basename(@path, '.layout.shtml')
-            cname += "-#{@asset_set}" if @asset_set
-            assets.each do |ass|
-                name = ass[:combine] || cname
-                combine[name] ||= []
-                combine[name] << ass
-            end
+        def compress_css(cpr)
+            
             pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
-            FileUtils.mkdir_p(pub_dest)
-            combine.each do |name, ass|
-                already_compressed = Dir.glob(pub_dest+'/'+name+'.*.css')
-                unless already_compressed.empty?
-                    res << File.basename(already_compressed.first)
-                    next
-                end
-                tmp_combined = Spider.paths[:tmp]+'/_'+name+'.css'
+            name = cpr[:name]
+            
+            already_compressed = Dir.glob(pub_dest+'/'+name+'.*.css')
+            unless already_compressed.empty?
+                return File.basename(already_compressed.first)
+            end
+            
+            tmp_combined = Spider.paths[:tmp]+'/_'+name+'.css'
                 
-                File.open(tmp_combined, 'w') do |f|
-                    ass.each do |a|
-                        path = a[:path]
-                        src_dir = File.dirname(path)
-                        app = a[:app]
-                        if app
-                            app_relative_path = a[:app].relative_path
-                            app_path = app.path
-                        elsif path.index(Spider::SpiderController.pub_path) == 0
-                            app_relative_path = 'spider'
-                            app_path = Spider::SpiderController.pub_path
-                        end
+            File.open(tmp_combined, 'w') do |f|
+                cpr[:assets].each do |a|
+                    path = a[:path]
+                    src_dir = File.dirname(path)
+                    app = a[:app]
+                    if app
+                        app_relative_path = a[:app].relative_path
+                        app_path = app.path
+                    elsif path.index(Spider::SpiderController.pub_path) == 0
+                        app_relative_path = 'spider'
+                        app_path = Spider::SpiderController.pub_path
+                    end
 
-                        pub_app = "#{pub_dest}/#{app_relative_path}"
-                        FileUtils.mkdir_p(pub_app)
-                        src_files = Spider::ContentUtils.resolve_css_includes(path)
-                        src = ""
-                        src_files.each do |src_file|
-                            src += IO.read(src_file)+"\n"
-                        end
-                        src.gsub!(/^\s*@import(?:\surl\(|\s)(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]*))?\1\)?(?:[^?;]*);?/i, "")
+                    pub_app = "#{pub_dest}/#{app_relative_path}"
+                    FileUtils.mkdir_p(pub_app)
+                    src_files = Spider::ContentUtils.resolve_css_includes(path)
+                    src = ""
+                    src_files.each do |src_file|
+                        src += IO.read(src_file)+"\n"
+                    end
+                    src.gsub!(/^\s*@import(?:\surl\(|\s)(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]*))?\1\)?(?:[^?;]*);?/i, "")
 
-                        src.scan(/url\([\s"']*([^\)"'\s]*)[\s"']*\)/m).uniq.collect do |url|
-                            url = url.first
-                            next if url =~ %r{^/} || url =~ %r{^[a-z]+://}
-                            path = ""
-                            url_dest = File.expand_path(File.join(pub_app, url))
-                            url_src = File.expand_path(File.join(src_dir, url))
-                            unless url_src.index(app_path) == 0
-                                raise "Can't combine CSS if paths go outside app: #{url} in #{path}"
-                            end
-                            FileUtils.mkdir_p(File.dirname(url_dest))
-                            cachebuster = Spider.conf.get('css.cachebuster')
-                            new_url = "#{app_relative_path}/#{url}"
-                            if File.exist?(url_src)
-                                mtime = File.mtime(url_src).to_i
-                                if cachebuster && File.exist?(url_dest) && mtime > File.mtime(url_dest).to_i
-                                    if cachebuster == :soft
+                    src.scan(/url\([\s"']*([^\)"'\s]*)[\s"']*\)/m).uniq.collect do |url|
+                        url = url.first
+                        next if url =~ %r{^/} || url =~ %r{^[a-z]+://}
+                        path = ""
+                        url_dest = File.expand_path(File.join(pub_app, url))
+                        url_src = File.expand_path(File.join(src_dir, url))
+                        unless url_src.index(app_path) == 0
+                            raise "Can't combine CSS if paths go outside app: #{url} in #{path}"
+                        end
+                        FileUtils.mkdir_p(File.dirname(url_dest))
+                        cachebuster = Spider.conf.get('css.cachebuster')
+                        new_url = "#{app_relative_path}/#{url}"
+                        if File.exist?(url_src)
+                            mtime = File.mtime(url_src).to_i
+                            if cachebuster && File.exist?(url_dest) && mtime > File.mtime(url_dest).to_i
+                                if cachebuster == :soft
+                                    File.cp(url_src, url_dest)
+                                    new_url += "?cb=#{mtime}"
+                                elsif cachebuster == :hard || cachebuster == :hardcopy
+                                    url_dir = File.dirname(url)
+                                    url_ext = File.extname(url)
+                                    url_basename = File.basename(url, url_ext)
+                                    url_dest_dir = File.dirname(url_dest)
+                                    cb_file_name = "#{url_basename}-cb#{mtime}#{url_ext}"
+                                    new_url = "#{url_dir}/#{cb_file_name}"
+                                    if cachebuster == :hard
                                         File.cp(url_src, url_dest)
-                                        new_url += "?cb=#{mtime}"
-                                    elsif cachebuster == :hard || cachebuster == :hardcopy
-                                        url_dir = File.dirname(url)
-                                        url_ext = File.extname(url)
-                                        url_basename = File.basename(url, url_ext)
-                                        url_dest_dir = File.dirname(url_dest)
-                                        cb_file_name = "#{url_basename}-cb#{mtime}#{url_ext}"
-                                        new_url = "#{url_dir}/#{cb_file_name}"
-                                        if cachebuster == :hard
-                                            File.cp(url_src, url_dest)
-                                        else
-                                            File.cp(url_src, "#{url_dest_dir}/#{cb_file_name}")
-                                        end
+                                    else
+                                        File.cp(url_src, "#{url_dest_dir}/#{cb_file_name}")
                                     end
-                                else
-                                    File.cp(url_src, url_dest)
                                 end
                             else
-                                Spider.logger.error("CSS referenced file not found: #{url_src}")
+                                File.cp(url_src, url_dest)
                             end
-                            src.gsub!(/\([\s"']*#{url}[\s"']*\)/m, "(#{new_url})")
+                        else
+                            Spider.logger.error("CSS referenced file not found: #{url_src}")
                         end
-                        f.write(src+"\n") 
+                        src.gsub!(/\([\s"']*#{url}[\s"']*\)/m, "(#{new_url})")
                     end
+                    f.write(src+"\n") 
                 end
+            end
                 
-                version = 0
-                curr = Dir.glob(pub_dest+"/._#{name}.*.css")                
-                unless curr.empty?
-                    curr.each do |f|
-                        name = File.basename(f)
-                        if name =~ /(\d+)\.js$/
-                            version = $1.to_i if $1.to_i > version
-                            File.unlink(f)
-                        end
+            version = 0
+            curr = Dir.glob(pub_dest+"/._#{name}.*.css")                
+            unless curr.empty?
+                curr.each do |f|
+                    currname = File.basename(f)
+                    if currname =~ /(\d+)\.js$/
+                        version = $1.to_i if $1.to_i > version
+                        File.unlink(f)
                     end
                 end
-                version += 1
-                compiled_name = "#{name}.#{version}.css"
-                combined = "#{pub_dest}/._#{compiled_name}"
+            end
+            version += 1
+            compiled_name = "#{name}.#{version}.css"
+            combined = "#{pub_dest}/._#{compiled_name}"
                 
-                dest = "#{pub_dest}/#{compiled_name}"
-                File.cp(tmp_combined, combined)
-                File.unlink(tmp_combined)
-                compressor = YUI::CssCompressor.new("charset" => "UTF-8")
-                io = open(combined, 'r')
-                cjs = compressor.compress(io)
-                open(dest, 'w') do |f|
-                    f << cjs
-                end
-                res << compiled_name
+            dest = "#{pub_dest}/#{compiled_name}"
+            File.cp(tmp_combined, combined)
+            File.unlink(tmp_combined)
+            compressor = YUI::CssCompressor.new("charset" => "UTF-8")
+            io = open(combined, 'r')
+            cjs = compressor.compress(io)
+            open(dest, 'w') do |f|
+                f << cjs
             end
-            res
+            return compiled_name
         end
         
     end
@@ -296,6 +310,7 @@ module Spider
         
         def output_assets(type=nil)
             types = type ? [type] : self.assets.keys
+            use_cdn = Spider.conf.get('assets.use_cdn')
             if types.include?(:js)
                 self.assets[:js].each do |ass|
                     ass = {:src => ass} if ass.is_a?(String)
@@ -305,7 +320,7 @@ module Spider
             if types.include?(:css)
                 self.assets[:css].each do |ass|
                     ass = {:src => ass} if ass.is_a?(String)
-                    link = "<link rel=\"stylesheet\" href=\"#{ass[:src]}\""
+                    link = "<link rel=\"stylesheet\" type=\"text/css\" href=\"#{ass[:src]}\""
                     link += " media=\"#{ass[:media]}\"" if ass[:media]
                     link += ">\n"
                     if ass[:if_ie_lte]
@@ -318,4 +333,5 @@ module Spider
         
     end
     
-end
+    
+end

data/lib/spiderfw/templates/template.rb

@@ -1,4 +1,5 @@
 require 'hpricot'
+require 'spiderfw/patches/hpricot'
 require 'spiderfw/templates/template_blocks'
 require 'spiderfw/cache/template_cache'
 begin
@@ -27,6 +28,7 @@ module Spider
         attr_accessor :assets
         attr_accessor :runtime_overrides
         attr_reader :overrides, :path, :subtemplates, :widgets
+        attr_accessor :asset_profiles
         
         @@registered = {}
         @@widget_plugins = {}
@@ -331,7 +333,7 @@ module Spider
                 wt.load
                 # sub_c = sub.compile(options.merge({:mode => :widget}))
                 @assets = wt.compiled.assets + @assets
-            end            
+            end
             
             seen = {}
             # @assets.each_index do |i|
@@ -339,6 +341,7 @@ module Spider
             #     if ass[:name]
             # end
             @assets.each do |ass|
+                ass[:profiles] = ((ass[:profiles] || []) + @asset_profiles).uniq if @asset_profiles
                 next if seen[ass.inspect]
                 res_init += "@assets << #{ass.inspect}\n"
                 # res_init += "@assets << {
@@ -364,6 +367,9 @@ module Spider
             if attributes[:name]
                 named = Spider::Template.get_named_asset(attributes[:name])
                 raise "Can't find named asset #{attributes[:name]}" unless named
+                if attributes[:profiles]
+                    named.each{ |nmdass| nmdass[:profiles] = attributes[:profiles] }
+                end
                 return named.map{ |nmdass| 
                     parse_asset(nmdass[:type], nmdass[:src], nmdass)
                 }.flatten
@@ -391,7 +397,7 @@ module Spider
             ass[:path] = res.path if res
             base_url = nil
             if controller.respond_to?(:pub_url)
-                if src[0].chr == '/'
+                if src[0].chr == '/' && !(controller <= Spider::HomeController)
                     # strips the app path from the src. FIXME: should probably be done somewhere else
                     src = src[(2+controller.app.relative_path.length)..-1]
                 end
@@ -406,17 +412,17 @@ module Spider
                 processor = TemplateAssets.const_get(ass_info[:processor])
                 ass = processor.process(ass)
             end
-            if attributes['sp:if']
-                ass[:if] = Spider::TemplateBlocks::Block.vars_to_scene(attributes['sp:if']).gsub("'", "\\'") 
-            end
             if attributes[:compressed]
                 compressed_res = Spider.find_resource(type.to_sym, attributes[:compressed], @path, [owner_class, @definer_class])
                 ass[:compressed_path] = compressed_res.path
                 ass[:compressed] = base_url+attributes[:compressed]
             end
-            [:gettext, :media, :if_ie_lte].each do |key|
+            [:gettext, :media, :if_ie_lte, :cdn].each do |key|
                 ass[key] = attributes[key] if attributes.key?(key)
             end
+            if attributes[:profiles]
+                ass[:profiles] = attributes[:profiles].split(/,\s*/).map{ |p| p.to_sym }
+            end
             return [ass]
         end
         
@@ -685,10 +691,11 @@ module Spider
         end
         
         
-        def load_subtemplate(id) # :nodoc:
+        def load_subtemplate(id, options={}) # :nodoc:
             load unless loaded?
             return nil unless @compiled.subtemplates[id]
             t = Template.new
+            t.asset_profiles = options[:asset_profiles] if options[:asset_profiles]
             t.compiled = @compiled.subtemplates[id]
             return t
         end
@@ -769,29 +776,7 @@ module Spider
             end
         end
         
-        # Template assets.
-        def conditional_assets
-            res = []
-            @assets.each do |ass|
-                 # FIXME: is this the best place to check if? Maybe it's better to do it when printing resources?
-                res << ass unless ass[:if] && !ass[:if].empty? && !@scene.instance_eval(ass[:if])
-            end
-            return res
-        end
-        
-#         # Assets for the template and contained widgets.
-#         def all_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
-        
+
         def with_widget(path, &proc)
             first, rest = path.split('/', 2)
             @widget_procs[first.to_sym] ||= []

data/lib/spiderfw/utils/http_client.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Spider
 
     def self.http_client

data/spider.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency("macaddr", [">= 1.0.0"])
   s.add_development_dependency("rake", ["> 0.7.3"])
   s.add_development_dependency("ruby-debug", ["> 0.9.3"])
-  s.requirements << "Optional dependencies: json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run"
+  s.requirements << "Optional dependencies: json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
   # optional dependencies
   # 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 5
-  - 16
-  version: 0.5.16
+  - 17
+  version: 0.5.17
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1029,6 +1029,7 @@ files:
 - lib/spiderfw/model/sync.rb
 - lib/spiderfw/model/type.rb
 - lib/spiderfw/model/unit_of_work.rb
+- lib/spiderfw/patches/hpricot.rb
 - lib/spiderfw/requires.rb
 - lib/spiderfw/resource.rb
 - lib/spiderfw/setup/app_manager.rb
@@ -1127,7 +1128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- "Optional dependencies: json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run"
+- "Optional dependencies: json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: