spiderfw 0.6.23 → 0.6.24

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

@@ -1,7 +1,7 @@
 module Spider
 
     config_option('runmode', "production, test, devel", :default => 'devel', :choices => ['production', 'test', 'devel'],
-        :action => Proc.new{ |option| Spider.runmode = option unless Spider.runmode || $SPIDER_RUNMODE}
+        :action => Proc.new{ |option| $SPIDER_RUNMODE = option }
     )
     
     config_option('apps', _('Apps to load'), :type => Array, :yaml_style => :inline)
@@ -34,8 +34,6 @@ module Spider
     config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
     config_option 'webserver.respawn_on_change', _("Restart the webserver when application code changes"), :type => Spider::Bool,
         :default => Proc.new{ RUBY_PLATFORM !~ /win32|mingw32/ && Spider.config.get('runmode') == 'devel' ? true : false }
-    config_option 'webserver.respawn.core_devel', _('Respawn on changes to the framework'), 
-        :type => Spider::Bool, :default => false
     config_option 'process.shutdown_timeout', _("Number of seconds a process is given to end"), :type => Fixnum, :default => 60
     config_option 'static_content.mode', _("Mode to use for serving static files"), :type => String,
         :choices => [nil, 'x-sendfile', 'x-accel-redirect', 'published'], :default => nil
@@ -81,6 +79,9 @@ module Spider
     
     config_option 'debugger.start', _("Start the debugger"), :type => Spider::DataTypes::Bool,
         :default => lambda{ ['test', 'devel'].include?(Spider.runmode) ? true : false }
+    config_option 'debugger.pry', _("User Pry for debugging"), :type => Spider::Bool, :default => lambda{
+        RUBY_VERSION_PARTS[1] == '9'
+    }
     config_option 'profiling.enable', _("Enable on-request profiling"), :type => Spider::DataTypes::Bool
     config_option 'request.mutex', _("Respond to requests sequentially"), :default => false
     

data/lib/spiderfw/controller/controller.rb

@@ -235,6 +235,7 @@ module Spider
         end
         
         def call_before(action='', *arguments)
+            return if respond_to?(:serving_static?) && self.serving_static?
             @call_path = action
             before(action, *arguments)
             catch(:done) do
@@ -251,6 +252,7 @@ module Spider
 
         
         def call_after(action='', *arguments)
+            return if respond_to?(:serving_static?) && self.serving_static?
             after(action, *arguments)
             catch(:done) do
                 d_next = dispatch_next(action)

data/lib/spiderfw/controller/http_controller.rb

@@ -11,8 +11,7 @@ module Spider
         def initialize(request, response, scene=nil)
             response.status = Spider::HTTP::OK
             response.headers = {
-                'Content-Type' => 'text/plain',
-                'Connection' => 'close'
+                'Content-Type' => 'text/plain'
             }
             @previous_stdout = $stdout
             Thread.current[:stdout] = response.server_output

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

@@ -103,8 +103,8 @@ module Spider; module ControllerMixins
                 ct = ct.to_s if ct
                 ct ||= "application/octet-stream"
             end
-            @response.headers['Content-Type'] = ct
-            @response.headers['Content-Length'] = stat.size
+            @response.content_type = ct
+            @response.content_length = stat.size
             @response.headers['Last-Modified'] = mtime.httpdate
             
             if mode == 'x-sendfile'
@@ -112,7 +112,7 @@ module Spider; module ControllerMixins
             elsif mode == 'x-accel-redirect'
                 @response.headers['X-Accel-Redirect'] = full_path
             else
-                f = File.open(full_path, 'r')
+                f = File.open(full_path, 'rb')
                 while (block = f.read(1024)) do
                     $out << block
                 end

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

@@ -22,8 +22,20 @@ module Spider; module ControllerMixins
         end
         
         def before(action='', *params)
-            @layout ||= self.class.get_layout(action)
-            @layout ||= @dispatcher_layout
+            unless self.respond_to?(:serving_static?) && self.serving_static?
+                @layout ||= self.class.get_layout(action)
+                @layout ||= @dispatcher_layout
+                n_route = dispatch_next(action)
+                obj = n_route.obj if n_route
+                if obj.is_a?(Visual) && !(obj.respond_to?(:serving_static?) && obj.serving_static?)
+                    set_layout = @layout
+                    if set_layout
+                        set_layout = [set_layout] unless set_layout.is_a?(Array)
+                        set_layout.map{ |l| self.class.load_layout(l) }
+                        obj.dispatcher_layout = set_layout
+                    end
+                end
+            end
             return super unless action_target?
             format = nil
             req_format = self.is_a?(Widget) && @is_target && @request.params['_wf'] ? @request.params['_wf'].to_sym : @request.format
