spiderfw 0.5.13 → 0.5.14

data/lib/spiderfw/controller/http_controller.rb

@@ -34,10 +34,12 @@ module Spider
             @uploaded_files = []
             if (@request.env['QUERY_STRING'])
                 @request.params = Spider::HTTP.parse_query(@request.env['QUERY_STRING'])
+                @request.get = @request.params
             end
             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))
+                    @request.post = Spider::HTTP.parse_query(@request.read_body)
+                    @request.params.merge!(@request.post)
                 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)
@@ -47,6 +49,43 @@ module Spider
 
             @request.http_method = @request.env['REQUEST_METHOD'].upcase.to_sym
             @request.http_host = @request.env['HTTP_HOST']
+            @request.ssl = true if @request.env['HTTPS'] == 'on'
+            if @request.http_host =~ /(.+)\:(\d+)/
+                @request.domain = $1
+                @request.port = $2.to_i
+            else
+                @request.domain = @request.http_host
+                @request.port = @request.ssl? ? 443 : 80
+            end
+            
+            unless Spider.site
+                port = @request.ssl? ? nil : @request.port
+                Spider.site = Spider::Site.new(@request.domain, port)
+                Spider.site._auto = true
+                Spider.site.save_cache
+            end
+            if @request.ssl? && Spider.site.auto? && !Spider.site.ssl_port
+                Spider.site.ssl_port = @request.port
+                Spider.site.save_cache
+            end
+            if !@request.ssl? && Spider.site.auto? && !Spider.site.port
+                Spider.site.port = @request.port
+                Spider.site.save_cache
+            end
+            if @request.env['HTTP_CACHE_CONTROL']
+                parts = @request.env['HTTP_CACHE_CONTROL'].split(';')
+                parts.each do |part|
+                    if part == 'no-cache'
+                        @request.cache_control[:no_cache] = true
+                    else
+                        key, val = part.split('=')
+                        @request.cache_control[key] = val
+                    end
+                end
+            end
+            if @request.env['HTTP_PRAGMA'] == 'no-cache'
+                @request.cache_control[:no_cache] = true
+            end
             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'])
@@ -56,6 +95,7 @@ module Spider
                 @request.format = $2.to_sym
             end
 #            Spider.reload_sources if Spider.conf.get('webserver.reload_sources')
+            Spider.logger.info("Request: #{@request.http_method} #{@request.http_host} #{@request.path}")
             super(action, *arguments)
         end
         
@@ -63,6 +103,8 @@ module Spider
             # FIXME: cache stripped action?
             action = $1 if (action =~ /(.+)\.(\w+)$/) # strip extension, set format
             super(action, *arguments)
+            log_done
+            #@response.headers['Date'] ||= Time.now.httpdate
         end
         
         def after(action='', *arguments)
@@ -75,9 +117,25 @@ module Spider
         def ensure(action='', *arguments)
             dispatch(:ensure, action, *arguments)
             $stdout = @previous_stdout
-            @uploaded_files.each do |f|
-                f.close
+            if @uploaded_files
+                @uploaded_files.each do |f|
+                    f.close
+                end
+            end
+        end
+        
+        def log_done
+            Spider::Request.current[:_http_logged_done] = true
+            str = "Done: #{@response.status} #{Spider::HTTP.status_messages[@response.status]}"
+            str += " (static)" if @request.misc[:is_static]
+            str += " in #{(Time.now - Spider::Request.current[:_start])*1000}ms" if Spider::Request.current[:_start]
+            if @request.respond_to?(:user) && @request.user
+                str += " for user #{@request.user.class}(#{@request.user.primary_keys})"
+            end
+            if Spider.conf.get('log.memory')
+                str += " - Memory usage: #{Spider::Memory.get_memory_usage}"
             end
+            Spider.logger.info(str)
         end
         
         
@@ -88,6 +146,7 @@ module Spider
         end
         
         def try_rescue(exc)
