spiderfw 0.6.21 → 0.6.22

data/lib/spiderfw/templates/layout.rb

@@ -31,91 +31,36 @@ module Spider
         def prepare_assets
             @template_assets = { :css => [], :js => [] }
             assets = {:css => [], :js => []}
+            compress_assets = {:js => {}, :css => {}}
             seen = {}
             js_messages = []
             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
+            @cname = cname
+
             all_assets.each do |ass|
                 seen_check = ass[:runtime] || ass[:src]
                 next if ass[:src].blank? && !ass[:runtime]
                 next if seen[seen_check]
                 seen[seen_check] = true
-                type = ass[:type].to_sym
                 
                 ass = compile_asset(ass)
-                
-                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] << {:src => Spider::Template.runtime_assets[ass[:runtime]].call(@request, @response, @scene)}
-                    else
-                        assets[type] << ass
-                    end
-                else
-                    unless pub_dest
-                        pub_dest = self.class.compiled_folder_path
-                        FileUtils.mkdir_p(pub_dest)
-                    end
-                    if comp = ass[:compressed_path] # Already compressed assets
-                        name = File.basename(comp)
-                        if ass[:compressed_rel_path] # Keeps the compressed files in a subdir
-                            dir = File.dirname(ass[:compressed_rel_path])
-                            if ass[:copy_dir] # Copies the source dir (which may contain resources used by the assets)
-                                start = dir
-                                if ass[:copy_dir].is_a?(Fixnum) # How many levels to go up
-                                    ass[:copy_dir].downto(0) do |i|
-                                        start = File.dirname(start)
-                                    end
-                                end
-                                dst_dir = File.join(pub_dest, start)
-                                unless File.dirname(start) == '.' || File.directory?(File.dirname(dst_dir))
-                                    FileUtils.mkdir_p(File.join(pub_dest, File.dirname(dst_dir)))
-                                end
-                                unless File.directory?(dst_dir)
-                                    FileUtils.cp_r(File.join(ass[:app].pub_path, start), dst_dir)
-                                end
-                            else
-                                FileUtils.mkdir_p(File.join(pub_dest, dir))
-                                File.cp(comp, File.join(pub_dest, dir)) unless File.exist?(File.join(pub_dest, dir))
-                            end
-                            src = dir+'/'+name
-                        else
-                            unless File.exist?(File.join(pub_dest, name))
-                                File.cp(comp, pub_dest)
-                            end
-                            src = name
-                        end
-                        ass[:src] = Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+src
-                        assets[type] << ass
-                    else # needs compression
-                        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
-                if ass[:gettext] && type == :js
-                    msg_path = asset_gettext_messages_file(ass[:path])
-                    if File.exists?(msg_path)
-                        js_messages += JSON.parse(File.read(msg_path))
-                    else
-                        Spider.logger.warn("Javascript Gettext file #{msg_path} not found")
-                    end
+
+                res = prepare_asset(ass, compress_assets, js_messages)
+                assets[:css] += res[:css]
+                assets[:js] += res[:js]
+
+            end
+
+
+            if @compile_less == false
+                less = Spider::Template.get_named_asset('less')
+                less.each do |ass|
+                    res = prepare_asset(parse_asset(ass[:type], ass[:src], ass).first)
+                    assets[:css] += res[:css]
+                    assets[:js] += res[:js]
                 end
             end
             assets[:js].each do |ass|
@@ -133,7 +78,7 @@ module Spider
                     @template_assets[:css] << Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
                 else
                     ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
-                    is_dyn = ass[:if_ie_lte] || ass[:media]
+                    is_dyn = ass[:if_ie_lte] || ass[:media] || ass[:rel]
                     @template_assets[:css] << (is_dyn ? ass : ass[:src])
                 end
             end
@@ -151,6 +96,84 @@ module Spider
             
             @assets_prepared = true
         end
