actionpack 1.9.1 → 1.10.1

data/lib/action_view/helpers/upload_progress_helper.rb

@@ -196,7 +196,7 @@ module ActionView
 
         updater = "if (#{upload_update_object}) { #{upload_update_object}.stop(); }"
         updater << "#{upload_update_object} = new Ajax.PeriodicalUpdater('#{status_tag_id}',"
-        updater << "'#{status_url}', #{options_for_ajax(options)}.extend(#{updater_options}))"
+        updater << "'#{status_url}', Object.extend(#{options_for_ajax(options)},#{updater_options}))"
 
         updater = "#{options[:begin]}; #{updater}" if options[:begin]
         updater = "#{upload_progress_update_bar_js(0)}; #{updater}"
@@ -384,7 +384,7 @@ module ActionView
         end.to_i
 
         # TODO do animation instead of jumping
-        "$('#{progress_bar_id}').firstChild.firstChild.style.width='#{percent}%'"
+        "if($('#{progress_bar_id}')){$('#{progress_bar_id}').firstChild.firstChild.style.width='#{percent}%'}"
       end
       
       # Generates a nicely formatted string of current upload progress for

data/lib/action_view/helpers/url_helper.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + '/javascript_helper'
+
 module ActionView
   module Helpers
     # Provides a set of methods for making easy links and getting urls that depend on the controller and action. This means that
@@ -5,32 +7,47 @@ module ActionView
     # synchronously, so link_to uses that same url as is generated by url_for, which again is the same url used for
     # redirection in redirect_to.
     module UrlHelper
+      include JavaScriptHelper
+      
       # Returns the URL for the set of +options+ provided. This takes the same options 
       # as url_for. For a list, see the url_for documentation in link:classes/ActionController/Base.html#M000079.
+      # Note that it'll set :only_path => true so you'll get /controller/action instead of the 
+      # http://example.com/controller/action part (makes it harder to parse httpd log files)
       def url_for(options = {}, *parameters_for_method_reference)
         options = { :only_path => true }.update(options.symbolize_keys) if options.kind_of? Hash
         @controller.send(:url_for, options, *parameters_for_method_reference)
       end
 
       # Creates a link tag of the given +name+ using an URL created by the set of +options+. See the valid options in
-      # link:classes/ActionController/Base.html#M000021. It's also possible to pass a string instead of an options hash to
+      # link:classes/ActionView/Helpers/UrlHelper.html#M000304. It's also possible to pass a string instead of an options hash to
       # get a link tag that just points without consideration. If nil is passed as a name, the link itself will become the name.
-      # The html_options have a special feature for creating javascript confirm alerts where if you pass :confirm => 'Are you sure?',
+      #
+      # The html_options has three special features. One for creating javascript confirm alerts where if you pass :confirm => 'Are you sure?',
       # the link will be guarded with a JS popup asking that question. If the user accepts, the link is processed, otherwise not.
       #
-      # Example:
+      # Another for creating a popup window, which is done by either passing :popup with true or the options of the window in 
+      # Javascript form.
+      #
+      # And a third for making the link do a POST request (instead of the regular GET) through a dynamically added form element that
+      # is instantly submitted. Note that if the user has turned off Javascript, the request will fall back on the GET. So its
+      # your responsibility to determine what the action should be once it arrives at the controller. The POST form is turned on by
+      # passing :post as true. Note, it's not possible to use POST requests and popup targets at the same time (an exception will be thrown).
+      #
+      # Examples:
       #   link_to "Delete this page", { :action => "destroy", :id => @page.id }, :confirm => "Are you sure?"
+      #   link_to "Help", { :action => "help" }, :popup => true
+      #   link_to "Busy loop", { :action => "busy" }, :popup => ['new_window', 'height=300,width=600']
+      #   link_to "Destroy account", { :action => "destroy" }, :confirm => "Are you sure?", :post => true
       def link_to(name, options = {}, html_options = nil, *parameters_for_method_reference)
-        html_options = (html_options || {}).stringify_keys
-        convert_confirm_option_to_javascript!(html_options)
-        if options.is_a?(String)
-          content_tag "a", name || options, (html_options || {}).merge("href" => options)
+        if html_options
+          html_options = html_options.stringify_keys
+          convert_options_to_javascript!(html_options)
+          tag_options = tag_options(html_options)
         else
-          content_tag(
-            "a", name || url_for(options, *parameters_for_method_reference),
-            (html_options || {}).merge("href" => url_for(options, *parameters_for_method_reference))
-          )
+          tag_options = nil
         end