+            log_done unless Spider::Request.current[:_http_logged_done]
             if exc.is_a?(Spider::Controller::NotFound)
                 Spider.logger.error("Not found: #{exc.path}")
             elsif exc.is_a?(Spider::Controller::Forbidden)
@@ -98,17 +157,22 @@ module Spider
         end
         
         module HTTPRequest
-            attr_accessor :http_method, :http_host
+            attr_accessor :http_method, :http_host, :domain, :port, :post, :get
             
             # Returns PATH_INFO reversing any proxy mappings if needed.
             def path
                 Spider::ControllerMixins::HTTPMixin.reverse_proxy_mapping(self.env['PATH_INFO'])
             end
             
-            def full_path
+            def http_path
                 'http://'+self.env['HTTP_HOST']+path
             end
             
+            def full_path
+                Spider.logger.warn("Request#full_path is deprecated. Use Request#http_path instead")
+                http_path
+            end
+            
             # Returns the REQUEST_URI reversing any proxy mappings if needed
             def uri
                 Spider::ControllerMixins::HTTPMixin.reverse_proxy_mapping(self.env['REQUEST_URI'])
@@ -119,10 +183,45 @@ module Spider
                 'http://'+self.env['HTTP_HOST']+uri
             end
             
+            def client_cert
+                return @client_certificate if @client_cert
+                unless self.env['SSL_CLIENT_CERT'].blank?
+                    @client_cert = OpenSSL::X509::Certificate.new(self.env['SSL_CLIENT_CERT'])
+                end
+            end
+            
+            def cache_control
+                @cache_control ||= {}
+            end
+            
+            def ssl=(bool)
+                @ssl = bool
+            end
+            
+            def ssl?
+                @ssl
+            end
+            
+            def post
+                @post ||= {}
+            end
+            
+            def get
+                @get ||= {}
+            end
+            
+            def post?
+                self.http_method == :POST
+            end
+            
+            def get?
+                self.http_method == :GET
+            end
+            
         end
     
         
         
     end
     
-end
+end

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

@@ -90,7 +90,6 @@ module Spider; module ControllerMixins
         def try_rescue(exc)
             if (exc.is_a?(Spider::Controller::NotFound))
                 @response.status = Spider::HTTP::NOT_FOUND
-                error("Not found: #{exc.path}")
             elsif (exc.is_a?(Spider::Controller::BadRequest))
                 @response.status = Spider::HTTP::BAD_REQUEST
             elsif (exc.is_a?(Spider::Controller::Forbidden))

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

@@ -5,10 +5,11 @@ require 'mime/types'
 module Spider; module ControllerMixins
     
     module StaticContent
+        include Spider::ControllerMixin
         include Spider::ControllerMixins::HTTPMixin
         
         def self.included(klass)
-            klass.extend(ClassMethods)
+            super
             klass.route('public/', :serve_static, :do => lambda{ @serving_static = true })
             klass.route('w/', :serve_widget_static, :do => lambda{ @serving_static = true })
             if (klass < Visual)
@@ -57,7 +58,6 @@ module Spider; module ControllerMixins
                 return redirect(url)
             end
             full_path = pub_path+'/'+path
-            raise Spider::Controller::NotFound.new(path) unless File.exist?(full_path)
             output_static(full_path)
         end
         
@@ -66,19 +66,39 @@ module Spider; module ControllerMixins
             parts = path.split('/public/', 2)
             raise Spider::Controller::NotFound.new(path) unless parts[1]
             full_path = self.class.app.widgets_path+'/'+parts[0]+'/public/'+parts[1]
-            raise Spider::Controller::NotFound.new(path) unless File.exist?(full_path)
             output_static(full_path)
         end
         
-        def output_static(full_path)
+        def output_static(full_path, file_name=nil)
+            file_name ||= File.basename(full_path)
+            @request.misc[:is_static] = true
             debug("Serving asset: #{full_path}")