@@ -44,16 +56,7 @@ module Spider; module ControllerMixins
             if Spider.runmode != 'devel' && File.exists?(File.join(Spider.paths[:tmp], 'maintenance.txt'))
                 raise Spider::Controller::Maintenance
             end
-            n_route = dispatch_next(action)
-            obj = n_route.obj if n_route
-            if obj.is_a?(Visual) && !(obj.respond_to?(:serving_static?) && obj.serving_static?)
-                set_layout = @layout || @dispatcher_layout
-                if set_layout
-                    set_layout = [set_layout] unless set_layout.is_a?(Array)
-                    set_layout.map{ |l| self.class.load_layout(l) }
-                    obj.dispatcher_layout = set_layout
-                end
-            end
+           
             super
         end
         
@@ -144,6 +147,13 @@ module Spider; module ControllerMixins
             @template = template
             return template
         end
+
+        def load_template_from_path(path, definer)
+            t = Spider::Template.new(path)
+            t.owner_class = self.class
+            t.definer_class = definer
+            t
+        end
         
         def prepare_template(template)
             template.owner = self
@@ -543,12 +553,17 @@ module Spider; module ControllerMixins
                 search_paths ||= template_paths
                 resource = Spider::Template.find_resource(name, cur_path, owner, search_paths)
                 raise "Template #{name} not found" unless resource && resource.path
-                t = Spider::Template.new(resource.path)
-                t.owner_class = self
-                t.definer_class = resource.definer
+                t = load_template_from_path(resource.path, resource.definer)
                 return t
+            end
 
+            def load_template_from_path(path, definer)
+                t = Spider::Template.new(path)
+                t.owner_class = self
+                t.definer_class = definer
+                t
             end
+
                         
             def template_exists?(name, paths=nil)
                 if (name[0..5] == 'SPIDER' || name[0..3] == 'ROOT')

data/lib/spiderfw/controller/response.rb

@@ -49,6 +49,90 @@ module Spider
             # end
         end
 
+        def buffering?
+            @prev_io != nil
+        end
+
+        def start_buffering
+            @buffer = StringIO.new
+            @prev_io = ThreadOut.output_to(@buffer)
+        end
+
+        def stop_buffering
+            ThreadOut.output_to(@prev_io)
+            @prev_io = nil
+            @buffer.rewind
+        end
+
+        def output_buffer
+            stop_buffering if buffering?
+            return unless @buffer
+            while d = @buffer.read(1024)
+                $out << d
+            end
+            buffer = @buffer
+            @buffer = nil
+            buffer
+        end
+
+        def buffer
+            @buffer
+        end
+
+        def clear_buffer
+            @buffer = nil
+        end
+
+        def content_type=(val)
+            @headers['Content-Type'] = val
+        end
+
+        def content_type
+            @headers['Content-Type']
+        end
+
+        def content_length=(val)
+            @headers['Content-Length'] = val
+            if @buffer_until_length && val
+                output_buffer
+                @buffer_until_length = false
+            end
+        end
+
+        def content_length
+            @headers['Content-Length']
+        end
+
+        def buffer_until_length
+            unless content_length
+                start_buffering
+                @buffer_until_length = true
+            end
+        end
+
+        def finish!
+            if buffering?
+                stop_buffering
+                needs_length = @needs_length
+                self.content_length = @buffer.length
+                output_buffer unless needs_length
+            end
+        end
+
+        def connection_keep_alive
+            @headers['Connection'] = 'Keep-Alive'
+            buffer_until_length unless Spider.conf.get('webserver.has_buffering_proxy')
+        end
+
+        def do_not_buffer!
+            unless Spider.conf.get('webserver.has_buffering_proxy')
+                @headers['Connection'] = 'Close'
+            end
+            output_buffer
+            @buffer_until_length = false
+        end
+
+
         
     end
     

data/lib/spiderfw/controller/session/file_session.rb

