spiderfw 0.5.7 → 0.5.9

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

@@ -10,7 +10,16 @@ module Spider
     
     # Web server
     config_option 'http.server', _("The internal server to use"), {
-        :default => 'mongrel'
+        :default => lambda{
+            begin
+                require 'rubygems'
+                require 'mongrel'
+                'mongrel'
+            rescue LoadError
+                'webrick'
+            end
+        },
+        :type => String, :choices => ['webrick', 'mongrel', 'thin']
     }
     config_option 'webserver.show_traces', _("Whether to show the stack trace on error"), {
         :default => Proc.new{ ['test', 'devel'].include?(Spider.config.get('runmode')) ? true : false  }
@@ -18,7 +27,7 @@ module Spider
     config_option 'webserver.reload_sources', _("Reload application and spider sources on each request"), {
         :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? true : false }
     }
-    config_option 'webserver.port', _("Port to use for the http server"), :default => 8080
+    config_option 'webserver.port', _("Port to use for the http server"), :type => Fixnum, :default => 8080
     config_option 'webserver.force_threads', _("Force threading on non-threaded adapters"),
         :default => Proc.new{ RUBY_VERSION_PARTS[1] == '8' ? true : false }
     config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
@@ -47,6 +56,7 @@ module Spider
     config_option 'storages', _("A list of named storages"), :type => :conf
     config_option 'storages.x.url', _("Connection url to the storage"), :type => String, :required => true
     config_option 'storages.x.encoding', _("Encoding the DB uses"), :type => String
+    config_option 'storages.x.enable_transactions', _("Whether to enable transactions on the db"), :type => Spider::DataTypes::Bool, :default => true
     
     config_option 'debugger.start', _("Start the debugger")
     config_option 'profiling.enable', _("Enable on-request profiling")
@@ -69,17 +79,19 @@ module Spider
     
     config_option 'http.nonce_life', _("Life in seconds of HTTP Digest Authentication nonces"), :type => Fixnum, :default => 60
     # TODO: implement in webrick/others, check if has a performance gain
-    config_option 'http.auto_headers', _("Automatically send headers on first output (breaks the debugger)"), :default => true
+    config_option 'http.auto_headers', _("Automatically send headers on first output"), 
+        :type => Spider::DataTypes::Bool, :default => true
     config_option 'http.seize_stdout', _("Redirect standard output to the browser"), :default => false
     config_option 'http.proxy_mapping', _("If the request is proxyied, the urls used to reach spider, with the corresponding paths called by the proxy"),
         :type => Hash
     config_option 'http.charset', _("The charset to use for http requests"), :default => 'UTF-8'
     
     config_option 'debug.console.level', _("Level of debug output to console"), :default => :INFO,
-        :process => lambda{ |opt| opt && opt != 'false' ? opt.to_s.upcase.to_sym : false }
-    config_option 'log.errors', _("Log errors to file"), :default => true
+        :process => lambda{ |opt| opt && opt != 'false' ? opt.to_s.upcase.to_sym : false },
+        :choices => [false, :DEBUG, :WARN, :INFO, :ERROR]
+    config_option 'log.errors', _("Log errors to file"), :type => Spider::DataTypes::Bool, :default => true
     config_option 'log.debug.level', _("Log level to use for debug file (false for no debug)"), :default => false,
-        :choices => [false, :DEBUG, :INFO],
+        :choices => [false, :DEBUG, :WARN, :INFO, :ERROR],
         :process => lambda{ |opt| opt && opt != 'false' ? opt.to_s.upcase.to_sym : false }
     config_option 'log.rotate.age', _("Number of old log files to keep, OR frequency of rotation (daily, weekly or monthly)"), :default => 'daily'
     config_option 'log.rotate.size', _("Maximum logfile size (only applies when log.rotate.age is a number)"), :default => 1048576

data/lib/spiderfw/controller/controller.rb

@@ -8,6 +8,7 @@ require 'spiderfw/controller/first_responder'
 require 'spiderfw/controller/mixins/visual'
 require 'spiderfw/controller/mixins/http_mixin'
 require 'spiderfw/controller/mixins/static_content'
+require 'spiderfw/widget/widget'
 
 require 'spiderfw/controller/helpers/widget_helper'
 
@@ -108,13 +109,14 @@ module Spider
         define_annotation(:action) { |k, m| k.controller_actions(m) }
         
         attr_reader :request, :response, :executed_method, :scene
-        attr_accessor :dispatch_action
+        attr_accessor :dispatch_action, :is_target
         
         def initialize(request, response, scene=nil)
             @request = request
             @response = response
             @scene = scene || get_scene
             @dispatch_path = ''
