kiss 0.9.1 → 0.9.2

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/kiss/action.rb

@@ -10,7 +10,7 @@ class Kiss
         @@controller = controller
       end
     end
-  
+    
     # Instance Methods
   
     # Raises custom error message for missing methods, specifying current action
@@ -134,7 +134,8 @@ class Kiss
       end
     
       @base_url ||= app(action_subdir + '/')
-      @layout = options.is_a?(Hash) && options.has_key?(:layout) ? options[:layout] : "/_layout"
+      @layout = options.is_a?(Hash) && options.has_key?(:layout) ? options[:layout] : 
+        (extension == 'rhtml' ? "/_layout" : nil)
     
       content = options[:content].is_a?(String) ? options[:content] : process({
         :template => action,

data/lib/kiss.rb

@@ -698,7 +698,7 @@ class Kiss
   # Raises Kiss::ActionDone exception to bypass caller stack and return directly 
   # to Kiss#call.
   def send_response(output = '',options = {})
-    content_type = options[:content_type] || @content_type || extension ? @@content_types[extension.to_sym] : nil
+    content_type = options[:content_type] || @content_type || (extension ? @@content_types[extension.to_sym] : nil)
     document_encoding ||= 'utf-8'
     
     @response['Content-Type'] = "#{content_type}; #{document_encoding}" if content_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kiss
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Shawn Van Ittersum