+
+        def prepare_asset(ass, compress_assets={}, js_messages=[])
+            type = ass[:type].to_sym
+            assets = {:css => [], :js => []}
+            pub_dest = nil
+            use_cdn = Spider.conf.get('assets.use_cdn')
+                
+            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] << {:src => Spider::Template.runtime_assets[ass[:runtime]].call(@request, @response, @scene)}
+                else
+                    assets[type] << ass
+                end
+            else
+                unless pub_dest
+                    pub_dest = self.class.compiled_folder_path
+                    FileUtils.mkdir_p(pub_dest)
+                end
+                if comp = ass[:compressed_path] # Already compressed assets
+                    name = File.basename(comp)
+                    if ass[:compressed_rel_path] # Keeps the compressed files in a subdir
+                        dir = File.dirname(ass[:compressed_rel_path])
+                        if ass[:copy_dir] # Copies the source dir (which may contain resources used by the assets)
+                            start = dir
+                            if ass[:copy_dir].is_a?(Fixnum) # How many levels to go up
+                                ass[:copy_dir].downto(0) do |i|
+                                    start = File.dirname(start)
+                                end
+                            end
+                            dst_dir = File.join(pub_dest, start)
+                            unless File.dirname(start) == '.' || File.directory?(File.dirname(dst_dir))
+                                FileUtils.mkdir_p(File.join(pub_dest, File.dirname(dst_dir)))
+                            end
+                            unless File.directory?(dst_dir)
+                                FileUtils.cp_r(File.join(ass[:app].pub_path, start), dst_dir)
+                            end
+                        else
+                            FileUtils.mkdir_p(File.join(pub_dest, dir))
+                            FileUtils.cp(comp, File.join(pub_dest, dir)) unless File.exist?(File.join(pub_dest, dir))
+                        end
+                        src = dir+'/'+name
+                    else
+                        unless File.exist?(File.join(pub_dest, name))
+                            FileUtils.cp(comp, pub_dest)
+                        end
+                        src = name
+                    end
+                    ass[:src] = Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+src
+                    assets[type] << ass
+                else # needs compression
+                    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
+            if ass[:gettext] && type == :js
+                msg_path = asset_gettext_messages_file(ass[:path])
+                if File.exists?(msg_path)
+                    js_messages += JSON.parse(File.read(msg_path))
+                else
+                    Spider.logger.warn("Javascript Gettext file #{msg_path} not found")
+                end
+            end
+            assets
+        end
         
         @@named_layouts = {}
         
@@ -190,26 +213,71 @@ module Spider
         end
         
         def compile_asset(ass)
-            return ass unless ass[:src]
+            return ass unless ass[:src] && ass[:path]
             if ass[:type] == :css
                 ext = File.extname(ass[:path])
                 compile_exts = ['.scss', '.sass', '.less']
+
                 if compile_exts.include?(ext)
+                    ass_type = nil
+                    if ext == '.less'
+                        ass_type = :less
+                        if @compile_less.nil?
+                            @compile_less = false
+                            if Spider.conf.get('css.compile_less')
+                                begin
+                                    require 'spiderfw/templates/resources/less'
+                                    @compile_less = true
+                                rescue LoadError
+                                    Spider.logger.error("Unable to compile LESS. Please install less-js gem and a JS backend.")
+                                end
+                            end
+                        end
+                        unless @compile_less
+                            ass[:rel] = 'stylesheet/less'
+                            return ass
+                        end
+                    elsif ['.scss', '.sass'].include?(ext)
+                        ass_type = :sass
+                    end
                     dir = File.dirname(ass[:path])
                     base = File.basename(ass[:path], ext)
                     newname = "#{base}.css"
-                    tmpdestdir = File.join(dir, 'stylesheets')
-                    dest = File.join(tmpdestdir, newname)
-                    compiler = if ['.scss', '.sass'].include?(ext)
-                        require 'spiderfw/templates/resources/sass'
-                        Spider::SassCompiler
-                    elsif ext == '.less'
-                        require 'spiderfw/templates/resources/less'
-                        Spider::LessCompiler
+                    parts = dir.split(File::SEPARATOR)
+                    if type_i = parts.index(ass_type.to_s)
+                        parts[type_i] = File.join(ass[:type].to_s, ass_type.to_s)
+                        destdir = parts.join(File::SEPARATOR) 
+                    else
+                        destdir = dir
+                    end
+                    FileUtils.mkdir_p(destdir)
+                    dest = File.join(destdir, newname)
+                    if Spider.conf.get('css.compile')
+                        compiler_class = if ass_type == :sass
+                            require 'spiderfw/templates/resources/sass'
+                            Spider::SassCompiler
+                        elsif ass_type == :less
+                            Spider::LessCompiler
+                        end
+                        begin
+                            compiler = compiler_class.new(ass[:app].pub_path)
+                            compiler.compile(ass[:path], dest)
+                        rescue Exception
+                            if ext == '.less'
+                                Spider.logger.error("Unable to compile LESS. Please ensure you have a JS backend
+                                 (see https://github.com/sstephenson/execjs)")
+                            else
+                                raise
+                            end
+                        end
                     end
-                    compiler.compile(ass[:path], dest)
                     ass[:path] = dest
-                    ass[:src] = File.join(File.dirname(ass[:src]), newname)
+                    srcdir = File.dirname(ass[:src])
+                    if destdir != dir
+                        srcdir = srcdir.sub(ass_type.to_s, File.join(ass[:type].to_s, ass_type.to_s))
+                    end
+                    ass[:src] = File.join(srcdir, newname)
+                    
                 end
             end
             return ass
@@ -250,7 +318,7 @@ module Spider
             combined = "#{pub_dest}/._#{compiled_name}"
 
             dest = "#{pub_dest}/#{compiled_name}"
-            File.cp(tmp_combined, combined)
+            FileUtils.cp(tmp_combined, combined)
             File.unlink(tmp_combined)
             compressor = ::YUI::JavaScriptCompressor.new("charset" => "UTF-8")
             io = open(combined, 'r')
@@ -320,7 +388,7 @@ module Spider
                             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)
+                                    FileUtils.cp(url_src, url_dest)
                                     new_url += "?cb=#{mtime}"
                                 elsif cachebuster == :hard || cachebuster == :hardcopy
                                     url_dir = File.dirname(url)
@@ -330,13 +398,13 @@ module Spider
                                     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)
+                                        FileUtils.cp(url_src, url_dest)
                                     else
-                                        File.cp(url_src, "#{url_dest_dir}/#{cb_file_name}")
+                                        FileUtils.cp(url_src, "#{url_dest_dir}/#{cb_file_name}")
                                     end
                                 end
                             else
-                                File.cp(url_src, url_dest)
+                                FileUtils.cp(url_src, url_dest)
                             end
                         else
                             Spider.logger.error("CSS referenced file not found: #{url_src}")
@@ -363,7 +431,7 @@ module Spider
             combined = "#{pub_dest}/._#{compiled_name}"
                 
             dest = "#{pub_dest}/#{compiled_name}"
-            File.cp(tmp_combined, combined)
+            FileUtils.cp(tmp_combined, combined)
             File.unlink(tmp_combined)
             compressor = ::YUI::CssCompressor.new("charset" => "UTF-8")
             io = open(combined, 'r')
@@ -392,7 +460,6 @@ 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)
@@ -412,7 +479,8 @@ module Spider
             if types.include?(:css)
                 self.assets[:css].each do |ass|
                     ass = {:src => ass} if ass.is_a?(String)
-                    link = "<link rel=\"stylesheet\" type=\"text/css\" href=\"#{ass[:src]}\""
+                    rel = ass[:rel] || 'stylesheet'
+                    link = "<link rel=\"#{rel}\" type=\"text/css\" href=\"#{ass[:src]}\""
                     link += " media=\"#{ass[:media]}\"" if ass[:media]
                     link += ">\n"
                     if ass[:if_ie_lte]

data/lib/spiderfw/templates/resources/less.rb

@@ -1,10 +1,18 @@
-require 'less-js'
+begin
+    require 'less-js'
+rescue LoadError
+    raise "Please install less-js gem to compile less files"
+end
 
 module Spider
     
     module LessCompiler