+            @is_target = true
             init
             #@parent = parent
         end
@@ -165,6 +167,11 @@ module Spider
             !@dispatch_next[@call_path] || @dispatch_next[@call_path].dest == self
         end
         
+        # Returns false if the target of the call is a widget, true otherwise
+        def is_target?
+            @is_target
+        end
+        
         
         def execute(action='', *arguments)
             return if @__done
@@ -178,12 +185,9 @@ module Spider
                 if (can_dispatch?(:execute, action))
                     d_next = dispatch_next(action)
                     #run_chain(:execute, action, *arguments)
-                    if d_next.dest != self # otherwise, shortcut route to self
-                        return do_dispatch(:execute, action) 
-                    else 
-                        arguments = d_next.params
-                    end
-#                        after(action, *arguments)
+                    #  shortcut route to self
+                    return do_dispatch(:execute, action) if d_next.dest != self 
+                    arguments = d_next.params
                 end
                 if (@executed_method)
                     meth = self.method(@executed_method)
@@ -264,7 +268,7 @@ module Spider
             klass = route.dest
             if klass.class != Class
                 if (klass == self) # route to self
-                    @executed_method = route.action
+                    @executed_method = route.action.to_sym
                     @executed_method_arguments = []
                 end
                 return klass
@@ -273,9 +277,6 @@ module Spider
             obj.dispatch_action = route.matched || ''
             # FIXME: this is not clean
             obj.set_action(route.action)
-            if (route.options[:do])
-                obj.instance_eval &route.options[:do]
-            end
 #            obj.dispatch_path = @dispatch_path + route.path
             return obj
         end

data/lib/spiderfw/controller/dispatcher.rb

@@ -40,11 +40,11 @@ module Spider
                 obj = dispatched_object(route)
                 obj.dispatch_previous = self if obj.respond_to?(:dispatch_previous=) && obj != self
                 route.obj = obj
+                if (route.options[:do])
+                    obj.instance_exec(*(route.params || []), &route.options[:do])
+                end
             end
-            obj = route.obj
-            if (route.options[:do])
-                route.options[:do].call(obj, *(route.params || []))
-            end
+            obj = route.obj            
             new_arguments = arguments
             new_arguments += route.params unless route.options[:remove_params]
             return [obj, route.action, new_arguments]
@@ -138,6 +138,7 @@ module Spider
                     match = try.match(path)
                     if (match)
                         action = action_index ? match[action_index] : match.post_match
+                        action = action[0..-2] if action.length > 0 && action[-1].chr == '/'
                         params = match[1..(match.length-1)]
                         matched = match[0]
                     end

data/lib/spiderfw/controller/http_controller.rb

@@ -31,12 +31,22 @@ module Spider
             @response.cookies['sid'] = @request.session.sid
             @response.cookies['sid'].path = '/'
             @request.params = {}
+            @uploaded_files = []
             if (@request.env['QUERY_STRING'])
                 @request.params = Spider::HTTP.parse_query(@request.env['QUERY_STRING'])
             end
-            if (@request.env['REQUEST_METHOD'] == 'POST' && @request.env['HTTP_CONTENT_TYPE'] && @request.env['HTTP_CONTENT_TYPE'].include?('application/x-www-form-urlencoded'))
-                @request.params.merge!(Spider::HTTP.parse_query(@request.read_body))
+            if @request.env['REQUEST_METHOD'] == 'POST' && @request.env['HTTP_CONTENT_TYPE']
+                if @request.env['HTTP_CONTENT_TYPE'].include?('application/x-www-form-urlencoded')
+                    @request.params.merge!(Spider::HTTP.parse_query(@request.read_body))
+                elsif @request.env['HTTP_CONTENT_TYPE'] =~ Spider::HTTP::MULTIPART_REGEXP
+                    multipart_params, multipart_files = Spider::HTTP.parse_multipart(@request.body, $1, @request.env['CONTENT_LENGTH'].to_i)
+                    @request.params.merge!(multipart_params)
+                    @uploaded_files = multipart_files
+                end
             end
+
+            @request.http_method = @request.env['REQUEST_METHOD'].upcase.to_sym
+            @request.http_host = @request.env['HTTP_HOST']
             Locale.clear
             Locale.init(:driver => :cgi)
             Locale.set_request(@request.params['lang'], @request.cookies['lang'], @request.env['HTTP_ACCEPT_LANGUAGE'], @request.env['HTTP_ACCEPT_CHARSET'])