@@ -17,7 +17,7 @@ module Spider
                 path = "#{dir}/#{sid}"
                 
                 @sync.lock(Sync::EX)
-                f = File.new(path, 'w+')
+                f = File.new(path, 'wb+')
                 f.flock(File::LOCK_EX)
                 f.puts(Marshal.dump(data))
                 f.flush
@@ -33,7 +33,7 @@ module Spider
                 data = nil
                 if (File.exist?(path))
                     @sync.lock(Sync::SH)
-                    f = File.new(path, 'r+')
+                    f = File.new(path, 'rb+')
                     f.flock(File::LOCK_SH)
                     begin
                         data = Marshal.restore(f.read)

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

@@ -20,12 +20,13 @@ module Spider; module HTTP
     
     class RackIO < ControllerIO
 
-        def initialize(response, controller_response, w)
+        def initialize(response, controller_response, w, options={})
             @response = response
             @controller_response = controller_response
             @w = w
             @headers_sent = false
             @rack_thread = Thread.current
+            @options = options
         end
 
         def write(msg)
@@ -46,7 +47,7 @@ module Spider; module HTTP
                 end
             end
             @headers_sent = true
-            @rack_thread.run if Spider.conf.get('webserver.force_threads')
+            @rack_thread.run if @options[:multithread]
         end
 
         def headers_sent?
@@ -83,10 +84,11 @@ module Spider; module HTTP
 
             w = nil
             controller_response = Spider::Response.new
-            if Spider.conf.get('webserver.force_threads')
+            multithread = env['rack.multithread'] || Spider.conf.get('webserver.force_threads')
+            if multithread
                 r, w = IO.pipe
                 rack_response_hash = {:body => r}
-                controller_response.server_output = RackIO.new(rack_response_hash, controller_response, w)
+                controller_response.server_output = RackIO.new(rack_response_hash, controller_response, w, :multithread => true)
             else
                 w = StringIO.new
                 rack_response_hash = {:body => w}
@@ -103,21 +105,19 @@ module Spider; module HTTP
                     controller.extend(Spider::FirstResponder)
                     controller.call_before(path)
                     controller.execute(path)
-                    if Spider.conf.get('webserver.force_threads')
+                    if multithread
                         w.close 
                         controller_response.server_output.send_headers unless controller_response.server_output.headers_sent?
                     end
                     controller.call_after(path)
                     controller_done = true
-                    Spider::Logger.debug("Controller done")
                 rescue => exc
-                    Spider.logger.debug("Error:")
-                    Spider.logger.debug(exc)
+                    Spider.logger.error(exc)
                     controller.ensure if controller
                     controller = nil
                 ensure
                     begin
-                        if Spider.conf.get('webserver.force_threads')
+                        if multithread
                             controller_response.server_output.send_headers unless controller_response.server_output.headers_sent?
                         else
                             controller_response.prepare_headers
@@ -134,7 +134,7 @@ module Spider; module HTTP
                         end
                         Spider.request_finished
                     ensure
-                        if Spider.conf.get('webserver.force_threads')
+                        if multithread
                            begin
                                w.close
                            rescue
@@ -146,8 +146,8 @@ module Spider; module HTTP
                 end
             end
             
-            if Spider.conf.get('webserver.force_threads')
-                controllerThread = Thread.start &run_block
+            if multithread
+                controllerThread = Thread.start(&run_block)
                 t = Time.now
                 while !controller_done && !controller_response.server_output.headers_sent? && (Time.now - t) < 60
                     Thread.stop
@@ -160,7 +160,6 @@ module Spider; module HTTP
                 run_block.call
             end
 
-            Spider.logger.debug("Rack responding")
             return [rack_response_hash[:status], rack_response_hash[:headers], rack_response_hash[:body]]
         end
         

data/lib/spiderfw/http/server.rb

@@ -1,3 +1,6 @@
+require 'rack'
+require 'spiderfw/http/adapters/rack'
+
 module Spider; module HTTP
     
     class Server
@@ -33,64 +36,87 @@ module Spider; module HTTP
         
         def request_received
         end