+
+        def intialize(base_path)
+            @base_path = base_path
+        end
         
-        def self.compile(src, dest)
+        def compile(src, dest)
             output = LessJs.compile File.read(src)
             File.open(dest, 'w') do |f|
                 f.write "/* This file is autogenerated; do not edit directly (edit #{src} instead) */\n\n"

data/lib/spiderfw/templates/resources/sass.rb

@@ -1,18 +1,75 @@
-require 'sass'
+require 'sass/plugin/configuration'
+
+module Sass::Plugin::Configuration
+
+  def default_options
+    @default_options ||= {
+      :css_location       => './public/stylesheets',
+      :always_update      => false,
+      :always_check       => true,
+      :full_exception     => true,
+      :cache_location     => File.join(Spider.paths[:tmp], 'sass', '.sass_cache')
+      }.freeze
+  end
+end
+
 require 'sass/plugin'
 
-Sass::Plugin.options[:cache_location] = File.join(Spider.paths[:tmp], 'sass-cache')
+require 'sass'
+
 
 module Spider
     
-    module SassCompiler
+    class SassCompiler
+
+        def initialize(base_path)
+            @base_path = base_path
+        end
         
-        def self.compile(src, dest)
-            engine = Sass::Engine.for_file(src, {})
-            output = engine.render
-            File.open(dest, 'w') do |f|
-                f.write "/* This file is autogenerated; do not edit directly (edit #{src} instead) */\n\n"
-                f.write output
+        def compile(src, dest)
+            use_compass = false
+            if Spider.conf.get('css.sass.use_compass')
+                begin
+                    require 'compass'
+                    use_compass = true
+                rescue LoadError => exc
+                    Spider.logger.debug(exc)
+                    Spider.logger.debug("Compass not found. Please install 'compass' gem")
+                end
+            end
+            if use_compass
+                work_dir = FileUtils.mkdir_p(File.join(Spider.paths[:tmp], 'sass'))
+                src_dir = File.dirname(src)
+                src_dir = src_dir
+                # dest_dir = File.dirname(dest)
+
+                options = {
+                    :project_path => @base_path,
+                    :css_dir => 'css', 
+                    :sass_dir => 'sass',
+                    # :fonts_path => src_dir,
+                    # :images_path => src_dir,
+                    :fonts_dir => 'fonts',
+                    :images_dir => 'img',
+                    :javascripts_dir => 'js',
+                    :relative_assets => true,
+                    :line_comments => Spider.runmode == 'devel' ? true : false,
+                    :sass => Compass.sass_engine_options.merge({
+                        :cache_location => File.join(work_dir, '.sass_cache')
+                    }),
+                    :css_filename => dest
+                }
+                config = Compass::Configuration::Data.new(:spider, options)
+                Compass.add_project_configuration(config)
+                compiler = Compass::Compiler.new(work_dir, File.dirname(src), File.dirname(dest), options)
+                compiler.compile(src, dest)
+            else
+                engine = Sass::Engine.for_file(src, {})
+                output = engine.render
+                File.open(dest, 'w') do |f|
+                    f.write "/* This file is autogenerated; do not edit directly (edit #{src} instead) */\n\n"
+                    f.write output
+                end
             end
         end
         

data/lib/spiderfw/templates/template.rb

@@ -46,7 +46,7 @@ module Spider
             
             # Returns the class TemplateCache instance
             def cache
-                @@cache ||= TemplateCache.new(Spider.paths[:var]+'/cache/templates')
+                @@cache ||= TemplateCache.new(File.join(Spider.paths[:var], 'cache', 'templates'))
             end
             
             # Sets allowed blocks
@@ -362,7 +362,7 @@ module Spider
             end
             compiled.block.init_code = res_init + compiled.block.init_code
             compiled.devel_info["source.xml"] = root.to_html
-            compiled.assets = @assets + assets
+            compiled.assets = (@assets + assets).uniq
             return compiled
         end
         