+        url = html_escape(options.is_a?(String) ? options : url_for(options, *parameters_for_method_reference))
+        "<a href=\"#{url}\"#{tag_options}>#{name||url}</a>"
       end
 
       # Generates a form containing a sole button that submits to the
@@ -80,15 +97,20 @@ module ActionView
       # +td+ element or in between +p+ elements, but not in the middle of
       # a run of text, nor can you place a form within another form.
       # (Bottom line: Always validate your HTML before going public.)
-
       def button_to(name, options = {}, html_options = nil)
         html_options = (html_options || {}).stringify_keys
         convert_boolean_attributes!(html_options, %w( disabled ))
-        convert_confirm_option_to_javascript!(html_options)
-        url, name = options.is_a?(String) ? 
+        
+        if confirm = html_options.delete("confirm")
+          html_options["onclick"] = "return #{confirm_javascript_function(confirm)};"
+        end
+
+        url, name = options.is_a?(String) ?
           [ options,  name || options ] :
-          [ url_for(options), name || url_for(options) ]
+          [ url_for(options), name || html_escape(url_for(options)) ]
+
         html_options.merge!("type" => "submit", "value" => name)
+
         "<form method=\"post\" action=\"#{h url}\" class=\"button-to\"><div>" +
           tag("input", html_options) + "</div></form>"
       end
@@ -213,15 +235,42 @@ module ActionView
 
       # Returns true if the current page uri is generated by the options passed (in url_for format).
       def current_page?(options)
-        url_for(options) == @request.request_uri
+        url_for(options) == @controller.request.request_uri
       end
 
       private
-        def convert_confirm_option_to_javascript!(html_options)
-          if confirm = html_options.delete("confirm")
-            html_options["onclick"] = "return confirm('#{confirm.gsub(/'/, '\\\\\'')}');"
+        def convert_options_to_javascript!(html_options)
+          confirm, popup, post = html_options.delete("confirm"), html_options.delete("popup"), html_options.delete("post")
+        
+          html_options["onclick"] = case
+            when popup && post
+              raise ActionView::ActionViewError, "You can't use :popup and :post in the same link"
+            when confirm && popup
+              "if (#{confirm_javascript_function(confirm)}) { #{popup_javascript_function(popup)} };return false;"
+            when confirm && post
+              "if (#{confirm_javascript_function(confirm)}) { #{post_javascript_function} };return false;"
+            when confirm
+              "return #{confirm_javascript_function(confirm)};"
+            when post
+              "#{post_javascript_function}return false;"
+            when popup
+              popup_javascript_function(popup) + 'return false;'
+            else
+              html_options["onclick"]
           end
         end
+        
+        def confirm_javascript_function(confirm)
+          "confirm('#{escape_javascript(confirm)}')"
+        end
+        
+        def popup_javascript_function(popup)
+          popup.is_a?(Array) ? "window.open(this.href,'#{popup.first}','#{popup.last}');" : "window.open(this.href);"
+        end
+        
+        def post_javascript_function
+          "f = document.createElement('form'); document.body.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit();"
+        end
 
         # Processes the _html_options_ hash, converting the boolean
         # attributes from true/false form into the form required by
@@ -246,12 +295,10 @@ module ActionView
         #
         #   convert_boolean_attributes!( html_options,
         #                                %w( checked disabled readonly ) )
-
         def convert_boolean_attributes!(html_options, bool_attrs)
           bool_attrs.each { |x| html_options[x] = x if html_options.delete(x) }
           html_options
         end
-
     end
   end
 end

data/lib/action_view/partials.rb

@@ -46,24 +46,30 @@ module ActionView
   # This will render the partial "advertisement/_ad.rhtml" regardless of which controller this is being called from.
   module Partials
     # Deprecated, use render :partial
-    def render_partial(partial_path, local_assigns = {}, deprecated_local_assigns = {}) #:nodoc:
+    def render_partial(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc:
       path, partial_name = partial_pieces(partial_path)
       object = extracting_object(partial_name, local_assigns, deprecated_local_assigns)
       local_assigns = extract_local_assigns(local_assigns, deprecated_local_assigns)
+      local_assigns = local_assigns ? local_assigns.clone : {}
       add_counter_to_local_assigns!(partial_name, local_assigns)
+      add_object_to_local_assigns!(partial_name, local_assigns, object)
 
-      render("#{path}/_#{partial_name}", { partial_name => object }.merge(local_assigns))
+      ActionController::Base.benchmark("Rendered #{path}/_#{partial_name}", Logger::DEBUG, false) do
+        render("#{path}/_#{partial_name}", local_assigns)
+      end
     end
 
     # Deprecated, use render :partial, :collection
-    def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = {}) #:nodoc:
+    def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = nil) #:nodoc:
       collection_of_partials = Array.new
       counter_name = partial_counter_name(partial_name)