-        
-        def self.start(server_name, port, options={})
-            servers = {
-                'webrick'   => :WEBrick,
-                'mongrel'   => :Mongrel,
-                'thin'      => :Thin
+
+        def self.get_opts(server_name, options)
+            server_name ||= Spider.conf.get('http.server')
+            options[:port] ||= Spider.conf.get('webserver.port')
+            opts = {
+                :server => server_name,
+                :Port => options[:port],
+                :config => File.join(Spider.paths[:root], 'config.ru')
             }
-            
-            start = lambda{
-                $SPIDER_WEB_SERVER = true
-                begin
-                    require 'spiderfw/init'
-                rescue Exception => exc
-                    Spider.logger.error(exc)
-                    return
+            case server_name
+            when 'thin'
+                opts[:threaded] = true unless options[:no_threads]
+                options[:daemonize] = true
+            end
+            opts[:app] = Spider::HTTP::RackApplication.new unless File.file?(opts[:config])
+            ssl_opts = nil
+            if options[:ssl]
+                require 'openssl'
+                options[:ssl_cert] ||= Spider.conf.get('orgs.default.cert')
+                options[:ssl_key] ||= Spider.conf.get('orgs.default.private_key')
+                raise "SSL Certificate not set" unless options[:ssl_cert]
+                raise "SSL Key not set" unless options[:ssl_key]
+                raise "SSL Certificate (#{options[:ssl_cert]}) not found" unless File.file?(options[:ssl_cert])
+                raise "SSL Key (#{options[:ssl_key]}) not found" unless File.file?(options[:ssl_key])
+                ssl_opts = opts.clone
+                ssl_opts[:Port] = options[:ssl]
+                private_key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]).read)
+                certificate = OpenSSL::X509::Certificate.new(File.open(options[:ssl_cert]).read)
+                case server_name
+                when 'webrick'
+                    require 'webrick/https'
+                    ssl_opts[:SSLEnable] = true
+                    ssl_opts[:SSLVerifyClient] = ::OpenSSL::SSL::VERIFY_NONE
+                    ssl_opts[:SSLCertificate] = certificate
+                    ssl_opts[:SSLPrivateKey] = private_key
+                # when 'thin'
+                #     ssl_opts[:ssl] = true
+                #     ssl_opts[:verify_peer] = ::OpenSSL::SSL::VERIFY_NONE
+                #     ssl_opts[:ssl_key_file] = private_key
+                #     ssl_opts[:ssl_cert_file] = certificate
+                else
+                    raise "SSL not supported with #{server_name} server"
                 end
-                require 'spiderfw/controller/http_controller'
+            end
+            return [opts, ssl_opts]
+        end
+        
+        def self.start(server_name, options={})
+            start = lambda{
+                
                 
-                port ||= Spider.conf.get('webserver.port')
-                server_name ||= Spider.conf.get('http.server')
                 pid_file = File.join(Spider.paths[:var], 'run/server.pid')
                 puts _("Using webserver %s") % server_name if options[:verbose]
-                puts _("Listening on port %s") % port if options[:verbose]
-                server = Spider::HTTP.const_get(servers[server_name]).new
+                puts _("Listening on port %s") % opts[:port] if options[:verbose]
+                rack = nil
+                ssl_rack = nil
+                server = nil
                 ssl_server = nil
+
+                require 'spiderfw/init'
+                Spider.logger.info{ "Routes: \n"+Spider::HomeController.print_app_routes }
                 Spider.startup
-                begin
-                    if Spider.conf.get('devel.trace.extended')
-                        require 'ruby-debug'
-                        require 'spiderfw/utils/monkey/debugger'
-                        Debugger.start
-                        Debugger.post_mortem
+                opts, ssl_opts = self.get_opts(server_name, options)
+                
+                if opts
+                    thread = Thread.new do
+                        rack = Rack::Server.start(opts)
+                        server = rack.server if rack
                     end
-                rescue Exception => exc
-                    Spider.logger.warn "Unable to start debugger"
+                    $stdout << "Spider server running on port #{opts[:Port]}\n"
                 end
                 
-                thread = Thread.new do
-                    server.start(:port => port, :cgi => options[:cgi])
-                end
-                $stdout << "Spider server running on port #{port}\n"
-                if options[:ssl]
-                    options[:ssl_cert] ||= Spider.conf.get('orgs.default.cert')
-                    options[:ssl_key] ||= Spider.conf.get('orgs.default.private_key')
-                    raise "SSL Certificate not set" unless options[:ssl_cert]
-                    raise "SSL Key not set" unless options[:ssl_key]
-                    raise "SSL Certificate (#{options[:ssl_cert]}) not found" unless File.file?(options[:ssl_cert])
-                    raise "SSL Key (#{options[:ssl_key]}) not found" unless File.file?(options[:ssl_key])
+                if ssl_opts
                     ssl_thread = Thread.new do
-                        ssl_server = Spider::HTTP.const_get(servers[server_name]).new
-                        ssl_server.start(:port => options[:ssl], :ssl => true, 
-                            :ssl_cert => options[:ssl_cert], :ssl_private_key => options[:ssl_key])
+                        ssl_rack = Rack::Server.start(ssl_opts)
+                        ssl_server = ssl_rack.server if ssl_rack
                     end
                 end
                 do_shutdown = lambda{
                     Debugger.post_mortem = false if defined?(Debugger)
-                    # debugger
-                    server.shutdown
+                    server.shutdown if server
                     ssl_server.shutdown if ssl_server
                     pid_file = File.join(Spider.paths[:var], 'run/server.pid')
                     begin
@@ -100,8 +126,11 @@ module Spider; module HTTP
                 }
                 Spider.on_shutdown(&do_shutdown)
                 
-                thread.join
-                ssl_thread.join if ssl_thread
+                begin
+                    thread.join if thread
+                    ssl_thread.join if ssl_thread
+                rescue SystemExit
+                end
             }
             if options[:daemonize]
                 require 'spiderfw/init'
