Merge branch 'master' of github.com:lifo/docrails

5 files changed, 366 insertions, 71 deletions

diff --git a/actionpack/test/dispatch/callbacks_test.rb b/actionpack/test/dispatch/callbacks_test.rb
new file mode 100644
index 0000000000..f3ea5209f4
--- /dev/null
+++ b/actionpack/test/dispatch/callbacks_test.rb
@@ -0,0 +1,107 @@
+require 'abstract_unit'
+
+class DispatcherTest < Test::Unit::TestCase
+  class Foo
+    cattr_accessor :a, :b
+  end
+
+  class DummyApp
+    def call(env)
+      [200, {}, 'response']
+    end
+  end 
+
+  def setup
+    Foo.a, Foo.b = 0, 0
+    ActionDispatch::Callbacks.reset_callbacks(:prepare)
+    ActionDispatch::Callbacks.reset_callbacks(:call)
+  end
+
+  def test_prepare_callbacks_with_cache_classes
+    a = b = c = nil
+    ActionDispatch::Callbacks.to_prepare { |*args| a = b = c = 1 }
+    ActionDispatch::Callbacks.to_prepare { |*args| b = c = 2 }
+    ActionDispatch::Callbacks.to_prepare { |*args| c = 3 }
+
+    # Ensure to_prepare callbacks are not run when defined
+    assert_nil a || b || c
+
+    # Run callbacks
+    dispatch
+
+    assert_equal 1, a
+    assert_equal 2, b
+    assert_equal 3, c
+
+    # Make sure they are only run once
+    a = b = c = nil
+    dispatch
+    assert_nil a || b || c
+  end
+
+  def test_prepare_callbacks_without_cache_classes
+    a = b = c = nil
+    ActionDispatch::Callbacks.to_prepare { |*args| a = b = c = 1 }
+    ActionDispatch::Callbacks.to_prepare { |*args| b = c = 2 }
+    ActionDispatch::Callbacks.to_prepare { |*args| c = 3 }
+
+    # Ensure to_prepare callbacks are not run when defined
+    assert_nil a || b || c
+
+    # Run callbacks
+    dispatch(false)
+
+    assert_equal 1, a
+    assert_equal 2, b
+    assert_equal 3, c
+
+    # Make sure they are run again
+    a = b = c = nil
+    dispatch(false)
+    assert_equal 1, a
+    assert_equal 2, b
+    assert_equal 3, c
+  end
+
+  def test_to_prepare_with_identifier_replaces
+    ActionDispatch::Callbacks.to_prepare(:unique_id) { |*args| Foo.a, Foo.b = 1, 1 }
+    ActionDispatch::Callbacks.to_prepare(:unique_id) { |*args| Foo.a = 2 }
+
+    dispatch
+    assert_equal 2, Foo.a
+    assert_equal 0, Foo.b
+  end
+
+  def test_before_and_after_callbacks
+    ActionDispatch::Callbacks.before { |*args| Foo.a += 1; Foo.b += 1 }
+    ActionDispatch::Callbacks.after  { |*args| Foo.a += 1; Foo.b += 1 }
+
+    dispatch
+    assert_equal 2, Foo.a
+    assert_equal 2, Foo.b
+
+    dispatch
+    assert_equal 4, Foo.a
+    assert_equal 4, Foo.b
+  end
+
+  def test_should_send_an_instrumentation_callback_for_async_processing
+    ActiveSupport::Notifications.expects(:instrument).with("action_dispatch.callback")
+    dispatch
+  end
+
+  def test_should_send_an_instrumentation_callback_for_async_processing_even_on_failure
+    ActiveSupport::Notifications.notifier.expects(:publish)
+    assert_raise RuntimeError do
+      dispatch { |env| raise "OMG" }
+    end
+  end
+
+  private
+
+    def dispatch(cache_classes = true, &block)
+      @dispatcher ||= ActionDispatch::Callbacks.new(block || DummyApp.new, !cache_classes)
+      @dispatcher.call({'rack.input' => StringIO.new('')})
+    end
+
+end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index b62df9a6b2..cb95ecea50 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -319,7 +319,7 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "allow method hacking on post" do
-    [:get, :head, :options, :put, :post, :delete].each do |method|
+    [:get, :options, :put, :post, :delete].each do |method|
       request = stub_request "REQUEST_METHOD" => method.to_s.upcase
       assert_equal(method == :head ? :get : method, request.method)
     end
