kiss 1.7.1 → 1.7.2

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.2

data/lib/kiss.rb

@@ -72,7 +72,7 @@ class Kiss
     :evolution_dir, :asset_host, :asset_uri, :asset_dir, :public_dir, :environment, 
     :rack_file, :default_action, :exception_log_file, :session_class, :cookie_name,
     :authenticate_all, :authenticate_exclude, :exception_handlers, :project_dir,
-    :config, :mailer_config, :mailer_override
+    :config, :mailer_config, :mailer_override, :exception_mailer_config
   
   _attr_accessor :session_setup
   
@@ -131,9 +131,10 @@ class Kiss
     @_gem_dirs = ['gems']
     @_require = []
     @_authenticate_exclude = ['/login', '/logout']
-    @_exception_handlers = {}
     @_mailer_config = {}
     @_mailer_override = {}
+    @_exception_handlers = {}
+    @_exception_mailer_config = {}
     
     # store for cached files and directories
     @_file_cache = {}
@@ -288,6 +289,13 @@ class Kiss
         @_mailer_override.merge!(mailer_override)
       end
       
+      if email_errors = new_config.delete(:email_errors)
+        @_exception_mailer_config.merge!(email_errors)
+      end
+      if exception_mailer = new_config.delete(:exception_mailer)
+        @_exception_mailer_config.merge!(exception_mailer)
+      end
+      
       @_config.merge!( new_config )
     end
   end

data/lib/kiss/ext/core.rb

@@ -594,6 +594,12 @@ class String
     original_sequel_underscore.gsub(/\W+/, '_').sub(/_\Z/, '')
   end
   
+  def capitalize
+    result = self.downcase
+    result[0,1] = result[0,1].upcase
+    result
+  end
+  
   # adapt titlecase method to downcase short prepositions in middle
   alias_method :original_sequel_titlecase, :titlecase
   def titlecase
@@ -601,6 +607,11 @@ class String
   end
   alias_method :titleize, :titlecase
   
+  def headercase
+    original_sequel_underscore.capitalize.gsub('_', '-')
+  end
+  alias_method :headerize, :titlecase
+  
   def adjective
     gsub(/\s/, '-')
   end

data/lib/kiss/mailer.rb

@@ -14,6 +14,8 @@ class Kiss
     
     class << self
       def send(options)
+        options = options.clone
+        
         if options[:sendmail] || (options[:engine] == :sendmail) || !options[:server]
           send_via_sendmail(options)
         else
@@ -72,7 +74,7 @@ class Kiss
     end
     
     # Renders email template to string, unless message option is
-    # already set to a string value.
+    # already set to a string value.  Also adds missing headers.
     def prepare_email_message(new_options = {})
       merge_options(new_options)
     
@@ -85,6 +87,36 @@ class Kiss
           raise 'no email message or template found to prepare'
         end
       end
+      
+      headers, body = options[:message].split(/\n\n/, 2)
+      header_lines = headers.split(/\n/)
+      headers_by_name = {}
+      headers.each do |header|
+        name, value = header.split(/:\s*/, 2)
+        headers_by_name[name] = value
+      end
+      
+      new_headers_by_name = {}
+      [:from, :to].each do |name|
+        headercase_name = name.to_s.headercase
+        unless headers_by_name[headercase_name]
+          value = options[name]
+          value = value.join(', ') if value.is_a?(Array)
+          new_headers_by_name[headercase_name] = value
+        end
+      end
+      
+      (options[:headers] || {}).each_pair do |name, value|
+        new_headers_by_name[name.to_s.headercase_name] = value
+      end
+      
+      new_headers_by_name.each_pair do |name, value|
+        header_line = "#{name}: #{value}"
+        header_lines.unshift header_line
+      end
+      
+      headers = header_lines.join("\n")
+      options[:message] = "#{headers}\n\n#{body}"
     
       return @_options[:message]
     end

data/lib/kiss/request.rb

@@ -133,14 +133,14 @@ class Kiss
         "X-Kiss-Error-Message" => exception_message
       }, body]
       
-      send_email = true
+      should_send_exception_email = true
       
       unless @_loading_exception_handler
         @_loading_exception_handler = true
         begin
           exception_handler = lookup_exception_handler(e)
           if exception_handler
-            send_email = exception_handler[:send_email]
+            should_send_exception_email = exception_handler[:send_email]
             new_result = load_exception_handler(exception_handler) 
             if exception_handler[:action]
               result = handle_request(exception_handler[:action])
@@ -152,16 +152,16 @@ class Kiss
         end
       end
       
-      if send_email && @_config.email_errors
+      if should_send_exception_email && !@_controller.exception_mailer_config.empty?
+        app_name = @_controller.exception_mailer_config.app_name ||
+          @_controller.exception_mailer_config.app || 'Kiss'
         email_message = <<-EOT
+Subject: #{app_name} - #{e.class.name}#{exception_message.blank? ? '' : ": #{exception_message}"}
 Content-type: text/html
-From: #{@_config.email_errors.from}
-To: #{@_config.email_errors.to.is_a?(String) ? @_config.email_errors.to : @_config.email_errors.to.join(', ')}
-Subject: #{@_config.email_errors.app} - #{e.class.name}#{ exception_message ? ": #{exception_message}" : ''}
 
 #{report}
 EOT
-        Kiss::Mailer.send( @_config.email_errors.merge(:message => email_message) )
+        send_email(@_controller.exception_mailer_config.merge(:message => email_message))
         @_exception_email_sent = true
       end
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 -08:00
+date: 2012-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency