actionpack 1.5.0 → 1.5.1

data/test/template/form_options_helper_test.rb

@@ -46,7 +46,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     )
   end
 
-  
+
   def test_collection_options_with_preselected_value
     @posts = [
       Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
@@ -75,14 +75,14 @@ class FormOptionsHelperTest < Test::Unit::TestCase
 
   def test_array_options_for_select
     assert_equal(
-      "<option>&lt;Denmark&gt;</option>\n<option>USA</option>\n<option>Sweden</option>", 
+      "<option>&lt;Denmark&gt;</option>\n<option>USA</option>\n<option>Sweden</option>",
       options_for_select([ "<Denmark>", "USA", "Sweden" ])
     )
   end
 
   def test_array_options_for_select_with_selection
     assert_equal(
-      "<option>Denmark</option>\n<option selected=\"selected\">&lt;USA&gt;</option>\n<option>Sweden</option>", 
+      "<option>Denmark</option>\n<option selected=\"selected\">&lt;USA&gt;</option>\n<option>Sweden</option>",
       options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
     )
   end
@@ -96,21 +96,21 @@ class FormOptionsHelperTest < Test::Unit::TestCase
 
   def test_hash_options_for_select
     assert_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>", 
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" })
     )
   end
 
   def test_hash_options_for_select_with_selection
     assert_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>", 
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar")
     )
   end
 
   def test_hash_options_for_select_with_selection
     assert_equal(
-      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>", 
+      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ])
     )
   end
@@ -197,7 +197,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @post = Post.new
     @post.category = "<mus>"
     assert_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option>abe</option>\n<option selected=\"selected\">&lt;mus&gt;</option>\n<option>hest</option></select>", 
+      "<select id=\"post_category\" name=\"post[category]\"><option>abe</option>\n<option selected=\"selected\">&lt;mus&gt;</option>\n<option>hest</option></select>",
       select("post", "category", %w( abe <mus> hest))
     )
   end
@@ -206,7 +206,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @post = Post.new
     @post.category = "<mus>"
     assert_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option></option>\n<option>abe</option>\n<option selected=\"selected\">&lt;mus&gt;</option>\n<option>hest</option></select>", 
+      "<select id=\"post_category\" name=\"post[category]\"><option></option>\n<option>abe</option>\n<option selected=\"selected\">&lt;mus&gt;</option>\n<option>hest</option></select>",
       select("post", "category", %w( abe <mus> hest), :include_blank => true)
     )
   end
@@ -222,7 +222,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @post.author_name = "Babe"
 
     assert_equal(
-      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>", 
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
       collection_select("post", "author_name", @posts, "author_name", "author_name")
     )
   end
@@ -238,7 +238,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @post.author_name = "Babe"
 
     assert_equal(
-      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>", 
+      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
       collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
     )
   end
@@ -291,6 +291,8 @@ class FormOptionsHelperTest < Test::Unit::TestCase
                  "<option value=\"E\">E</option>" +
                  "</select>",
                  html
+    assert_equal html, time_zone_select("firm", "time_zone", nil, {},
+      :style => "color: red")
   end
 
   def test_time_zone_select_with_blank_and_style
@@ -306,6 +308,8 @@ class FormOptionsHelperTest < Test::Unit::TestCase
                  "<option value=\"E\">E</option>" +
                  "</select>",
                  html
+    assert_equal html, time_zone_select("firm", "time_zone", nil,
+      { :include_blank => true }, :style => "color: red")
   end
 
   def test_time_zone_select_with_priority_zones

data/test/template/form_tag_helper_test.rb

@@ -11,12 +11,13 @@ class FormTagHelperTest < Test::Unit::TestCase
     %(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(eval(method), tag) }
+    MethodToTag.each { |method, tag| assert_equal(tag, eval(method)) }
   end
-end
+end

data/test/template/tag_helper_test.rb

@@ -8,23 +8,26 @@ class TagHelperTest < Test::Unit::TestCase
 
   def test_tag
     assert_equal "<p class=\"show\" />", tag("p", "class" => "show")
+    assert_equal tag("p", "class" => "show"), tag("p", :class => "show")
   end