+      local_assigns = local_assigns ? local_assigns.clone : {}
       collection.each_with_index do |element, counter|
-        collection_of_partials.push(render_partial(partial_name, element, { counter_name => counter }.merge(local_assigns)))
+        local_assigns[counter_name] = counter
+        collection_of_partials.push(render_partial(partial_name, element, local_assigns))
       end
 
-      return nil if collection_of_partials.empty?
+      return " " if collection_of_partials.empty?
 
       if partial_spacer_template
         spacer_path, spacer_name = partial_pieces(partial_spacer_template)
@@ -85,7 +91,7 @@ module ActionView
       end
 
       def partial_counter_name(partial_name)
-        "#{partial_name.split('/').last}_counter"
+        "#{partial_name.split('/').last}_counter".intern
       end
       
       def extracting_object(partial_name, local_assigns, deprecated_local_assigns)
@@ -105,5 +111,10 @@ module ActionView
         counter_name = partial_counter_name(partial_name)
         local_assigns[counter_name] = 1 unless local_assigns.has_key?(counter_name)
       end
+      
+      def add_object_to_local_assigns!(partial_name, local_assigns, object)
+        local_assigns[partial_name.intern] ||= object.is_a?(ActionView::Base::ObjectWrapper) ? object.value : object
+        local_assigns[partial_name.intern] ||= controller.instance_variable_get("@#{partial_name}")
+      end
   end
 end

data/lib/action_view/template_error.rb

@@ -7,16 +7,13 @@ module ActionView
     attr_reader :original_exception
 
     def initialize(base_path, file_name, assigns, source, original_exception)
-      @base_path, @file_name, @assigns, @source, @original_exception = 
-        base_path, file_name, assigns, source, original_exception
+      @base_path, @assigns, @source, @original_exception = 
+        base_path, assigns, source, original_exception
+      @file_name = file_name
     end
   
     def message