+            begin
+                while File.symlink?(full_path)
+                    full_path = File.readlink(full_path)
+                end
+            rescue NotImplemented
+            end
             mode = Spider.conf.get('static_content.mode')
             raise Spider::Controller::NotFound.new(full_path) unless File.exist?(full_path)
             stat = File.lstat(full_path)
-            if @request.env['HTTP_IF_MODIFIED_SINCE']
-                if_modified = Time.httpdate(@request.env['HTTP_IF_MODIFIED_SINCE'])
-                if stat.mtime <= if_modified
-                    debug("Not modified #{full_path}")
+            mtime = stat.mtime
+            now = Time.now
+            if @request.env['HTTP_IF_MODIFIED_SINCE'] && !@request.cache_control[:no_cache]
+                if_modified = nil
+                begin
+                  if_modified = Time.httpdate(@request.env['HTTP_IF_MODIFIED_SINCE'])
+                rescue ArgumentError # Passenger with IE6 has this header wrong
+                  if_modified = 0
+                end
+                max_age = nil
+                fresh = true
+                if fresh && mtime <= if_modified
+                    debug("Not modified since #{if_modified}: #{full_path}")
+                    #@response.status = Spider::HTTP::NOT_MODIFIED
+                    @response.headers.delete("Content-Type")
+                    @response.headers['Date'] = mtime.httpdate
+                    @response.no_cookies
                     raise HTTPStatus.new(Spider::HTTP::NOT_MODIFIED) 
                     return
                 end
@@ -86,13 +106,14 @@ module Spider; module ControllerMixins
             if File.directory?(full_path)
                 ct = "httpd/unix-directory"
             else
-                ct = MIME::Types.type_for(full_path)
+                ct = MIME::Types.type_for(file_name)
+                ct = ct.first if ct.is_a?(Array)
                 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
+            @response.headers['Last-Modified'] = mtime.httpdate
             
             if mode == 'x-sendfile'
                 @response.headers['X-Sendfile'] = full_path
@@ -112,8 +133,10 @@ module Spider; module ControllerMixins
             return scene
         end
         
-        def serving_static?
-            @serving_static
+        def serving_static?(action=nil)
+            return @serving_static if @serving_static || !action
+            n = dispatch_next(action)
+            n && n.action == "serve_static"
         end
         
     end

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

@@ -21,13 +21,13 @@ module Spider; module ControllerMixins
             @layout ||= @dispatcher_layout
             format = nil
             req_format = self.is_a?(Widget) && @is_target && @request.params['_wf'] ? @request.params['_wf'].to_sym : @request.format
-            if (req_format)
+            if (req_format && self.class.output_formats[@executed_method])
                 format = req_format if self.class.output_format?(@executed_method, req_format)
                 if (format)
                     format_params = self.class.output_format_params(@executed_method, format)
                 end
-                if @executed_method && !format || (format_params && format_params[:widgets] && !@request.params['_wt'])
-                    raise Spider::Controller::NotFound.new("#{action}.#{@request.format}") 
+                if @executed_method && !format || (format_params && format_params[:widgets] && !target_mode?)
+                    #raise Spider::Controller::NotFound.new("#{action}.#{@request.format}") 
                 end
             end
             format ||= self.class.output_format(@executed_method)
@@ -61,6 +61,10 @@ module Spider; module ControllerMixins
             @visual_params ||= {}
         end
         
+        def target_mode?
+            !@request.params['_wt'].nil? && !@request.params['_wt'].empty?
+        end
+        
         def init_widgets(template, layout=nil)
             widget_target = @request.params['_wt']
             widget_execute = @request.params['_we']
@@ -71,7 +75,7 @@ module Spider; module ControllerMixins
                 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.is_target_ancestor = true
                 @_widget.widget_target = rest
             end
             template.do_widgets_before
@@ -84,7 +88,7 @@ module Spider; module ControllerMixins
         
         def execute(action='', *params)
             @visual_params = @executed_format_params
