actionpack 1.9.0 → 1.9.1

data/CHANGELOG

@@ -1,3 +1,41 @@
+*1.9.1* (11 July, 2005)
+
+* Fixed that auto_complete_for didn't force the input string to lower case even as the db comparison was
+
+* Fixed that Action View should always use the included Builder, never attempt to require the gem, to ensure compatibility
+
+* Added that nil options are not included in tags, so tag("p", :ignore => nil) now returns <p /> not <p ignore="" />  but that tag("p", :ignore => "") still includes it #1465 [michael@schuerig.de]
+
+* Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on the name if no link was to be applied. This is unnecessary and breaks its use with images #1649 [joergd@pobox.com]
+
+* Improved error message for DoubleRenderError
+
+* Fixed routing to allow for testing of *path components #1650 [Nicholas Seckar]
+
+* Added :handle as an option to sortable_element to restrict the drag handle to a given class #1642 [thejohnny]
+
+* Added a bunch of script.aculo.us features #1644, #1677, #1695 [Thomas Fuchs]
+  * Effect.ScrollTo, to smoothly scroll the page to an element
+  * Better Firefox flickering handling on SlideUp/SlideDown
+  * Removed a possible memory leak in IE with draggables
+  * Added support for cancelling dragging my hitting ESC
+  * Added capability to remove draggables/droppables and redeclare sortables in dragdrop.js (this makes it possible to call sortable_element on the same element more than once, e.g. in AJAX returns that modify the sortable element. all current sortable 'stuff' on the element will be discarded and the sortable will be rebuilt)
+  * Always reset background color on Effect.Highlight; this make change backwards-compatibility, to be sure include style="background-color:(target-color)" on your elements or else elements will fall back to their CSS rules (which is a good thing in most circumstances)
+  * Removed circular references from element to prevent memory leaks (still not completely gone in IE)
+  * Changes to class extension in effects.js
+  * Make Effect.Highlight restore any previously set background color when finishing (makes effect work with CSS classes that set a background color)
+  * Fixed myriads of memory leaks in IE and Gecko-based browsers [David Zülke]
+  * Added incremental and local autocompleting and loads of documentation to controls.js [Ivan Krstic]
+  * Extended the auto_complete_field helper to accept tokens option
+  * Changed object extension mechanism to favor Object.extend to make script.aculo.us easily adaptable to support 3rd party libs like IE7.js [David Zülke]
+  
+* Fixed that named routes didn't use the default values for action and possible other parameters #1534 [Nicholas Seckar]
+
+* Fixed JavascriptHelper#visual_effect to use camelize such that :blind_up will work #1639 [pelletierm@eastmedia.net]
+
+* Fixed that a SessionRestoreError was thrown if a model object was placed in the session that wasn't available to all controllers. This means that it's no longer necessary to use the 'model :post' work-around in ApplicationController to have a Post model in your session.
+
+
 *1.9.0* (6 July, 2005)
 
 * Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions)

data/README

@@ -174,7 +174,7 @@ A short rundown of the major features:
     link_to_remote "Delete this post", :update => "posts", 
                    :url => { :action => "destroy", :id => post.id }
   
-  {Learn more}[link:classes/ActionView/Helpers/JavascriptHelper.html]
+  {Learn more}[link:classes/ActionView/Helpers/JavaScriptHelper.html]
 
 
 * Pagination for navigating lists of results.

data/lib/action_controller/auto_complete.rb

@@ -24,7 +24,7 @@ module ActionController
     #   auto_complete_for :post, :title, :limit => 15, :order => 'created_at DESC'
     #
     # For help on defining text input fields with autocompletion, 
-    # see ActionView::Helpers::JavascriptHelper.
+    # see ActionView::Helpers::JavaScriptHelper.
     #
     # For more examples, see script.aculo.us:
     # * http://script.aculo.us/demos/ajax/autocompleter