-  
+
   def test_content_tag
     assert_equal "<a href=\"create\">Create</a>", content_tag("a", "Create", "href" => "create")
+    assert_equal content_tag("a", "Create", "href" => "create"),
+                 content_tag("a", "Create", :href => "create")
   end
 
   def test_mail_to_with_javascript
-  	assert_equal "<script type=\"text/javascript\" language=\"javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript")
+    assert_equal "<script type=\"text/javascript\" language=\"javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript")
   end
 
   def test_mail_to_with_hex
-  	assert_equal "<a href=\"mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex")
+    assert_equal "<a href=\"mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex")
   end
 
   def test_mail_to
-  	assert_equal "<a href=\"mailto:me@domain.com\">My email</a>", mail_to("me@domain.com", "My email")
+    assert_equal "<a href=\"mailto:me@domain.com\">My email</a>", mail_to("me@domain.com", "My email")
   end
 
   # FIXME: Test form tag
-end
+end

data/test/template/text_helper_test.rb

@@ -8,11 +8,11 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal "Hello World!", truncate("Hello World!", 12)
     assert_equal "Hello Worl...", truncate("Hello World!!", 12)
   end
-  
+
   def test_strip_links
     assert_equal "on my mind", strip_links("<a href='almost'>on my mind</a>")
   end
-  
+
   def test_highlighter
     assert_equal(
       "This is a <strong class=\"highlight\">beautiful</strong> morning",
@@ -29,7 +29,7 @@ class TextHelperTest < Test::Unit::TestCase
       highlight("This is a beautiful morning, but also a beautiful day", "beautiful", '<b>\1</b>')
     )
   end
-  
+
   def test_highlighter_with_regexp
     assert_equal(
       "This is a <strong class=\"highlight\">beautiful!</strong> morning",
@@ -46,7 +46,7 @@ class TextHelperTest < Test::Unit::TestCase
       highlight("This is a beautiful? morning", "beautiful? morning")
     )
   end
-  
+
   def test_excerpt
     assert_equal("...is a beautiful morni...", excerpt("This is a beautiful morning", "beautiful", 5))
     assert_equal("This is a...", excerpt("This is a beautiful morning", "this", 5))
@@ -54,16 +54,16 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", 5))
     assert_nil excerpt("This is a beautiful morning", "day")
   end
-  
+
   def test_pluralization
     assert_equal("1 count", pluralize(1, "count"))
     assert_equal("2 counts", pluralize(2, "count"))
   end
