kiss 1.0.4 → 1.1

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rubygems'
-Gem::manage_gems
+require 'rubygems/builder'
 require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
@@ -11,16 +11,19 @@ spec = Gem::Specification.new do |s|
     s.homepage  =   'http://www.rubykiss.org'
     s.rubyforge_project = 'kiss'
     s.summary   =   'An MVC web application framework using Rack, Sequel, and Erubis.'
-    s.files     =   %w( Rakefile VERSION LICENSE ) + Dir['{lib,tests}/**/*']
+    s.files     =   %w( Rakefile VERSION LICENSE ) + Dir['{bin,data,lib,tests}/**/*']
     s.require_path  =   'lib'
     s.test_files    =   Dir.glob('tests/*.rb')
     s.has_rdoc      =   true
+    s.executables   =  %w( kiss )
     
-    s.rdoc_options << '--main' << 'Kiss' <<
-                      '--title' << 'Kiss: Ruby MVC Web Framework -- RDoc Reference Documentation'
+    s.rdoc_options.push(
+      '--main', 'Kiss',
+      '--title', 'Kiss: Ruby MVC Web Framework -- RDoc Reference Documentation'
+    )
     
-    s.add_dependency('rack')
-    s.add_dependency('sequel','>=2.2.0')
+    s.add_dependency('rack','=0.4.0')
+    s.add_dependency('sequel','>=2.5.0')
     s.add_dependency('erubis')
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1

data/bin/kiss

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+
+def create
+  project_name = ARGV[0]
+  display_usage('create') unless project_name =~ /\S/
+
+  path = File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'data','scaffold.tgz')
+
+  `mkdir #{project_name}`
+
+  print "Expanding '#{path}' to '#{project_name}'..."
+
+  `cd '#{ARGV[0]}'; tar xvfz '#{path}'`
+
+  puts 'done.'
+end
+
+def run
+  project_name = ARGV[0]
+  project_name = '.' unless project_name =~ /\S/
+  
+  require 'rubygems'
+  require 'kiss'
+
+  Kiss.run( :project_dir => project_name )
+end
+
+def display_usage(command = nil)
+  case command
+  when 'create'
+    puts <<-EOT
+usage: kiss create <app_directory>
+Creates a skeleton for a new Kiss application.
+EOT
+  when 'run'
+    puts <<-EOT
+usage: kiss run [app_directory]
+Runs a Kiss application located within app_directory.
+
+The app_directory path may be omitted when running this command from 
+within the top-level directory of a Kiss application.
+EOT
+  else
+    puts <<-EOT
+usage: kiss <command> [arguments]
+Utility to support and facilitate the Kiss web framework.
+
+Commands:
+  create   - Create a new Kiss application project.
+  run      - Run a Kiss application.
+  help     - Display usage info.
+
+For help on any command above, type:
+  kiss help <command>
+EOT
+  end
+  puts
+  exit
+end
+
+
+# main
+
+case (command = ARGV.shift)
+when 'create'
+  create
+when 'run'
+  run
+when 'help'
+  display_usage(ARGV[0])
+else
+  display_usage
+end
+exit

data/lib/kiss.rb

@@ -22,10 +22,12 @@ autoload :Sequel, 'sequel'
 
 module Rack
   autoload :Bench, 'kiss/rack/bench'
+  autoload :ErrorsOK, 'kiss/rack/errors_ok'
   autoload :EmailErrors, 'kiss/rack/email_errors'
   autoload :Facebook, 'kiss/rack/facebook'
   autoload :FileNotFound, 'kiss/rack/file_not_found'
   autoload :LogExceptions, 'kiss/rack/log_exceptions'
+  autoload :Recorder, 'kiss/rack/recorder'
   autoload :ShowDebug, 'kiss/rack/show_debug'
   autoload :ShowExceptions, 'kiss/rack/show_exceptions'
 end
@@ -64,6 +66,7 @@ class Kiss
   autoload :ExceptionReport, 'kiss/exception_report'
   autoload :Mailer, 'kiss/mailer'
   autoload :Iterator, 'kiss/iterator'
+  autoload :Login, 'kiss/login'
   autoload :Form, 'kiss/form'
   autoload :Format, 'kiss/format'
   autoload :SequelSession, 'kiss/sequel_session'
