Merge branch 'master' of github.com:rails/rails

8 files changed, 55 insertions, 81 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index c3609958bc..1796d11dcd 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,15 +1,5 @@
 *Rails 3.0.0 [beta 4] (June 8th, 2010)*
 
-* Add shallow routes back to the new router [Diego Carrion]
-
-    resources :posts do
-      shallow do
-        resources :comments
-      end
-    end
-    
-    You can now use comment_path for /comments/1 instead of post_comment_path for /posts/1/comments/1.
-
 * Remove middleware laziness [José Valim]
 
 * Make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean. [José Valim]
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index cf16417e84..e9db0d97b6 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -57,6 +57,7 @@ module ActionController #:nodoc:
         def before(controller)
           self.controller = controller
           callback(:before) if controller.perform_caching
+          true # before method from sweeper should always return true
         end
 
         def after(controller)
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e91a72cbe5..7b79b6bde3 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -350,10 +350,6 @@ module ActionDispatch
           scope(:constraints => constraints) { yield }
         end
 
-        def shallow
-          scope(:shallow => true) { yield }
-        end
-
         def defaults(defaults = {})
           scope(:defaults => defaults) { yield }
         end
@@ -378,21 +374,12 @@ module ActionDispatch
             @scope_options ||= private_methods.grep(/^merge_(.+)_scope$/) { $1.to_sym }
           end
 
-          def merge_shallow_scope(parent, child)
-            parent or child
-          end
-
           def merge_path_scope(parent, child)
-            parent_path = (@scope[:shallow] and child.eql?(':id')) ? parent.split('/').last : parent
-            Mapper.normalize_path "#{parent_path}/#{child}"
+            Mapper.normalize_path("#{parent}/#{child}")
           end
 
           def merge_name_prefix_scope(parent, child)
-            if @scope[:shallow]
-              child
-            else
-              parent ? "#{parent}_#{child}" : child
-            end
+            parent ? "#{parent}_#{child}" : child
           end
 
           def merge_module_scope(parent, child)
@@ -535,10 +522,6 @@ module ActionDispatch
             options["#{singular}_id".to_sym] = id_constraint if id_constraint?
             options
           end
-
-          def shallow?
-            options[:shallow]
-          end
         end
 
         class SingletonResource < Resource #:nodoc:
@@ -620,12 +603,8 @@ module ActionDispatch
 
           resource = Resource.new(resources.pop, options)
 
-          scope(:path => resource.path, :controller => resource.controller, :shallow => resource.shallow?) do
+          scope(:path => resource.path, :controller => resource.controller) do
             with_scope_level(:resources, resource) do
-              if @scope[:shallow] && @scope[:name_prefix]
-                @scope[:path] = "/#{@scope[:name_prefix].pluralize}/:#{@scope[:name_prefix]}_id/#{resource.path}"
-              end
-
               yield if block_given?
 
               with_scope_level(:collection) do
@@ -639,8 +618,6 @@ module ActionDispatch
               with_scope_level(:member) do
                 scope(':id') do
                   scope(resource.options) do
-                    @scope[:name_prefix] = nil if @scope[:shallow]
-
                     get    :show if resource.actions.include?(:show)
                     put    :update if resource.actions.include?(:update)
                     delete :destroy if resource.actions.include?(:destroy)
@@ -702,6 +679,14 @@ module ActionDispatch
           end
         end
 
+        def namespace(path)
+          if resource_scope?
+            nested { super }
+          else
+            super
+          end
+        end
+
         def match(*args)
           options = args.extract_options!
 
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 4dbbd2eb6a..15d424be74 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -131,12 +131,14 @@ module ActionView
       end
 
       def _view
-        view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
-        view.singleton_class.send :include, _helpers
-        view.singleton_class.send :include, @controller._router.url_helpers
-        view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
-        view.output_buffer = self.output_buffer
-        view
+        @_view ||= begin
+                     view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
+                     view.singleton_class.send :include, _helpers
+                     view.singleton_class.send :include, @controller._router.url_helpers
+                     view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
+                     view.output_buffer = self.output_buffer
+                     view
+                   end
       end
 
       EXCLUDE_IVARS = %w{
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index d2e5d2e965..84c5395610 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -24,6 +24,9 @@ require 'action_view/testing/resolvers'
 require 'action_dispatch'
 require 'active_support/dependencies'
 require 'active_model'
+require 'active_record'
+require 'action_controller/caching'
+require 'action_controller/caching/sweeping'
 
 begin
   require 'ruby-debug'
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index d5704eba78..25b78124e3 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -445,6 +445,12 @@ class FilterTest < ActionController::TestCase
 
   end
 
+
+  def test_before_method_of_sweeper_should_always_return_true
+    sweeper =  ActionController::Caching::Sweeper.send(:new)
+    assert sweeper.before(TestController.new)
+  end
+
   def test_non_yielding_around_filters_not_returning_false_do_not_raise
     controller = NonYieldingAroundFilterController.new
     controller.instance_variable_set "@filter_return_value", true
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index a294535e88..e13960e0dc 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -34,33 +34,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      resources :users do
-        shallow do
-          resources :photos do
-            resources :types do
-              member do
-                post :preview
-              end
-              collection do
-                delete :erase
-              end
-            end
-          end
-        end
-      end
-      
-      shallow do
-        resources :teams do
-          resources :players
-        end
-      
-        resources :countries do
-          resources :cities do
-            resources :places
-          end
-        end
-      end
-
       match 'account/logout' => redirect("/logout"), :as => :logout_redirect
       match 'account/login', :to => redirect("/login")
 
@@ -171,6 +144,16 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       resources :sheep
 
+      resources :clients do
+        namespace :google do
+          resource :account do
+            namespace :secret do
+              resource :info
+            end
+          end
+        end
+      end
+
       match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
 
       match 'people/:id/update', :to => 'people#update', :as => :update_person
@@ -779,18 +762,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_shallow_routes
-    with_test_routes do
-      assert_equal '/photos/4', photo_path(4)
-      assert_equal '/types/10/edit', edit_type_path(10) 
-      assert_equal '/types/5/preview', preview_type_path(5)
-      assert_equal '/photos/2/types', photo_types_path(2)
-      assert_equal '/cities/1/places', url_for(:controller => :places, :action => :index, :city_id => 1, :only_path => true)
-      assert_equal '/teams/new', url_for(:controller => :teams, :action => :new, :only_path => true)
-      assert_equal '/photos/11/types/erase', url_for(:controller => :types, :action => :erase, :photo_id => 11, :only_path => true)
-    end
-  end
-
   def test_update_project_person
     with_test_routes do
       get '/projects/1/people/2/update'
@@ -852,6 +823,18 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal '/account/admin/subscription', account_admin_subscription_path
     end
   end
+  
+  def test_namespace_nested_in_resources
+    with_test_routes do
+      get '/clients/1/google/account'
+      assert_equal '/clients/1/google/account', client_google_account_path(1)
+      assert_equal 'google/accounts#show', @response.body
+
+      get '/clients/1/google/account/secret/info'
+      assert_equal '/clients/1/google/account/secret/info', client_google_account_secret_info_path(1)
+      assert_equal 'google/secret/infos#show', @response.body
+    end
+  end
 
   def test_articles_with_id
     with_test_routes do
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 16e5ee4f72..9b50ea8a42 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -37,6 +37,10 @@ module ActionView
     include SharedTests
     test_case = self
 
+    test "memoizes the _view" do
+      assert_same _view, _view
+    end
+
     test "works without testing a helper module" do
       assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
     end