@@ -341,7 +341,7 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "head masquerading as get" do
-    request = stub_request 'REQUEST_METHOD' => 'HEAD'
+    request = stub_request 'REQUEST_METHOD' => 'GET', "rack.methodoverride.original_method" => "HEAD"
     assert_equal :get, request.method
     assert request.get?
     assert request.head?
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index c4b0b9cdbf..6dccabdb3f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -22,6 +22,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         delete 'logout' => :destroy, :as => :logout
       end
 
+      resource :session do
+        get :create
+      end
+
       match 'account/logout' => redirect("/logout"), :as => :logout_redirect
       match 'account/login', :to => redirect("/login")
 
@@ -29,6 +33,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       match 'account/modulo/:name', :to => redirect("/%{name}s")
       match 'account/proc/:name', :to => redirect {|params| "/#{params[:name].pluralize}" }
+      match 'account/google' => redirect('http://www.google.com/')
 
       match 'openid/login', :via => [:get, :post], :to => "openid#login"
 
@@ -47,6 +52,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         get 'admin/accounts' => "queenbee#accounts"
       end
 
+      scope 'es' do
+        resources :projects, :path_names => { :edit => 'cambiar' }, :as => 'projeto'
+      end
+
       resources :projects, :controller => :project do
         resources :involvements, :attachments
 
@@ -56,7 +65,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
         resources :companies do
           resources :people
-          resource  :avatar
+          resource  :avatar, :controller => :avatar
         end
 
         resources :images do
@@ -65,7 +74,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
         resources :people do
           nested do
-            namespace ":access_token" do
+            scope "/:access_token" do
               resource :avatar
             end
           end
@@ -88,6 +97,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
+      resources :replies do
+        member do
+          put :answer, :to => :mark_as_answer
+          delete :answer, :to => :unmark_as_answer
+        end
+      end
+
+      resources :posts, :only => [:index, :show]
+
       match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
 
       match 'people/:id/update', :to => 'people#update', :as => :update_person
@@ -97,7 +115,18 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       match 'articles/:year/:month/:day/:title', :to => "articles#show", :as => :article
 
       namespace :account do
+        match 'description', :to => "account#description", :as => "description"
         resource :subscription, :credit, :credit_card
+
+        namespace :admin do
+          resource :subscription
+        end
+      end
+
+      namespace :forum do
+        resources :products, :as => '' do
+          resources :questions
+        end
       end
 
       controller :articles do
@@ -112,6 +141,16 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         resources :rooms
       end
 
+      scope '(:locale)', :locale => /en|pl/ do
+        resources :descriptions
+      end
+
+      namespace :admin do
+        scope '(/:locale)', :locale => /en|pl/ do
+          resources :descriptions
+        end
+      end
+
       match '/info' => 'projects#info', :as => 'info'
 
       root :to => 'projects#index'
@@ -165,6 +204,31 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_session_singleton_resource
+    with_test_routes do
+      get '/session'
+      assert_equal 'sessions#create', @response.body
+      assert_equal '/session', session_path
+
+      post '/session'
+      assert_equal 'sessions#create', @response.body
+
+      put '/session'
+      assert_equal 'sessions#update', @response.body
+
+      delete '/session'
+      assert_equal 'sessions#destroy', @response.body
+
+      get '/session/new'
+      assert_equal 'sessions#new', @response.body
+      assert_equal '/session/new', new_session_path
+
+      get '/session/edit'
+      assert_equal 'sessions#edit', @response.body
+      assert_equal '/session/edit', edit_session_path
+    end
+  end
+
   def test_redirect_modulo
     with_test_routes do
       get '/account/modulo/name'