-  
+
   def test_auto_linking
     assert_equal %(hello <a href="mailto:david@loudthinking.com">david@loudthinking.com</a>), auto_link("hello david@loudthinking.com", :email_addresses)
     assert_equal %(Go to <a href="http://www.rubyonrails.com">http://www.rubyonrails.com</a>), auto_link("Go to http://www.rubyonrails.com", :urls)
     assert_equal %(Go to http://www.rubyonrails.com), auto_link("Go to http://www.rubyonrails.com", :email_addresses)
     assert_equal %(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>), auto_link("Go to http://www.rubyonrails.com and say hello to david@loudthinking.com")
   end
-end
+end

data/test/template/url_helper_test.rb

@@ -11,7 +11,7 @@ class UrlHelperTest < 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
@@ -19,35 +19,66 @@ class UrlHelperTest < Test::Unit::TestCase
 
   # todo: missing test cases
   def test_link_tag_with_straight_url
-    assert_equal "<a href=\"http://www.world.com\">Hello</a>", link_to("Hello", "http://www.world.com")
+    assert_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", "http://www.example.com")
   end
-  
+
   def test_link_tag_with_javascript_confirm
     assert_equal(
-      "<a href=\"http://www.world.com\" onclick=\"return confirm('Are you sure?');\">Hello</a>", 
-      link_to("Hello", "http://www.world.com", :confirm => "Are you sure?")
+      "<a href=\"http://www.example.com\" onclick=\"return confirm('Are you sure?');\">Hello</a>",
+      link_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
+    )
+    assert_equal(
+      "<a href=\"http://www.example.com\" onclick=\"return confirm('You can\\'t possibly be sure, can you?');\">Hello</a>", 
+      link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure, can you?")
     )
   end
-  
-  def test_link_to_image
+
+  def test_link_image_to
     assert_equal(
-      "<a href=\"http://www.world.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>", 
-      link_to_image("rss", "http://www.world.com", "size" => "30x45")
+      "<a href=\"http://www.example.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>",
+      link_image_to("rss", "http://www.example.com", "size" => "30x45", "border" => "0")
     )
 
     assert_equal(
-      "<a class=\"admin\" href=\"http://www.world.com\"><img alt=\"Feed\" border=\"0\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>", 
-      link_to_image("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin")
+      "<a class=\"admin\" href=\"http://www.example.com\"><img alt=\"Feed\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>",
+      link_image_to("rss.gif", "http://www.example.com", "size" => "30x45", "alt" => "Feed", "class" => "admin")
     )
+
+    assert_equal link_image_to("rss", "http://www.example.com", "size" => "30x45"),
+                 link_image_to("rss", "http://www.example.com", :size => "30x45")
+    assert_equal link_image_to("rss.gif", "http://www.example.com", "size" => "30x45", "alt" => "Feed", "class" => "admin"),
+                 link_image_to("rss.gif", "http://www.example.com", :size => "30x45", :alt => "Feed", :class => "admin")
+  end
+
+  def test_link_to_unless
+    assert_equal "Showing", link_to_unless(true, "Showing", :action => "show", :controller => "weblog")
+    assert "<a href=\"http://www.example.com\">Listing</a>", link_to_unless(false, "Listing", :action => "list", :controller => "weblog")
+    assert_equal "Showing", link_to_unless(true, "Showing", :action => "show", :controller => "weblog", :id => 1)
+    assert_equal "<strong>Showing</strong>", link_to_unless(true, "Showing", :action => "show", :controller => "weblog", :id => 1) { |name, options, html_options, *parameters_for_method_reference|
+      "<strong>#{name}</strong>"
+    }
+    assert_equal "<strong>Showing</strong>", link_to_unless(true, "Showing", :action => "show", :controller => "weblog", :id => 1) { |name|
+      "<strong>#{name}</strong>"
+    }    
+    assert_equal "test", link_to_unless(true, "Showing", :action => "show", :controller => "weblog", :id => 1) {
+      "test"
+    }    
   end
   
+  def test_link_to_if
+    assert_equal "Showing", link_to_if(false, "Showing", :action => "show", :controller => "weblog")
+    assert "<a href=\"http://www.example.com\">Listing</a>", link_to_if(true, "Listing", :action => "list", :controller => "weblog")
+    assert_equal "Showing", link_to_if(false, "Showing", :action => "show", :controller => "weblog", :id => 1)
+  end
+
+
   def test_link_unless_current
-    @request = RequestMock.new("http://www.world.com")
+    @request = RequestMock.new("http://www.example.com")
     assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
-    @request = RequestMock.new("http://www.notworld.com")
-    assert "<a href=\"http://www.world.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
+    @request = RequestMock.new("http://www.example.org")
+    assert "<a href=\"http://www.example.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
 
-    @request = RequestMock.new("http://www.world.com")
+    @request = RequestMock.new("http://www.example.com")
     assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
   end
 
@@ -55,12 +86,14 @@ class UrlHelperTest < Test::Unit::TestCase
     assert_equal "<a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>", mail_to("david@loudthinking.com")
     assert_equal "<a href=\"mailto:david@loudthinking.com\">David Heinemeier Hansson</a>", mail_to("david@loudthinking.com", "David Heinemeier Hansson")
     assert_equal(
-      "<a class=\"admin\" href=\"mailto:david@loudthinking.com\">David Heinemeier Hansson</a>", 
+      "<a class=\"admin\" href=\"mailto:david@loudthinking.com\">David Heinemeier Hansson</a>",
       mail_to("david@loudthinking.com", "David Heinemeier Hansson", "class" => "admin")
     )
+    assert_equal mail_to("david@loudthinking.com", "David Heinemeier Hansson", "class" => "admin"),
+                 mail_to("david@loudthinking.com", "David Heinemeier Hansson", :class => "admin")
   end
-  
+
   def test_link_with_nil_html_options
-    assert_equal "<a href=\"http://www.world.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
+    assert_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
-date: 2005-02-24
+  version: 1.5.1
+date: 2005-03-07
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib
@@ -161,7 +161,6 @@ files:
   - test/template/tag_helper_test.rb
   - test/template/text_helper_test.rb
   - test/template/url_helper_test.rb
-  - test/template/url_helper_test.rb.rej
   - examples/address_book
   - examples/address_book_controller.cgi
   - examples/address_book_controller.fcgi
@@ -193,5 +192,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
       version: 

data/test/template/url_helper_test.rb.rej

@@ -1,105 +0,0 @@
-***************
-*** 11,17 ****
-    def setup
-      @controller = Class.new do
-        def url_for(options, *parameters_for_method_reference)
--         "http://www.world.com"
-        end
-      end
-      @controller = @controller.new
---- 11,17 ----
-    def setup
-      @controller = Class.new do
-        def url_for(options, *parameters_for_method_reference)
-+         "http://www.example.com"
-        end
-      end
-      @controller = @controller.new
-***************
-*** 19,53 ****
-  
-    # todo: missing test cases
-    def test_link_tag_with_straight_url
--     assert_equal "<a href=\"http://www.world.com\">Hello</a>", link_to("Hello", "http://www.world.com")
-    end
-    
-    def test_link_tag_with_javascript_confirm
-      assert_equal(
--       "<a href=\"http://www.world.com\" onclick=\"return confirm('Are you sure?');\">Hello</a>", 
--       link_to("Hello", "http://www.world.com", :confirm => "Are you sure?")
-      )
-    end
-    
-    def test_link_to_image
-      assert_equal(
--       "<a href=\"http://www.world.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>", 
--       link_to_image("rss", "http://www.world.com", "size" => "30x45")
-      )
-  
-      assert_equal(
--       "<a class=\"admin\" href=\"http://www.world.com\"><img alt=\"Feed\" border=\"0\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>", 
--       link_to_image("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin")
-      )
-    end
-    
-    def test_link_unless_current
--     @request = RequestMock.new("http://www.world.com")
-      assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
--     @request = RequestMock.new("http://www.notworld.com")
--     assert "<a href=\"http://www.world.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
-  
--     @request = RequestMock.new("http://www.world.com")
-      assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
-    end
-  
---- 19,53 ----
-  
-    # todo: missing test cases
-    def test_link_tag_with_straight_url
-+     assert_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", "http://www.example.com")
-    end
-    
-    def test_link_tag_with_javascript_confirm
-      assert_equal(
-+       "<a href=\"http://www.example.com\" onclick=\"return confirm('Are you sure?');\">Hello</a>", 
-+       link_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
-      )
-    end
-    
-    def test_link_to_image
-      assert_equal(
-+       "<a href=\"http://www.example.com\"><img alt=\"Rss\" border=\"1\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>", 
-+       link_to_image("rss", "http://www.example.com", "size" => "30x45", "border" => 1)
-      )
-  
-      assert_equal(
-+       "<a class=\"admin\" href=\"http://www.example.com\"><img alt=\"Feed\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>", 
-+       link_to_image("rss.gif", "http://www.example.com", "size" => "30x45", "alt" => "Feed", "class" => "admin")
-      )
-    end
-    
-    def test_link_unless_current
-+     @request = RequestMock.new("http://www.example.com")
-      assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
-+     @request = RequestMock.new("http://www.example.org")
-+     assert "<a href=\"http://www.example.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
-  
-+     @request = RequestMock.new("http://www.example.com")
-      assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
-    end
-  
-***************
-*** 61,66 ****
-    end
-    
-    def test_link_with_nil_html_options
--     assert_equal "<a href=\"http://www.world.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
-    end
-  end
---- 61,66 ----
-    end
-    
-    def test_link_with_nil_html_options
-+     assert_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
-    end
-  end