@@ -65,6 +75,9 @@ module Spider
         def ensure(action='', *arguments)
             dispatch(:ensure, action, *arguments)
             $stdout = @previous_stdout
+            @uploaded_files.each do |f|
+                f.close
+            end
         end
         
         
@@ -85,6 +98,7 @@ module Spider
         end
         
         module HTTPRequest
+            attr_accessor :http_method, :http_host
             
             # Returns PATH_INFO reversing any proxy mappings if needed.
             def path

data/lib/spiderfw/controller/mixins/http_mixin.rb

@@ -1,5 +1,5 @@
 require 'base64'
-require 'uuid'
+require 'uuidtools'
 require 'digest/md5'
 require 'macaddr'
 require 'spiderfw/http/http'
@@ -14,6 +14,7 @@ module Spider; module ControllerMixins
         
         def redirect(url, code=Spider::HTTP::MOVED_PERMANENTLY)
             debug "REDIRECTING TO #{url}"
+            @request.session.persist if @request.session # It might be too late afterwards
             @response.status = code
             @response.headers["Location"] = url
             @response.headers.delete("Content-Type")
@@ -130,7 +131,7 @@ module Spider; module ControllerMixins
             pk  = Digest::MD5.hexdigest("#{now}:#{digest_instance_key}")[0,32]
             nonce = [now + ":" + pk].pack("m*").chop # it has 60 length of chars.
             
-            opaque = [UUID.new.generate].pack("m*").chop
+            opaque = [UUIDTools::UUID.random_create.to_s].pack("m*").chop
             header = "Digest realm=\"#{realm}\", qop=\"auth\", nonce=\"#{nonce}\", opaque=\"#{opaque}\""
             @response.headers['WWW-Authenticate'] = header
             @response.status = Spider::HTTP::UNAUTHORIZED

data/lib/spiderfw/controller/mixins/static_content.rb

@@ -20,7 +20,7 @@ module Spider; module ControllerMixins
         module ClassMethods
             
             def output_format?(method, format)
-                return true if method == "serve_static"
+                return true if method == :serve_static
                 return super
             end
             
@@ -68,7 +68,13 @@ module Spider; module ControllerMixins
             debug("Serving asset: #{full_path}")
             raise Spider::Controller::NotFound.new(full_path) unless File.exist?(full_path)
             stat = File.lstat(full_path)
-            ct = File.directory?(full_path) ? "httpd/unix-directory" : WEBrick::HTTPUtils::mime_type(full_path, ::MIME::Types)
+            if File.directory?(full_path)
+                ct = "httpd/unix-directory"
+            else
+                ct = MIME::Types.type_for(full_path)
+                ct = ct.to_s if ct
+                ct ||= "application/octet-stream"
+            end
             @response.headers['Content-Type'] = ct
             @response.headers['Content-Length'] = stat.size
             @response.headers['Last-Modified'] = stat.mtime.httpdate

data/lib/spiderfw/controller/mixins/visual.rb

@@ -57,52 +57,62 @@ module Spider; module ControllerMixins
             end
         end
         
+        def visual_params
+            @visual_params ||= {}
+        end
+        
+        def init_widgets(template)
+            widget_target = @request.params['_wt']
+            widget_execute = @request.params['_we']
+            if (widget_target && !@rendering_error)
+                first, rest = widget_target.split('/', 2)
+                @_widget = find_widget(first)
+                raise Spider::Controller::NotFound.new("Widget #{widget_target}") unless @_widget
+                @is_target = false
+                @_widget.is_target = true unless rest
+                @_widget.set_action(widget_execute) if widget_execute
+                @_widget.target_mode = true
+                @_widget.widget_target = rest
+            end
+            template.do_widgets_before
+            if @_widget
+                @_widget.execute
+                done
+            end
+        end
+        
         def execute(action='', *params)
-            format_params = @executed_format_params
+            @visual_params = @executed_format_params
             if (self.is_a?(Widget) && @is_target && @request.params['_wp'])
                 params = @request.params['_wp']
-            elsif (format_params.is_a?(Hash) && format_params[:params])
+            elsif (@visual_params.is_a?(Hash) && @visual_params[:params])
                 p_first, p_rest = action.split('/')
                 params = format_params[:params].call(p_rest) if p_rest
             end
             super(action, *params)