@@ -193,20 +257,19 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  # TODO: rackmount is broken
-  # def test_admin
-  #   with_test_routes do
-  #     get '/admin', {}, {'REMOTE_ADDR' => '192.168.1.100'}
-  #     assert_equal 'queenbee#index', @response.body
-  #
-  #     assert_raise(ActionController::RoutingError) { get '/admin', {}, {'REMOTE_ADDR' => '10.0.0.100'} }
-  #
-  #     get '/admin/accounts', {}, {'REMOTE_ADDR' => '192.168.1.100'}
-  #     assert_equal 'queenbee#accounts', @response.body
-  #
-  #     assert_raise(ActionController::RoutingError) { get '/admin/accounts', {}, {'REMOTE_ADDR' => '10.0.0.100'} }
-  #   end
-  # end
+  def test_admin
+    with_test_routes do
+      get '/admin', {}, {'REMOTE_ADDR' => '192.168.1.100'}
+      assert_equal 'queenbee#index', @response.body
+
+      assert_raise(ActionController::RoutingError) { get '/admin', {}, {'REMOTE_ADDR' => '10.0.0.100'} }
+
+      get '/admin/accounts', {}, {'REMOTE_ADDR' => '192.168.1.100'}
+      assert_equal 'queenbee#accounts', @response.body
+
+      assert_raise(ActionController::RoutingError) { get '/admin/accounts', {}, {'REMOTE_ADDR' => '10.0.0.100'} }
+    end
+  end
 
   def test_global
     with_test_routes do
@@ -231,31 +294,34 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   def test_projects
     with_test_routes do
       get '/projects'
-      assert_equal 'projects#index', @response.body
+      assert_equal 'project#index', @response.body
       assert_equal '/projects', projects_path
 
+      post '/projects'
+      assert_equal 'project#create', @response.body
+
       get '/projects.xml'
-      assert_equal 'projects#index', @response.body
+      assert_equal 'project#index', @response.body
       assert_equal '/projects.xml', projects_path(:format => 'xml')
 
       get '/projects/new'
-      assert_equal 'projects#new', @response.body
+      assert_equal 'project#new', @response.body
       assert_equal '/projects/new', new_project_path
 
       get '/projects/new.xml'
-      assert_equal 'projects#new', @response.body
+      assert_equal 'project#new', @response.body
       assert_equal '/projects/new.xml', new_project_path(:format => 'xml')
 
       get '/projects/1'
-      assert_equal 'projects#show', @response.body
+      assert_equal 'project#show', @response.body
       assert_equal '/projects/1', project_path(:id => '1')
 
       get '/projects/1.xml'
-      assert_equal 'projects#show', @response.body
+      assert_equal 'project#show', @response.body
       assert_equal '/projects/1.xml', project_path(:id => '1', :format => 'xml')
 
       get '/projects/1/edit'
-      assert_equal 'projects#edit', @response.body
+      assert_equal 'project#edit', @response.body
       assert_equal '/projects/1/edit', edit_project_path(:id => '1')
     end
   end
@@ -317,7 +383,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
 
       get '/projects/1/companies/1/avatar'
-      assert_equal 'avatars#show', @response.body
+      assert_equal 'avatar#show', @response.body
       assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
     end
   end