@@ -33,7 +33,7 @@ module ActionController
       def auto_complete_for(object, method, options = {})
         define_method("auto_complete_for_#{object}_#{method}") do
           find_options = { 
-            :conditions => [ "LOWER(#{method}) LIKE ?", '%' + params[object][method] + '%' ], 
+            :conditions => [ "LOWER(#{method}) LIKE ?", '%' + params[object][method].downcase + '%' ], 
             :order => "#{method} ASC",
             :limit => 10 }.merge!(options)
             

data/lib/action_controller/base.rb

@@ -26,6 +26,11 @@ module ActionController #:nodoc:
   class MissingFile < ActionControllerError #:nodoc:
   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)
+      super(message || DEFAULT_MESSAGE)
+    end
   end
 
   # Action Controllers are made up of one or more actions that performs its purpose and then either renders a template or
@@ -179,16 +184,19 @@ module ActionController #:nodoc:
   #
   # == Calling multiple redirects or renders
   #
-  # The rule for handling calls of multiple redirects and renders is that the first call wins. So in the following example:
+  # An action should conclude by a single render or redirect. Attempting to try to do either again will result in a DoubleRenderError:
   #
   #   def do_something
   #     redirect_to :action => "elsewhere"
-  #     render :action => "overthere"
+  #     render :action => "overthere" # raises DoubleRenderError
   #   end
   #
-  # Only the redirect happens. The rendering call is simply ignored.
+  # If you need to redirect on the condition of something, then be sure to add "and return" to halt execution.
   #
-  # == Environments
+  #   def do_something
+  #     redirect_to(:action => "elsewhere") and return if monkeys.nil?
+  #     render :action => "overthere" # won't be called unless monkeys is nil
+  #   end  # == Environments
   #
   # Action Controller works out of the box with CGI, FastCGI, and mod_ruby. CGI and mod_ruby controllers are triggered just the same using:
   #
@@ -455,9 +463,6 @@ module ActionController #:nodoc:
       #   # Renders the template for the action "goal" within the current controller
       #   render :action => "goal"
       #
-      #   # Renders the template for the action "explosion" from the ErrorsController
-      #   render :action => "errors/explosion", :status => 500 
-      #
       #   # Renders the template for the action "short_goal" within the current controller,
       #   # but without the current active layout
       #   render :action => "short_goal", :layout => false
@@ -500,14 +505,17 @@ module ActionController #:nodoc:
       #
       # === Rendering a file
       # 
-      # File rendering works just like action rendering except that it takes a complete path to the template intended
-      # for rendering and that the current layout is not applied automatically.
+      # File rendering works just like action rendering except that it takes a path relative to the template root or an absolute
+      # path if use_full_path is passed as true. The current layout is not applied automatically.
+      #
+      #   # Renders the template located in [TEMPLATE_ROOT]/weblog/show.r(html|xml) (in Rails, app/views/weblog/show.rhtml)
+      #   render :file => "weblog/show"
       #
       #   # Renders the template located in /path/to/some/template.r(html|xml)
-      #   render :file => "/path/to/some/template"
+      #   render :file => "/path/to/some/template", :use_full_path => false
       #
       #   # Renders the same template within the current layout, but with a 404 status code
-      #   render :file => "/path/to/some/template", :layout => true, :status => 404
+      #   render :file => "/path/to/some/template", :use_full_path => false, :layout => true, :status => 404
       #
       # _Deprecation_ _notice_: This used to have the signature <tt>render_file(path, status = 200)</tt>
       #
@@ -560,7 +568,7 @@ module ActionController #:nodoc:
       #   render :nothing => true, :status => 401
       def render(options = {}, deprecated_status = nil) #:doc:
         # puts "Rendering: #{options.inspect}"
-        raise DoubleRenderError, "Can only render or redirect once per action" if performed?
+        raise DoubleRenderError if performed?
 
         # Backwards compatibility
         return render({ :template => options || default_template_name, :status => deprecated_status }) if !options.is_a?(Hash)
