spiderfw 0.5.19 → 0.6.0

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

@@ -13,7 +13,7 @@ module Spider; module TemplateBlocks
             c += html.get_start(options)
             c += "end\n"
             c, init = html.compile_content(c, init, options)
-            tag_end = html.get_end
+            tag_end = html.get_end(options)
             if (tag_end)
                 c += "if (#{cond})\n"
                 c += "  $out <<  '#{tag_end}'\n"

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

@@ -75,7 +75,7 @@ module Spider; module TemplateBlocks
             
             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"
+            init += "add_widget('#{id}', #{klass}.new(@request, @response), {#{init_params.join(', ')}}, '#{runtime_content}', #{t_param})\n"
             c = "yield :\"#{id}\"\n"
             return CompiledBlock.new(init, c)
         end

data/lib/spiderfw/templates/layout.rb

@@ -40,7 +40,7 @@ module Spider
             pub_dest = nil
             all_assets.each do |ass|
                 seen_check = ass[:runtime] || ass[:src]
-                next if !ass[:src] || ass[:src].empty?
+                next if ass[:src].blank? && !ass[:runtime]
                 next if seen[seen_check]
                 seen[seen_check] = true
                 type = ass[:type].to_sym
@@ -55,7 +55,7 @@ module Spider
                 
                 if no_compress
                     if ass[:runtime]
-                        assets[type] << Spider::Template.runtime_assets[ass[:runtime]].call(@request, @response, @scene)
+                        assets[type] << {:src => Spider::Template.runtime_assets[ass[:runtime]].call(@request, @response, @scene)}
                     else
                         assets[type] << ass
                     end
@@ -66,10 +66,34 @@ module Spider
                     end
                     if comp = ass[:compressed_path]
                         name = File.basename(comp)
-                        unless File.exist?(File.join(pub_dest, name))
-                            File.cp(comp, pub_dest)
+                        if ass[:compressed_rel_path]
+                            dir = File.dirname(ass[:compressed_rel_path])
+                            if ass[:copy_dir]
+                                start = dir
+                                if ass[:copy_dir].is_a?(Fixnum)
+                                    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+'/'+name
+                        ass[:src] = Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+src
                         assets[type] << ass
                     else
                         name = ass[:compress] || cname

data/lib/spiderfw/templates/template.rb

@@ -33,7 +33,6 @@ module Spider
         @@registered = {}
         @@widget_plugins = {}
         @@namespaces = {}
-        @@cache = TemplateCache.new(Spider.paths[:var]+'/cache/templates')
         @@overrides = ['content', 'override', 'override-content', 'override-attr', 'append-attr',
                         'append', 'prepend', 'delete', 'before', 'after']
                         
@@ -47,7 +46,7 @@ module Spider
             
             # Returns the class TemplateCache instance
             def cache
-                @@cache
+                @@cache ||= TemplateCache.new(Spider.paths[:var]+'/cache/templates')
             end
             
             # Sets allowed blocks
@@ -245,6 +244,7 @@ module Spider
         # Loads the compiled template (from cache if available).
         def load(path=nil)
             @path = real_path(path) if path
+            @path = File.expand_path(@path)
 #            debug("TEMPLATE LOADING #{@path}")
             cache_path = @path.sub(Spider.paths[:root], 'ROOT').sub(Spider.paths[:spider], 'SPIDER')
             unless @runtime_overrides.empty?
@@ -269,7 +269,7 @@ module Spider
             doc = open(@path){ |f| Hpricot.XML(f) }
             root = get_el(doc)
             el = process_tags(root)
-            @overrides.each{ |o| apply_override(root, o) } if (@overrides)
+            @overrides.each{ |o| apply_override(root, o) } if @overrides
             root.search('tpl:placeholder').remove # remove empty placeholders
             owner_class = @owner ? @owner.class : @owner_class
             @assets += owner_class.assets if owner_class
@@ -316,6 +316,9 @@ module Spider
             root_block = TemplateBlocks.parse_element(root, self.class.allowed_blocks, self)
             if doc.children && doc.children[0].is_a?(Hpricot::DocType)
                 root_block.doctype = doc.children[0]