-      if original_exception.message.include?("(eval):")
-        original_exception.message.scan(/\(eval\):(?:[0-9]*):in `.*'(.*)/).first.first
-      else
-        original_exception.message
-      end
+      original_exception.message
     end
   
     def sub_template_message
@@ -42,49 +39,47 @@ module ActionView
 
       extract.join
     end
-  
+
     def sub_template_of(file_name)
       @sub_templates ||= []
       @sub_templates << file_name
     end
   
     def line_number
-      trace = @original_exception.backtrace.join
-      if trace.include?("erb):")
-        trace.scan(/\((?:erb)\):([0-9]*)/).first.first.to_i
-      elsif trace.include?("eval):")
-        trace.scan(/\((?:eval)\):([0-9]*)/).first.first.to_i
-      else
-        1
+      if file_name
+        regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)\s*$/
+        [@original_exception.message, @original_exception.clean_backtrace].flatten.each do |line|
+          return $1.to_i if regexp =~ line
+        end
       end
+      0
     end
   
     def file_name
-      strip_base_path(@file_name)
+      stripped = strip_base_path(@file_name)
+      stripped[0] == ?/ ? stripped[1..-1] : stripped
     end
     
     def to_s
       "\n\n#{self.class} (#{message}) on line ##{line_number} of #{file_name}:\n" + 
       source_extract + "\n    " +
-      clean_backtrace(original_exception).join("\n    ") +
+      original_exception.clean_backtrace.join("\n    ") +
       "\n\n"
     end
 
     def backtrace
       [ 
         "On line ##{line_number} of #{file_name}\n\n#{source_extract(4)}\n    " + 
-        clean_backtrace(original_exception).join("\n    ")
+        original_exception.clean_backtrace.join("\n    ")
       ]
     end
 
     private
       def strip_base_path(file_name)
+        file_name = File.expand_path(file_name).gsub(/^#{Regexp.escape File.expand_path(RAILS_ROOT)}/, '')
         file_name.gsub(@base_path, "")
       end
-
-      def clean_backtrace(exception)
-        base_dir = File.expand_path(File.dirname(__FILE__) + "/../../../../")
-        exception.backtrace.collect { |line| line.gsub(base_dir, "").gsub("/public/../config/environments/../../", "").gsub("/public/../", "") }
-      end
   end
-end
+end
+
+Exception::TraceSubstitutions << [/:in\s+`_run_(html|xml).*'\s*$/, ''] if defined?(Exception::TraceSubstitutions)

data/rakefile

@@ -5,10 +5,11 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.9.1' + PKG_BUILD
+PKG_VERSION   = ActionPack::Version::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
@@ -61,7 +62,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.1.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.2.1' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
@@ -239,4 +240,4 @@ task :release => [:package] do
       first_file = false
     end
   end
-end
+end

data/test/abstract_unit.rb

@@ -8,5 +8,6 @@ require 'action_controller'
 require 'action_controller/test_process'
 
 ActionController::Base.logger = nil
-ActionController::Base.ignore_missing_templates = true
+ActionController::Base.ignore_missing_templates = false
 ActionController::Routing::Routes.reload rescue nil
+

data/test/controller/action_pack_assertions_test.rb

@@ -20,6 +20,8 @@ class ActionPackAssertionsController < ActionController::Base
   def redirect_to_controller() redirect_to :controller => "elsewhere", :action => "flash_me"; end
 
   def redirect_to_path() redirect_to '/some/path' end
+
+  def redirect_to_named_route() redirect_to route_one_url end
   
   # a redirect to an external location
   def redirect_external() redirect_to_url "http://www.rubyonrails.org"; end
@@ -48,7 +50,7 @@ class ActionPackAssertionsController < ActionController::Base
   # assign some template instance variables
   def assign_this
     @howdy = "ho"
-    render_text "Mr. Henke"
+    render :inline => "Mr. Henke"
   end
 
   def render_based_on_parameters
@@ -75,6 +77,41 @@ class ActionPackAssertionsController < ActionController::Base
   def raise_on_post
     raise "post" if @request.post?
     render_text "request method: #{@request.env['REQUEST_METHOD']}"
+  end       
+  
+  def get_valid_record
+    @record = Class.new do       
+      def valid?
+        true
+      end
+
+      def errors
+        Class.new do 
+           def full_messages; '...stuff...'; end          
+        end.new
+      end    
+    
+    end.new
+        
+    render :nothing => true    
+  end
+
+
+  def get_invalid_record
+    @record = Class.new do 
+      
+      def valid?
+        false
+      end
+      
+      def errors
+        Class.new do 
+           def full_messages; '...stuff...'; end          
+        end.new
+      end
+    end.new                
+    
+    render :nothing => true    
   end
 
   # 911
@@ -185,6 +222,14 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :redirect_external
     assert_redirect_url_match /ruby/
   end
+
+  # test the redirection to a named route
+  def test_assert_redirect_to_named_route
+    process :redirect_to_named_route
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_redirected_to 'http://test.host/route_two'
+    end
+  end
   
   # test the flash-based assertions with something is in the flash
   def test_flash_assertions_full
@@ -410,6 +455,21 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     
     get :redirect_to_fellow_controller
     assert_redirected_to :controller => 'admin/user'
+  end                 
+  
+  def test_assert_valid
+    get :get_valid_record
+    assert_valid assigns('record')    
+  end                
+  
+  def test_assert_valid_failing
+    get :get_invalid_record
+    
+    begin
+      assert_valid assigns('record')    
+      assert false
+    rescue Test::Unit::AssertionFailedError => e             
+    end
   end
 end
 
@@ -427,4 +487,4 @@ class ActionPackHeaderTest < Test::Unit::TestCase
     process :hello_xml_world
     assert_equal('application/pdf', @controller.headers['Content-Type'])
   end
-end
+end

data/test/controller/active_record_assertions_test.rb

@@ -47,7 +47,7 @@ class ActiveRecordAssertionsController < ActionController::Base
     @company = Company.new
     @company.name = "B"
     @company.rating = 2
-    render_text "snicker...."
+    render :inline => "snicker...."
   end
 
   # fail with 2 bad columns
@@ -55,7 +55,7 @@ class ActiveRecordAssertionsController < ActionController::Base
     @company = Company.new
     @company.name = ""
     @company.rating = 2
-    render_text "double snicker...."
+    render :inline => "double snicker...."
   end
 
   # this will pass validation
@@ -63,20 +63,19 @@ class ActiveRecordAssertionsController < ActionController::Base
     @company = Company.new
     @company.name = "A"
     @company.rating = 69
-    render_text "Goodness Gracious!"
+    render :inline => "Goodness Gracious!"
   end
 
   # this will fail validation
   def bad_company
     @company = Company.new 
-    render_text "Who's Bad?"
+    render :inline => "Who's Bad?"
   end
 
   # the safety dance......
   def rescue_action(e) raise; end
 end
-
-
+                    
 class ActiveRecordAssertionsControllerTest < Test::Unit::TestCase
   def setup
     @request = ActionController::TestRequest.new