-            return unless format_params.is_a?(Hash)
-            if (format_params.is_a?(Hash) && format_params[:template])
-                @template ||= init_template
-                widget_target = @request.params['_wt']
-                widget_execute = @request.params['_we']
-                if (widget_target)
-                    first, rest = widget_target.split('/', 2)
-                    @_widget = find_widget(first)
-                    raise Spider::Controller::NotFound.new("Widget #{widget_target}") unless @_widget
-                    @_widget.is_target = true unless rest
-                    @_widget.set_action(widget_execute) if widget_execute
-                    @_widget.target_mode = true
-                    @_widget.widget_target = rest
-                    @template.do_widgets_before
-                    @_widget.execute
-                end
+            return unless @visual_params.is_a?(Hash)
+            @template = init_template if !@template && @visual_params[:template]
+            init_widgets(@template) if @template
+            if @visual_params[:call]
+                send(@visual_params[:call], *params)
             end
-            if (format_params.is_a?(Hash) && format_params[:template] && !@_widget)
+            if @visual_params[:template] && !@_widget && !done?
                 if (@template)
-                    render(@template, format_params)  # has been init'ed in before method
+                    render(@template, @visual_params)  # has been init'ed in before method
                 else
-                    render(format_params[:template], format_params)
+                    render(@visual_params[:template], @visual_params)
                 end
             end
-            return unless format_params.is_a?(Hash)
-            if (format_params[:redirect])
-                # red = format_params[:redirect] == true ? request_url : format_params[:redirect]
-                # red = owner_controller.request_url if (self.is_a?(Widget))
-                redirect(format_params[:redirect])
+            if @visual_params[:redirect]
+                redirect(@visual_params[:redirect])
             end
-            if (@executed_format == :json && format_params[:scene] || format_params[:return]) # FIXME: move in JSON mixin?
-                if (format_params[:return])
-                    $out << format_params[:return].to_json
-                elsif (format_params[:scene].is_a?(Array))
+            if @executed_format == :json && @visual_params[:scene] || @visual_params[:return] # FIXME: move in JSON mixin?
+                if (@visual_params[:return])
+                    $out << @visual_params[:return].to_json
+                elsif (@visual_params[:scene].is_a?(Array))
                     h = @scene.to_hash
                     res = {}
-                    format_params[:scene].each{ |k| res[k] = h[k] }
+                    @visual_params[:scene].each{ |k| res[k] = h[k] }
                     $out << res.to_json
                 else
                     $out << @scene.to_json
@@ -112,11 +122,15 @@ module Spider; module ControllerMixins
         
         def load_template(path, cur_path=nil, owner=nil, search_paths=nil)
             template = self.class.load_template(path, cur_path, owner, search_paths)
+            prepare_template(template)
+            @template = template
+            return template
+        end
+        
+        def prepare_template(template)
             template.owner = self
             template.request = request
             template.response = response
-            @template = template
-            return template
         end
         
         def template_exists?(name)
@@ -129,15 +143,21 @@ module Spider; module ControllerMixins
             scene ||= @scene
             scene ||= get_scene
             if (!path)
-                format_params = self.class.output_format_params(@executed_method, @executed_format)
+                format_params = @visual_params || self.class.output_format_params(@executed_method, @executed_format)
                 return unless format_params && format_params[:template]
                 path = format_params[:template]
                 options = format_params.merge(options)
             end
             template = load_template(path)
-            template.init(scene)
+            do_template_init(template, options)            
             @template = template
             @loaded_template_path = path
+
+            return template
+        end
+        
+        def do_template_init(template, options={})
+            template.init(scene)
             if (@request.params['_action'])
                 template._widget_action = @request.params['_action']
             else
@@ -171,22 +191,21 @@ module Spider; module ControllerMixins
             else
                 template = init_template(path, scene, options)
             end
-            template.do_widgets_before
-            unless (@_partial_render) # TODO: implement or remove
-                chosen_layouts = options[:layout] || @layout
-                chosen_layouts = [chosen_layouts] if chosen_layouts && !chosen_layouts.is_a?(Array)
-                if (chosen_layouts)
-                    t = template
-                    l = nil
-                    (chosen_layouts.length-1).downto(0) do |i|
-                        l = init_layout(chosen_layouts[i])
-                        l.template = t
-                        t = l
-                    end
-                    l.render(scene)
-                else
-                    template.render(scene)
+            init_widgets(template)
+            return template if done?
+            chosen_layouts = options[:layout] || @layout
+            chosen_layouts = [chosen_layouts] if chosen_layouts && !chosen_layouts.is_a?(Array)
+            if (chosen_layouts)
+                t = template
+                l = nil
+                (chosen_layouts.length-1).downto(0) do |i|
+                    l = init_layout(chosen_layouts[i])
+                    l.template = t
+                    t = l
                 end
+                l.render(scene)
+            else
+                template.render(scene)
             end
             return template
         end