+                options[:doctype] = DocType.new(root_block.doctype)
+            else
+                options[:doctype] ||= DocType.new(Spider.conf.get('template.default_doctype'))
             end
             options[:root] = true
             options[:owner] = @owner
@@ -406,6 +409,7 @@ module Spider
             else
                 base_url = ''
             end
+            ass[:rel_path] = src
             ass[:src] = base_url + src
             ass_info = self.class.asset_types[type]
             if (ass_info && ass_info[:processor])
@@ -415,6 +419,7 @@ module Spider
             if cpr = attributes[:compressed] 
                 if cpr == "true"
                     ass[:compressed_path] = ass[:path]
+                    ass[:compressed_rel_path] = ass[:rel_path]
                     ass[:compressed] = base_url + File.basename(ass[:path])
                 else
                     compressed_res = Spider.find_resource(type.to_sym, cpr, @path, [owner_class, @definer_class])
@@ -422,6 +427,8 @@ module Spider
                     ass[:compressed] = base_url+cpr
                 end
             end
+            ass[:copy_dir] = attributes[:copy_dir]
+            ass[:copy_dir] = ass[:copy_dir] =~ /\d+/ ? ass[:copy_dir].to_i : true
             [:gettext, :media, :if_ie_lte, :cdn].each do |key|
                 ass[key] = attributes[key] if attributes.key?(key)
             end
@@ -471,6 +478,9 @@ module Spider
                 elsif ext_app
                     ext_app = Spider.apps_by_path[ext_app]
                     ext_owner = ext_app
+                else 
+                    ext_owner = @owner.class
+                    ext_app = ext_owner.app
                 end
                 ext_search_paths = nil
                 if (ext_owner && ext_owner.respond_to?(:template_paths))
@@ -754,15 +764,30 @@ module Spider
                 found.remove
             else
                 found.each do |f|
+                    o_doc = nil
                     if (override.name == 'tpl:override-content')
                         overridden = f.innerHTML
                         f.innerHTML = override.innerHTML
-                        f.search('tpl:overridden').each{ |o| o.swap(overridden) }
+                        f.search('tpl:overridden').each do |o| 
+                            ovr = overridden
+                            if o_search = o.get_attribute('search')
+                                o_doc ||= Hpricot("<o>#{overridden}</o>")
+                                ovr = o_doc.root.search(o_search).to_html
+                            end 
+                            o.swap(ovr)
+                        end
                     elsif (override.name == 'tpl:override' || override.name == 'tpl:content')
                         overridden = f.to_html
                         parent = f.parent
                         f.swap(override.innerHTML)
-                        parent.search('tpl:overridden').each{ |o| o.swap(overridden) }
+                        parent.search('tpl:overridden').each do |o| 
+                            ovr = overridden
+                            if o_search = o.get_attribute('search')
+                                o_doc ||= Hpricot("<o>#{overridden}</o>")
+                                ovr = o_doc.root.search(o_search).to_html
+                            end
+                            o.swap(ovr)
+                        end
                     elsif (override.name == 'tpl:override-attr')
                         f.set_attribute(override.get_attribute("name"), override.get_attribute("value"))
                     elsif (override.name == 'tpl:append-attr')
@@ -810,7 +835,7 @@ module Spider
         SceneVarRegexp = /@(\w[\w\d_]+)/
         
         def self.scan_text(text)
-            text = text.gsub(/\302\240/, ' ') # remove annoying fake space
+            text = text.gsub(/\302\240/u, ' ') # remove annoying fake space
             scanner = ::StringScanner.new(text)
             pos = 0
             c = ""
@@ -847,7 +872,7 @@ module Spider
             end
             yield :plain, scanner.rest
         end
-        
+                
     end
     
     # Class holding compiled template code.
@@ -881,4 +906,44 @@ module Spider
     class TemplateCompileError < RuntimeError
     end
     
