actionpack 1.11.0 → 1.11.1

data/CHANGELOG

@@ -1,3 +1,48 @@
+*1.11.1* (December 7th, 2005)
+
+* More robust relative url root discovery for SCGI compatibility.  This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint.  #3070 [Dave Ringoen]
+
+* Fix docs for text_area_tag. #3083. [Christopher Cotton]
+ 
+* Make ActionController's render honor the :locals option when rendering a :file. #1665. [Emanuel Borsboom, Marcel Molina Jr.]
+
+* Don't put flash in session if sessions are disabled.  [Jeremy Kemper]
+
+* Strip out trailing &_= for raw post bodies. Closes #2868. [Sam Stephenson]
+
+* Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan]
+
+* Always create new AR sessions rather than trying too hard to avoid database traffic.  #2731 [Jeremy Kemper]
+
+* Update to Prototype 1.4.0_rc4. Closes #2943 (old Array.prototype.reverse behavior can be obtained by passing false as an argument). [Sam Stephenson]
+
+* Update to Prototype 1.4.0_rc3. Closes #1893, #2505, #2550, #2748, #2783. [Sam Stephenson]
+
+* Updated docs for in_place_editor, fixes a couple bugs and offers extended support for external controls [Justin Palmer]
+
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
+* Remove the unused, slow response_dump and session_dump variables from error pages.  #1222 [lmarlow@yahoo.com]
+
+* Update to latest script.aculo.us version (as of [3031])
+
+* Update documentation for render :file.  #2858 [Tom Werner]
+
+* Only include builtin filters whose filenames match /^[a-z][a-z_]*_helper.rb$/ to avoid including operating system metadata such as ._foo_helper.rb.  #2855 [court3nay@gmail.com]
+
+* options_for_select allows any objects which respond_to? :first and :last rather than restricting to Array and Range.  #2824 [Jacob Robbins <jrobbins@cmj.com>, Jeremy Kemper]
+
+* The auto_link text helper accepts an optional block to format the link text for each url and email address.  Example: auto_link(post.body) { |text| truncate(text, 10) }  [Jeremy Kemper]
+
+* assert_tag uses exact matches for string conditions, instead of partial matches. Use regex to do partial matches. #2799 [Jamis Buck]
+
+* CGI::Session::ActiveRecordStore.data_column_name = 'foobar' to use a different session data column than the 'data' default.  [nbpwie102@sneakemail.com]
+
+* Do not raise an exception when default helper is missing; log a debug message instead.  It's nice to delete empty helpers.  [Jeremy Kemper]
+
+* Controllers with acronyms in their names (e.g. PDFController) require the correct default helper (PDFHelper in file pdf_helper.rb).  #2262 [jeff@opendbms.com]
+
+
 *1.11.0* (November 7th, 2005)
 
 * Added request as instance method to views, so you can do <%= request.env["HTTP_REFERER"] %>, just like you can already access response, session, and the likes [DHH]

data/lib/action_controller/assertions.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'test/unit/assertions'
 require 'rexml/document'
-require "#{File.dirname(__FILE__)}/vendor/html-scanner/html/document"
+require File.dirname(__FILE__) + "/vendor/html-scanner/html/document"
 
 module Test #:nodoc:
   module Unit #:nodoc:

data/lib/action_controller/base.rb

@@ -28,11 +28,15 @@ module ActionController #:nodoc:
   end
   class SessionOverflowError < ActionControllerError #:nodoc:
     DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
   end
   class DoubleRenderError < ActionControllerError #:nodoc:
     DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and only once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\". Finally, note that to cause a before filter to halt execution of the rest of the filter chain, the filter must return false, explicitly, so \"render(...) and return false\"." 
 
-    def initialize(message=nil)
+    def initialize(message = nil)
       super(message || DEFAULT_MESSAGE)
     end
   end
@@ -455,9 +459,12 @@ module ActionController #:nodoc:
         self.class.controller_name
       end
 
+      def session_enabled?
+        request.session_options[:disabled] != false
+      end
+
     protected
-      # Renders the content that'll be returned to the browser as the response body. This can just be as regular text, but is
-      # more often the compilation of a template.
+      # Renders the content that will be returned to the browser as the response body.
       #
       # === Rendering an action
       # 
@@ -517,14 +524,19 @@ module ActionController #:nodoc:
       #
       # === Rendering a file
       # 
