kiss 1.0.4 → 1.1

data/lib/kiss/action.rb

@@ -1,64 +1,115 @@
 class Kiss
   class Action
+    class << self
+      def inherited(subclass)
+        subclass.clear_subclasses
+      end
+      def clear_subclasses
+        @subclasses = {}
+      end
+      
+      def get_subclass(key, path, controller)
+        # each subdir must get a subclass of the parent dir class;
+        # each subclass has its own @subclasses hash of its subdirs
+        
+        src, updated = controller.file_cache(path, true)
+        
+        if updated
+          klass = Class.new(self)
+          klass.class_eval(src,path) if src
+          @subclasses[key] = klass
+        end
+        
+        @subclasses[key]
+      end
+    end
+    self.clear_subclasses
+    
+    
     include Kiss::TemplateMethods
+    
+    attr_reader :controller, :forms, :action, :action_uri, :action_subdir, :template, :extension,
+      :args, :params, :output, :output_options
+    
+    def arg(index)
+      @args[index]
+    end
+    
+    def args
+      @args
+    end
   
     # Raises custom error message for missing methods, specifying current action
     # more clearly than standard error message.
     def method_missing(meth)
       raise NoMethodError, "undefined method `#{meth}'"
     end
-  
-    def controller
-      @controller
-    end
-  
+    
     # Creates a new action instance from controller data.
-    def initialize(controller)
+    def initialize(controller,action,action_uri,action_subdir,extension,args,params = nil)
       @controller = controller
-      @action = @controller.action
-    
+      @action = @template = action
+      @action_uri = action_uri
+      @action_subdir = action_subdir
+      @extension = extension
+      @args = args
+      @params = params || {}
+      
       @data = {}
       @forms = {}
       @template_dir = @controller.template_dir
     end
   
-    # Invokes controller's file_cache, setting exception class to Kiss::TemplateFileNotFound,
-    # which will be raised if file is not found.  (This exception class may be caught and
-    # handled by Rack builder option FileNotFound to produce an HTTP 404 error response.)
-    def file_cache(path,fnf_file_type,fnf_exception_class = Kiss::TemplateFileNotFound,&block)
-      controller.file_cache(path,fnf_file_type,fnf_exception_class,&block)
-    end
-  
-    def forms
-      @forms
-    end
-  
     # Returns true is `form' param matches current action path.
     def form_action_match
       form = params['form']
       return false unless form =~ /^\/?\w+(\/\w+)*$/s
       return form == @action || @action =~ /\/#{form}/
     end
-  
-    # Returns object from specified table, with id matching first argument (or argument of specified index).
-    def arg_object(table,index = 0,desired_values = {})
-      id = arg(index)
-      result = dbm[table].where(:id => id).first || (raise "#{table.to_s.singularize} id=#{id} not found")
+    
+    # Raises error if database model object does not match the key=value data in
+    # desired_values hash.
+    def check_desired_values(object,desired_values)
       desired_values.each_pair do |key,value|
-        unless result[key] == value
-          raise "#{table.to_s.singularize} id=#{id} does not have #{key} == #{value.inspect}"
+        unless object[key] == value
+          raise "#{object.table.to_s.singularize} id=#{object.id} does not have #{key} == #{value.inspect}"
         end
       end
-      result
+      object
     end
-  
-    # Returns arg_object, or new object of specified table if arg_object is not found.
+    
+    # Verifies valid id value, selects database model object from specified table
+    # with specified id, and checks result to match desired_values. 
+    def get_object_by_id(table, id, desired_values = {})
+      id = id.to_i
+      raise 'bad object id' unless id > 0
+      result = dbm[table][id] || (raise "#{table.to_s.singularize} id=#{id} not found")
+      check_desired_values(result,desired_values)
+    end
+    
+    # Returns database model object from specified table, with id matching argument 
+    # of specified index (defaults to first argument).  Raises error if object not
+    # found in database or object data does not match desired_values.
+    def arg_object(table, index = 0, desired_values = {})
+      get_object_by_id(table, arg(index).to_i, desired_values)
+    end
+    
+    # Returns arg_object, or new object of specified table if arg_object fails.
     def arg_object_or_new(table,index = 0,desired_values = {})
-      begin
-        arg_object(table,index,desired_values)
-      rescue => e
-        dbm[table].new(desired_values)
-      end
+      arg_object(table,index,desired_values) rescue dbm[table].new(desired_values)
+    end
+    
+    # Returns database model object from specified table, with id matching param 
+    # of specified key (defaults to singular form of table name).  Raises error if 
+    # object not found in database or object data does not match desired_values.
+    def param_object(table, key = nil, desired_values = {})
+      key ||= table.to_s.singularize
+      get_object_by_id(table, params[key.to_s], desired_values)
+    end
+    
+    # Returns param_object, or new object of specified table if param_object fails.
+    def param_object_or_new(table,key = nil,desired_values = {})
+      param_object(table,key,desired_values) rescue dbm[table].new(desired_values)
     end
   
     # Validates param of specified key against specified format.
@@ -80,10 +131,10 @@ class Kiss
   
     # Creates and invokes new Kiss::Mailer instance to send email message via SMTP.
     def send_email(options = {})