@@ -407,6 +407,7 @@ module Spider
             controller = nil
             if res && res.definer
                 controller = res.definer.controller
+                ass[:app] = res.definer unless res.definer.is_a?(Spider::Home)
             elsif owner_class < Spider::Controller
                 controller = owner_class
             end
@@ -434,7 +435,7 @@ module Spider
                 ass = processor.process(ass)
             end
             if cpr = attributes[:compressed] 
-                if cpr == "true"
+                if cpr == true || cpr == "true"
                     ass[:compressed_path] = ass[:path]
                     ass[:compressed_rel_path] = ass[:rel_path]
                     ass[:compressed] = base_url + File.basename(ass[:path])
@@ -477,9 +478,14 @@ module Spider
             overrides.each{ |o| o.set_attribute('class', 'to_delete') }
             root.search('.to_delete').remove
             add_overrides overrides
+            our_domain = nil
+            if @definer_class
+                our_domain = @definer_class.respond_to?(:app) ? @definer_class.app.short_name : 'spider'
+            end
             @overrides += orig_overrides
             if root.name == 'tpl:extend'
                 orig_overrides = @overrides
+
                 @overrides = []
                 ext_src = root.get_attribute('src')
                 ext_app = root.get_attribute('app')
@@ -510,6 +516,9 @@ module Spider
                 @dependencies << ext
                 tpl = Template.new(ext)
                 root = get_el(ext)
+                if ext_app.short_name != our_domain
+                    root.set_attribute('tpl:text-domain', ext_app.short_name)
+                end
                 root.children_of_type('tpl:asset').each do |ass|
                     ass_src = ass.get_attribute('src')
                     if ass_src && ass_src[0].chr != '/'
@@ -547,6 +556,10 @@ module Spider
                         end
                     end
                     incl_el.search('.to_delete').remove
+                    td = resource.definer.respond_to?(:app) ? resource.definer.app.short_name : 'spider'
+                    if td != our_domain
+                        incl_el.set_attribute('tpl:text-domain', td)
+                    end
                     incl.swap(incl_el.to_html)
                 end
                 
@@ -663,6 +676,11 @@ module Spider
         # - exec
         # - eval the template's compiled run code.
         def render(scene=nil)
+            prev_domain = nil
+            if @definer_class
+                td = @definer_class.respond_to?(:app) ? @definer_class.app.short_name : 'spider'
+                prev_domain = Spider::GetText.set_domain(td)
+            end
             scene ||= @scene
             load unless loaded?
             init(scene) unless init_done?
@@ -693,6 +711,7 @@ module Spider
                     @content[yielded].render if @content[yielded]
                 end
             end
+            Spider::GetText.restore_domain(prev_domain) if prev_domain
             # end
         end
         
@@ -777,7 +796,7 @@ module Spider
             elsif override.name == 'tpl:content'
                 found = el.search("tpl:placeholder[@name='#{override.get_attribute('name')}']")
             else
-                if ['sp:pass', 'tpl:pass', 'sp:template'].include?(el.name)
+                if ['sp:template'].include?(el.name)
                     found = el.children.select{ |child| child.is_a?(Hpricot::Elem) }
                 else
                     found = [el]
@@ -803,7 +822,11 @@ module Spider
                     elsif override.name == 'tpl:override' || override.name == 'tpl:content'
                         overridden = f.to_html
                         parent = f.parent
-                        f.swap(override.innerHTML)
+                        if f == el
+                            f.innerHTML = override.innerHTML
+                        else
+                            f.swap(override.innerHTML)
+                        end
                         parent.search('tpl:overridden').each do |o| 
                             ovr = overridden
                             if o_search = o.get_attribute('search')
@@ -815,8 +838,10 @@ module Spider
                     elsif override.name == 'tpl:override-attr'
                         f.set_attribute(override.get_attribute("name"), override.get_attribute("value"))
                     elsif override.name == 'tpl:append-attr'