@@ -684,7 +692,7 @@ module ActionController #:nodoc:
       def redirect_to(options = {}, *parameters_for_method_reference) #:doc:
         case options
           when %r{^\w+://.*}
-            raise DoubleRenderError, "Can only render or redirect once per action" if performed?
+            raise DoubleRenderError if performed?
             logger.info("Redirected to #{options}") unless logger.nil?
             response.redirect(options)
             response.redirected_to = options

data/lib/action_controller/cgi_process.rb

@@ -95,29 +95,22 @@ module ActionController #:nodoc:
         @session["__valid_session"]
         return @session
       rescue ArgumentError => e
-        # TODO: Uncomment this on 0.13.1
-        # 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
-        # else
-        #   raise
-        # end
-        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}])"
-        )
+        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
+        else
+          raise
+        end
       end
     end
     

data/lib/action_controller/routing.rb

@@ -92,14 +92,14 @@ module ActionController
     
       def initialize(key, options = {})
         @key = key.to_sym
-        @default, @condition = options[:default], options[:condition]
-        @optional = options.key?(:default)
+        default, @condition = options[:default], options[:condition]
+        self.default = default if options.key?(:default)
       end
 
       def default_check(g)
         presence = "#{g.hash_value(key, !! default)}"
         if default
-           "!(#{presence} && #{g.hash_value(key, false)} != #{default.inspect})"
+           "!(#{presence} && #{g.hash_value(key, false)} != #{default.to_s.inspect})"
         else
           "! #{presence}"
         end
@@ -210,7 +210,7 @@ module ActionController
           mod_name = controller_name = segment = nil
       
           while index < length
-            return nil unless /^[a-z][a-z\d_]*$/ =~ (segment = segments[index])
+            return nil unless /^[A-Za-z][A-Za-z\d_]*$/ =~ (segment = segments[index])
             index += 1
         
             mod_name = segment.camelize
@@ -226,8 +226,12 @@ module ActionController
 
     class PathComponent < DynamicComponent #:nodoc:
       def optional?() true end
-      def default()   ''   end
+      def default()   []  end
       def condition() nil  end
+
+      def default=(value)
+        raise RoutingError, "All path components have an implicit default of []" unless value == []
+      end
   
       def write_generation(g)
         raise RoutingError, 'Path components must occur last' unless g.after.empty?
@@ -245,24 +249,28 @@ module ActionController
         start = "(#{start})" unless /^\w+$/ =~ start
     
         value_expr = "#{g.path_name}[#{start}..-1] || []"
-        g.result key, "ActionController::Routing::PathComponent::Result.new(#{value_expr})"
+        g.result key, "ActionController::Routing::PathComponent::Result.new_escaped(#{value_expr})"
         g.finish(false)
       end
   
       class Result < ::Array
         def to_s() join '/' end
+        def self.new_escaped(strings)
+          new strings.collect {|str| CGI.unescape str}
+        end
       end
     end
 
     class Route #:nodoc:
       attr_accessor :components, :known
-      attr_reader :path, :options, :keys
+      attr_reader :path, :options, :keys, :defaults
   
       def initialize(path, options = {})
         @path, @options = path, options
     
         initialize_components path
         defaults, conditions = initialize_hashes options.dup
+        @defaults = defaults.dup
         configure_components(defaults, conditions)
         initialize_keys
       end
@@ -423,7 +431,7 @@ module ActionController
         path.shift  
    
         hash = recognize_path(path)  
-        recognition_failed(request) unless hash && hash['controller']  
+        return recognition_failed(request) unless hash && hash['controller']  
    
         controller = hash['controller']  
         hash['controller'] = controller.controller_path  
@@ -576,7 +584,7 @@ module ActionController
         end
 
         def name_route(route, name)