@@ -201,7 +230,12 @@ module Spider; module HTTP
                 rd.close
                 Spider.spawner = wr
                 return unless @actions[action]
-                @actions[action].call
+                begin
+                    @actions[action].call
+                rescue Exception => exc
+                    Spider.logger.debug(exc)
+                    Process.kill 'KILL', Process.pid
+                end
             end
         end
         

data/lib/spiderfw/i18n/cldr.rb

@@ -14,7 +14,6 @@ module Spider; module I18n
         end
 
         def localize_date_time(object, format = 'medium', options={})
-            raise "Localize format is nil" unless format
             options[:calendar] ||= 'gregorian'
             format = 'medium' if format == :default
                         
@@ -41,8 +40,8 @@ module Spider; module I18n
             # FIXME: handle more efficiently
             d = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
             obj_d = d[object.wday]
-            days = @cldr.calendar.days[options[:calendar].to_sym][:format] || @cldr.calendar.days[options[:calendar].to_sym]
-            months = @cldr.calendar.months[options[:calendar].to_sym][:format] || @cldr.calendar.months[options[:calendar].to_sym]
+            days = @cldr.calendar.days[options[:calendar].to_sym]
+            months = @cldr.calendar.months[options[:calendar].to_sym]
             replacements = [
                 [/y{1,4}/, '%Y'], # year  don't use two digits year, they cause confusion [/y{1,2}/, '%y']
                 [/M{5}/, months[:narrow][object.month.to_s]], [/M{4}/, months[:wide][object.month.to_s]], #month
@@ -116,9 +115,9 @@ module Spider; module I18n
             end
         end
         
-        def day_names(format = :wide, context = :stand_alone, calendar = self.default_calendar)
+        def day_names(format = :wide, calendar = self.default_calendar)
             begin
-                days = @cldr.calendar.days[calendar][format] || @cldr.calendar.days[calendar][context][format]
+                days = @cldr.calendar.days[calendar][format]
                 return [days['sun'], days['mon'], days['tue'], days['wed'], days['thu'], days['fri'], days['sat']]
             rescue NoMethodError
                 raise ArgumentError, "Calendar #{calendar} not found" unless @cldr.days[calendar]
@@ -127,12 +126,10 @@ module Spider; module I18n
             
         end
         
-        def month_names(format = :wide, context = :stand_alone, calendar = self.default_calendar)
+        def month_names(format = :wide, calendar = self.default_calendar)
             months = []
             begin
-                # CLDR 1 doesn't have context, CLDR 2 does
-                months = @cldr.calendar.months[calendar][format] || @cldr.calendar.months[calendar][context][format]
-                months.each do |k, v|
+                @cldr.calendar.months[calendar][format].each do |k, v|
                     months[k.to_i] = v
                 end
             rescue NoMethodError