-                        f.set_attribute(override.get_attribute("name"), \
-                        (f.get_attribute(override.get_attribute("name")) || '')+override.get_attribute("value")) 
+                        a = f.get_attribute(override.get_attribute("name")) || ''
+                        a += ' ' unless a.blank?
+                        a += override.get_attribute("value")
+                        f.set_attribute(override.get_attribute("name"), a)
                     elsif override.name == 'tpl:append'
                         f.innerHTML += override.innerHTML
                     elsif override.name == 'tpl:prepend'
@@ -854,7 +879,7 @@ module Spider
         end
         
         ExpressionOutputRegexp = /\{?\{\s([^\s].*?)\s\}\}?/
-        GettextRegexp = /_\(([^\)]+)?\)(\s%\s([^\s,]+(?:,\s*\S+\s*)?))?/
+        GettextRegexp = /([snp][snp]?)?_\(([^\)]+)?\)(\s%\s([^\s,]+(?:,\s*\S+\s*)?))?/
         ERBRegexp = /(<%(.+)?%>)/
         SceneVarRegexp = /@(\w[\w\d_]+)/
         
@@ -875,8 +900,8 @@ module Spider
                         yield :expr, $1, scanner.matched
                     end
                 when GettextRegexp
-                    gt = [$1]
-                    gt << $3 if $2 # interpolated vars
+                    gt = {:val => $2, :func => $1}
+                    gt[:vars] = $4 if $3 # interpolated vars
                     yield :gettext, gt, scanner.matched
                 when ERBRegexp
                     yield :erb, $1, scanner.matched

data/lib/spiderfw/templates/template_blocks.rb

@@ -45,6 +45,8 @@ module Spider
                 block = :ParentContext
             elsif el.name == 'sp:recurse'
                 block = :Recurse
+            elsif !skip_attributes && el.has_attribute?('tpl:text-domain')
+                block = :TextDomain    
             elsif Spider::Template.registered?(el.name)
                 klass = Spider::Template.get_registered_class(el.name)
                 if klass < ::Spider::Widget
@@ -145,9 +147,9 @@ module Spider
                     when :expr
                         res += "'+("+vars_to_scene(val)+").to_s+'"
                     when :gettext
-                        res += "'\n$out << _('#{escape_text(val[0])}')"
-                        if val[1]
-                            res += " #{vars_to_scene(val[1])}" 
+                        res += "'\n$out << _('#{escape_text(val[:val])}')"
+                        if val[:vars]
+                            res += " #{vars_to_scene(val[:vars])}" 
                         end
                         res += "\n$out << '"
                     end
@@ -217,5 +219,6 @@ require 'spiderfw/templates/blocks/layout_assets'
 require 'spiderfw/templates/blocks/layout_meta'
 require 'spiderfw/templates/blocks/lambda'
 require 'spiderfw/templates/blocks/recurse'
+require 'spiderfw/templates/blocks/text_domain'
 
 

data/lib/spiderfw/utils/logger.rb

@@ -7,6 +7,7 @@ module Spider
     # and will pass log messages to each of its child.
     
     module Logger
+        @@levels = [:DEBUG, :WARN, :INFO, :ERROR]
         
         class << self
             
@@ -55,6 +56,7 @@ module Spider
             def send_to_loggers(action, *args, &proc)
                 return if $SAFE > 1
                 return unless @loggers
+                return if thread_level && !check_thread_level(action)
                 @loggers.each do |dest, logger| 
                     begin
                         logger.send(action, *args, &proc) 
@@ -133,6 +135,24 @@ module Spider
                 send_to_loggers(method, *args, &proc)
             end
 
+            def set_thread_level(level)
+                prev = Thread.current[:spider_logger_level]
+                Thread.current[:spider_logger_level] = @@levels.index(level)
+                return prev
+            end
+
+            def thread_level
+                Thread.current[:spider_logger_level]
+            end
+
+            def check_thread_level(action)
+                tl = thread_level
+                return unless tl
+                action_i = @@levels.index(action.to_s.upcase.to_sym)
+                return action_i > tl
+            end
+
+
         end
         
         def log(*args, &proc)