actionpack 1.5.1 → 1.6.0

data/test/template/tag_helper_test.rb

@@ -1,4 +1,5 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
+
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper'
 
@@ -16,18 +17,4 @@ class TagHelperTest < Test::Unit::TestCase
     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")
-  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")
-  end
-
-  def test_mail_to
-    assert_equal "<a href=\"mailto:me@domain.com\">My email</a>", mail_to("me@domain.com", "My email")
-  end
-
-  # FIXME: Test form tag
 end

data/test/template/text_helper_test.rb

@@ -3,6 +3,12 @@ require File.dirname(__FILE__) + '/../../lib/action_view/helpers/text_helper'
 
 class TextHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TextHelper
+  
+  def test_simple_format
+    assert_equal "<p>crazy\n<br /> cross\n<br /> platform linebreaks</p>", simple_format("crazy\r\n cross\r platform linebreaks")
+    assert_equal "<p>A paragraph</p>\n\n<p>and another one!</p>", simple_format("A paragraph\n\nand another one!")
+    assert_equal "<p>A paragraph\n<br /> With a newline</p>", simple_format("A paragraph\n With a newline")
+  end
 
   def test_truncate
     assert_equal "Hello World!", truncate("Hello World!", 12)

data/test/template/url_helper_test.rb

@@ -1,10 +1,13 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
+
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper'
+require File.dirname(__FILE__) + '/../../lib/action_view/helpers/asset_tag_helper'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper'
 
 RequestMock = Struct.new("Request", :request_uri)
 
 class UrlHelperTest < Test::Unit::TestCase
+  include ActionView::Helpers::AssetTagHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
 
@@ -33,23 +36,6 @@ class UrlHelperTest < Test::Unit::TestCase
     )
   end
 
-  def test_link_image_to
-    assert_equal(
-      "<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.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")
@@ -93,6 +79,15 @@ class UrlHelperTest < Test::Unit::TestCase
                  mail_to("david@loudthinking.com", "David Heinemeier Hansson", :class => "admin")
   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")
+  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")
+  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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.8
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
-date: 2005-03-07
+  version: 1.6.0
+date: 2005-03-22
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib
@@ -53,6 +53,7 @@ files:
   - lib/action_controller/flash.rb
   - lib/action_controller/helpers.rb
   - lib/action_controller/layout.rb
+  - lib/action_controller/pagination.rb
   - lib/action_controller/request.rb
   - lib/action_controller/rescue.rb
   - lib/action_controller/response.rb
@@ -95,14 +96,19 @@ files:
   - lib/action_view/helpers/active_record_helper.rb
   - lib/action_view/helpers/asset_tag_helper.rb
   - lib/action_view/helpers/cache_helper.rb
+  - lib/action_view/helpers/capture_helper.rb
   - lib/action_view/helpers/date_helper.rb
   - lib/action_view/helpers/debug_helper.rb
   - lib/action_view/helpers/form_helper.rb
   - lib/action_view/helpers/form_options_helper.rb
   - lib/action_view/helpers/form_tag_helper.rb
+  - lib/action_view/helpers/javascript_helper.rb
+  - lib/action_view/helpers/javascripts
+  - lib/action_view/helpers/pagination_helper.rb
   - lib/action_view/helpers/tag_helper.rb
   - lib/action_view/helpers/text_helper.rb
   - lib/action_view/helpers/url_helper.rb
+  - lib/action_view/helpers/javascripts/prototype.js
   - lib/action_view/vendor/builder
   - lib/action_view/vendor/builder.rb
   - lib/action_view/vendor/builder/blankslate.rb
@@ -131,7 +137,6 @@ files:
   - test/controller/routing_tests.rb
   - test/controller/send_file_test.rb
   - test/controller/url_obsolete.rb
-  - test/controller/url_obsolete.rb.rej
   - test/fixtures/fun
   - test/fixtures/helpers
   - test/fixtures/layouts
@@ -192,5 +197,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.1
+            version: 1.0.2
       version: 

data/test/controller/url_obsolete.rb.rej