-          hash = route.known.symbolize_keys
+          hash = route.defaults.merge(route.known).symbolize_keys
           hash[:controller] = "/#{hash[:controller]}"
       
           define_method(hash_access_name(name)) { hash }

data/lib/action_controller/session/active_record_store.rb

@@ -27,7 +27,7 @@ class CGI
     #   initialize(hash_of_session_id_and_data)
     #   attr_reader :session_id
     #   attr_accessor :data
-    #   save!
+    #   save
     #   destroy
     #
     # The fast SqlBypass class is a generic SQL session store.  You may
@@ -198,7 +198,7 @@ class CGI
           @data
         end
 
-        def save!
+        def save
           marshaled_data = self.class.marshal(data)
           if @new_record
             @new_record = false
@@ -240,7 +240,7 @@ class CGI
       # Find or instantiate a session given a CGI::Session.
       def initialize(session, option = nil)
         session_id = session.session_id
-        unless @session = @@session_class.find_by_session_id(session_id)
+        unless @session = ActiveRecord::Base.silence { @@session_class.find_by_session_id(session_id) }
           unless session.new_session
             raise CGI::Session::NoSession, 'uninitialized session'
           end
@@ -258,7 +258,7 @@ class CGI
       # Save session store.
       def update
         if @session
-          ActiveRecord::Base.silence { @session.save! }
+          ActiveRecord::Base.silence { @session.save }
         end
       end
 

data/lib/action_controller/test_process.rb

@@ -72,10 +72,16 @@ module ActionController #:nodoc:
       extra_keys = ActionController::Routing::Routes.extra_keys(parameters)
       non_path_parameters = get? ? query_parameters : request_parameters
       parameters.each do |key, value|
+        if value.is_a? Fixnum
+          value = value.to_s
+        elsif value.is_a? Array
+          value = ActionController::Routing::PathComponent::Result.new(value)
+        end
+
         if extra_keys.include?(key.to_sym)
           non_path_parameters[key] = value
         else
-          path_parameters[key] = value.to_s
+          path_parameters[key.to_s] = value
         end
       end
     end                        
@@ -352,6 +358,36 @@ module Test
           return @controller.send(selector, *args) if ActionController::Routing::NamedRoutes::Helpers.include?(selector)
           return super
         end
+
+        # A helper to make it easier to test different route configurations.
+        # This method temporarily replaces ActionController::Routing::Routes
+        # with a new RouteSet instance. 
+        #
+        # The new instance is yielded to the passed block. Typically the block
+        # will create some routes using map.draw { map.connect ... }:
+        #
+        #   with_routing do |set|
+        #     set.draw { set.connect ':controller/:id/:action' }
+        #     assert_equal(
+        #        ['/content/10/show', {}],
+        #        set.generate(:controller => 'content', :id => 10, :action => 'show')
+        #     )
+        #   end
+        #
+        def with_routing
+          real_routes = ActionController::Routing::Routes
+          ActionController::Routing.send :remove_const, :Routes
+
+          temporary_routes = ActionController::Routing::RouteSet.new
+          ActionController::Routing.send :const_set, :Routes, temporary_routes
+          
+          yield temporary_routes
+        ensure
+          if ActionController::Routing.const_defined? :Routes
+            ActionController::Routing.send(:remove_const, :Routes) 
+          end
+          ActionController::Routing.const_set(:Routes, real_routes) if real_routes
+        end
     end
   end
 end

data/lib/action_view.rb

@@ -21,14 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-begin
-  require 'rubygems'
-  require 'builder'
-rescue LoadError
-  # RubyGems is not available, use included Builder
-  $:.unshift(File.dirname(__FILE__) + "/action_view/vendor")
-  require 'action_view/vendor/builder'
-end
+$:.unshift(File.dirname(__FILE__) + "/action_view/vendor")
+require 'action_view/vendor/builder'
 
 require 'action_view/base'
 require 'action_view/partials'

data/lib/action_view/helpers/javascript_helper.rb