-      # File rendering works just like action rendering except that it takes an absolute path. 
-      # The current layout is not applied automatically.
+      # File rendering works just like action rendering except that it takes a filesystem path. By default, the path
+      # is assumed to be absolute, and the current layout is not applied.
+      #
+      #   # Renders the template located at the absolute filesystem path
+      #   render :file => "/path/to/some/template.rhtml"
+      #   render :file => "c:/path/to/some/template.rhtml"
       #
-      #   # Renders the template located in /path/to/some/template.r(html|xml)
-      #   render :file => "/path/to/some/template"
+      #   # Renders a template within the current layout, and with a 404 status code
+      #   render :file => "/path/to/some/template.rhtml", :layout => true, :status => 404
+      #   render :file => "c:/path/to/some/template.rhtml", :layout => true, :status => 404
       #
-      #   # Renders the same template within the current layout, but with a 404 status code
-      #   render :file => "/path/to/some/template", :layout => true, :status => 404
+      #   # Renders a template relative to the template root and chooses the proper file extension
+      #   render :file => "some/template", :use_full_path => true
       #
       # _Deprecation_ _notice_: This used to have the signature <tt>render_file(path, status = 200)</tt>
       #
@@ -588,7 +600,7 @@ module ActionController #:nodoc:
 
         else
           if file = options[:file]
-            render_file(file, options[:status], options[:use_full_path])
+            render_file(file, options[:status], options[:use_full_path], options[:locals] || {})
 
           elsif template = options[:template]
             render_file(template, options[:status], true)
@@ -636,11 +648,11 @@ module ActionController #:nodoc:
         end
       end
 
-      def render_file(template_path, status = nil, use_full_path = false)
+      def render_file(template_path, status = nil, use_full_path = false, locals = {})
         add_variables_to_assigns
         assert_existance_of_template_file(template_path) if use_full_path
         logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger
-        render_text(@template.render_file(template_path, use_full_path), status)
+        render_text(@template.render_file(template_path, use_full_path, locals), status)
       end
 
       def render_template(template, status = nil, type = :rhtml, local_assigns = {})

data/lib/action_controller/caching.rb

@@ -236,6 +236,7 @@ module ActionController #:nodoc:
     # * DRbStore: Keeps the fragments in the memory of a separate, shared DRb process. This works for all environments and only keeps one cache
     #   around for all processes, but requires that you run and manage a separate DRb process.
     # * MemCacheStore: Works like DRbStore, but uses Danga's MemCache instead.
+    #   Requires the ruby-memcache library:  gem install ruby-memcache.
     #
     # Configuration examples (MemoryStore is the default):
     #

data/lib/action_controller/cgi_ext/raw_post_data_fix.rb

@@ -54,6 +54,7 @@ class CGI #:nodoc:
         content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) || ''
         # fix for Safari Ajax postings that always append \000
         content.chop! if content[-1] == 0
+        content.gsub! /&_=$/, ''
         env_table['RAW_POST_DATA'] = content.freeze
       end
 

data/lib/action_controller/cgi_process.rb

@@ -89,37 +89,28 @@ module ActionController #:nodoc:
     def port_from_http_host
       $1.to_i if env['HTTP_HOST'] && /:(\d+)$/ =~ env['HTTP_HOST']
     end
-    
-    def session
-      return @session unless @session.nil?
 
-      begin
-        @session = (@session_options == false ? {} : CGI::Session.new(@cgi, session_options_with_string_keys))
-        @session["__valid_session"]
-        return @session
-      rescue ArgumentError => e
-        if e.message =~ %r{undefined class/module (\w+)}
-          begin
-            Module.const_missing($1)
-          rescue LoadError, NameError => e
-            raise(
-              ActionController::SessionRestoreError, 
-              "Session contained objects where the class definition wasn't available. " +
-              "Remember to require classes for all objects kept in the session. " +
-              "(Original exception: #{e.message} [#{e.class}])"
-            )
-          end
-        
-          retry
+    def session
+      unless @session
+        if @session_options == false
+          @session = Hash.new
         else
-          raise
+          stale_session_check! do
+            if session_options_with_string_keys['new_session'] == true
+              @session = new_session
+            else
+              @session = CGI::Session.new(@cgi, session_options_with_string_keys)
+            end
+            @session['__valid_session']
+          end
         end
       end
+      @session
     end
-    
+
     def reset_session
       @session.delete if CGI::Session === @session
