actionpack 1.5.0 → 1.5.1

data/lib/action_view/helpers/tag_helper.rb

@@ -7,14 +7,14 @@ module ActionView
     module TagHelper
       include ERB::Util
 
-      # Examples: 
+      # Examples:
       # * <tt>tag("br") => <br /></tt>
       # * <tt>tag("input", { "type" => "text"}) => <input type="text" /></tt>
       def tag(name, options = {}, open = false)
         "<#{name}#{tag_options(options)}" + (open ? ">" : " />")
       end
-      
-      # Examples: 
+
+      # Examples:
       # * <tt>content_tag("p", "Hello world!") => <p>Hello world!</p></tt>
       # * <tt>content_tag("div", content_tag("p", "Hello world!"), "class" => "strong") => </tt>
       #   <tt><div class="strong"><p>Hello world!</p></div></tt>
@@ -26,7 +26,7 @@ module ActionView
         def tag_options(options)
           unless options.empty?
             " " + options.map { |key, value|
-              %(#{key}="#{html_escape(value)}")
+              %(#{key}="#{html_escape(value.to_s)}")
             }.sort.join(" ")
           end
         end

data/lib/action_view/helpers/text_helper.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers #:nodoc:
     # Provides a set of methods for working with text strings that can help unburden the level of inline Ruby code in the
-    # templates. In the example below we iterate over a collection of posts provided to the template and prints each title 
+    # templates. In the example below we iterate over a collection of posts provided to the template and prints each title
     # after making sure it doesn't run longer than 20 characters:
     #   <% for post in @posts %>
     #     Title: <%= truncate(post.title, 20) %>
@@ -29,14 +29,14 @@ module ActionView
         if text.nil? || phrase.nil? then return end
         text.gsub(/(#{escape_regexp(phrase)})/i, highlighter) unless text.nil?
       end
-      
+
       # Extracts an excerpt from the +text+ surrounding the +phrase+ with a number of characters on each side determined
-      # by +radius+. If the phrase isn't found, nil is returned. Ex: 
+      # by +radius+. If the phrase isn't found, nil is returned. Ex:
       #   excerpt("hello my world", "my", 3) => "...lo my wo..."
       def excerpt(text, phrase, radius = 100, excerpt_string = "...")
         if text.nil? || phrase.nil? then return end
         phrase = escape_regexp(phrase)
-        
+
         if found_pos = text =~ /(#{phrase})/i
           start_pos = [ found_pos - radius, 0 ].max
           end_pos   = [ found_pos + phrase.length + radius, text.length ].min
@@ -58,7 +58,7 @@ module ActionView
           plural
         elsif Object.const_defined?("Inflector")
           Inflector.pluralize(singular)
-        else 
+        else
           singular + "s"
         end
       end
@@ -66,13 +66,13 @@ module ActionView
       begin
         require "redcloth"
 
-        # Returns the text with all the Textile codes turned into HTML-tags. 
+        # Returns the text with all the Textile codes turned into HTML-tags.
         # <i>This method is only available if RedCloth can be required</i>.
         def textilize(text)
           text.empty? ? "" : RedCloth.new(text, [ :hard_breaks ]).to_html
         end
 
-        # Returns the text with all the Textile codes turned into HTML-tags, but without the regular bounding <p> tag. 
+        # Returns the text with all the Textile codes turned into HTML-tags, but without the regular bounding <p> tag.
         # <i>This method is only available if RedCloth can be required</i>.
         def textilize_without_paragraph(text)
           textiled = textilize(text)
@@ -87,7 +87,7 @@ module ActionView
       begin
         require "bluecloth"
 
-        # Returns the text with all the Markdown codes turned into HTML-tags. 
+        # Returns the text with all the Markdown codes turned into HTML-tags.
         # <i>This method is only available if BlueCloth can be required</i>.
         def markdown(text)
           text.empty? ? "" : BlueCloth.new(text).to_html
@@ -101,7 +101,7 @@ module ActionView
       #
       # Example:
       #   auto_link("Go to http://www.rubyonrails.com and say hello to david@loudthinking.com") =>
-      #     Go to <a href="http://www.rubyonrails.com">http://www.rubyonrails.com</a> and 
+      #     Go to <a href="http://www.rubyonrails.com">http://www.rubyonrails.com</a> and
       #     say hello to <a href="mailto:david@loudthinking.com">david@loudthinking.com</a>
       def auto_link(text, link = :all)
         case link
@@ -115,7 +115,7 @@ module ActionView
       def strip_links(text)
         text.gsub(/<a.*>(.*)<\/a>/m, '\1')
       end
-      
+
       private
         # Returns a version of the text that's safe to use in a regular expression without triggering engine features.
         def escape_regexp(text)
@@ -133,4 +133,4 @@ module ActionView
         end
     end
   end
-end
+end

data/lib/action_view/helpers/url_helper.rb

@@ -5,43 +5,46 @@ 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
-      # Returns the URL for the set of +options+ provided. See the valid options in link:classes/ActionController/Base.html#M000021
+      # 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.
       def url_for(options = {}, *parameters_for_method_reference)
-        if Hash === options then options = { :only_path => true }.merge(options) end
+        if Hash === options then options = { :only_path => true }.update(options.stringify_keys) end
         @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
-      # 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?', 
+      # 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 link will be guarded with a JS popup asking that question. If the user accepts, the link is processed, otherwise not.
       #
       # Example:
       #   link_to "Delete this page", { :action => "destroy", :id => @page.id }, :confirm => "Are you sure?"
-      def link_to(name, options = {}, html_options = {}, *parameters_for_method_reference)
-        convert_confirm_option_to_javascript!(html_options) unless html_options.nil?
+      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 })
+          content_tag "a", name || options, (html_options || {}).merge("href" => options)
         else
           content_tag(
-            "a", name || url_for(options, *parameters_for_method_reference), 
-            (html_options || {}).merge({ "href" => url_for(options, *parameters_for_method_reference) })
+            "a", name || url_for(options, *parameters_for_method_reference),
+            (html_options || {}).merge("href" => url_for(options, *parameters_for_method_reference))
           )
         end
       end
 
-      # Creates a link tag on the image residing at the +src+ 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
-      # get a link tag that just points without consideration. The <tt>html_options</tt> works jointly for the image and ahref tag by
-      # letting the following special values enter the options on the image and the rest goes to the ahref:
+      # Creates a link tag on the image residing at the +src+ using an URL created by the set of +options+. This takes the same options 
+      # as url_for. For a list, see the url_for documentation in link:classes/ActionController/Base.html#M000079. 
+      # It's also possible to pass a string instead of an options hash to get a link tag that just points without consideration. 
+      # The <tt>html_options</tt> works jointly for the image and ahref tag by letting the following special values enter the options on
+      # the image and the rest goes to the ahref:
       #
       # * <tt>:alt</tt> - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
       # * <tt>:size</tt> - Supplied as "XxY", so "30x45" becomes width="30" and height="45"
-      # * <tt>:border</tt> - Is set to 0 by default
+      # * <tt>:border</tt> - Draws a border around the link
       # * <tt>:align</tt> - Sets the alignment, no special features
       #
-      # The +src+ can be supplied as a... 
+      # The +src+ can be supplied as a...
       # * full path, like "/my_images/image.gif"
       # * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
       # * file name without extension, like "logo", that gets expanded to "/images/logo.png"
@@ -51,8 +54,9 @@ module ActionView
       #   link_image_to "delete", { :action => "destroy" }, :size => "10x10", :confirm => "Are you sure?", "class" => "admin"
       def link_image_to(src, options = {}, html_options = {}, *parameters_for_method_reference)
         image_options = { "src" => src.include?("/") ? src : "/images/#{src}" }
-        image_options["src"] = image_options["src"] + ".png" unless image_options["src"].include?(".")
-        
+        image_options["src"] += ".png" unless image_options["src"].include?(".")
+
+        html_options = html_options.stringify_keys
         if html_options["alt"]
           image_options["alt"] = html_options["alt"]
           html_options.delete "alt"
@@ -68,10 +72,8 @@ module ActionView
         if html_options["border"]
           image_options["border"] = html_options["border"]
           html_options.delete "border"
-        else
-          image_options["border"] = "0"
         end
-        
+
         if html_options["align"]
           image_options["align"] = html_options["align"]
           html_options.delete "align"
@@ -82,18 +84,32 @@ module ActionView
 
       alias_method :link_to_image, :link_image_to # deprecated name
 
-      # Creates a link tag of the given +name+ using an URL created by the set of +options+, unless the current 
+      # Creates a link tag of the given +name+ using an URL created by the set of +options+, unless the current
       # request uri is the same as the link's, in which case only the name is returned (or the
-      # given block is yielded, if one exists). This is useful for creating link bars where you don't want to link 
+      # given block is yielded, if one exists). This is useful for creating link bars where you don't want to link
       # to the page currently being viewed.
-      def link_to_unless_current(name, options = {}, html_options = {}, *parameters_for_method_reference)
-        if current_page?(options)
-          block_given? ?
-            yield(name, options, html_options, *parameters_for_method_reference) :
+      def link_to_unless_current(name, options = {}, html_options = {}, *parameters_for_method_reference, &block)
+        link_to_unless current_page?(options), name, options, html_options, *parameters_for_method_reference, &block
+      end
+
+      # Create a link tag of the given +name+ using an URL created by the set of +options+, unless +condition+
+      # is true, in which case only the name is returned (or the given block is yielded, if one exists). 
+      def link_to_unless(condition, name, options = {}, html_options = {}, *parameters_for_method_reference, &block)
+        if condition
+          if block_given?
+            block.arity <= 1 ? yield(name) : yield(name, options, html_options, *parameters_for_method_reference)
+          else
             html_escape(name)
+          end
         else
           link_to(name, options, html_options, *parameters_for_method_reference)
-        end
+        end  
+      end
+      
+      # Create a link tag of the given +name+ using an URL created by the set of +options+, if +condition+
+      # is true, in which case only the name is returned (or the given block is yielded, if one exists). 
+      def link_to_if(condition, name, options = {}, html_options = {}, *parameters_for_method_reference, &block)
+        link_to_unless !condition, name, options, html_options, *parameters_for_method_reference, &block
       end
 
       # Creates a link tag for starting an email to the specified <tt>email_address</tt>, which is also used as the name of the
@@ -107,8 +123,8 @@ module ActionView
       #   mail_to "me@domain.com", "My email", :encode => "hex"  # =>
       #     <a href="mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">My email</a>
       def mail_to(email_address, name = nil, html_options = {})
-        encode = html_options[:encode]
-        html_options.delete(:encode)
+        html_options = html_options.stringify_keys
+        encode = html_options.delete("encode")
         string = ''
         if encode == 'javascript'
           tmp = "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address.to_s }))}');"
@@ -137,11 +153,10 @@ module ActionView
 
       private
         def convert_confirm_option_to_javascript!(html_options)
-          if html_options.include?(:confirm)
-            html_options["onclick"] = "return confirm('#{html_options[:confirm]}');"
-            html_options.delete(:confirm)
+          if confirm = html_options.delete("confirm")
+            html_options["onclick"] = "return confirm('#{confirm.gsub(/'/, '\\\\\'')}');"
           end
         end
     end
   end
-end
+end

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.5.0' + PKG_BUILD
+PKG_VERSION   = '1.5.1' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"
@@ -57,7 +57,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.0.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.0.1' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'

data/test/controller/request_test.rb

@@ -54,6 +54,17 @@ class RequestTest < Test::Unit::TestCase
     assert_equal "/", @request.path
   end
 
+  def test_path_info
+    @request.env["PATH_INFO"] = "/path/of/some/uri"
+    assert_equal "/path/of/some/uri", @request.path_info
+    assert_equal "/path/of/some/uri", @request.path
+    
+    # PATH_INFO actually has a .html suffix on many servers. But we don't want Rails to see the .html part.
+    @request.env["PATH_INFO"] = "/path/of/some/uri.html"
+    assert_equal "/path/of/some/uri", @request.path_info
+    assert_equal "/path/of/some/uri", @request.path
+  end
+
   def test_host_with_port
     @request.env['HTTP_HOST'] = "rubyonrails.org:8080"
     assert_equal "rubyonrails.org:8080", @request.host_with_port
@@ -67,4 +78,4 @@ class RequestTest < Test::Unit::TestCase
     @request.port = 81
     assert_equal "rubyonrails.org:81", @request.host_with_port
   end
-end
+end

data/test/controller/routing_tests.rb

@@ -479,6 +479,30 @@ class RouteSetTests < Test::Unit::TestCase
     @request.path_parameters = {:controller => 'admin/users', :action => 'index'}
     verify_generate 'admin/users', {}
   end
+
+  def test_url_with_spaces_in_controller
+    @request.path = 'not%20a%20valid/controller/name'
+    @set.add_route(@rails_route) if @set.empty?
+    assert_raises(ActionController::RoutingError) {@set.recognize!(@request)}
+  end
+  def test_url_with_dots_in_controller
+    @request.path = 'not.valid/controller/name'
+    @set.add_route(@rails_route) if @set.empty?
+    assert_raises(ActionController::RoutingError) {@set.recognize!(@request)}
+  end
+
+  def test_generate_of_empty_url
+    @set.connect '', :controller => 'content', :action => 'view', :id => "1"
+    @set.add_route(@rails_route)
+    verify_generate('content/view/2', {:controller => 'content', :action => 'view', :id => 2})
+    verify_generate('', {:controller => 'content', :action => 'view', :id => 1})
+  end
+  def test_generate_of_empty_url_with_numeric_requirement
+    @set.connect '', :controller => 'content', :action => 'view', :id => 1
+    @set.add_route(@rails_route)
+    verify_generate('content/view/2', {:controller => 'content', :action => 'view', :id => 2})
+    verify_generate('', {:controller => 'content', :action => 'view', :id => 1})
+  end
 end
 
 #require '../assertions/action_pack_assertions.rb'

data/test/template/active_record_helper_test.rb

@@ -48,7 +48,7 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
 
     @controller = Class.new do
       def url_for(options, *parameters_for_method_reference)
-        options[:action]
+        options[:action] || options["action"]
       end
     end
     @controller = @controller.new

data/test/template/asset_tag_helper_test.rb

@@ -9,16 +9,16 @@ class AssetTagHelperTest < Test::Unit::TestCase
   def setup
     @controller = Class.new do
       def url_for(options, *parameters_for_method_reference)
-        "http://www.world.com"
+        "http://www.example.com"
       end
     end
     @controller = @controller.new
   end
 
   AutoDiscoveryToTag = {
-    %(auto_discovery_link_tag) => %(<link href="http://www.world.com" rel="alternate" title="RSS" type="application/rss+xml" />),
-    %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.world.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
-    %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.world.com" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
+    %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
   }
 
   JavascriptIncludeToTag = {

data/test/template/form_helper_test.rb

@@ -15,7 +15,7 @@ class FormHelperTest < Test::Unit::TestCase
   $VERBOSE = old_verbose
 
   def setup
-    @post = Post.new    
+    @post = Post.new
     def @post.errors() Class.new{ def on(field) field == "author_name" end }.new end
 
     def @post.id; 123; end
@@ -47,31 +47,29 @@ class FormHelperTest < Test::Unit::TestCase
   end
 
   def test_text_field_with_options
-    assert_equal(
-      '<input id="post_title" name="post[title]" size="35" type="text" value="Hello World" />', 
-      text_field("post", "title", "size" => "35")
-    )
+    expected = '<input id="post_title" name="post[title]" size="35" type="text" value="Hello World" />'
+    assert_equal expected, text_field("post", "title", "size" => 35)
+    assert_equal expected, text_field("post", "title", :size => 35)
   end
-  
+
   def test_text_field_assuming_size
-    assert_equal(
-      '<input id="post_title" maxlength="35" name="post[title]" size="35" type="text" value="Hello World" />', 
-      text_field("post", "title", "maxlength" => 35)
-    )
+    expected = '<input id="post_title" maxlength="35" name="post[title]" size="35" type="text" value="Hello World" />'
+    assert_equal expected, text_field("post", "title", "maxlength" => 35)
+    assert_equal expected, text_field("post", "title", :maxlength => 35)
   end
-  
+
   def test_check_box
     assert_equal(
       '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
       check_box("post", "secret")
     )
-    
+
     @post.secret = 0
     assert_equal(
       '<input id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
-      check_box("post", "secret")    
+      check_box("post", "secret")
     )
-    
+
     @post.secret = true
     assert_equal(
       '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
@@ -81,20 +79,20 @@ class FormHelperTest < Test::Unit::TestCase
 
   def test_radio_button
     assert_equal('<input checked="checked" id="post_title" name="post[title]" size="30" type="radio" value="Hello World" />',
-      radio_button("post", "title", "Hello World") 
+      radio_button("post", "title", "Hello World")
     )
     assert_equal('<input id="post_title" name="post[title]" size="30" type="radio" value="Goodbye World" />',
-      radio_button("post", "title", "Goodbye World") 
+      radio_button("post", "title", "Goodbye World")
     )
   end
-  
+
   def test_text_area
     assert_equal(
       '<textarea cols="40" id="post_body" name="post[body]" rows="20" wrap="virtual">Back to the hill and over it again!</textarea>',
       text_area("post", "body")
     )
   end
-  
+
   def test_text_area_with_escapes
     @post.body        = "Back to <i>the</i> hill and over it again!"
     assert_equal(
@@ -109,12 +107,11 @@ class FormHelperTest < Test::Unit::TestCase
       text_area("post", "body")
     )
   end
-  
-  
+
   def test_explicit_name
     assert_equal(
       '<input id="post_title" name="dont guess" size="30" type="text" value="Hello World" />', text_field("post", "title", "name" => "dont guess")
-    )  
+    )
     assert_equal(
       '<textarea cols="40" id="post_body" name="really!" rows="20" wrap="virtual">Back to the hill and over it again!</textarea>',
       text_area("post", "body", "name" => "really!")
@@ -123,12 +120,18 @@ class FormHelperTest < Test::Unit::TestCase
       '<input checked="checked" id="post_secret" name="i mean it" type="checkbox" value="1" /><input name="i mean it" type="hidden" value="0" />',
       check_box("post", "secret", "name" => "i mean it")
     )
+    assert_equal text_field("post", "title", "name" => "dont guess"),
+                 text_field("post", "title", :name => "dont guess")
+    assert_equal text_area("post", "body", "name" => "really!"),
+                 text_area("post", "body", :name => "really!")
+    assert_equal check_box("post", "secret", "name" => "i mean it"),
+                 check_box("post", "secret", :name => "i mean it")
   end
- 
+
   def test_explicit_id
     assert_equal(
       '<input id="dont guess" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title", "id" => "dont guess")
-    )  
+    )
     assert_equal(
       '<textarea cols="40" id="really!" name="post[body]" rows="20" wrap="virtual">Back to the hill and over it again!</textarea>',
       text_area("post", "body", "id" => "really!")
@@ -137,6 +140,12 @@ class FormHelperTest < Test::Unit::TestCase
       '<input checked="checked" id="i mean it" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
       check_box("post", "secret", "id" => "i mean it")
     )
+    assert_equal text_field("post", "title", "id" => "dont guess"),
+                 text_field("post", "title", :id => "dont guess")
+    assert_equal text_area("post", "body", "id" => "really!"),
+                 text_area("post", "body", :id => "really!")
+    assert_equal check_box("post", "secret", "id" => "i mean it"),
+                 check_box("post", "secret", :id => "i mean it")
   end
 
   def test_auto_index
@@ -159,7 +168,5 @@ class FormHelperTest < Test::Unit::TestCase
     assert_equal("<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"radio\" value=\"Goodbye World\" />",
       radio_button("post[]", "title", "Goodbye World")
     )
-
   end
-
 end