+    class DocType
+        attr_reader :type, :variant
+        
+        def initialize(type_or_str)
+            if type_or_str.is_a?(Symbol)
+                @type = type_or_str
+            else
+                @type = parse(type_or_str.to_s)
+            end
+        end
+        
+        def parse(str)
+            if str =~ /DOCTYPE HTML PUBLIC.+\sHTML/i
+                @type = :html4
+            elsif str =~ /DOCTYPE HTML PUBLIC.+\sXHTML/i
+                @type = :xhtml
+            elsif str.downcase == '<!doctype html>'
+                @type = :html5
+            end
+            if str =~ /strict/i
+                @variant = :strict
+            elsif str =~ /transitional/i
+                @variant = :transitional
+            end
+        end
+        
+        def html?
+            @type == :html4 || @type == :html5
+        end
+        
+        def xhtml?
+            @type == :xhtml
+        end
+        
+        def strict?
+            @variant == :strict
+        end
+        
+    end
+    
 end

data/lib/spiderfw/templates/template_blocks.rb

@@ -135,7 +135,7 @@ module Spider
                     when :plain
                         res += escape_text(val)
                     when :escaped_expr
-                        res += full
+                        res += "{ #{val} }"
                     when :expr
                         res += "'+("+vars_to_scene(val)+").to_s+'"
                     when :gettext

data/lib/spiderfw/test/capybara.rb

@@ -0,0 +1,7 @@
+require 'spiderfw/http/adapters/rack'
+require 'capybara'
+require 'capybara/cucumber'
+require 'culerity'
+
+Capybara.app = Spider::HTTP::RackApplication.new
+Capybara.default_host = 'localhost'

data/lib/spiderfw/test/cucumber.rb

@@ -0,0 +1,12 @@
+require 'cucumber/rspec/doubles'
+require 'spiderfw/spider'
+require 'spiderfw/test'
+require 'fileutils'
+
+Before do
+    Spider::Test.before
+end
+
+After do
+    Spider::Test.after
+end

data/lib/spiderfw/test/page_object.rb

@@ -0,0 +1,29 @@
+module Spider; module Test
+    
+    class PageObject
+        attr_reader :browser
+        
+        def initialize(browser=nil)
+            unless browser
+                if Object.const_defined?(:Capybara) && Capybara.current_session
+                    browser = Capybara.current_session
+                end
+            end
+            @browser = browser
+        end
+        
+        def go(url)
+            if url =~ /^https?:\/\/([^\/])(\/.+)$/
+                url = $1
+            end
+            @browser.visit(url)
+        end
+        
+        def method_missing(method, *args)
+            @browser.send(method, *args)
+        end
+        
+        
+    end
+    
+end; end

data/lib/spiderfw/test/spec.rb

@@ -0,0 +1,20 @@
+$SPIDER_RUNMODE = 'test'
+require 'rspec'
+require 'rr'
+require 'spiderfw/spider'
+require 'spiderfw/test'
+$:.unshift($SPIDER_PATH) unless $:.include?($SPIDER_PATH)
+$:.unshift(File.join($SPIDER_PATH, 'test'))
+Spider::Controller # autoload
+Spider.start_loggers
+require 'ruby-debug' rescue LoadError
+
+RSpec.configure do |config|
+    config.mock_with :rr
+    config.before(:each) do
+        Spider::Test.before
+    end
+    config.after(:each) do
+        Spider::Test.after
+    end
+end

data/lib/spiderfw/test/stubs/mapper_stub.rb

@@ -0,0 +1,18 @@
+module Spider; module Test
+    
+    class MapperStub < Spider::Model::Mapper
+        
+        def fetch(query)
+            Spider::Model::QuerySet.static(@model)
+        end
+        
+        def have_references?(element)
+            false
+        end
+        
+        def do_insert(obj)
+        end
+        
+    end
+    
+end; end

data/lib/spiderfw/test/stubs/storage_stub.rb

@@ -0,0 +1,23 @@
+require 'spiderfw/model/storage/base_storage'
+require 'spiderfw/test/stubs/mapper_stub'
+
+module Spider; module Test
+    
+    class StorageStub < Spider::Model::Storage::BaseStorage
+        
+        def get_mapper(model)
+            mapper = Spider::Test::MapperStub.new(model, self)            
+        end
+        
+        def parse_url(url)
+        end
+        
+        def method_missing(method, *args)
+        end
+        
+        def do_insert
+        end
+        
+    end
+    
+end; end

