actionpack 1.5.1 → 1.6.0

data/lib/action_view/helpers/url_helper.rb

@@ -8,7 +8,7 @@ module ActionView
       # 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 }.update(options.stringify_keys) end
+        options = { :only_path => true }.update(options.symbolize_keys) if options.kind_of? Hash
         @controller.send(:url_for, options, *parameters_for_method_reference)
       end
 
@@ -33,25 +33,8 @@ module ActionView
         end
       end
 
-      # 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> - Draws a border around the link
-      # * <tt>:align</tt> - Sets the alignment, no special features
-      #
-      # 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"
-      #
-      # Examples:
-      #   link_image_to "logo", { :controller => "home" }, :alt => "Homepage", :size => "45x80"
-      #   link_image_to "delete", { :action => "destroy" }, :size => "10x10", :confirm => "Are you sure?", "class" => "admin"
+      # This tag is deprecated. Combine the link_to and AssetTagHelper::image_tag yourself instead, like:
+      #   link_to(image_tag("rss", :size => "30x45", :border => 0), "http://www.example.com")
       def link_image_to(src, options = {}, html_options = {}, *parameters_for_method_reference)
         image_options = { "src" => src.include?("/") ? src : "/images/#{src}" }
         image_options["src"] += ".png" unless image_options["src"].include?(".")

data/lib/action_view/partials.rb

@@ -17,7 +17,7 @@ module ActionView
   # a partial by the same name as the elements contained within. So the three-lined example in "Using partials" can be rewritten
   # with a single line:
   #
-  #   <%= render_collection_of_partials "ad", @advertisements %>
+  #   <%= render_partial_collection "ad", @advertisements %>
   #
   # This will render "advertiser/_ad.rhtml" and pass the local variable +ad+ to the template for display. An iteration counter
   # will automatically be made available to the template with a name of the form +partial_name_counter+. In the case of the 
@@ -39,7 +39,7 @@ module ActionView
       render("#{path}/_#{partial_name}", { partial_name => object }.merge(local_assigns))
     end
 
-    def render_collection_of_partials(partial_name, collection, partial_spacer_template = nil, local_assigns = {})
+    def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = {})
       collection_of_partials = Array.new
       counter_name = partial_counter_name(partial_name)
       collection.each_with_index do |element, counter|
@@ -55,6 +55,8 @@ module ActionView
       end
     end
     
+    alias_method :render_collection_of_partials, :render_partial_collection
+    
     private
       def partial_pieces(partial_path)
         if partial_path.include?('/')

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.1' + PKG_BUILD
+PKG_VERSION   = '1.6.0' + 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.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.0.2' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'

data/test/controller/action_pack_assertions_test.rb

@@ -179,7 +179,6 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # test the flash-based assertions with no flash at all
   def test_flash_assertions_negative
     process :nothing
-    assert_flash_not_exists
     assert_flash_empty
     assert_flash_has_no 'hello'
     assert_flash_has_no 'qwerty'
@@ -230,7 +229,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # check the empty flashing
   def test_flash_me_naked
     process :flash_me_naked
-    assert @response.has_flash?
+    assert !@response.has_flash?
     assert !@response.has_flash_with_contents?
   end
 

data/test/controller/flash_test.rb

@@ -7,12 +7,26 @@ class FlashTest < Test::Unit::TestCase
       render_text "hello"
     end
 
+    def set_flash_now
+      flash.now["that"] = "hello"
+      @flash_copy = {}.update flash
+      render_text "hello"
+    end
+
+    def attempt_to_use_flash_now
+      @flash_copy = {}.update flash
+      @flashy = flash["that"]
+      render_text "hello"
+    end
+
     def use_flash
+      @flash_copy = {}.update flash
       @flashy = flash["that"]
       render_text "hello"
     end
 
     def use_flash_and_keep_it
+      @flash_copy = {}.update flash
       @flashy = flash["that"]
       keep_flash
       render_text "hello"
@@ -33,11 +47,11 @@ class FlashTest < Test::Unit::TestCase
 
     @request.action = "use_flash"
     first_response = process_request
-    assert_equal "hello", first_response.template.assigns["flash"]["that"]
+    assert_equal "hello", first_response.template.assigns["flash_copy"]["that"]
     assert_equal "hello", first_response.template.assigns["flashy"]
 
     second_response = process_request
-    assert_nil second_response.template.assigns["flash"]["that"], "On second flash"
+    assert_nil second_response.template.assigns["flash_copy"]["that"], "On second flash"
   end
 
   def test_keep_flash
