actionpack 1.6.0 → 1.7.0

data/test/controller/helper_test.rb

@@ -77,7 +77,7 @@ class HelperTest < Test::Unit::TestCase
 
   def test_declare_missing_helper
     assert_equal helper_methods, missing_methods
-    assert_raise(LoadError) { @controller_class.helper :missing }
+    assert_raise(MissingSourceFile) { @controller_class.helper :missing }
   end
 
   def test_declare_missing_file_from_helper

data/test/controller/test_test.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class TestTest < Test::Unit::TestCase
+  class TestController < ActionController::Base
+    def set_flash
+      flash["test"] = ">#{flash["test"]}<"
+    end
+  end
+
+  def setup
+    @controller = TestController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_process_without_flash
+    process :set_flash
+    assert_flash_equal "><", "test"
+  end
+
+  def test_process_with_flash
+    process :set_flash, nil, nil, { "test" => "value" }
+    assert_flash_equal ">value<", "test"
+  end
+end

data/test/controller/verification_test.rb

@@ -0,0 +1,137 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class VerificationTest < Test::Unit::TestCase
+  class TestController < ActionController::Base
+    verify :only => :guarded_one, :params => "one",
+           :redirect_to => { :action => "unguarded" }
+
+    verify :only => :guarded_two, :params => %w( one two ),
+           :redirect_to => { :action => "unguarded" }
+
+    verify :only => :guarded_with_flash, :params => "one",
+           :add_flash => { "notice" => "prereqs failed" },
+           :redirect_to => { :action => "unguarded" }
+
+    verify :only => :guarded_in_session, :session => "one",
+           :redirect_to => { :action => "unguarded" }
+
+    verify :only => [:multi_one, :multi_two], :session => %w( one two ),
+           :redirect_to => { :action => "unguarded" }
+
+    def guarded_one
+      render_text "#{@params["one"]}"
+    end
+
+    def guarded_with_flash
+      render_text "#{@params["one"]}"
+    end
+
+    def guarded_two
+      render_text "#{@params["one"]}:#{@params["two"]}"
+    end
+
+    def guarded_in_session
+      render_text "#{@session["one"]}"
+    end
+
+    def multi_one
+      render_text "#{@session["one"]}:#{@session["two"]}"
+    end
+
+    def multi_two
+      render_text "#{@session["two"]}:#{@session["one"]}"
+    end
+
+    def unguarded
+      render_text "#{@params["one"]}"
+    end
+  end
+
+  def setup
+    @controller = TestController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_guarded_one_with_prereqs
+    process "guarded_one", "one" => "here"
+    assert_equal "here", @response.body
+  end
+
+  def test_guarded_one_without_prereqs
+    process "guarded_one"
+    assert_redirected_to :action => "unguarded"
+  end
+
+  def test_guarded_with_flash_with_prereqs
+    process "guarded_with_flash", "one" => "here"
+    assert_equal "here", @response.body
+    assert_flash_empty
+  end
+
+  def test_guarded_with_flash_without_prereqs
+    process "guarded_with_flash"
+    assert_redirected_to :action => "unguarded"
+    assert_flash_equal "prereqs failed", "notice"
+  end
+
+  def test_guarded_two_with_prereqs
+    process "guarded_two", "one" => "here", "two" => "there"
+    assert_equal "here:there", @response.body
+  end
+
+  def test_guarded_two_without_prereqs_one
+    process "guarded_two", "two" => "there"
+    assert_redirected_to :action => "unguarded"
+  end
+
+  def test_guarded_two_without_prereqs_two
+    process "guarded_two", "one" => "here"
+    assert_redirected_to :action => "unguarded"
+  end
+
+  def test_guarded_two_without_prereqs_both
+    process "guarded_two"
+    assert_redirected_to :action => "unguarded"
+  end
+
+  def test_unguarded_with_params
+    process "unguarded", "one" => "here"
+    assert_equal "here", @response.body
+  end
+
+  def test_unguarded_without_params
+    process "unguarded"
+    assert_equal "", @response.body
+  end
+
+  def test_guarded_in_session_with_prereqs
+    process "guarded_in_session", {}, "one" => "here"
+    assert_equal "here", @response.body
+  end
+
+  def test_guarded_in_session_without_prereqs
+    process "guarded_in_session"
+    assert_redirected_to :action => "unguarded"
+  end
+
+  def test_multi_one_with_prereqs
+    process "multi_one", {}, "one" => "here", "two" => "there"
+    assert_equal "here:there", @response.body
+  end
+
+  def test_multi_one_without_prereqs
+    process "multi_one"
+    assert_redirected_to :action => "unguarded"
+  end
+
+  def test_multi_two_with_prereqs
+    process "multi_two", {}, "one" => "here", "two" => "there"
+    assert_equal "there:here", @response.body
+  end
+
+  def test_multi_two_without_prereqs
+    process "multi_two"
+    assert_redirected_to :action => "unguarded"
+  end
+end

data/test/template/date_helper_test.rb