@@ -72,7 +72,7 @@ module ActionView
       #       :url => { :action => "undo", :n => word_counter },
       #       :complete => "undoRequestCompleted(request)"
       #
-      # The callbacks that may be specified are:
+      # The callbacks that may be specified are (in order):
       #
       # <tt>:loading</tt>::       Called when the remote document is being 
       #                           loaded with data by the browser.
@@ -81,13 +81,15 @@ module ActionView
       # <tt>:interactive</tt>::   Called when the user can interact with the 
       #                           remote document, even though it has not 
       #                           finished loading.
-      # <tt>:complete</tt>::      Called when the XMLHttpRequest is complete,
-      #                           and the HTTP status code is 200 OK.
-      # <tt>:failure</tt>::       Called when the XMLHttpRequest is complete,
-      #                           and the HTTP status code is anything other than
-      #                           200 OK.
-      #
-      # You can further refine <tt>:failure</tt> by adding additional 
+      # <tt>:success</tt>::       Called when the XMLHttpRequest is completed,
+      #                           and the HTTP status code is in the 2XX range.
+      # <tt>:failure</tt>::       Called when the XMLHttpRequest is completed,
+      #                           and the HTTP status code is not in the 2XX
+      #                           range.
+      # <tt>:complete</tt>::      Called when the XMLHttpRequest is complete 
+      #                           (fires after success/failure if they are present).,
+      #                     
+      # You can further refine <tt>:success</tt> and <tt>:failure</tt> by adding additional 
       # callbacks for specific status codes:
       #
       # Example:
@@ -96,6 +98,7 @@ module ActionView
       #       404 => "alert('Not found...? Wrong URL...?')",
       #       :failure => "alert('HTTP Error ' + request.status + '!')"
       #
+      # A status code callback overrides the success/failure handlers if present.
       #
       # If you for some reason or another need synchronous processing (that'll
       # block the browser while the request is happening), you can specify 
@@ -358,8 +361,13 @@ module ActionView
         function << "'#{field_id}', "
         function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', "
         function << "'#{url_for(options[:url])}'"
-
+        
         js_options = {}
+        if options[:tokens] and options[:tokens].kind_of?(Array)
+          js_options[:tokens] = "['#{options[:tokens].join('\',\'')}']"
+        elsif options[:tokens]
+          js_options[:tokens] = "'#{options[:tokens]}'" if options[:tokens]
+        end
         js_options[:callback]   = "function(element, value) { return #{options[:with]} }" if options[:with]
         js_options[:indicator]  = "'#{options[:indicator]}'" if options[:indicator]
         function << (', ' + options_for_javascript(js_options) + ')')
@@ -419,7 +427,7 @@ module ActionView
       # http://script.aculo.us for more documentation.
       def visual_effect(name, element_id = false, js_options = {})
         element = element_id ? "'#{element_id}'" : "element"
-        "new Effect.#{name.to_s.capitalize}(#{element},#{options_for_javascript(js_options)});"
+        "new Effect.#{name.to_s.camelize}(#{element},#{options_for_javascript(js_options)});"
       end
       
       # Makes the element with the DOM ID specified by +element_id+ sortable
@@ -441,7 +449,7 @@ module ActionView
         options[:onUpdate] ||= "function(){" + remote_function(options) + "}"
         options.delete_if { |key, value| AJAX_OPTIONS.include?(key) }
         
-        [:tag, :overlap, :constraint].each do |option|
+        [:tag, :overlap, :constraint, :handle].each do |option|
           options[option] = "'#{options[option]}'" if options[option]
         end
         
@@ -504,7 +512,7 @@ module ActionView
 
     private
       def options_for_javascript(options)
-        '{' + options.map {|k, v| "#{k}:#{v}"}.join(', ') + '}'
+        '{' + options.map {|k, v| "#{k}:#{v}"}.sort.join(', ') + '}'
       end
       
       def options_for_ajax(options)