@@ -394,6 +460,42 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_replies
+    with_test_routes do
+      put '/replies/1/answer'
+      assert_equal 'replies#mark_as_answer', @response.body
+
+      delete '/replies/1/answer'
+      assert_equal 'replies#unmark_as_answer', @response.body
+    end
+  end
+
+  def test_posts
+    with_test_routes do
+      get '/posts'
+      assert_equal 'posts#index', @response.body
+      assert_equal '/posts', posts_path
+
+      get '/posts/1'
+      assert_equal 'posts#show', @response.body
+      assert_equal '/posts/1', post_path(:id => 1)
+
+      assert_raise(ActionController::RoutingError) { post '/posts' }
+      assert_raise(ActionController::RoutingError) { put '/posts/1' }
+      assert_raise(ActionController::RoutingError) { delete '/posts/1' }
+    end
+  end
+
+  def test_path_names
+    with_test_routes do
+      get '/es/projeto'
+      assert_equal 'projects#index', @response.body
+
+      get '/es/projeto/1/cambiar'
+      assert_equal 'projects#edit', @response.body
+    end
+  end
+
   def test_sprockets
     with_test_routes do
       get '/sprockets.js'
@@ -419,6 +521,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_forum_products
+    with_test_routes do
+      get '/forum'
+      assert_equal 'forum/products#index', @response.body
+      assert_equal '/forum', forum_products_path
+
+      get '/forum/basecamp'
+      assert_equal 'forum/products#show', @response.body
+      assert_equal '/forum/basecamp', forum_product_path(:id => 'basecamp')
+
+      get '/forum/basecamp/questions'
+      assert_equal 'forum/questions#index', @response.body
+      assert_equal '/forum/basecamp/questions', forum_product_questions_path(:product_id => 'basecamp')
+
+      get '/forum/basecamp/questions/1'
+      assert_equal 'forum/questions#show', @response.body
+      assert_equal '/forum/basecamp/questions/1', forum_product_question_path(:product_id => 'basecamp', :id => 1)
+    end
+  end
+
   def test_articles_perma
     with_test_routes do
       get '/articles/2009/08/18/rails-3'
@@ -431,13 +553,24 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   def test_account_namespace
     with_test_routes do
       get '/account/subscription'
-      assert_equal 'subscriptions#show', @response.body
+      assert_equal 'account/subscriptions#show', @response.body
+      assert_equal '/account/subscription', account_subscription_path
 
       get '/account/credit'
-      assert_equal 'credits#show', @response.body
+      assert_equal 'account/credits#show', @response.body
+      assert_equal '/account/credit', account_credit_path
 
       get '/account/credit_card'
-      assert_equal 'credit_cards#show', @response.body
+      assert_equal 'account/credit_cards#show', @response.body
+      assert_equal '/account/credit_card', account_credit_card_path
+    end
+  end
+
+  def test_nested_namespace
+    with_test_routes do
+      get '/account/admin/subscription'
+      assert_equal 'account/admin/subscriptions#show', @response.body
+      assert_equal '/account/admin/subscription', account_admin_subscription_path
     end
   end
 
@@ -472,7 +605,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'projects#index', @response.body
     end
   end
-  
+
   def test_index
     with_test_routes do
       assert_equal '/info', info_path
@@ -488,7 +621,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'projects#info', @response.body
     end
   end
-  
+
   def test_convention_match_with_no_scope
     with_test_routes do
       assert_equal '/account/overview', account_overview_path