-      Kiss::Mailer.new.send_email({
+      Kiss::Mailer.new({
         :data => data,
         :controller => controller
-      }.merge(options))
+      }.merge(options)).send
     end
   
     # Sends HTTP 302 response to redirect client agent to specified URL.
@@ -92,14 +143,24 @@ class Kiss
     end
   
     # Redirects to specified action path, which may also include arguments.
-    def redirect_action(action)
-      redirect_url "#{app}#{ app_absolute_path(action) }"
+    def redirect_action(action, options = {})
+      redirect_url( app(options) + app_absolute_path(action) + (options[:params] ?
+        '?' + options[:params].keys.map do |k|
+          "#{Kiss.url_escape k.to_s}=#{Kiss.url_escape options[:params][k].to_s}"
+        end.join('&') : '')
+      )
     end
+    
+    def invoke(path,options = {})
+      action_handler = controller.invoke_action(path,options[:params] || {},{:layout => nil})
+      action_handler.output
+    end
+    alias_method :process_action, :invoke
   
     # Convert specified action path by prefixing current action_subdir,
     # unless specified path starts with slash (/).
     def app_absolute_path(path)
-      path = controller.action_subdir + '/' + path if path !~ /\A\//
+      path = @action_subdir + path if path !~ /\A\//
       path
     end
   
@@ -111,15 +172,17 @@ class Kiss
         return options[:text].to_s
       end
       
-      @base_url ||= app(action_subdir + '/')
-      @layout = options.is_a?(Hash) && options.has_key?(:layout) ? options[:layout] : 
-        (extension == 'rhtml' ? Kiss.layout : nil)
+      @base_url ||= app + action_uri
       
+      unless defined?(@layout)
+        @layout = options.is_a?(Hash) && options.has_key?(:layout) ? options[:layout] : 
+          (extension == 'rhtml' ? Kiss.layout : nil)
+      end
       content = options[:content].is_a?(String) ? options[:content] : process({
         :template => template,
         :extension => extension
       }.merge(options))