@@ -13,6 +13,22 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal "about 3 hours", distance_of_time_in_words(from, Time.mktime(2004, 3, 7, 0, 41))
     assert_equal "about 4 hours", distance_of_time_in_words(from, Time.mktime(2004, 3, 7, 1, 20))
     assert_equal "2 days", distance_of_time_in_words(from, Time.mktime(2004, 3, 9, 15, 40))
+
+    # include seconds 
+    assert_equal "less than a minute", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 19), false)
+    assert_equal "less than 5 seconds", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 19), true)
+    assert_equal "less than 10 seconds", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 28), true)
+    assert_equal "less than 20 seconds", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 38), true)
+    assert_equal "half a minute", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 48), true)
+    assert_equal "less than a minute", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 42, 17), true)
+    
+    assert_equal "1 minute", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 42, 18), true)
+    assert_equal "1 minute", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 42, 28), true)
+    assert_equal "2 minutes", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 42, 48), true)
+    
+    # test to < from
+    assert_equal "about 4 hours", distance_of_time_in_words(Time.mktime(2004, 3, 7, 1, 20), from)
+    assert_equal "less than 20 seconds", distance_of_time_in_words(Time.mktime(2004, 3, 6, 21, 41, 38), from, true)
   end
 
   def test_select_day

data/test/template/javascript_helper.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class JavascriptHelperTest < Test::Unit::TestCase
+  include ActionView::Helpers::JavascriptHelper
+
+  def test_escape_javascript
+    assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
+  end
+end

data/test/template/text_helper_test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/text_helper'
+require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/numeric'  # for human_size
 
 class TextHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TextHelper
@@ -52,6 +53,22 @@ class TextHelperTest < Test::Unit::TestCase
       highlight("This is a beautiful? morning", "beautiful? morning")
     )
   end
+  
+  def test_human_size
+    assert_equal("0 Bytes", human_size(0))
+    assert_equal("3 Bytes", human_size(3.14159265))
+    assert_equal("123 Bytes", human_size(123.0))
+    assert_equal("123 Bytes", human_size(123))
+    assert_equal("1.2 KB", human_size(1234))
+    assert_equal("12.1 KB", human_size(12345))
+    assert_equal("1.2 MB", human_size(1234567))
+    assert_equal("1.1 GB", human_size(1234567890))
+    assert_equal("1.1 TB", human_size(1234567890123))
+    assert_equal("444.0 KB", human_size(444.kilobytes))
+    assert_equal("1023.0 MB", human_size(1023.megabytes))
+    assert_equal("3.0 TB", human_size(3.terabytes))
+    assert_nil human_size('x')
+  end
 
   def test_excerpt
     assert_equal("...is a beautiful morni...", excerpt("This is a beautiful morning", "beautiful", 5))
@@ -72,4 +89,5 @@ class TextHelperTest < Test::Unit::TestCase
     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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
-date: 2005-03-22
+  version: 1.7.0
+date: 2005-03-27
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib
@@ -64,6 +64,7 @@ files:
   - lib/action_controller/templates
   - lib/action_controller/test_process.rb
   - lib/action_controller/url_rewriter.rb
+  - lib/action_controller/verification.rb
   - lib/action_controller/assertions/action_pack_assertions.rb
   - lib/action_controller/assertions/active_record_assertions.rb
   - lib/action_controller/cgi_ext/cgi_ext.rb
@@ -136,7 +137,8 @@ files:
   - test/controller/request_test.rb
   - test/controller/routing_tests.rb
   - test/controller/send_file_test.rb
-  - test/controller/url_obsolete.rb
+  - test/controller/test_test.rb
+  - test/controller/verification_test.rb
   - test/fixtures/fun
   - test/fixtures/helpers
   - test/fixtures/layouts
@@ -163,6 +165,7 @@ files:
   - test/template/form_helper_test.rb
   - test/template/form_options_helper_test.rb
   - test/template/form_tag_helper_test.rb
+  - test/template/javascript_helper.rb
   - test/template/tag_helper_test.rb
   - test/template/text_helper_test.rb
   - test/template/url_helper_test.rb
@@ -197,5 +200,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.2
+            version: 1.0.3
       version: 

data/test/controller/url_obsolete.rb