@@ -216,7 +235,7 @@ module Spider; module ControllerMixins
         end
         
         def try_rescue(exc)
-            exc.uuid = UUID.new.generate if exc.respond_to?(:uuid=)
+            exc.uuid = UUIDTools::UUID.random_create.to_s if exc.respond_to?(:uuid=)
             format = self.class.output_format(:error) || :html
             return super unless @executed_format == :html
             return super unless action_target?
@@ -261,6 +280,7 @@ module Spider; module ControllerMixins
                     super(exc)
                 end
             end
+            @rendering_error = true
             render "errors/#{error_page}", :layout => "errors/error"
             super
         end
@@ -449,7 +469,7 @@ module Spider; module ControllerMixins
                 return t
 
             end
-            
+                        
             def template_exists?(name, paths=nil)
                 if (name[0..5] == 'SPIDER' || name[0..3] == 'ROOT')
                     name.sub!('SPIDER', $SPIDER_PATH).sub!('ROOT', Spider.paths[:root])

data/lib/spiderfw/controller/request.rb

@@ -20,14 +20,18 @@ module Spider
             @body = b
         end
         
-        def body(&proc)
+        def body
             b = @body.is_a?(String) ? StringIO.new(@body) : @body
             return nil unless b
-            while (buf = b.read(BUFSIZE))
-                yield buf
+            if block_given?
+                while (buf = b.read(BUFSIZE))
+                    yield buf
+                end
             end
+            return b
         end
         
+        
         def read_body
             return @body if @body.is_a?(String)
             b = ''

data/lib/spiderfw/controller/scene.rb

@@ -21,6 +21,12 @@ module Spider
             @table
         end
         
+        def <<(other)
+            if other.is_a?(Hash)
+                @table.merge!(other)
+            end
+        end
+        
     end
     
     

data/lib/spiderfw/controller/session.rb

@@ -1,4 +1,4 @@
-require 'uuid'
+require 'uuidtools'
 require 'spiderfw/controller/session/flash_hash'
 require 'spiderfw/controller/session/transient_hash'
 
@@ -39,11 +39,6 @@ module Spider
         
         def initialize(sid=nil)
             @sid = sid || generate_sid
-            restore
-            Spider::Logger.debug("SESSION RESTORED:")
-            Spider::Logger.debug(@data)
-            @data ||= {}
-            @data[:_flash].reset if @data[:_flash]
         end
         
         def delete
@@ -51,22 +46,26 @@ module Spider
         end
         
         def generate_sid
-            UUID.new.generate
+            UUIDTools::UUID.random_create.to_s
         end
         
         def [](key)
+            restore unless @restored
             @data[key]
         end
         
         def []=(key, val)
+            restore unless @restored
             @data[key] = val
         end
         
         def delete(key)
+            restore unless @restored
             @data.delete(key)
         end
         
         def persist
+            return unless @restored
             clear_empty_hashes!(@data)
             @data[:_flash].purge if @data[:_flash]
             @data[:_transient].purge if @data[:_transient]
@@ -76,14 +75,19 @@ module Spider
         end
         
         def restore
-            @data = self.class[@sid]
+            @data = self.class[@sid] || {}
+            @data[:_flash].reset if @data[:_flash]
+            Spider.logger.debug("Session restored: #{@data.inspect}")
+            @restored = true
         end
         
         def flash
+            restore unless @restored
             @data[:_flash] ||= FlashHash.new
         end
         
         def transient
+            restore unless @restored
             @data[:_transient] ||= TransientHash.new
         end
         

data/lib/spiderfw/env.rb

@@ -11,7 +11,7 @@ ENV['GETTEXT_PATH'] += $SPIDER_PATH+'/data/locale,'+$SPIDER_RUN_PATH+'/data/loca
 $:.push($SPIDER_RUN_PATH)
 
 $:.push($SPIDER_PATH)
-Dir.chdir($SPIDER_RUN_PATH)
+# Dir.chdir($SPIDER_RUN_PATH)
 
 $SPIDER_RUNMODE = ENV['SPIDER_RUNMODE']
 $SPIDER_CONFIG_SETS = ENV['SPIDER_CONFIG_SETS'].split(/\s+,\s+/) if ENV['SPIDER_CONFIG_SETS']

data/lib/spiderfw/http/adapters/mongrel.rb

@@ -122,7 +122,7 @@ module Spider; module HTTP
             else
                 controller_response.server_output = response
             end
-
+            controller = nil
             begin
                 main_block = lambda do
                     controller = ::Spider::HTTPController.new(controller_request, controller_response)