@@ -1,747 +0,0 @@
-***************
-*** 35,41 ****
-    def setup
-      @library_url = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
--       "www.singlefile.com", 
-        80,
-        "/library/books/ISBN/0743536703/show",
-        { "type" => "ISBN", "code" => "0743536703" }
---- 35,41 ----
-    def setup
-      @library_url = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
-+       "www.example.com", 
-        80,
-        "/library/books/ISBN/0743536703/show",
-        { "type" => "ISBN", "code" => "0743536703" }
-***************
-*** 43,49 ****
-  
-      @library_url_using_module = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
--       "www.singlefile.com", 
-        80,
-        "/library/books/ISBN/0743536703/show",
-        { "type" => "ISBN", "code" => "0743536703", "module" => "library" }
---- 43,49 ----
-  
-      @library_url_using_module = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
-+       "www.example.com", 
-        80,
-        "/library/books/ISBN/0743536703/show",
-        { "type" => "ISBN", "code" => "0743536703", "module" => "library" }
-***************
-*** 51,57 ****
-  
-      @library_url_on_index = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
--       "www.singlefile.com", 
-        80,
-        "/library/books/ISBN/0743536703/", 
-        { "type" => "ISBN", "code" => "0743536703" }
---- 51,57 ----
-  
-      @library_url_on_index = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
-+       "www.example.com", 
-        80,
-        "/library/books/ISBN/0743536703/", 
-        { "type" => "ISBN", "code" => "0743536703" }
-***************
-*** 59,103 ****
-      
-      @clean_urls = [
-        ActionController::UrlRewriter.old_new(MockRequest.new(
--         "http://", "www.singlefile.com", 80, "/identity/", {}
-        ), "identity", "index"),
-        ActionController::UrlRewriter.old_new(MockRequest.new(
--         "http://", "www.singlefile.com", 80, "/identity", {}
-        ), "identity", "index")
-      ]
-  
-      @clean_url_with_id = ActionController::UrlRewriter.old_new(MockRequest.new(
--       "http://", "www.singlefile.com", 80, "/identity/show/5", { "id" => "5" }
-      ), "identity", "show")
-  
-      @clean_url_with_same_action_and_controller_name = ActionController::UrlRewriter.old_new(MockRequest.new(
--       "http://", "www.singlefile.com", 80, "/login/login", {  }
-      ), "login", "login")
-  
-      @clean_url_with_same_action_and_controller_and_module_name = ActionController::UrlRewriter.old_new(MockRequest.new(
--       "http://", "www.singlefile.com", 80, "/login/login/login", { "module" => "login" }
-      ), "login", "login")
-  
-      @clean_url_with_id_as_char = ActionController::UrlRewriter.old_new(MockRequest.new(
--       "http://", "www.singlefile.com", 80, "/teachers/show/t", { "id" => "t" }
-      ), "teachers", "show")
-    end
-  
-    def test_clean_action
--     assert_equal "http://www.singlefile.com/library/books/ISBN/0743536703/edit", @library_url.rewrite(:action => "edit")
-    end
-  
-    def test_clean_action_to_another_host
-      assert_equal(
--       "http://www.booksphere.com/library/books/ISBN/0743536703/edit", 
--       @library_url.rewrite(:action => "edit", :host => "www.booksphere.com")
-      )
-    end
-  
-    def test_clean_action_to_another_host_and_protocol
-      assert_equal(
--       "https://www.booksphere.com/library/books/ISBN/0743536703/edit", 
--       @library_url.rewrite(:action => "edit", :host => "www.booksphere.com", :protocol => "https://")
-      )
-    end
-  
---- 59,103 ----
-      
-      @clean_urls = [
-        ActionController::UrlRewriter.old_new(MockRequest.new(
-+         "http://", "www.example.com", 80, "/identity/", {}
-        ), "identity", "index"),
-        ActionController::UrlRewriter.old_new(MockRequest.new(
-+         "http://", "www.example.com", 80, "/identity", {}
-        ), "identity", "index")
-      ]
-  
-      @clean_url_with_id = ActionController::UrlRewriter.old_new(MockRequest.new(
-+       "http://", "www.example.com", 80, "/identity/show/5", { "id" => "5" }
-      ), "identity", "show")
-  
-      @clean_url_with_same_action_and_controller_name = ActionController::UrlRewriter.old_new(MockRequest.new(
-+       "http://", "www.example.com", 80, "/login/login", {  }
-      ), "login", "login")
-  
-      @clean_url_with_same_action_and_controller_and_module_name = ActionController::UrlRewriter.old_new(MockRequest.new(
-+       "http://", "www.example.com", 80, "/login/login/login", { "module" => "login" }
-      ), "login", "login")
-  
-      @clean_url_with_id_as_char = ActionController::UrlRewriter.old_new(MockRequest.new(
-+       "http://", "www.example.com", 80, "/teachers/show/t", { "id" => "t" }
-      ), "teachers", "show")
-    end
-  
-    def test_clean_action
-+     assert_equal "http://www.example.com/library/books/ISBN/0743536703/edit", @library_url.rewrite(:action => "edit")
-    end
-  
-    def test_clean_action_to_another_host
-      assert_equal(
-+       "http://www.example.com/library/books/ISBN/0743536703/edit", 
-+       @library_url.rewrite(:action => "edit", :host => "www.example.com")
-      )
-    end
-  
-    def test_clean_action_to_another_host_and_protocol
-      assert_equal(
-+       "https://www.example.com/library/books/ISBN/0743536703/edit", 
-+       @library_url.rewrite(:action => "edit", :host => "www.example.com", :protocol => "https://")
-      )
-    end
-  
-***************
-*** 106,246 ****
-    end
-  
-    def test_action_from_index
--     assert_equal "http://www.singlefile.com/library/books/ISBN/0743536703/edit", @library_url_on_index.rewrite(:action => "edit")
-    end
-  
-    def test_action_from_index_on_clean
-      @clean_urls.each do |url|
--       assert_equal "http://www.singlefile.com/identity/edit", url.rewrite(:action => "edit")
-      end
-    end
-  
-    def test_action_without_prefix
--     assert_equal "http://www.singlefile.com/library/books/", @library_url.rewrite(:action => "index", :action_prefix => "")
-    end
-  
-    def test_action_with_prefix
-      assert_equal(
--       "http://www.singlefile.com/library/books/XTC/123/show", 
-        @library_url.rewrite(:action => "show", :action_prefix => "XTC/123")
-      )
-    end
-  
-    def test_action_prefix_alone
-      assert_equal(
--       "http://www.singlefile.com/library/books/XTC/123/",
-        @library_url.rewrite(:action_prefix => "XTC/123")
-      )
-    end
-  
-    def test_action_with_suffix
-      assert_equal(
--       "http://www.singlefile.com/library/books/show/XTC/123",
-        @library_url.rewrite(:action => "show", :action_prefix => "", :action_suffix => "XTC/123")
-      )
-    end
-  
-    def test_clean_controller
--     assert_equal "http://www.singlefile.com/library/settings/", @library_url.rewrite(:controller => "settings")
-    end
-  
-    def test_clean_controller_prefix
--     assert_equal "http://www.singlefile.com/shop/", @library_url.rewrite(:controller_prefix => "shop")
-    end
-  
-    def test_clean_controller_with_module
--     assert_equal "http://www.singlefile.com/shop/purchases/", @library_url.rewrite(:module => "shop", :controller => "purchases")
-    end
-    
-    def test_getting_out_of_a_module
--     assert_equal "http://www.singlefile.com/purchases/", @library_url_using_module.rewrite(:module => false, :controller => "purchases")
-    end
-  
-    def test_controller_and_action
--     assert_equal "http://www.singlefile.com/library/settings/show", @library_url.rewrite(:controller => "settings", :action => "show")
-    end
-  
-    def test_controller_and_action_and_anchor
-      assert_equal(
--       "http://www.singlefile.com/library/settings/show#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_and_empty_overwrite_params_and_anchor
-      assert_equal(
--       "http://www.singlefile.com/library/settings/show?code=0743536703&type=ISBN#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :overwrite_params => {},  :anchor => "5")
-      )
-    end
-    
-    def test_controller_and_action_and_overwrite_params_and_anchor
-      assert_equal(
--       "http://www.singlefile.com/library/settings/show?code=0000001&type=ISBN#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :overwrite_params => {"code"=>"0000001"},  :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_and_overwrite_params_with_nil_value_and_anchor
-      assert_equal(
--       "http://www.singlefile.com/library/settings/show?type=ISBN#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :overwrite_params => {"code" => nil},  :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_params_and_overwrite_params_and_anchor
-      assert_equal(
--       "http://www.singlefile.com/library/settings/show?code=0000001&version=5.0#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :params=>{"version" => "5.0"},  :overwrite_params => {"code"=>"0000001"},  :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_and_params_anchor
-      assert_equal(
--       "http://www.singlefile.com/library/settings/show?update=1#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :params => { "update" => "1"}, :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_index_action
--     assert_equal "http://www.singlefile.com/library/settings/", @library_url.rewrite(:controller => "settings", :action => "index")
-    end
-  
-    def test_same_controller_and_action_names
--     assert_equal "http://www.singlefile.com/login/logout", @clean_url_with_same_action_and_controller_name.rewrite(:action => "logout")
-    end
-  
-    def xtest_same_module_and_controller_and_action_names
--     assert_equal "http://www.singlefile.com/login/login/logout", @clean_url_with_same_action_and_controller_and_module_name.rewrite(:action => "logout")
-    end
-  
-    def test_controller_and_action_with_same_name_as_controller
-      @clean_urls.each do |url|
--       assert_equal "http://www.singlefile.com/anything/identity", url.rewrite(:controller => "anything", :action => "identity")
-      end
-    end
-  
-    def test_controller_and_index_action_without_controller_prefix
-      assert_equal(
--       "http://www.singlefile.com/settings/", 
-        @library_url.rewrite(:controller => "settings", :action => "index", :controller_prefix => "")
-      )
-    end
-  
-    def test_controller_and_index_action_with_controller_prefix
-      assert_equal(
--       "http://www.singlefile.com/fantastic/settings/show", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :controller_prefix => "fantastic")
-      )
-    end
-  
-    def test_path_parameters
--     assert_equal "http://www.singlefile.com/library/books/EXBC/0743536703/show", @library_url.rewrite(:path_params => {"type" => "EXBC"})
-    end
-    
-    def test_parameters
-      assert_equal(
--       "http://www.singlefile.com/library/books/ISBN/0743536703/show?delete=1&name=David", 
-        @library_url.rewrite(:params => {"delete" => "1", "name" => "David"})
-      )
-    end
---- 106,246 ----
-    end
-  
-    def test_action_from_index
-+     assert_equal "http://www.example.com/library/books/ISBN/0743536703/edit", @library_url_on_index.rewrite(:action => "edit")
-    end
-  
-    def test_action_from_index_on_clean
-      @clean_urls.each do |url|
-+       assert_equal "http://www.example.com/identity/edit", url.rewrite(:action => "edit")
-      end
-    end
-  
-    def test_action_without_prefix
-+     assert_equal "http://www.example.com/library/books/", @library_url.rewrite(:action => "index", :action_prefix => "")
-    end
-  
-    def test_action_with_prefix
-      assert_equal(
-+       "http://www.example.com/library/books/XTC/123/show", 
-        @library_url.rewrite(:action => "show", :action_prefix => "XTC/123")
-      )
-    end
-  
-    def test_action_prefix_alone
-      assert_equal(
-+       "http://www.example.com/library/books/XTC/123/",
-        @library_url.rewrite(:action_prefix => "XTC/123")
-      )
-    end
-  
-    def test_action_with_suffix
-      assert_equal(
-+       "http://www.example.com/library/books/show/XTC/123",
-        @library_url.rewrite(:action => "show", :action_prefix => "", :action_suffix => "XTC/123")
-      )
-    end
-  
-    def test_clean_controller
-+     assert_equal "http://www.example.com/library/settings/", @library_url.rewrite(:controller => "settings")
-    end
-  
-    def test_clean_controller_prefix
-+     assert_equal "http://www.example.com/shop/", @library_url.rewrite(:controller_prefix => "shop")
-    end
-  
-    def test_clean_controller_with_module
-+     assert_equal "http://www.example.com/shop/purchases/", @library_url.rewrite(:module => "shop", :controller => "purchases")
-    end
-    
-    def test_getting_out_of_a_module
-+     assert_equal "http://www.example.com/purchases/", @library_url_using_module.rewrite(:module => false, :controller => "purchases")
-    end
-  
-    def test_controller_and_action
-+     assert_equal "http://www.example.com/library/settings/show", @library_url.rewrite(:controller => "settings", :action => "show")
-    end
-  
-    def test_controller_and_action_and_anchor
-      assert_equal(
-+       "http://www.example.com/library/settings/show#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_and_empty_overwrite_params_and_anchor
-      assert_equal(
-+       "http://www.example.com/library/settings/show?code=0743536703&type=ISBN#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :overwrite_params => {},  :anchor => "5")
-      )
-    end
-    
-    def test_controller_and_action_and_overwrite_params_and_anchor
-      assert_equal(
-+       "http://www.example.com/library/settings/show?code=0000001&type=ISBN#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :overwrite_params => {"code"=>"0000001"},  :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_and_overwrite_params_with_nil_value_and_anchor
-      assert_equal(
-+       "http://www.example.com/library/settings/show?type=ISBN#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :overwrite_params => {"code" => nil},  :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_params_and_overwrite_params_and_anchor
-      assert_equal(
-+       "http://www.example.com/library/settings/show?code=0000001&version=5.0#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :params=>{"version" => "5.0"},  :overwrite_params => {"code"=>"0000001"},  :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_action_and_params_anchor
-      assert_equal(
-+       "http://www.example.com/library/settings/show?update=1#5", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :params => { "update" => "1"}, :anchor => "5")
-      )
-    end
-  
-    def test_controller_and_index_action
-+     assert_equal "http://www.example.com/library/settings/", @library_url.rewrite(:controller => "settings", :action => "index")
-    end
-  
-    def test_same_controller_and_action_names
-+     assert_equal "http://www.example.com/login/logout", @clean_url_with_same_action_and_controller_name.rewrite(:action => "logout")
-    end
-  
-    def xtest_same_module_and_controller_and_action_names
-+     assert_equal "http://www.example.com/login/login/logout", @clean_url_with_same_action_and_controller_and_module_name.rewrite(:action => "logout")
-    end
-  
-    def test_controller_and_action_with_same_name_as_controller
-      @clean_urls.each do |url|
-+       assert_equal "http://www.example.com/anything/identity", url.rewrite(:controller => "anything", :action => "identity")
-      end
-    end
-  
-    def test_controller_and_index_action_without_controller_prefix
-      assert_equal(
-+       "http://www.example.com/settings/", 
-        @library_url.rewrite(:controller => "settings", :action => "index", :controller_prefix => "")
-      )
-    end
-  
-    def test_controller_and_index_action_with_controller_prefix
-      assert_equal(
-+       "http://www.example.com/fantastic/settings/show", 
-        @library_url.rewrite(:controller => "settings", :action => "show", :controller_prefix => "fantastic")
-      )
-    end
-  
-    def test_path_parameters
-+     assert_equal "http://www.example.com/library/books/EXBC/0743536703/show", @library_url.rewrite(:path_params => {"type" => "EXBC"})
-    end
-    
-    def test_parameters
-      assert_equal(
-+       "http://www.example.com/library/books/ISBN/0743536703/show?delete=1&name=David", 
-        @library_url.rewrite(:params => {"delete" => "1", "name" => "David"})
-      )
-    end
-***************
-*** 248,254 ****
-    def test_parameters_with_id
-      @clean_urls.each do |url|
-        assert_equal(
--         "http://www.singlefile.com/identity/show?name=David&id=5", 
-          url.rewrite(
-            :action => "show",
-            :params => { "id" => "5", "name" => "David" }
---- 248,254 ----
-    def test_parameters_with_id
-      @clean_urls.each do |url|
-        assert_equal(
-+         "http://www.example.com/identity/show?name=David&id=5", 
-          url.rewrite(
-            :action => "show",
-            :params => { "id" => "5", "name" => "David" }
-***************
-*** 260,266 ****
-    def test_parameters_with_array
-      @clean_urls.each do |url|
-        assert_equal(
--         "http://www.singlefile.com/identity/show?id[]=3&id[]=5&id[]=10",
-  	url.rewrite(
-  		:action => "show",
-  		:params => { 'id' => [ 3, 5, 10 ] } )
---- 260,266 ----
-    def test_parameters_with_array
-      @clean_urls.each do |url|
-        assert_equal(
-+         "http://www.example.com/identity/show?id[]=3&id[]=5&id[]=10",
-  	url.rewrite(
-  		:action => "show",
-  		:params => { 'id' => [ 3, 5, 10 ] } )
-***************
-*** 270,276 ****
-  
-    def test_action_with_id
-     assert_equal(
--       "http://www.singlefile.com/identity/show/7", 
-        @clean_url_with_id.rewrite(
-          :action => "show", 
-          :id => 7
---- 270,276 ----
-  
-    def test_action_with_id
-     assert_equal(
-+       "http://www.example.com/identity/show/7", 
-        @clean_url_with_id.rewrite(
-          :action => "show", 
-          :id => 7
-***************
-*** 278,284 ****
-      )
-      @clean_urls.each do |url|
-        assert_equal(
--         "http://www.singlefile.com/identity/index/7", 
-          url.rewrite(:id => 7)
-        )
-      end
---- 278,284 ----
-      )
-      @clean_urls.each do |url|
-        assert_equal(
-+         "http://www.example.com/identity/index/7", 
-          url.rewrite(:id => 7)
-        )
-      end
-***************
-*** 286,292 ****
-  
-    def test_parameters_with_id_and_away
-      assert_equal(
--       "http://www.singlefile.com/identity/show/25?name=David", 
-        @clean_url_with_id.rewrite(
-          :path_params => { "id" => "25" },
-          :params => { "name" => "David" }
---- 286,292 ----
-  
-    def test_parameters_with_id_and_away
-      assert_equal(
-+       "http://www.example.com/identity/show/25?name=David", 
-        @clean_url_with_id.rewrite(
-          :path_params => { "id" => "25" },
-          :params => { "name" => "David" }
-***************
-*** 297,303 ****
-    def test_parameters_with_index_and_id
-      @clean_urls.each do |url|
-        assert_equal(
--         "http://www.singlefile.com/identity/index/25?name=David", 
-          url.rewrite(
-            :path_params => { "id" => "25" },
-            :params => { "name" => "David" }
---- 297,303 ----
-    def test_parameters_with_index_and_id
-      @clean_urls.each do |url|
-        assert_equal(
-+         "http://www.example.com/identity/index/25?name=David", 
-          url.rewrite(
-            :path_params => { "id" => "25" },
-            :params => { "name" => "David" }
-***************
-*** 308,314 ****
-  
-    def test_action_going_away_from_id
-      assert_equal(
--       "http://www.singlefile.com/identity/list", 
-        @clean_url_with_id.rewrite(
-          :action => "list"
-        )
---- 308,314 ----
-  
-    def test_action_going_away_from_id
-      assert_equal(
-+       "http://www.example.com/identity/list", 
-        @clean_url_with_id.rewrite(
-          :action => "list"
-        )
-***************
-*** 317,323 ****
-  
-    def test_parameters_with_direct_id_and_away
-      assert_equal(
--       "http://www.singlefile.com/identity/show/25?name=David", 
-        @clean_url_with_id.rewrite(
-          :id => "25",
-          :params => { "name" => "David" }
---- 317,323 ----
-  
-    def test_parameters_with_direct_id_and_away
-      assert_equal(
-+       "http://www.example.com/identity/show/25?name=David", 
-        @clean_url_with_id.rewrite(
-          :id => "25",
-          :params => { "name" => "David" }
-***************
-*** 327,333 ****
-  
-    def test_parameters_with_direct_id_and_away
-      assert_equal(
--       "http://www.singlefile.com/store/open/25?name=David", 
-        @clean_url_with_id.rewrite(
-          :controller => "store",
-          :action => "open",
---- 327,333 ----
-  
-    def test_parameters_with_direct_id_and_away
-      assert_equal(
-+       "http://www.example.com/store/open/25?name=David", 
-        @clean_url_with_id.rewrite(
-          :controller => "store",
-          :action => "open",
-***************
-*** 341,347 ****
-      @clean_urls.each do |url|
-        %w(show index).each do |action|
-          assert_equal(
--           "http://www.singlefile.com/identity/#{action}/25?name=David", 
-            url.rewrite(
-              :action => action,
-              :path_params => { "id" => "25" },
---- 341,347 ----
-      @clean_urls.each do |url|
-        %w(show index).each do |action|
-          assert_equal(
-+           "http://www.example.com/identity/#{action}/25?name=David", 
-            url.rewrite(
-              :action => action,
-              :path_params => { "id" => "25" },
-***************
-*** 354,360 ****
-  
-    def test_parameters_from_id
-      assert_equal(
--       "http://www.singlefile.com/identity/", 
-        @clean_url_with_id.rewrite(
-          :action => "index"
-        )
---- 354,360 ----
-  
-    def test_parameters_from_id
-      assert_equal(
-+       "http://www.example.com/identity/", 
-        @clean_url_with_id.rewrite(
-          :action => "index"
-        )
-***************
-*** 363,369 ****
-    
-    def test_id_as_char_and_part_of_controller
-      assert_equal(
--       "http://www.singlefile.com/teachers/skill/5", 
-        @clean_url_with_id_as_char.rewrite(
-          :action => "skill",
-          :id => 5
---- 363,369 ----
-    
-    def test_id_as_char_and_part_of_controller
-      assert_equal(
-+       "http://www.example.com/teachers/skill/5", 
-        @clean_url_with_id_as_char.rewrite(
-          :action => "skill",
-          :id => 5
-***************
-*** 374,380 ****
-    def test_from_clean_to_library
-      @clean_urls.each do |url|
-        assert_equal(
--         "http://www.singlefile.com/library/books/ISBN/0743536703/show?delete=1&name=David", 
-          url.rewrite(
-            :controller_prefix => "library",
-            :controller => "books", 
---- 374,380 ----
-    def test_from_clean_to_library
-      @clean_urls.each do |url|
-        assert_equal(
-+         "http://www.example.com/library/books/ISBN/0743536703/show?delete=1&name=David", 
-          url.rewrite(
-            :controller_prefix => "library",
-            :controller => "books", 
-***************
-*** 388,394 ****
-    
-    def test_from_library_to_clean
-      assert_equal(
--       "http://www.singlefile.com/identity/", 
-        @library_url.rewrite(
-          :controller => "identity", :controller_prefix => ""
-        )
---- 388,394 ----
-    
-    def test_from_library_to_clean
-      assert_equal(
-+       "http://www.example.com/identity/", 
-        @library_url.rewrite(
-          :controller => "identity", :controller_prefix => ""
-        )
-***************
-*** 398,411 ****
-    def test_from_another_port
-      @library_url = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
--       "www.singlefile.com", 
-        8080,
-        "/library/books/ISBN/0743536703/show", 
-        { "type" => "ISBN", "code" => "0743536703" }
-      ), "books", "show")
-  
-      assert_equal(
--       "http://www.singlefile.com:8080/identity/", 
-        @library_url.rewrite(
-          :controller => "identity", :controller_prefix => ""
-        )
---- 398,411 ----
-    def test_from_another_port
-      @library_url = ActionController::UrlRewriter.old_new(MockRequest.new(
-        "http://",
-+       "www.example.com", 
-        8080,
-        "/library/books/ISBN/0743536703/show", 
-        { "type" => "ISBN", "code" => "0743536703" }
-      ), "books", "show")
-  
-      assert_equal(
-+       "http://www.example.com:8080/identity/", 
-        @library_url.rewrite(
-          :controller => "identity", :controller_prefix => ""
-        )
-***************
-*** 465,487 ****
-    end
-  
-    def test_clean_application_prefix
--     assert_equal "http://www.singlefile.com/namespace/library/books/ISBN/0743536703/show",
-        @library_url.rewrite(:application_prefix => "/namespace")
-    end
-  
-    def test_clean_application_prefix_with_controller_prefix
--     assert_equal "http://www.singlefile.com/namespace/shop/",
-        @library_url.rewrite(:application_prefix => "/namespace",
-                             :controller_prefix => "shop" )
-    end
-  
-    def test_blank_application_prefix
--     assert_equal "http://www.singlefile.com/library/books/ISBN/0743536703/show",
-        @library_url.rewrite(:application_prefix => "")
-    end
-  
-    def test_nil_application_prefix
--     assert_equal "http://www.singlefile.com/library/books/ISBN/0743536703/show",
-        @library_url.rewrite(:application_prefix => nil)
-    end
-  end
---- 465,487 ----
-    end
-  
-    def test_clean_application_prefix
-+     assert_equal "http://www.example.com/namespace/library/books/ISBN/0743536703/show",
-        @library_url.rewrite(:application_prefix => "/namespace")
-    end
-  
-    def test_clean_application_prefix_with_controller_prefix
-+     assert_equal "http://www.example.com/namespace/shop/",
-        @library_url.rewrite(:application_prefix => "/namespace",
-                             :controller_prefix => "shop" )
-    end
-  
-    def test_blank_application_prefix
-+     assert_equal "http://www.example.com/library/books/ISBN/0743536703/show",
-        @library_url.rewrite(:application_prefix => "")
-    end
-  
-    def test_nil_application_prefix
-+     assert_equal "http://www.example.com/library/books/ISBN/0743536703/show",
-        @library_url.rewrite(:application_prefix => nil)
-    end
-  end