data/lib/spiderfw/test/unit.rb

@@ -0,0 +1,23 @@
+$SPIDER_RUNMODE = 'test'
+require 'spiderfw/test'
+require "test/unit"
+
+module Spider
+    
+    class TestCase < ::Test::Unit::TestCase
+        
+        def setup
+            Spider::Test.before
+        end
+        
+        def teardown
+            Spider::Test.after
+        end
+        
+        def default_test
+            return super unless self.class == Spider::TestCase
+        end
+        
+    end
+    
+end

data/lib/spiderfw/test.rb

@@ -0,0 +1,89 @@
+require 'spiderfw/test/page_object'
+
+module Spider; module Test
+    
+    def self.env
+        @env ||= {}
+    end
+    
+    def self.before
+        if Spider.init_done?
+            Spider.config.get('storages').keys.each do |k|
+                Spider::Model::BaseModel.get_storage(k).start_transaction
+            end
+            unless Spider.runmode == 'production'
+                FileUtils.rm_rf(Spider.paths[:var]) 
+                FileUtils.mkdir_p(Spider.paths[:var])
+            end
+        end
+        begin
+           Mail::TestMailer.deliveries.clear
+        rescue
+        end
+        Spider::Request.reset_current
+        Spider.apps.each do |name, mod|
+            mod.before_test if mod.respond_to?(:before_test)
+        end
+    end
+    
+    def self.after
+        if Spider.init_done?
+            Spider.config.get('storages').keys.each do |k|
+                storage = Spider::Model::BaseModel.get_storage(k)
+                storage.rollback! if storage.supports_transactions?
+            end
+        end
+        begin
+           Mail::TestMailer.deliveries.clear
+        rescue
+        end
+        Spider.apps.each do |name, mod|
+            mod.before_test if mod.respond_to?(:after_test)
+        end
+    end
+    
+    def self.load_fixtures!(app)
+        load_fixtures(app, true)
+    end
+    
+    def self.load_fixtures(app, truncate=false)
+        path = File.join(app.path, 'test', 'fixtures')
+        Dir.glob(File.join(path, '*.yml')).each do |yml|
+            Spider::Model.load_fixtures(yml, truncate)
+        end
+    end
+    
+    def self.load_fixtures_file(app, file, truncate=false)
+        path = File.join(app.path, 'test', 'fixtures')
+        Spider::Model.load_fixtures(File.join(path, file)+'.yml', truncate)
+    end
+    
+    def self.load_fixtures_file!(app, file)
+        load_fixtures_file(app, file, true)
+    end
+    
+    def self.restart_transactions
+        Spider.config.get('storages').keys.each do |k|
+            storage = Spider::Model::BaseModel.get_storage(k)
+            storage.rollback!
+            storage.start_transaction
+        end
+    end
+    
+    def self.use_storage_stub_for(app_or_model)
+        require 'spiderfw/test/stubs/storage_stub'
+        Spider::Test.env[:storage_stub] ||= StorageStub.new('dummy')
+        models = []
+        if app_or_model < Spider::App
+            models = app_or_model.models
+        else
+            models = [app_or_model]
+        end
+        models.each do |m|
+            m.use_storage 'stub://stub'
+        end
+    end
+    
+    
+end; end
+

data/lib/spiderfw/utils/json.rb

@@ -37,3 +37,9 @@ class Integer
     to_s
   end
 end
+
+def BigDecimal
+   def to_json(options = nil) #:nodoc:
+       to_f.to_json
+   end
+end

data/lib/spiderfw/utils/logger.rb

@@ -14,13 +14,22 @@ module Spider
             #     @@loggers ||= {}
             #     @@loggers[dest]
             # end
+            
+            @loggers = {}
         
             # Open a new logger.
             def open(dest, level= :WARN)