-      @session = (@session_options == false ? {} : new_session)
+      @session = new_session
     end
 
     def method_missing(method_id, *arguments)
@@ -127,12 +118,38 @@ module ActionController #:nodoc:
     end
 
     private
+      # Delete an old session if it exists then create a new one.
       def new_session
-        CGI::Session.new(@cgi, session_options_with_string_keys.update("new_session" => true))
+        if @session_options == false
+          Hash.new
+        else
+          CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => false)).delete rescue nil
+          CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
+        end
       end
-      
+
+      def stale_session_check!
+        yield
+      rescue ArgumentError => argument_error
+        if argument_error.message =~ %r{undefined class/module (\w+)}
+          begin
+            Module.const_missing($1)
+          rescue LoadError, NameError => const_error
+            raise ActionController::SessionRestoreError, <<end_msg
+Session contains objects whose class definition isn't available.
+Remember to require the classes for all objects kept in the session.
+(Original exception: #{const_error.message} [#{const_error.class}])
+end_msg
+          end
+
+          retry
+        else
+          raise
+        end
+      end
+
       def session_options_with_string_keys
-        DEFAULT_SESSION_OPTIONS.merge(@session_options).inject({}) { |options, (k,v)| options[k.to_s] = v; options }
+        @session_options_with_string_keys ||= DEFAULT_SESSION_OPTIONS.merge(@session_options).inject({}) { |options, (k,v)| options[k.to_s] = v; options }
       end
   end
 

data/lib/action_controller/components.rb

@@ -52,11 +52,11 @@ module ActionController #:nodoc:
       def component_response(options, reuse_response = true)
         begin
           ActionController::Flash::FlashHash.avoid_sweep = true
-          Thread.current[:p] = component_class(options).process(request_for_component(options), reuse_response ? @response : response_for_component)
+          p = component_class(options).process(request_for_component(options), reuse_response ? @response : response_for_component)
         ensure
           ActionController::Flash::FlashHash.avoid_sweep = false
         end
-        Thread.current[:p]
+        p
       end
     
       def component_class(options)

data/lib/action_controller/flash.rb

@@ -132,22 +132,31 @@ module ActionController #:nodoc:
           end
         end
     end
-     
-   
+
+
     protected 
       # Access the contents of the flash. Use <tt>flash["notice"]</tt> to read a notice you put there or 
       # <tt>flash["notice"] = "hello"</tt> to put a new one.
+      # Note that if sessions are disabled only flash.now will work.
       def flash #:doc:
-        @session['flash'] ||= FlashHash.new
+        # @session = Hash.new if sessions are disabled
+        if @session.is_a?(Hash)
+          @__flash ||= FlashHash.new
+
+        # otherwise, @session is a CGI::Session or a TestSession
+        else
+          @session['flash'] ||= FlashHash.new
+        end
       end
-  
+
       # deprecated. use <tt>flash.keep</tt> instead
       def keep_flash #:doc:
+        warn 'keep_flash is deprecated; use flash.keep instead.'
         flash.keep
       end
-  
-  
-      private
+
+
+    private
   
       # marks flash entries as used and expose the flash to the view 
       def fire_flash

data/lib/action_controller/helpers.rb

@@ -108,12 +108,23 @@ module ActionController #:nodoc:
       end
 
       private 
+        def default_helper_module!
+          module_name = name.sub(/^Controllers::/, '').sub(/Controller$|$/, 'Helper')
+          module_path = module_name.split('::').map { |m| m.underscore }.join('/')
+          require_dependency module_path
+          helper module_name.constantize
+        rescue LoadError
+          logger.debug("#{name}: missing default helper path #{module_path}") if logger
+        rescue NameError
+          logger.debug("#{name}: missing default helper module #{module_name}") if logger
+        end
+
         def inherited_with_helper(child)
           inherited_without_helper(child)
           begin
             child.master_helper_module = Module.new
             child.master_helper_module.send :include, master_helper_module
-            child.helper child.controller_path
+            child.send :default_helper_module!
           rescue MissingSourceFile => e
             raise unless e.is_missing?("helpers/#{child.controller_path}_helper")
           end

data/lib/action_controller/layout.rb

@@ -66,7 +66,9 @@ module ActionController #:nodoc:
     # <tt>app/views/layouts/weblog.rhtml</tt> or <tt>app/views/layouts/weblog.rxml</tt> exists then it will be automatically set as
     # the layout for your WeblogController. You can create a layout with the name <tt>application.rhtml</tt> or <tt>application.rxml</tt>
     # and this will be set as the default controller if there is no layout with the same name as the current controller and there is 
-    # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour. 
+    # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour
+    # for the controller where the layout is set. Explicitly setting the layout in a parent class, though, will not override the 
+    # child class's layout assignement if the child class has a layout with the same name. 
     #
     # == Inheritance for layouts
     #

data/lib/action_controller/macros/in_place_editing.rb

@@ -14,7 +14,7 @@ module ActionController
       #   end
       #
       #   # View
-      #   <%= in_place_editor_field :post, title %>
+      #   <%= in_place_editor_field :post, 'title' %>
       #
       # For help on defining an in place editor in the browser,
       # see ActionView::Helpers::JavaScriptHelper.

data/lib/action_controller/request.rb

@@ -2,7 +2,7 @@ module ActionController
   # These methods are available in both the production and test Request objects.
   class AbstractRequest
     cattr_accessor :relative_url_root
-    
+
     # Returns both GET and POST parameters in a single hash.
     def parameters
       @parameters ||= request_parameters.merge(query_parameters).merge(path_parameters).with_indifferent_access
@@ -110,7 +110,7 @@ module ActionController
     # a different <tt>tld_length</tt>, such as 2 to catch rubyonrails.co.uk in "www.rubyonrails.co.uk".
     def domain(tld_length = 1)
       return nil if !/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/.match(host).nil? or host.nil?
-        
+
       host.split('.').last(1 + tld_length).join('.')
     end
 
@@ -123,13 +123,13 @@ module ActionController
       parts[0..-(tld_length+2)]
     end
 
-    # Receive the raw post data. 
-    # This is useful for services such as REST, XMLRPC and SOAP 
-    # which communicate over HTTP POST but don't use the traditional parameter format. 
+    # Receive the raw post data.
+    # This is useful for services such as REST, XMLRPC and SOAP
+    # which communicate over HTTP POST but don't use the traditional parameter format.
     def raw_post
       env['RAW_POST_DATA']
     end
-    
+
     # Returns the request URI correctly, taking into account the idiosyncracies
     # of the various servers.
     def request_uri
@@ -153,9 +153,9 @@ module ActionController
 
     # Is this an SSL request?
     def ssl?
-      env['HTTPS'] == 'on' 
+      env['HTTPS'] == 'on'
     end
-  
+
     # Returns the interpreted path to requested resource after all the installation directory of this application was taken into account
     def path
       path = (uri = request_uri) ? uri.split('?').first : ''
@@ -165,18 +165,19 @@ module ActionController
       path[0, root.length] = '' if root
       path || ''
     end
-    
+
     # Returns the path minus the web server relative installation directory.
     # This method returns nil unless the web server is apache.
     def relative_url_root
-      @@relative_url_root ||= server_software == 'apache' ? File.dirname(env["SCRIPT_NAME"].to_s).gsub(/(^\.$|^\/$)/, '') : ''
+      @@relative_url_root ||= server_software == 'apache' ? env["SCRIPT_NAME"].to_s.sub(/\/dispatch\.(fcgi|rb|cgi)$/, '') : ''
+      
     end
 
     # Returns the port number of this request as an integer.
     def port
       @port_as_int ||= env['SERVER_PORT'].to_i
     end
-    
+
     # Returns the standard port number for this request's protocol
     def standard_port
       case protocol
@@ -196,12 +197,12 @@ module ActionController
     def host_with_port
       host + port_string
     end
-  
+
     def path_parameters=(parameters)
       @path_parameters = parameters
       @symbolized_path_parameters = @parameters = nil
     end
-    
+
     def symbolized_path_parameters
       @symbolized_path_parameters ||= path_parameters.symbolize_keys
     end
@@ -224,10 +225,13 @@ module ActionController
     def request_parameters #:nodoc:
     end
 
-    def env #:nodoc:
+    # Returns the hash of environment variables for this request,
+    # such as { 'RAILS_ENV' => 'production' }.
+    def env
     end
 
-    def host #:nodoc:
+    # Returns the host for this request, such as example.com.
+    def host
     end
 
     def cookies #:nodoc:
@@ -237,6 +241,6 @@ module ActionController
     end
 
     def reset_session #:nodoc:
-    end    
+    end
   end
 end