@@ -1,487 +0,0 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
-require 'action_controller/url_rewriter'
-
-MockRequest = Struct.new("MockRequest", :protocol, :host, :port, :path, :parameters, :path_parameters)
-class MockRequest
-  def host_with_port
-    if (protocol == "http://" && port == 80) || (protocol == "https://" && port == 443)
-      host
-    else
-      host + ":#{port}"
-    end
-  end
-end
-
-class UrlMockFactory
-  def self.create(path, parameters)
-    ActionController::UrlRewriter.new(
-      MockRequest.new("http://", "example.com", 80, path, parameters), 
-      parameters
-    )
-  end
-end
-
-# old-style support for .new
-module ActionController
-  class UrlRewriter
-    def self.old_new(request, controller, action)
-      request.parameters[:controller] = controller
-      request.parameters[:action] = action
-      return new(request, request.parameters)
-    end
-  end
-end
-class UrlTest < Test::Unit::TestCase
-  def setup
-    @library_url = ActionController::UrlRewriter.old_new(MockRequest.new(
-      "http://",
-      "www.singlefile.com", 
-      80,
-      "/library/books/ISBN/0743536703/show",
-      { "type" => "ISBN", "code" => "0743536703" }
-    ), "books", "show")
-
-    @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" }
-    ), "books", "show")
-
-    @library_url_on_index = ActionController::UrlRewriter.old_new(MockRequest.new(
-      "http://",
-      "www.singlefile.com", 
-      80,
-      "/library/books/ISBN/0743536703/", 
-      { "type" => "ISBN", "code" => "0743536703" }
-    ), "books", "index")
-    
-    @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
-
-  def test_clean_action_with_only_path
-    assert_equal "/library/books/ISBN/0743536703/edit", @library_url.rewrite(:action => "edit", :only_path => true)
-  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
-
-  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" }
-        )
-      )
-    end
-  end
-
-  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 ] } )
-      )
-    end
-  end
-
-  def test_action_with_id
-   assert_equal(
-      "http://www.singlefile.com/identity/show/7", 
-      @clean_url_with_id.rewrite(
-        :action => "show", 
-        :id => 7
-      )
-    )
-    @clean_urls.each do |url|
-      assert_equal(
-        "http://www.singlefile.com/identity/index/7", 
-        url.rewrite(:id => 7)
-      )
-    end
-  end
-
-  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" }
-      )
-    )
-  end
-
-  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" }
-        )
-      )
-    end
-  end
-
-  def test_action_going_away_from_id
-    assert_equal(
-      "http://www.singlefile.com/identity/list", 
-      @clean_url_with_id.rewrite(
-        :action => "list"
-      )
-    )
-  end
-
-  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" }
-      )
-    )
-  end
-
-  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",
-        :id => "25",
-        :params => { "name" => "David" }
-      )
-    )
-  end
-
-  def test_parameters_to_id
-    @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" },
-            :params => { "name" => "David" }
-          )
-        )
-      end
-    end
-  end
-
-  def test_parameters_from_id
-    assert_equal(
-      "http://www.singlefile.com/identity/", 
-      @clean_url_with_id.rewrite(
-        :action => "index"
-      )
-    )
-  end
-  
-  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
-      )
-    )
-  end
-
-  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", 
-          :action_prefix => "ISBN/0743536703",
-          :action => "show", 
-          :params => { "delete" => "1", "name" => "David" }
-        )
-      )
-    end
-  end
-  
-  def test_from_library_to_clean
-    assert_equal(
-      "http://www.singlefile.com/identity/", 
-      @library_url.rewrite(
-        :controller => "identity", :controller_prefix => ""
-      )
-    )
-  end
-  
-  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 => ""
-      )
-    )
-  end
-  
-  def test_basecamp
-    basecamp_url = ActionController::UrlRewriter.old_new(MockRequest.new(
-      "http://",
-      "projects.basecamp", 
-      80,
-      "/clients/disarray/1/msg/transcripts/", 
-      {"category_name"=>"transcripts", "client_name"=>"disarray", "action"=>"index", "controller"=>"msg", "project_name"=>"1"}
-    ), "msg", "index")
-    
-    assert_equal(
-      "http://projects.basecamp/clients/disarray/1/msg/transcripts/1/comments", 
-      basecamp_url.rewrite(:action_prefix => "transcripts/1", :action => "comments")
-    )
-  end
-
-  def test_on_explicit_index_page # My index page is very modest, thank you...
-    url = ActionController::UrlRewriter.old_new(
-      MockRequest.new(
-        "http://", "example.com", 80, "/controller/index",
-        {"controller"=>"controller", "action"=>"index"}
-      ), "controller", "index"
-    )
-    assert_equal("http://example.com/controller/foo", url.rewrite(:action => 'foo'))
-  end
-
-  def test_rewriting_on_similar_fragments
-    url = UrlMockFactory.create("/advertisements/advert/", {"controller"=>"advert", "action"=>"index"})
-    assert_equal("http://example.com/advertisements/advert/news", url.rewrite(:action => 'news'))
-  end
-
-  def test_rewriting_on_similar_fragments_with_action_prefixes
-    url = UrlMockFactory.create(
-      "/clients/prall/1/msg/all/", 
-      { "category_name"=>"all", "client_name"=>"prall", "action"=>"index", "controller"=>"msg", "project_name"=>"1"}
-    )
-
-    assert_equal(
-      "http://example.com/clients/prall/1/msg/all/new", 
-      url.rewrite({ :controller => "msg", :action_prefix => "all", :action => "new" })
-    )
-
-    url = UrlMockFactory.create(
-      "/clients/prall/1/msg/all/", 
-      { "category_name"=>"all", "client_name"=>"prall", "action"=>"index", "controller"=>"msg", "project_name"=>"1"}
-    )
-
-    assert_equal(
-      "http://example.com/clients/prall/1/msg/allous/new", 
-      url.rewrite({ :controller => "msg", :action_prefix => "allous", :action => "new" })
-    )
-  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