@@ -88,10 +91,7 @@ class Kiss
     :evolution_dir, :asset_dir, :public_dir, :environment, :options, :layout, :rack_file
   
   # attributes below are request-specific
-  attr_reader :params, :args, :action, :action_subdir, :action_path, :extension, :host, :request,
-    :exception_cache
-  
-  attr_accessor :last_sql
+  attr_reader :protocol, :host, :request, :exception_cache, :env
   
   @@default_action = 'index'
   @@default_cookie_name = 'Kiss'
@@ -133,12 +133,12 @@ class Kiss
             unless builder_option.is_a?(Class)
               builder_option = Rack.const_get(builder_option.to_s)
             end
-        
+            
             use(builder_option,*builder_args)
           end
-
+          
           run app
-        end
+        end.to_app
         
         handler = @@options[:rack_handler] || Rack::Handler::WEBrick
         if !handler.is_a?(Class)
@@ -148,7 +148,7 @@ class Kiss
       rescue StandardError, LoadError, SyntaxError => e
         if @@options[:rack_handler] == :CGI
           print "Content-type: text/html\n\n"
-          print Kiss::ExceptionReport.generate(e)
+          print $debug_messages.to_s + Kiss::ExceptionReport.generate(e)
         else
           print "Content-type: text/plain\n\n"
           puts "exception:\n" + e.message
@@ -195,7 +195,7 @@ class Kiss
       @@lib_dirs = ['lib']
       @@gem_dirs = ['gems']
       @@require = []
-      @@authenticate_exclude = ['/logout']
+      @@authenticate_exclude = ['/login','/logout']
     
       # common (shared) config
       if (File.file?(config_file = @@config_dir+'/common.yml'))
@@ -220,7 +220,7 @@ class Kiss
     
       @@email_template_dir = @@options[:email_template_dir] || 'email_templates'
       @@upload_dir = @@options[:upload_dir] || 'uploads'
-    
+      
       @@cookie_name = @@options[:cookie_name] || @@default_cookie_name
       @@default_action = @@options[:default_action] || @@default_action
       @@action_root_class = @@options[:action_class] || Class.new(Kiss::Action)
@@ -231,14 +231,20 @@ class Kiss
       # default layout
       @@layout = @@options[:layout]
     
-      # public_uri: uri of requests to serve from public_dir
-      @@asset_uri = @@public_uri = @@options[:asset_uri] || @@options[:public_uri]
-      @@rack_file = Rack::File.new(@@asset_dir) if @@asset_uri
-    
       # app_url: URL of the app actions root
-      @@app_host = @@options[:app_host] ? ('http://' + @@options[:app_host]) : ''
+      @@protocol = ENV['HTTPS'] == 'on' ? 'https' : 'http'
+      @@app_host = @@options[:app_host] ? (@@protocol + '://' + @@options[:app_host]) : ''
       @@app_uri = @@options[:app_uri] || ''
       @@app_url =  @@app_host + @@app_uri