@@ -46,17 +60,28 @@ class FlashTest < Test::Unit::TestCase
     
     @request.action = "use_flash_and_keep_it"
     first_response = process_request
-    assert_equal "hello", first_response.template.assigns["flash"]["that"]
+    assert_equal "hello", first_response.template.assigns["flash_copy"]["that"]
     assert_equal "hello", first_response.template.assigns["flashy"]
 
     @request.action = "use_flash"
     second_response = process_request
-    assert_equal "hello", second_response.template.assigns["flash"]["that"], "On second flash"
+    assert_equal "hello", second_response.template.assigns["flash_copy"]["that"], "On second flash"
 
     third_response = process_request
-    assert_nil third_response.template.assigns["flash"]["that"], "On third flash"
+    assert_nil third_response.template.assigns["flash_copy"]["that"], "On third flash"
   end
   
+  def test_flash_now
+    @request.action = "set_flash_now"
+    response = process_request
+    assert_equal "hello", response.template.assigns["flash_copy"]["that"]
+
+    @request.action = "attempt_to_use_flash_now"
+    first_response = process_request
+    assert_nil first_response.template.assigns["flash_copy"]["that"]
+    assert_nil first_response.template.assigns["flashy"]
+  end 
+  
   private
     def initialize_request_and_response
       @request  = ActionController::TestRequest.new

data/test/controller/request_test.rb

@@ -32,6 +32,23 @@ class RequestTest < Test::Unit::TestCase
     assert_equal ":8080", @request.port_string
   end
   
+    def test_relative_url_root
+    @request.env['SCRIPT_NAME'] = nil
+    assert_equal "", @request.relative_url_root
+
+    @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
+    assert_equal "", @request.relative_url_root
+
+    @request.env['SCRIPT_NAME'] = "/myapp.rb"
+    assert_equal "", @request.relative_url_root
+
+    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
+    assert_equal "/hieraki", @request.relative_url_root
+
+    @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
+    assert_equal "/collaboration/hieraki", @request.relative_url_root    
+  end
+  
   def test_request_uri
     @request.set_REQUEST_URI "http://www.rubyonrails.org/path/of/some/uri?mapped=1"
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
@@ -52,18 +69,24 @@ class RequestTest < Test::Unit::TestCase
     @request.set_REQUEST_URI "/?m=b"
     assert_equal "/?m=b", @request.request_uri
     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
+    @request.set_REQUEST_URI "/"
+    @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
+    assert_equal "/", @request.request_uri
+    assert_equal "/", @request.path    
+
+    @request.set_REQUEST_URI "/hieraki/"
+    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
+    assert_equal "/hieraki/", @request.request_uri
+    assert_equal "/", @request.path    
+
+    @request.set_REQUEST_URI "/collaboration/hieraki/books/edit/2"
+    @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
+    assert_equal "/collaboration/hieraki/books/edit/2", @request.request_uri
+    assert_equal "/books/edit/2", @request.path    
+
   end
+  
 
   def test_host_with_port
     @request.env['HTTP_HOST'] = "rubyonrails.org:8080"

data/test/controller/routing_tests.rb

@@ -325,6 +325,25 @@ class RouteTests < Test::Unit::TestCase
     assert_equal Controllers::Admin::UserController, controller
     assert_equal %w{action id}, leftovers
   end
+
+  def test_path_collection
+    route '*path_info', :controller => 'content', :action => 'fish'
+    verify_recognize'path/with/slashes',
+        :controller => 'content', :action => 'fish', :path_info => %w(path with slashes)
+    verify_generate('path/with/slashes', {},
+        {:controller => 'content', :action => 'fish', :path_info => 'path/with/slashes'},
+	{})
+  end
+  def test_path_collection_with_array
+    route '*path_info', :controller => 'content', :action => 'fish'
+    verify_recognize'path/with/slashes',
+        :controller => 'content', :action => 'fish', :path_info => %w(path with slashes)
+    verify_generate('path/with/slashes', {},
+        {:controller => 'content', :action => 'fish', :path_info => %w(path with slashes)},
+	{})
+  end
+
+
   
   def test_special_characters
     route ':id', :controller => 'content', :action => 'fish'
@@ -337,6 +356,13 @@ class RouteTests < Test::Unit::TestCase
     verify_generate('id%2Fwith%2Fslashes', {},
         {:controller => 'content', :action => 'fish', :id => 'id/with/slashes'}, {})
   end
+
+  def test_generate_with_numeric_param
+    o = Object.new
+    def o.to_param() 10 end
+    verify_generate('content/action/10', {}, {:controller => 'content', :action => 'action', :id => o}, @defaults)
+    verify_generate('content/show/10', {}, {:controller => 'content', :action => 'show', :id => o}, @defaults)
+  end
 end
 
 class RouteSetTests < Test::Unit::TestCase