-    
+      
       while @layout
         layout_path = get_template_path(
           :template => @layout,
@@ -133,20 +196,43 @@ class Kiss
         # process layout file
         content = erubis(layout_path,binding,content)
       end
-      
       # add a base tag in case of arguments appended to request URI
-      content.sub(/(\<html)/i,%Q(<base href="#{@base_url}" />\\1))
+      
+      base_url = options.has_key?(:base_url) ? options[:base_url] : @base_url
+      if (base_url)
+        content = Kiss.html_prepend(%Q(<base href="#{base_url}" />),content,'head')
+      end
+      
+      content
     end
   
     # Render and return response to Rack.
     def render(options = {})
-      output = render_to_string(options)
-      controller.send_response(output,options)
+      @output = render_to_string(options)
+      @output_options = options
+      throw :kiss_action_done
     end
   
     # Placeholder for generic actions that do nothing but render template.
     # render is called from Kiss#call after this method returns.
     def call; end
+    
+    # Does nothing by default; override this method in your _action.rb or
+    # other action files to specify authentication behavior.
+    def authenticate; end
+    
+    # Does nothing by default; override this method in your _action.rb or
+    # other action files to expand objects from persistent login data.
+    def expand_login; end
+    
+    # Ensure that action requested via SSL; redirects to same action with
+    # https protocol if protocol is not https.
+    def force_ssl(options = {})
+      unless protocol == 'https'
+        redirect_action(@action, options.merge( :protocol => 'https' ))
+      end
+    end
+    alias_method :force_https, :force_ssl
   
     # Creates and adds form to current action, using specified attributes.
     def add_form(attrs = {})

data/lib/kiss/bench.rb

@@ -4,7 +4,7 @@ class Kiss
   # TextMate links to source files, plus login hash, last SQL,
   # GET/POST params, cookies, and Rack environment variables.
   module Bench
-    def prepend_benchmarks(body)
+    def prepend_benchmarks(document)
       html = <<-EOT
 <style>
 .kiss_bench {
@@ -39,8 +39,7 @@ EOT
 EOT
       end.join
       
-      body.each {|p| html += p }
-      html
+      Kiss.html_prepend(html,document,'body')
     end
     
     def context_link(context)

data/lib/kiss/controller_accessors.rb

@@ -4,46 +4,42 @@ class Kiss
       Kiss.environment
     end
   
+    def project_dir
+      Kiss.project_dir
+    end
+  
+    def public_dir
+      Kiss.public_dir
+    end
+  
     def upload_dir
       Kiss.upload_dir
     end
-    
-    def pub(*args)
-      Kiss.pub(*args)
-    end
   end
   
   module ControllerAccessors
     def debug(object)
       controller.debug(object, Kernel.caller[0])
     end
+    alias_method :trace, :debug
     
     def bench(label = nil)
       controller.bench(label, Kernel.caller[0])
     end
     
-    def db
-      controller.db
+    def models
+      controller.models
     end
-    alias_method :database, :db
+    alias_method :dbm, :models
     
-    def dbm
-      controller.dbm
+    def database
+      controller.database
     end
-    alias_method :models, :dbm
     
     def file_cache(*args,&block)
       controller.file_cache(*args,&block)
     end
     
-    def params
-      controller.params
-    end
-    
-    def args
-      controller.args
-    end
-    
     def session
       controller.session
     end
@@ -55,65 +51,25 @@ class Kiss
     def request
       controller.request
     end
-  
-    def set_login_expires(*args)
-      controller.set_login_expires(*args)
-    end
-  
-    def set_login_data(*args)
-      controller.set_login_data(*args)
-    end
-  
-    def set_login_session(*args)
-      controller.set_login_session(*args)
-    end
     
-    def logout
-      controller.logout
-    end
-  
-    def reset_login_data
-      controller.reset_login_data
-    end
-  
-    def reset_login_session
-      controller.reset_login_session
-    end
-  
-    def login_session_valid?
-      controller.login_session_valid?
-    end
-  
     def app(*args)
       controller.app_url(*args)
     end
     
-    def host
-      controller.host
-    end
-  
-    def action
-      controller.action
-    end
-  
-    def template
-      controller.template
-    end
-  
-    def action_subdir
-      controller.action_subdir
+    def pub(*args)
+      controller.pub_url(*args)
     end
     
-    def extension
-      controller.extension
+    def env
+      controller.env
     end
-  
-    def arg(index)
-      controller.args[index]
+    
+    def protocol
+      controller.protocol
     end
-  
-    def authenticate
-      controller.authenticate
+    
+    def host
+      controller.host
     end
   
     def new_email

data/lib/kiss/debug.rb

@@ -4,7 +4,7 @@ class Kiss
   # TextMate links to source files, plus login hash, last SQL,
   # GET/POST params, cookies, and Rack environment variables.
   module Debug
-    def prepend_debug(body)
+    def prepend_debug(document)
       html = <<-EOT
 <style>
 .kiss_debug {
@@ -29,7 +29,7 @@ text-decoration: underline;
 EOT
       html += @debug_messages.map do |object,context|
         filename, line, method = context.split(/:/)
-        textmate_url = "txmt://open?url=file://" + h(Kiss.absolute_path(filename)) + '&amp;line=' + line
+        textmate_url = "txmt://open?url=file://" + Kiss.url_escape(Kiss.absolute_path(filename)) + '&line=' + line
         <<-EOT
 <div class="kiss_debug">
 <tt><b>#{object.gsub(/\</,'&lt;')}</b></tt>
@@ -37,9 +37,8 @@ EOT
 </div>
 EOT
       end.join
-    
-      body.each {|p| html += p }
-      html
+      
+      Kiss.html_prepend(html,document,'body')
     end
   end
 end

data/lib/kiss/exception_report.rb

@@ -15,7 +15,7 @@ class Kiss
         end
       
         backtrace = exception.backtrace
-        #backtrace.shift while lines[0] =~ /\/lib\/kiss(\/|\.rb)/
+        #backtrace.shift while (backtrace[0] =~ /\/lib\/kiss(\/|\.rb)/) || (backtrace[0] =~ /\/lib\/sequel/)
         
         frames = backtrace.map { |line|
           frame = {}
@@ -58,8 +58,12 @@ class Kiss
         "txmt://open?url=file://"+(h(Kiss.absolute_path(frame.filename)))+"&line="+(h frame.lineno)
       end
       
+      def w(str)
+        str.gsub(/([;\/])/,'\1<wbr/>')
+      end
+      
       def h(*args)
-        Kiss.h(*args)
+        Kiss.html_escape(*args)
       end
 
       # :stopdoc:
@@ -106,8 +110,8 @@ class Kiss
     table.source td {
         font-family:monospace; white-space:pre; border-bottom:1px solid #eee; }
     ul.traceback { list-style-type:none; }
-    ul.traceback li.frame { margin-bottom:1em; }
-    div.context { margin: 10px 0 10px 40px; background-color: #fff; }
+    ul.traceback li.frame { padding: 8px; border-top: 1px solid #ccc; }
+    div.context { margin: 6px 0 2px 40px; background-color: #fff; }
     div.context ol {
         padding: 1px; margin-bottom: -1px; }
     div.context ol li {
@@ -216,7 +220,7 @@ class Kiss
   <ul class="traceback">
 <% frames.each { |frame| %>
       <li class="frame">
-        <a href="<%= textmate_href(frame) %>">line <%= h frame.lineno %></a> of <code><%=h frame.filename %></code> (in <code><b><%=h frame.function %></b></code>)
+        <a href="<%= textmate_href(frame) %>">line <%= h frame.lineno %></a> of <code><%=w h frame.filename %></code> (in <code><b><%=h frame.function %></b></code>)
 
           <% if frame.context_line %>
           <div class="context" id="c<%=h frame.object_id %>">
@@ -339,7 +343,7 @@ class Kiss
           <% env.sort_by { |k, v| k.to_s }.each { |key, val| %>
           <tr>
             <td><%=h key %></td>
-            <td class="code"><div><%=h val %></div></td>
+            <td class="code"><div><%=w h val %></div></td>
           </tr>
           <% } %>
       </tbody>