-            @is_target = false if @request.params['_wt'] && !self.is_a?(Spider::Widget)
+            @is_target = false if target_mode? && !self.is_a?(Spider::Widget)
             if (self.is_a?(Widget) && @is_target && @request.params['_wp'])
                 params = @request.params['_wp']
             elsif (@visual_params.is_a?(Hash) && @visual_params[:params])
@@ -96,7 +100,13 @@ module Spider; module ControllerMixins
             @template = get_template if !@template && @visual_params[:template]
             init_widgets(@template) if @template
             if @visual_params[:call]
-                send(@visual_params[:call], *params)
+                meth = self.method(@visual_params[:call])
+                args = params + @executed_method_arguments
+                arity = meth.arity
+                arity = (-arity + 1) if arity < 0
+                args = arity == 0 ? [] : args[0..(arity-1)]
+                args = [nil] if meth.arity == 1 && args.empty?
+                send(@visual_params[:call], *args)
             end
             if @visual_params[:template] && !@_widget && !done?
                 if (@template)
@@ -108,7 +118,7 @@ module Spider; module ControllerMixins
             if @visual_params[:redirect]
                 redirect(@visual_params[:redirect])
             end
-            if @executed_format == :json && @visual_params[:scene] || @visual_params[:return] # FIXME: move in JSON mixin?
+            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))
@@ -158,7 +168,8 @@ module Spider; module ControllerMixins
             return template
         end
         
-        def init_template(template, options={})
+        def init_template(template=nil, options={})
+            return get_template(template, nil, options) unless template.is_a?(Spider::Template)
             prepare_template(template) unless template.owner # if called directly
             template.init(scene)
             if (@request.params['_action'])
@@ -234,11 +245,12 @@ module Spider; module ControllerMixins
             return obj
         end
         
-        def try_rescue(exc)
+        def try_rescue(exc)            
             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?
+            return super if target_mode?
             output_format_headers(format)
             if (exc.is_a?(Spider::Controller::NotFound))
                 error_page = '404'
@@ -258,7 +270,7 @@ module Spider; module ControllerMixins
                 @scene.exception_uuid = exc.uuid
                 @scene.email_subject += " (#{exc.uuid})"
             end
-            @scene.admin_email = Spider.conf.get('site.admin.email')
+            @scene.admin_email = Spider.conf.get('site.tech_admin.email')
             if (Spider.runmode == 'devel')
                 begin
                     @scene.devel = true
@@ -281,13 +293,37 @@ module Spider; module ControllerMixins
                 end
             end
             @rendering_error = true
+            @scene.__is_error_page = true
+            if Spider.const_defined?(:Messenger) && Spider.conf.get('errors.send_email') && Spider.conf.get('site.tech_admin.email')
+                begin
+                    send_error_email(exc)
+                rescue => exc2
+                end
+            end
             render "errors/#{error_page}", :layout => "errors/error"
             super
         end
         
+        def send_error_email(exc)
+            scene = Spider::Scene.new
+            scene.request = @request.env
+            scene.exception = exc
+            subject = _("Site error")
+            if Spider.conf.get('orgs.default.name')
+                subject = "#{Spider.conf.get('orgs.default.name')} - #{subject}"
+            elsif @request.env.key?('HTTP_HOST')
+                subject = "#{@request.env['HTTP_HOST']} - #{subject}" 
+            end
+            headers = {'Subject' => subject}
+            from = Spider.conf.get('orgs.default.auto_from_email') || Spider.conf.get('site.tech_admin.email')
+            Spider::Messenger::MessengerHelper.send_email(
+                self.class, 'error', scene, from, Spider.conf.get('site.tech_admin.email'), headers
+            )
+        end
+        
         def build_backtrace(exc)
             bt = []
-            if Debugger && Debugger.started? && Debugger.post_mortem?
+            if Object.const_defined?(:Debugger) && Debugger.started? && Debugger.post_mortem?
                 use_debugger = true
                 context = exc.__debug_context
                 ct_first_file = context.frame_file(0)
@@ -307,67 +343,70 @@ module Spider; module ControllerMixins
             end
             context = exc.__debug_context
             0.upto(Debugger.current_context.stack_size - 2) do |i|
