kiss 0.9.3 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/kiss.rb

@@ -43,20 +43,16 @@ class Kiss
   autoload :SequelSession, 'kiss/sequel_session'
   
   attr_reader :action, :action_subdir, :action_path, :extension, :host, :template_dir,
-    :email_template_dir, :upload_dir, :evolution_dir, :public_dir, :params, :args, :db,
-    :login, :request, :environment, :content_types
+    :email_template_dir, :upload_dir, :evolution_dir, :asset_dir, :public_dir, :params, :args, :db,
+    :login, :request, :environment
   
   @@default_action = 'index'
   
   @@cookie_name = 'Kiss'
   
-  @@content_types = {
-    :rhtml => 'text/html',
-    :html => 'text/html',
-    :txt  => 'text/plain',
-    :xml  => 'application/xml',
-    :doc  => 'application/msword',
-    :xls  => 'application/application/vnd.ms-excel'
+  # these supplement the mime types from Rack::File
+  @@mime_types = {
+    'rhtml' => 'text/html'
   }
   
   # Purposely empty class.
@@ -221,10 +217,11 @@ class Kiss
   alias_method :dbm, :models
   
   # Returns URL/URI of app's static assets (asset_host or public_uri).
-  def pub(suffix = nil)
-    @pub ||= @options[:asset_host] || (@request.server + @options[:public_uri].to_s)
+  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.
@@ -339,7 +336,7 @@ class Kiss
     @action_dir = @options[:action_dir] || 'actions'
     @template_dir = @options[:template_dir] ? @options[:template_dir] : @action_dir
     
-    @public_dir = @options[:public_dir] || 'public_html'
+    @asset_dir = @public_dir = @options[:asset_dir] || @options[:public_dir] || 'public_html'
     
     @model_dir = @options[:model_dir] || 'models'
     @evolution_dir = @options[:evolution_dir] || 'evolutions'
@@ -351,6 +348,10 @@ class Kiss
     @default_action = @options[:default_action] || @@default_action
     @action_root_class = @options[:action_class] || Class.new(Kiss::Action)
     
+    # 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
+    
     # include lib dirs
     $LOAD_PATH.unshift(*( @lib_dirs.flatten.select {|dir| File.directory?(dir) } ))
     
@@ -459,6 +460,11 @@ class Kiss
   def call(env)
     clear_exception_cache
     
+    if (env["PATH_INFO"] == '/favicon.ico') ||
+      (@asset_uri && env["PATH_INFO"].sub!(Regexp.new("\\A#{@asset_uri}"),''))
+        return @rack_file.call(env)
+    end
+    
     check_evolution_number if @db
     
     @files_cached_this_request = {}
@@ -710,7 +716,8 @@ 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 ? Rack::File::MIME_TYPES[extension] || @@mime_types[extension] : 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.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-19 00:00:00 -07:00
+date: 2008-08-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/kiss/rack/bench.rb
 - lib/kiss/rack/email_errors.rb
 - lib/kiss/rack/facebook.rb
+- lib/kiss/rack/file.rb
 - lib/kiss/rack/file_not_found.rb
 - lib/kiss/rack/log_exceptions.rb
 - lib/kiss/rack/show_debug.rb