@@ -497,6 +630,78 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_redirect_with_complete_url
+    with_test_routes do
+      get '/account/google'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.google.com/', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
+  def test_redirect_with_port
+    previous_host, self.host = self.host, 'www.example.com:3000'
+    with_test_routes do
+      get '/account/login'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com:3000/login', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  ensure
+    self.host = previous_host
+  end
+
+  def test_normalize_namespaced_matches
+    with_test_routes do
+      assert_equal '/account/description', account_description_path
+
+      get '/account/description'
+      assert_equal 'account#description', @response.body
+    end
+  end
+
+  def test_optional_scoped_path
+    with_test_routes do
+      assert_equal '/en/descriptions', descriptions_path("en")
+      assert_equal '/descriptions', descriptions_path(nil)
+      assert_equal '/en/descriptions/1', description_path("en", 1)
+      assert_equal '/descriptions/1', description_path(nil, 1)
+
+      get '/en/descriptions'
+      assert_equal 'descriptions#index', @response.body
+
+      get '/descriptions'
+      assert_equal 'descriptions#index', @response.body
+
+      get '/en/descriptions/1'
+      assert_equal 'descriptions#show', @response.body
+
+      get '/descriptions/1'
+      assert_equal 'descriptions#show', @response.body
+    end
+  end
+
+  def test_nested_optional_scoped_path
+    with_test_routes do
+      assert_equal '/admin/en/descriptions', admin_descriptions_path("en")
+      assert_equal '/admin/descriptions', admin_descriptions_path(nil)
+      assert_equal '/admin/en/descriptions/1', admin_description_path("en", 1)
+      assert_equal '/admin/descriptions/1', admin_description_path(nil, 1)
+
+      get '/admin/en/descriptions'
+      assert_equal 'admin/descriptions#index', @response.body
+
+      get '/admin/descriptions'
+      assert_equal 'admin/descriptions#index', @response.body
+
+      get '/admin/en/descriptions/1'
+      assert_equal 'admin/descriptions#show', @response.body
+
+      get '/admin/descriptions/1'
+      assert_equal 'admin/descriptions#show', @response.body
+    end
+  end
+
   private
     def with_test_routes
       real_routes, temp_routes = ActionController::Routing::Routes, Routes
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 9f6a93756c..951fb4a22e 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -104,4 +104,27 @@ class ShowExceptionsTest < ActionController::IntegrationTest
     assert_response 405
     assert_match /ActionController::MethodNotAllowed/, body
   end
+
+  test "publishes notifications" do
+    # Wait pending notifications to be published
+    ActiveSupport::Notifications.notifier.wait
+
+    @app, event = ProductionApp, nil
+    self.remote_addr = '127.0.0.1'
+
+    ActiveSupport::Notifications.subscribe('action_dispatch.show_exception') do |*args|
+      event = args
+    end
+
+    get "/"
+    assert_response 500
+    assert_match /puke/, body
+
+    ActiveSupport::Notifications.notifier.wait
+
+    assert_equal 'action_dispatch.show_exception', event.first
+    assert_kind_of Hash, event.last[:env]
+    assert_equal 'GET', event.last[:env]["REQUEST_METHOD"]
+    assert_kind_of RuntimeError, event.last[:exception]
+  end
 end
diff --git a/actionpack/test/dispatch/string_coercion_test.rb b/actionpack/test/dispatch/string_coercion_test.rb
deleted file mode 100644
index d79b17b932..0000000000
--- a/actionpack/test/dispatch/string_coercion_test.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'abstract_unit'
-
-class StringCoercionTest < ActiveSupport::TestCase
-  test "body responds to each" do
-    original_body = []
-    body = ActionDispatch::StringCoercion::UglyBody.new(original_body)
-
-    assert original_body.respond_to?(:each)
-    assert body.respond_to?(:each)
-  end
-
-  test "body responds to to_path" do
-    original_body = []
-    def original_body.to_path; end
-    body = ActionDispatch::StringCoercion::UglyBody.new(original_body)
-
-    assert original_body.respond_to?(:to_path)
-    assert body.respond_to?(:to_path)
-  end
-
-  test "body does not responds to to_path" do
-    original_body = []
-    body = ActionDispatch::StringCoercion::UglyBody.new(original_body)
-
-    assert !original_body.respond_to?(:to_path)
-    assert !body.respond_to?(:to_path)
-  end
-
-  test "calls to_s on body parts" do
-    app = lambda { |env|
-      [200, {'Content-Type' => 'html'}, [1, 2, 3]]
-    }
-    app = ActionDispatch::StringCoercion.new(app)
-    parts = []
-    status, headers, body = app.call({})
-    body.each { |part| parts << part }
-
-    assert_equal %w( 1 2 3 ), parts
-  end
-end