-                file = context.frame_file(i)
-                line = context.frame_line(i)
-                klass = context.frame_class(i)
-                method = context.frame_method(i)
-                args = context.frame_args(i)
-                locals = context.frame_locals(i)
-                frame_self = context.frame_self(i)
-                dest = context.frame_self(i-1) unless i == 0
-                ex_method = context.frame_method(i-1) unless i == 0
-                in_method = context.frame_method(i)
-#s                ex_args = context.frame_args(i+1)
-                str = "#{file}:#{line}: in #{in_method}"
-                #str = exc.backtrace[i]
+                begin
+                    file = context.frame_file(i)
+                    line = context.frame_line(i)
+                    klass = context.frame_class(i)
+                    method = context.frame_method(i)
+                    args = context.frame_args(i)
+                    locals = context.frame_locals(i)
+                    frame_self = context.frame_self(i)
+                    dest = context.frame_self(i-1) unless i == 0
+                    ex_method = context.frame_method(i-1) unless i == 0
+                    in_method = context.frame_method(i)
+    #s                ex_args = context.frame_args(i+1)
+                    str = "#{file}:#{line}: in #{in_method}"
+                    #str = exc.backtrace[i]
                 
-                self_str = frame_self
-#                self_str = "#<#{frame_self.class}:#{frame_self.object_id}>"
-                if (dest)
-                    dest_str = dest.is_a?(Class) ? dest.inspect : "#<#{dest.class}:#{dest.object_id}>"
-                else
-                    dest_str = ""
-                end
-                self_str = frame_self.is_a?(Class) ? frame_self.inspect : "#<#{frame_self.class}:#{frame_self.object_id}>"
-                if (i == -1)
-                    info = ""
-                else
-                    # if (frame_self == dest)
-                    #                        info = "#{dest_str}"
-                    #                    else
-                    #                        info = "#{self_str}: #{dest_str}"
-                    #                    end
-                    info = "#{self_str}: #{dest_str}"
-                    info += ".#{ex_method}("
-                    info += args.map{ |arg|
-                        val = locals[arg]
-                        arg_str = "#{arg}##{val.class}"
-                        val_str = nil
-                        if (val.is_a?(String))
-                            if (val.length > 20)
-                                val_str = (val[0..20]+'...').inspect
-                            else
+                    self_str = frame_self
+    #                self_str = "#<#{frame_self.class}:#{frame_self.object_id}>"
+                    if (dest)
+                        dest_str = dest.is_a?(Class) ? dest.inspect : "#<#{dest.class}:#{dest.object_id}>"
+                    else
+                        dest_str = ""
+                    end
+                    self_str = frame_self.is_a?(Class) ? frame_self.inspect : "#<#{frame_self.class}:#{frame_self.object_id}>"
+                    if (i == -1)
+                        info = ""
+                    else
+                        # if (frame_self == dest)
+                        #                        info = "#{dest_str}"
+                        #                    else
+                        #                        info = "#{self_str}: #{dest_str}"
+                        #                    end
+                        info = "#{self_str}: #{dest_str}"
+                        info += ".#{ex_method}("
+                        info += args.map{ |arg|
+                            val = locals[arg]
+                            arg_str = "#{arg}##{val.class}"
+                            val_str = nil
+                            if (val.is_a?(String))
+                                if (val.length > 20)
+                                    val_str = (val[0..20]+'...').inspect
+                                else
+                                    val_str = val.inspect
+                                end
+                            elsif (val.is_a?(Symbol) || val.is_a?(Fixnum) || val.is_a?(Float) || val.is_a?(BigDecimal) || val.is_a?(Date) || val.is_a?(Time))
                                 val_str = val.inspect
                             end
-                        elsif (val.is_a?(Symbol) || val.is_a?(Fixnum) || val.is_a?(Float) || val.is_a?(BigDecimal) || val.is_a?(Date) || val.is_a?(Time))
-                            val_str = val.inspect
-                        end
-                        arg_str += "=#{val_str}" if val_str
-                        arg_str
-                    }.join(', ')
-                    info += ")"
-                end
-                if (Spider.conf.get('devel.trace.show_instance_variables'))
-                    iv = {}
-                    frame_self.instance_variables.each{ |var| iv[var] = frame_self.instance_variable_get(var) }
-                    iv.reject{ |k, v| v.nil? }
+                            arg_str += "=#{val_str}" if val_str
+                            arg_str
+                        }.join(', ')
+                        info += ")"
+                    end
+                    if (Spider.conf.get('devel.trace.show_instance_variables'))
+                        iv = {}
+                        frame_self.instance_variables.each{ |var| iv[var] = frame_self.instance_variable_get(var) }
+                        iv.reject{ |k, v| v.nil? }
+                    end
+                    locals = nil unless Spider.conf.get('devel.trace.show_locals')
+                    bt << {
+                        :text => str, :info => info, 
+                        :path => File.expand_path(file), :line => line, :method => method, :klass => klass, :locals => locals,
+                        :instance_variables => iv
+                    }
+                rescue => exc2
                 end