+      
+      # asset host: hostname of static assets
+      # (remove http:// prefix if present)
+      @@asset_host = @@options[:asset_host]
+      @@asset_host.sub!(/^http:\/\//,'') if @@asset_host
+    
+      # public_uri: uri of requests to serve from public_dir
+      @@asset_uri = @@options[:asset_uri] || @@options[:public_uri] || ''
+      @@rack_file = Rack::File.new(@@asset_dir) if @@asset_uri
     
       # include lib dirs
       $LOAD_PATH.unshift(*( @@lib_dirs.flatten.select {|dir| File.directory?(dir) } ))
@@ -250,16 +256,18 @@ class Kiss
       @@require.flatten.each {|lib| require lib }
     
       # session class
-      if (@@options[:session_class])
-        @@session_class = (@@options[:session_class].class == Class) ? @@options[:session_class] :
-          @@options[:session_class].to_const
-      end
+      @@session_class = @@options[:session_class] ?
+        (@@session_class = (@@options[:session_class].class == Class) ?
+          @@options[:session_class] : @@options[:session_class].to_const
+        ) : nil
     
       # load extensions to action class
       action_extension_path = @@action_dir + '/_action.rb'
       if File.file?(action_extension_path)
         @@action_root_class.class_eval(File.read(action_extension_path),action_extension_path) rescue nil
       end
+      
+      @@action_classes = {}
     
       # database
       @@database_config = @@options[:database]
@@ -267,14 +275,7 @@ class Kiss
     
       self
     end
-  
-    # Returns URL/URI of app's static assets (asset_host or public_uri).
-    def assets(suffix = nil)
-      @@pub ||= @@options[:asset_host]
-      suffix ? @@pub + '/' + suffix : @@pub
-    end
-    alias_method :pub, :assets
-  
+    
     # Returns true if specified path is a directory.
     # Cache result if file_cache_no_reload option is set; otherwise, always check filesystem.
     def directory_exists?(dir)
@@ -313,14 +314,23 @@ class Kiss
       filename = ( filename =~ /\A\// ? '' : (Dir.pwd + '/') ) + filename
     end
     
+    # prepend addition just inside the specified tag of document
+    def html_prepend(addition,document,tag)
+      document = document.body unless document.is_a?(String)
+      document.sub(/(\<#{tag}[^\>]*\>)/i, '\1'+addition)
+    end
+    
     # Returns string representation of object with HTML entities escaped.
-    def h(obj)
-      case obj
-      when String
-        Rack::Utils.escape_html(obj).gsub(/^(\s+)/) {'&nbsp;' * $1.length}
-      else
-        Rack::Utils.escape_html(obj.inspect)
-      end
+    def html_escape(obj)
+      Rack::Utils.escape_html(
+        obj.is_a?(String) ? obj : obj.inspect
+      ).gsub(/^(\s+)/) {'&nbsp;' * $1.length}
+    end
+    
+    # Escapes string for use in URLs.
+    def url_escape(string)
+    	# encode space to '+'; don't encode letters, numbers, periods
+      string.gsub(/([^A-Za-z0-9\.])/) { sprintf("%%%02X", $&.unpack("C")[0]) }
     end
     
     # Returns MIME type corresponding to passed-in extension.
@@ -391,34 +401,55 @@ class Kiss
     
     # Given a file path, caches or returns the file's contents or the return value of
     # the passed block applied to the file's contents.
-    # If file is not found, raises exception of type fnf_exception_class.
-    def file_cache(path, fnf_file_type = nil, fnf_exception_class = Kiss::FileNotFound)
-      if (@@options[:file_cache_no_reload] && @@file_cache.has_key?(path))
-        return @@file_cache[path]
-      end
+    # If file is not found, the file's contents are nil.
+    def file_cache(path, report_change = false)
+      raise 'nil file path cannot be cached' unless path
       
-      if !File.file?(path)
-        raise fnf_exception_class, "#{fnf_file_type} file missing: '#{path}'" if fnf_file_type
-    
-        @@file_cache[path] = nil
-        contents = nil
+      if @@file_cache.has_key?(path) && @@options[:file_cache_no_reload]
+        # already loaded this path, and no_reload option is on; don't re-cache
+        change = false
+      elsif !@@file_cache.has_key?(path)
+        # haven't loaded this path yet
+        change = true
+        if !File.file?(path)
+          # nil path, of file doesn't exist
+          @@file_cache_time[path] = nil
+          contents = nil
+        else
+          # file exists; mark cache time and read file
+          @@file_cache_time[path] = Time.now
+          contents = File.read(path)
+        end
       else
-        # expire cache if file (or symlink) modified
-        # TODO: what about symlinks to symlinks?
-        if !@@file_cache_time[path] ||
-          @@file_cache_time[path] < File.mtime(path) ||
-          ( File.symlink?(path) && (@@file_cache_time[path] < File.lstat(path).mtime) )
-    
-            @@file_cache[path] = nil
-            @@file_cache_time[path] = Time.now
-            contents = File.read(path)
+        # we've read this path before; may need to re-cache
+        if !File.file?(path)
+          if @@file_cache_time[path]
+            # file cached as existing but has been removed; update cache to show no file
+            change = true
+            @@file_cache_time[path] = nil
+            contents = nil
+          else
+            change = false
+          end
+        elsif !@@file_cache_time[path] ||
+              @@file_cache_time[path] < File.mtime(path) ||
+              ( File.symlink?(path) && (@@file_cache_time[path] < File.lstat(path).mtime) )
+          # cache shows file missing, or file has been modified since cached
+          change = true
+          @@file_cache_time[path] = Time.now
+          contents = File.read(path)
+        else
+          # cached file is still current; don't re-cache
+          change = false
         end
       end
       
-      @@file_cache[path] ||= begin
-        (block_given?) ? yield(contents) : contents
+      if change
+        @@file_cache[path] ||= block_given? ? yield(contents) : contents
       end
-    end
+      
+      report_change ? [@@file_cache[path], change] : @@file_cache[path]
+    end 
   end # end class methods
   
   ### Instance Methods
@@ -438,49 +469,61 @@ class Kiss
     @files_cached_this_request = {}
   end
   
-  # Caches the specified file and return its contents.  See Kiss.file_cache above.
-  def file_cache(path, fnf_file_type = nil, fnf_exception_class = Kiss::FileNotFound, &block)
-    return @@file_cache[path] if @files_cached_this_request[path]
-    @files_cached_this_request[path] = true
+  def invoke_action(path,params,render_options = {})
+    action, action_handler = get_action_handler(path,params)
+    catch :kiss_action_done do
+      action_handler.expand_login
     
-    self.class.file_cache(path, fnf_file_type, fnf_exception_class, &block)
+      if @@options[:authenticate_all]
+        if (!@@authenticate_exclude.is_a?(Array) ||
+            @@authenticate_exclude.select {|a| a == action}.size == 0)
+          action_handler.authenticate
+        end
+      end
+    
+      action_handler.call
+      action_handler.render(render_options)
+    end
+    action_handler
   end
   
   # Processes and responds to a request received via Rack.  Should only be called once
   # for each controller instance (i.e. each controller instance should handle at most 
   # one request, then be discarded).  Returns array of response code, headers, and body.
   def call(env)
-    if @@rack_file && (
-      (env["PATH_INFO"] == '/favicon.ico') ||
-       (env["PATH_INFO"].sub!(Regexp.new("\\A#{@@asset_uri}"),''))
-    )
-      return @@rack_file.call(env)
-    end
+    @env = env
+    
+    # if @@rack_file && (
+    #   (env["PATH_INFO"] == '/favicon.ico') ||
+    #    (env["PATH_INFO"].sub!(Regexp.new("\\A#{@@asset_uri}"),''))
+    # )
+    #   return @@rack_file.call(env)
+    # end
     
     # catch and report exceptions in this block
     
     code, headers, body = begin
-      get_request(env)
+      @request = Rack::Request.new(env)
       @response = Rack::Response.new
+    
+      @protocol, @app_host = (@request.server rescue '').split(/\:\/\//, 2)
+      @app_host = @@options[:app_host] if @@options[:app_host]
+      @app_uri = @@options[:app_uri] || @request.script_name || ''
+    
+      @host ||= @request.host rescue ''
+    
+      path = @request.path_info || '/'
+      params = @request.params
       
-      catch :kiss_action_done do
-        parse_action_path(@path)
-        env['kiss.parsed_action'] = @action
-        env['kiss.parsed_args'] = @args.inspect
-        
-        redirect_url(app_url + '/') if @action == '/login'
+      catch :kiss_request_done do
+        action_handler = invoke_action(path,params)
+        extension = action_handler.extension
         
-        if login_session_valid?
-          load_from_login_session
-        elsif @@options[:authenticate_all]
-          if (!@@authenticate_exclude.is_a?(Array) ||
-              @@authenticate_exclude.select {|action| action == @action}.size == 0)
-            authenticate
-          end
+        if content_type = options[:content_type] || (extension ? Kiss.mime_type(extension) : nil)
+          @response['Content-Type'] = "#{content_type}; #{options[:document_encoding] || 'utf-8'}"
         end
         
-        env['kiss.processed_action'] = @action
-        process.render
+        send_response(action_handler.output, action_handler.output_options)
       end
       finalize_session if @session
       
@@ -511,56 +554,159 @@ class Kiss
       headers['Content-Length'] = body.length.to_s
     end
     
-    @@database_pool.push(@db) if @db
+    if @db
+      @db.kiss_controller = nil
+      @@database_pool.push(@db)
+    end
     
     [code,headers,body]
   end
   
-  # Adds debug message to inspect object.  Debug messages will be shown at top of
-  # application response body.
-  def debug(object, context = Kernel.caller[0])
-    @debug_messages.push( [object.inspect, context] )
-    object
-  end
   
-  # Starts a new benchmark timer, with optional label.  Benchmark results will be shown 
-  # at top of application response body.
-  def bench(label = nil, context = Kernel.caller[0])
-    stop_benchmark(context)
-    @benchmarks.push(
-      :label => label,
-      :start_time => Time.now,
-      :start_context => context
-    )
-  end
+  ##### ACTION METHODS #####
   
-  # Stops last benchmark timer, if still running.
-  def stop_benchmark(end_context = nil)
-    if @benchmarks[-1] && !@benchmarks[-1][:end_time]
-      @benchmarks[-1][:end_time] = Time.now
-      @benchmarks[-1][:end_context] = end_context
+  # Parses request URI to determine action path and arguments, then 
+  # instantiates action class to create action handler.
+  def get_action_handler(path,params)
+    action_subdir = '/'
+    action_uri = ''
+    action = nil
+    args = []
+    
+    redirect_url(app_url + '/') if path == ''
+    
+    path += @@default_action if path =~ /\/\Z/
+    
+    parts = path.sub(/^\/*/,'').split('/')
+    
+    action_class = Kiss::Action.get_subclass('/', @@action_dir + '/_action.rb', self) ||
+      Kiss::Action
+    
+    while part = parts.shift
+      action_uri += '/' + part
+      
+      if part =~ /\A(\d+)\Z/ || part =~ /\A\=([\w\.\-]+)\Z/
+        args << $1
+        next
+      end
+      
+      raise 'bad action path' if part !~ /\A[a-z][\w\-\.]*\Z/i
+      
+      test_path = @@action_dir + action_subdir + part
+      if Kiss.directory_exists?(test_path)
+        action_subdir += part + '/'
+        action_class = action_class.get_subclass(
+          part + '/',
+          @@action_dir + action_subdir + '_action.rb',
+          self
+        )
+        next
+      end
+      
+      if part =~ /\A(.+)\.(\w+)\Z/
+        extension = $2
+        part = $1
+      else
+        extension = 'rhtml'
+      end
+      
+      action = action_subdir + part
+      
+      action_class = action_class.get_subclass(part, @@action_dir + action + '.rb', self)
+      break
     end
-  end
-  
-  # Sets up request-specified variables based in request information received from Rack.
-  def get_request(env)
-    @request = Rack::Request.new(env)
     
-    @app_host = @@options[:app_host] ? ('http://' + @@options[:app_host]) : @request.server rescue ''
-    @app_uri = @@options[:app_uri] || @request.script_name || ''
-    @app_url =  @app_host + @app_uri
+    # if no action, must have traversed all parts to a directory
+    # add a trailing slash and try again
+    redirect_url(app_url + action_subdir) unless action
     
-    @path = @request.path_info || '/'
-    @params = @request.params
+    # keep rest of path_info in args
+    args.push(*parts)
     
-    @host ||= @request.host rescue ''
-    @protocol = env['HTTPS'] == 'on' ? 'https' : 'http'
+    # return action path and action handler (instance of action class)
+    [action, action_class.new(self,action,action_uri,action_subdir,extension,args,params)]
   end
   
-  # Returns URL/URI of app root (corresponding to top level of action_dir).
-  def app_url(suffix = nil)
-    suffix ? @app_url + suffix : @app_url
+  
+  ##### FILE METHODS #####
+  
+  # If file has already been cached in handling the current request, retrieve from cache
+  # and do not check filesystem for updates.  Else cache file via Kiss.file_cache.
+  def file_cache(path, *args, &block)
+    return @@file_cache[path] if @files_cached_this_request[path]
+    @files_cached_this_request[path] = true
+    
+    self.class.file_cache(path, *args, &block)
+  end
+  
+  
+  ##### DATABASE METHODS #####
+  
+  # Acquires and returns a database connection object from the connection pool,
+  # opening a new connection if the pool is empty.
+  #
+  # Tip: `db' is a shorthand alias for `database'.
+  def database
+    @db ||= @@database_pool.shift || begin
+      raise 'database config missing' unless @@database_config
+      
+      # open database connection (if not already open)
+      @db = @@database_config.is_a?(String) ? (Sequel.open @@database_config) :
+        @@database_config.is_a?(Hash) ? (Sequel.open @@database_config) : @@database_config
+      
+      @@db_extras_loaded ||= begin
+        @db.class.class_eval do
+          attr_accessor :kiss_controller, :kiss_model_cache
+          
+          @last_query = nil
+          def last_query   #:nodoc:
+            @last_query
+          end
+  
+          alias_method :execute_old, :execute
+          def execute(sql, *args, &block)   #:nodoc:
+            @last_query = sql
+            execute_old(sql, *args, &block)
+          end
+        end
+        
+        require 'kiss/model'
+        Kiss::ModelCache.model_dir = @@model_dir
+        
+        if @db.class.name == 'Sequel::MySQL::Database'
+          # add fetch_arrays, all_arrays methods
+          require 'kiss/sequel_mysql'
+          # turn off convert_tinyint_to_bool, unless options say otherwise
+          Sequel.convert_tinyint_to_bool = false unless @@options[:convert_tinyint_to_bool]
+        end
+        
+        true
+      end
+      
+      # TODO: rewrite evolution file exists check for speed
+      check_evolution_number
+      
+      # create model cache for this database connection
+      @db.kiss_model_cache = Kiss::ModelCache.new(@db)
+      @db.kiss_controller = self
+      
+      @db
+    end
   end
+  alias_method :db, :database
+  
+  # Kiss Model cache, used to invoke and store Kiss database models.
+  #
+  # Example:
+  # models[:users] == database model for `users' table
+  #
+  # Tip: `dbm' (stands for `database models') is a shorthand alias for `models'.
+  def models
+    # make sure we have a database connection
+    # create new model cache unless exists already
+    db.kiss_model_cache
+  end
+  alias_method :dbm, :models
   
   # Returns Sequel dataset to evolution_number table, which specifies app's current evolution number.
   # Creates evolution_number table if it does not exist.
@@ -595,13 +741,10 @@ class Kiss
     end
   end
   
-  # Saves session to session store, if session data has changed since load.
-  def finalize_session
-    @session.save if @session_fingerprint != Marshal.dump(@session.data).hash
-  end
   
-  ##### LOGIN SESSION #####
+  ##### SESSION METHODS #####
   
+  # Retrieves or generates session data object, based on session ID from cookie value.
   def session
     @session ||= begin
       @@session_class ? begin
@@ -629,177 +772,35 @@ class Kiss
     end
   end
   
-  def login
-    @login ||= begin
-      login = {}
-      
-      login.merge!(session[:login]) if (session[:login] && session[:login][:expires_at] && 
-        session[:login][:expires_at] > Time.now)
-      
-      login
-    end
-  end
-  
-  # Deletes login data from session.
-  def logout
-    session.delete(:login)
-    @login = nil
-  end
-  alias_method :reset_login_session, :logout
-  alias_method :reset_login_data, :logout
-  
-  # Merges data hash (key-value pairs) into request login hash.
-  def set_login_data(data)
-    login.merge!(data)
-    login
-  end
-  
-  # Merges data hash (key-value pairs) into session login hash.
-  def set_login_session(data)
-    set_login_data(data)
-    session[:login] = (session[:login] || {}).merge(data)
-  end
-  
-  # Sets expire time of session login hash, after which time it will be reset (emptied).
-  # If given a FixNum, sets expire time to now plus number of seconds.
-  def set_login_expires(time)
-    time = Time.now + time if time.is_a?(Fixnum)
-    set_login_session(:expires_at => time)
-  end
-  
-  # Returns true if login hash is defined and not expired.
-  def login_session_valid?
-    login && !login_session_expired?
-  end
-  
-  # Returns true if login hash is expired.
-  def login_session_expired?
-    login && (!login[:expires_at] || login[:expires_at] < Time.now)
-  end
-  
-  # Calls login action's load_from_session method to populate request login hash.
-  def load_from_login_session
-    klass = action_class('/login')
-    raise 'load_from_login_session called, but no login action found' unless klass
-    
-    action_handler = klass.new(self)
-    action_handler.load_from_session
-  end
-  
-  # Returns path to login action.
-  def login_path
-    @@action_dir + '/login.rb'
-  end
-  
-  # If valid login session exists, loads login action to populate request login hash data.
-  # Otherwise, loads and calls login action to authenticate user.
-  def authenticate
-    if login_session_valid?
-      load_from_login_session
-    else
-      klass = action_class('/login')
-      raise 'authenticate called, but no login action found' unless klass
-      
-      old_template = @template
-      @template = '/login.rhtml'
-      
-      process(klass,login_path)
-      
-      @template = old_template
-      
-      unless login_session_valid?
-        #raise 'login action completed without setting valid login session'
-      end
-    end
+  # Saves session to session store, if session data has changed since load.
+  def finalize_session
+    @session.save if @session_fingerprint != Marshal.dump(@session.data).hash
   end
   
-  ##### ACTION METHODS #####
-  
-  # Creates and caches anonymous class with which to invoke specified (or current) action.
-  def action_class(action = @action)
-    action_path = @@action_dir + action.to_s + '.rb'
-    return nil unless action_path.is_a?(String) && action_path.length > 0
-    
-    file_cache(action_path) do |src|
-      # create new action class, subclass of shared action parent class
-      klass = Class.new(@@action_root_class)
-      klass.class_eval(src,action_path) if src
-      klass
-    end
+  # Returns a Kiss::Login object containing data from session.login.
+  def login
+    @login ||= Kiss::Login.new(session)
   end
   
-  # Parses request URI to determine action path and arguments.
-  def parse_action_path(path)
-    @action_subdir = ''
-    @action = nil
-    
-    redirect_url(app_url + '/') if path == ''
-    
-    path += @@default_action if path =~ /\/\Z/
-    
-    parts = path.sub(/^\/*/,'').split('/')
-    
-    while part = parts.shift
-      raise 'bad action' if part !~ /\A[a-z0-9][\w\-\.]*\Z/i
-      
-      test_path = @@action_dir + @action_subdir + '/' + part
-      if Kiss.directory_exists?(test_path)
-        @action_subdir += '/' + part
-        next
-      end
-      
-      if part =~ /\A(.+)\.(\w+)\Z/
-        @extension = $2
-        part = $1
-      else
-        @extension = 'rhtml'
-      end
-      
-      @action = @action_subdir + '/' + part
-      break
-    end
-    
-    # if no action, must have traversed all parts to a directory
-    # add a trailing slash and try again
-    redirect_url(app_url + '/' + path + '/') unless @action
-    
-    @action_path = @@action_dir + '/' + @action + '.rb'
-    
-    # keep rest of path_info in args
-    @args = parts
-  end
   
-  # Processes specified (or current) action, by instantiating its anonymous
-  # action class and invoking `call' method on the instance.
-  def process(klass = action_class, action_path = @action_path)
-    action_handler = klass.new(self)
-    action_handler.call
-    
-    # return handler to follow with render
-    action_handler
-  end
+  ##### OUTPUT METHODS #####
   
   # Outputs a Kiss::StaticFile object as response to Rack.
   # Used to return static files efficiently.
   def send_file(path, mime_type = nil)
     @response = Kiss::StaticFile.new(path,mime_type)
     
-    throw :kiss_action_done
+    throw :kiss_request_done
   end
   
   # Prepares Rack::Response object to return application response to Rack.
   # Raises Kiss::ActionDone exception to bypass caller stack and return directly 
   # to Kiss#call.
   def send_response(output = '',options = {})
-    content_type = options[:content_type] || 
-      (extension ? Kiss.mime_type(extension) : nil)
-    document_encoding ||= 'utf-8'
-    
-    @response['Content-Type'] = "#{content_type}; #{document_encoding}" if content_type
     @response['Content-Length'] = output.length.to_s
     @response.body = output
     
-    throw :kiss_action_done
+    throw :kiss_request_done
     
     # back to Kiss#call, which finalizes session and returns @response
     # (throws exception if no @response set)
@@ -809,81 +810,71 @@ class Kiss
   def redirect_url(url)
     @response.status = 302
     @response['Location'] = url
-    send_response
+    @response.body = ''
+    
+    throw :kiss_request_done
   end
   
-  # Returns new Kiss::Mailer object using specified options.
-  def new_email(options = {})
-    mailer = Kiss::Mailer.new(options)
-    mailer.controller = self
-    mailer
-  end
   
-  def db
-    @db ||= @@database_pool.shift || begin
-      raise 'database config missing' unless @@database_config
-      
-      # open database connection (if not already open)
-      @db = @@database_config.is_a?(String) ? (Sequel.open @@database_config) :
-        @@database_config.is_a?(Hash) ? (Sequel.open @@database_config) : @@database_config
-      
-      @@db_extras_loaded ||= begin
-        @db.class.class_eval do
-          @last_query = nil
-          def last_query
-            @last_query
-          end
+  ##### DEBUG/BENCH OUTPUT #####
   
-          alias_method :execute_old, :execute
-          def execute(sql, *args, &block)
-            @last_query = sql
-            execute_old(sql, *args, &block)
-          end
-        end
-        
-        require 'kiss/model'
-        Kiss::ModelCache.model_dir = @@model_dir
-        
-        if @db.class.name == 'Sequel::MySQL::Database'
-          # add fetch_arrays, all_arrays methods
-          require 'kiss/sequel_mysql'
-          # turn off convert_tinyint_to_bool, unless options say otherwise
-          Sequel.convert_tinyint_to_bool = false unless @@options[:convert_tinyint_to_bool]
-        end
-        true
-      end
-      
-      # TODO: rewrite evolution file exists check for speed
-      check_evolution_number
-      
-      @db
-    end
+  # Adds debug message to inspect object.  Debug messages will be shown at top of
+  # application response body.
+  def debug(object, context = Kernel.caller[0])
+    @debug_messages.push( [object.inspect, context] )
+    object
   end
+  alias_method :trace, :debug
   
-  # Kiss Model cache, used to invoke and store Kiss database models.
-  #
-  # Example:
-  # models[:users] : database model for `users' table
-  def dbm
-    db unless @db
-    @dbm ||= Kiss::ModelCache.new(self)
+  # Starts a new benchmark timer, with optional label.  Benchmark results will be shown 
+  # at top of application response body.
+  def bench(label = nil, context = Kernel.caller[0])
+    stop_benchmark(context)
+    @benchmarks.push(
+      :label => label,
+      :start_time => Time.now,
+      :start_context => context
+    )
   end
-  alias_method :models, :dbm
   
-  def random_text(*args)
-    self.class.random_text(*args)
+  # Stops last benchmark timer, if still running.
+  def stop_benchmark(end_context = nil)
+    if @benchmarks[-1] && !@benchmarks[-1][:end_time]
+      @benchmarks[-1][:end_time] = Time.now
+      @benchmarks[-1][:end_context] = end_context
+    end
   end
   
-  def h(*args)
-    self.class.h(*args)
+  
+  ##### OTHER METHODS #####
+  
+  # Returns URL/URI of app root (corresponding to top level of action_dir).
+  def app_url(options = {})
+    options.empty? ? (@app_url ||= @protocol + '://' + @app_host + @app_uri) :
+      (options[:protocol] || @protocol) + '://' + (options[:host] || @app_host) + 
+      (options[:uri] || @app_uri)
   end
   
-  def template
-    @template || @action
+  # Returns URL/URI of app's static assets (asset_host or public_uri).
+  def pub_url(options = {})
+    options.empty? ?
+      (@pub ||= (@@asset_host ? @protocol + '://' + @@asset_host : '') + @@asset_uri) :
+      (options[:protocol] || @protocol) + '://' + (options[:host] || @@asset_host) + 
+        (options[:uri] || @@asset_uri)
   end
+  alias_method :asset_url, :pub_url
   
   # Adds data to be displayed in "Cache" section of Kiss exception reports.
-  def set_exception_cache(data)
-    @exception_cache.merge!(data)
+  def exception_cache(data = nil)
+    @exception_cache.merge!(data) if data
+    @exception_cache
+  end
+  alias_method :set_exception_cache, :exception_cache
+  
+  # Returns new Kiss::Mailer object using specified options.
+  def new_email(options = {})
+    mailer = Kiss::Mailer.new(options)
+    mailer.controller = self
+    mailer
   end
 end