-                @loggers ||= {}
-                logger = Spider::Logger::Logger.new(dest, Spider.conf.get('log.rotate.age'), Spider.conf.get('log.rotate.size'))
-                logger.formatter = Spider::Logger::Formatter.new
-                logger.level = ::Logger.const_get(level)
+                begin
+                    logger = Spider::Logger::Logger.new(dest, Spider.conf.get('log.rotate.age'), Spider.conf.get('log.rotate.size'))
+                    logger.formatter = Spider::Logger::Formatter.new
+                    logger.level = ::Logger.const_get(level)
+                    add(dest, logger)
+                rescue => exc
+                    STDERR << "Can't open logging to #{dest}: #{exc}\n"
+                end
+            end
+            
+            def add(dest, logger, levels={})
                 @loggers[dest] = logger
             end
             
@@ -115,6 +124,10 @@ module Spider
             def unknown(*args, &proc)
                 send_to_loggers(:unknown, *args, &proc)
             end
+            
+            def method_missing(method, *args, &proc)
+                send_to_loggers(method, *args, &proc)
+            end
 
         end
         

data/lib/spiderfw/utils/loggers/apache_commons_logger.rb

@@ -0,0 +1,61 @@
+module Spider; module Loggers
+    
+    class ApacheCommonsLogger
+        
+        def initialize(klass='spider')
+            @logger = org.apache.commons.logging.LogFactory.getLog(klass)
+        end
+        
+        def do_log(level, message=nil, &proc)
+            if block_given?
+                return unless send("#{level}?")
+        	    message = yield
+    	    end
+            @logger.send(level, message)
+        end
+        
+        def fatal(message, &proc)
+            do_log(:fatal, message, &proc)
+        end
+        
+        def error(message, &proc)
+            do_log(:error, message, &proc)
+        end
+        
+        def warn(message, &proc)
+            do_log(:warn, message, &proc)
+        end
+        
+        def info(message, &proc)
+            do_log(:info, message, &proc)
+        end
+        
+        def debug(message, &proc)
+            do_log(:info, message, &proc)
+        end
+        
+        def fatal?
+            @logger.isFatalEnabled
+        end
+        
+        def error?
+            @logger.isErrorEnabled
+        end
+        
+        def warn?
+            @logger.isWarnEnabled
+        end
+        
+        def info?
+            @logger.isInfoEnabled
+        end
+        
+        def debug?
+            @logger.isDebugEnabled
+        end
+        
+        
+        
+    end
+    
+end; end

data/lib/spiderfw/utils/monkey/date_time.rb

@@ -10,7 +10,7 @@ class Date
 
     # Converts to a Time object in the local timezone.
     def to_local_time
-        to_time(new_offset(DateTime.now.offset), :local)
+        conv_to_time(new_offset(DateTime.now.offset), :local)
     end
     
     def to_date
@@ -38,7 +38,7 @@ class Date
     end
 
     private
-    def to_time(dest, method)
+    def conv_to_time(dest, method)
         #Convert a fraction of a day to a number of microseconds
         usec = (dest.send(:sec_fraction) * 60 * 60 * 24 * (10**6)).to_i
         if dest.respond_to?(:hour)

data/lib/spiderfw/utils/monkey/module.rb

@@ -6,7 +6,9 @@ class Module #:nodoc:
     end
     
     def parent_module(n=1)
-        return const_get_full(self.to_s.reverse.split('::', n+1)[n].reverse)
+        part = self.to_s.reverse.split('::', n+1)[n]
+        return nil if part.blank?
+        return const_get_full(part.reverse)
     end
     
     def last_name

data/lib/spiderfw/utils/profiling.rb

@@ -15,8 +15,6 @@ module Spider
         end
         
         def self.stop
-            Spider.request_mutex.unlock
-            Spider.request_mutex = nil
             result = RubyProf.stop
             @profiling_started = false
             printer = ::RubyProf::GraphHtmlPrinter.new(result)
@@ -25,6 +23,8 @@ module Spider
                 printer.print(f, :min_percent => 0)
             end
             Spider.logger.info("Written profiling info in #{file_name}")
+            Spider.request_mutex.unlock
+            Spider.request_mutex = nil
         end
         
         def self.started?