-                locals = nil unless Spider.conf.get('devel.trace.show_locals')
-                bt << {
-                    :text => str, :info => info, 
-                    :path => File.expand_path(file), :line => line, :method => method, :klass => klass, :locals => locals,
-                    :instance_variables => iv
-                }
             end
             return bt
         end
@@ -391,6 +430,10 @@ module Spider; module ControllerMixins
                 return @output_formats[method][0]
             end
             
+            def output_formats
+                @output_formats || {}
+            end
+            
             def output_format?(method, format)
                 return false unless @output_formats
                 @output_formats[method] && @output_formats[method].include?(format)
@@ -413,9 +456,13 @@ module Spider; module ControllerMixins
                 @layouts ||= []
             end
             
+            def layout_params
+                @layout_params ||= {}
+            end
+            
             def layout(name, params={})
-                @layouts ||= []
-                @layouts << [name, params]
+                self.layouts << name
+                self.layout_params[name] = params
             end
             
             
@@ -431,8 +478,8 @@ module Spider; module ControllerMixins
                     end
                 end
                 action = (action && !action.empty?) ? action.to_sym : self.default_action
-                layouts.each do |try|
-                    name, params = try
+                layouts.each do |name|
+                    params = @layout_params[name]
                     if (params[:for])
                         next unless check_action(action, params[:for])
                     end
@@ -487,12 +534,14 @@ module Spider; module ControllerMixins
                 unless respond_to?(:layout_path)
                     raise NotImplementedError, "The layout_path class method must be implemented by object using the Visual mixin, but #{self} does not"
                 end
+                params = self.layout_params[path] || {}
                 if (path.is_a?(Symbol))
                     path = Spider::Layout.named_layouts[path]
                 end
                 resource = Spider::Template.find_resource(path+'.layout', layout_path, self)
                 layout = Spider::Layout.new(resource.path)
                 layout.definer_class = resource.definer
+                layout.asset_set = params[:assets] if params[:assets]
                 layout
             end
             
@@ -501,6 +550,10 @@ module Spider; module ControllerMixins
                 Spider::Inflector.underscore(self.to_s.split('::')[-1])
             end
             
+            def assets
+                []
+            end
+            
         end
         
     end

data/lib/spiderfw/controller/request.rb

@@ -7,6 +7,18 @@ module Spider
                       
         BUFSIZE = 1024*4
         
+        def self.current
+            Thread.current[:spider_request] ||= {}
+        end
+        
+        def self.current=(val)
+            Thread.current[:spider_request] = val
+        end
+        
+        def self.reset_current
+            Thread.current[:spider_request] = nil
+        end
+        
         
         def initialize(env)
             Spider::Logger.debug("REQUEST:")
@@ -52,4 +64,4 @@ module Spider
         
     end
     
-end
+end