data/test/template/asset_tag_helper_test.rb

@@ -8,11 +8,19 @@ class AssetTagHelperTest < Test::Unit::TestCase
 
   def setup
     @controller = Class.new do
+    
       def url_for(options, *parameters_for_method_reference)
         "http://www.example.com"
       end
-    end
-    @controller = @controller.new
+      
+    end.new
+    
+    @request = Class.new do 
+      def relative_url_root
+        ""
+      end       
+    end.new
+    
   end
 
   AutoDiscoveryToTag = {
@@ -31,6 +39,74 @@ class AssetTagHelperTest < Test::Unit::TestCase
     %(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />\n<link href="/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />)
   }
 
+  ImageLinkToTag = {
+    %(image_tag("xml")) => %(<img alt="Xml" src="/images/xml.png" />),
+    %(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.png" />),
+    %(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
+  }
+
+  def test_auto_discovery
+    AutoDiscoveryToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+  end
+
+  def test_javascript_include
+    JavascriptIncludeToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+  end
+
+  def test_style_link
+    StyleLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+  end
+
+  def test_image_tag
+    ImageLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+  end
+  
+end
+
+class AssetTagHelperNonVhostTest < Test::Unit::TestCase
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::AssetTagHelper
+
+  def setup
+    @controller = Class.new do
+    
+      def url_for(options, *parameters_for_method_reference)
+        "http://www.example.com/calloboration/hieraki"
+      end
+      
+    end.new
+    
+    @request = Class.new do 
+      def relative_url_root
+        "/calloboration/hieraki"
+      end
+    end.new
+    
+  end
+
+  AutoDiscoveryToTag = {
+    %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com/calloboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com/calloboration/hieraki" rel="alternate" title="ATOM" type="application/atom+xml" />),
+    %(auto_discovery_link_tag) => %(<link href="http://www.example.com/calloboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />),
+  }
+
+  JavascriptIncludeToTag = {
+    %(javascript_include_tag("xmlhr")) => %(<script language="JavaScript" src="/calloboration/hieraki/javascripts/xmlhr.js" type="text/javascript"></script>),
+    %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script language="JavaScript" src="/calloboration/hieraki/javascripts/common.javascript" type="text/javascript"></script>\n<script language="JavaScript" src="/calloboration/hieraki/elsewhere/cools.js" type="text/javascript"></script>),
+  }
+
+  StyleLinkToTag = {
+    %(stylesheet_link_tag("style")) => %(<link href="/calloboration/hieraki/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/calloboration/hieraki/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />\n<link href="/calloboration/hieraki/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />)
+  }
+  
+  ImageLinkToTag = {
+    %(image_tag("xml")) => %(<img alt="Xml" src="/calloboration/hieraki/images/xml.png" />),
+    %(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/calloboration/hieraki/images/rss.png" />),
+    %(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/calloboration/hieraki/images/gold.png" width="45" />),
+  }
+
   def test_auto_discovery
     AutoDiscoveryToTag.each { |method, tag| assert_equal(tag, eval(method)) }
   end
@@ -42,4 +118,13 @@ class AssetTagHelperTest < Test::Unit::TestCase
   def test_style_link
     StyleLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }
   end
+
+  def test_image_tag
+    assert_equal %(<img alt="Gold" height="70" src="/calloboration/hieraki/images/gold.png" width="45" />), image_tag("gold", :size => "45x70")
+  end
+  
+  def test_image_tag
+    ImageLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+  end
+  
 end

data/test/template/form_helper_test.rb

@@ -19,6 +19,7 @@ class FormHelperTest < Test::Unit::TestCase
     def @post.errors() Class.new{ def on(field) field == "author_name" end }.new end
 
     def @post.id; 123; end
+    def @post.id_before_type_cast; 123; end
 
     @post.title       = "Hello World"
     @post.author_name = ""

data/test/template/form_options_helper_test.rb

@@ -94,6 +94,17 @@ class FormOptionsHelperTest < Test::Unit::TestCase
       )
   end
 
+  def test_array_options_for_string_include_in_other_string_bug_fix
+      assert_equal(
+        "<option>ruby</option>\n<option selected=\"selected\">rubyonrails</option>",
+        options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
+      )
+      assert_equal(
+        "<option selected=\"selected\">ruby</option>\n<option>rubyonrails</option>",
+        options_for_select([ "ruby", "rubyonrails" ], "ruby")
+      )
+  end
+  
   def test_hash_options_for_select
     assert_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",

data/test/template/form_tag_helper_test.rb

@@ -1,23 +1,91 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/action_view/helpers/form_tag_helper'
+require File.dirname(__FILE__) + '/../abstract_unit'
 
 class FormTagHelperTest < Test::Unit::TestCase
+
+  include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::FormTagHelper
 
-  MethodToTag = {
-    %(text_field_tag("title", "Hello!")) => %(<input id="title" name="title" type="text" value="Hello!" />),
-    %(text_field_tag("title", "Hello!", "class" => "admin")) => %(<input class="admin" id="title" name="title" type="text" value="Hello!" />),
-    %(hidden_field_tag "id", 3) => %(<input id="id" name="id" type="hidden" value="3" />),
-    %(password_field_tag) => %(<input id="password" name="password" type="password" value="" />),
-    %(text_area_tag("body", "hello world", :size => "20x40")) => %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>),
-    %(text_area_tag("body", "hello world", "size" => "20x40")) => %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>),
-    %(check_box_tag("admin")) => %(<input id="admin" name="admin" type="checkbox" value="1" />),
-    %(radio_button_tag("people", "david")) => %(<input id="people" name="people" type="radio" value="david" />),
-    %(select_tag("people", "<option>david</option>")) => %(<select id="people" name="people"><option>david</option></select>),
-  }
-
-  def test_tags
-    MethodToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+  def setup
+    @controller = Class.new do
+      def url_for(options, *parameters_for_method_reference)
+        "http://www.example.com"
+      end
+    end
+    @controller = @controller.new
+  end
+
+  def test_check_box_tag
+    actual = check_box_tag "admin"
+    expected = %(<input id="admin" name="admin" type="checkbox" value="1" />)
+    assert_equal expected, actual
+  end
+
+  def test_form_tag
+    actual = form_tag 
+    expected = %(<form action="http://www.example.com" method="post">)
+    assert_equal expected, actual
+  end
+
+  def test_form_tag_multipart
+    actual = form_tag({}, { 'multipart' => true })
+    expected = %(<form action="http://www.example.com" enctype="multipart/form-data" method="post">)
+    assert_equal expected, actual
+  end
+
+  def test_hidden_field_tag
+    actual = hidden_field_tag "id", 3
+    expected = %(<input id="id" name="id" type="hidden" value="3" />)
+    assert_equal expected, actual
+  end
+
+  def test_password_field_tag
+    actual = password_field_tag
+    expected = %(<input id="password" name="password" type="password" value="" />)
+    assert_equal expected, actual
+  end
+
+  def test_radio_button_tag
+    actual = radio_button_tag "people", "david"
+    expected = %(<input id="people" name="people" type="radio" value="david" />)
+    assert_equal expected, actual
+  end
+
+  def test_select_tag
+    actual = select_tag "people", "<option>david</option>"
+    expected = %(<select id="people" name="people"><option>david</option></select>)
+    assert_equal expected, actual
+  end
+
+  def test_text_area_tag_size_string
+    actual = text_area_tag "body", "hello world", "size" => "20x40"
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>)
+    assert_equal expected, actual
+  end
+
+  def test_text_area_tag_size_symbol
+    actual = text_area_tag "body", "hello world", :size => "20x40"
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>)
+    assert_equal expected, actual
+  end
+
+  def test_text_field_tag
+    actual = text_field_tag "title", "Hello!"
+    expected = %(<input id="title" name="title" type="text" value="Hello!" />)
+    assert_equal expected, actual
+  end
+
+  def test_text_field_tag_class_string
+    actual = text_field_tag "title", "Hello!", "class" => "admin"
+    expected = %(<input class="admin" id="title" name="title" type="text" value="Hello!" />)
+    assert_equal expected, actual
+  end
+
+  def test_boolean_optios
+    assert_equal %(<input checked="checked" disabled="disabled" id="admin" name="admin" readonly="readonly" type="checkbox" value="1" />), check_box_tag("admin", 1, true, 'disabled' => true, :readonly => "yes")
+    assert_equal %(<input checked="checked" id="admin" name="admin" type="checkbox" value="1" />), check_box_tag("admin", 1, true, :disabled => false, :readonly => nil)
+    assert_equal %(<select id="people" multiple="multiple" name="people"><option>david</option></select>), select_tag("people", "<option>david</option>", :multiple => true)
+    assert_equal %(<select id="people" name="people"><option>david</option></select>), select_tag("people", "<option>david</option>", :multiple => nil)
   end
 end
+