spec/fixtures/views/a/_partial_render_parent.html.erb spec/fixtures/views/b/_partial_render_parent.html.erb spec/fixtures/views/b/partial_render_parent.html.erb spec/fixtures/views/c/_partial_render_parent.html.erb @@ -95,10 +95,11 @@ module Ardes#:nodoc: # Set the inherit view paths, in order of self to ancestor. # - # The controller_path for self is always prepended to the front, no matter what the arguments - def inherit_view_paths=(paths) - inherited = inherit_view_paths - paths - [controller_path] - instance_variable_set('@inherit_view_paths', [controller_path] + ((paths - [controller_path]) + inherited)) + # The controller_path for self is always prepended to the front, no matter what the arguments. + def inherit_view_paths=(new_paths) + new_paths -= [controller_path] + old_paths = inherit_view_paths - [controller_path] - new_paths + instance_variable_set('@inherit_view_paths', [controller_path] + new_paths + old_paths) end end end lib/ardes/inherit_views.rb @@ -6,35 +6,16 @@ end # its subclasses will inherit its views class AController < InheritViewsTestController inherit_views - - def in_a; end - def in_ab; end - def in_abc; end - def render_parent; end - def inherited_template_path; end end # :b controller is a normal controller with inherit_views 'a' # It will inherit a's views, and its sublcasses will inherit its views ('b', then 'a') class BController < InheritViewsTestController inherit_views 'a' - - def in_a; end - def in_ab; end - def in_b; end - def in_abc; end - def render_parent; end - def bad_render_parent; end - def partial_in_bc; end - def partial_in_b; end - def collection_in_bc; end end # :c cotroller is a subclass of :b controller, so it inheirt's b's views ('c', 'b', then 'a') class CController < BController - - def in_c; end - def render_parent; end end # :d controller is a subclass of :a controller, with inherit_views 'other', so its views == ('d', 'other', then 'a') @@ -44,45 +25,4 @@ end # used to test that inherit_views doesn't muck anything else up class NormalController < InheritViewsTestController - def partial_from_c; end -end - - -##### -# These are created in production mode to test caching -ENV["RAILS_ENV"] = 'production' - -class ProductionModeController < InheritViewsTestController - inherit_views -end - -class OtherProductionModeController < ProductionModeController -end - -# back to test mode -ENV['RAILS_ENV'] = 'test' -##### - - -##### -# BC: This is created without ActionView::TemplateFinder existing -orig_template_finder = (ActionView::TemplateFinder rescue nil) -orig_template_finder && ActionView.send(:remove_const, :TemplateFinder) - -class NoTemplateFinderController < InheritViewsTestController - inherit_views -end - -# And this with a TemplateFinder -ActionView::TemplateFinder = :defined - -class WithTemplateFinderController < InheritViewsTestController - inherit_views -end - -# revert back to whatever ActionView::TemplateFinder is -if orig_template_finder - ActionView.send :remove_const, :TemplateFinder - ActionView::TemplateFinder = orig_template_finder end -##### \ No newline at end of file spec/app.rb @@ -45,9 +45,7 @@ describe BController, " < TestController; inherit_views 'a'" do end it "GET :bad_render_parent should raise ActionView::TemplateError as there is no parent to render" do - pending do - lambda { get :bad_render_parent }.should raise_error(ActionView::TemplateError, "no parent for b/bad_render_parent found") - end + lambda { get :bad_render_parent }.should raise_error(ActionView::TemplateError, "no parent for b/bad_render_parent found") end it "GET :partial_in_bc should render b/partial_in_bc & b/_partial_in_bc" do @@ -64,5 +62,10 @@ describe BController, " < TestController; inherit_views 'a'" do get :collection_in_bc response.body.should == 'b:collection_in_bc => b:_partial_in_bc' end + + it "GET :partial_render_parent should render b/partial_render_parent & b/_partial_render_parent & a/_partial_render_parent" do + get :partial_render_parent + response.body.should == 'b:partial_render_parent => b:_partial_render_parent(a:_partial_render_parent)' + end end end \ No newline at end of file spec/controllers/b_controller_spec.rb @@ -65,5 +65,10 @@ describe CController, " < BController" do get :collection_in_bc response.body.should == 'b:collection_in_bc => c:_partial_in_bc' end + + it "GET :partial_render_parent should render b/partial_render_parent & c/_partial_render_parent & b/_partial_render_parent & a/_partial_render_parent" do + get :partial_render_parent + response.body.should == 'b:partial_render_parent => c:_partial_render_parent(b:_partial_render_parent(a:_partial_render_parent))' + end end end \ No newline at end of file spec/controllers/c_controller_spec.rb 19e89116da925afdddeb8383dca53a2de932d471 Ian White ian.w.white@gmail.com http://github.com/ianwhite/inherit_views/commit/4ab74c4f152b85c6f8093cb5ae9e89009b1ddc6a 4ab74c4f152b85c6f8093cb5ae9e89009b1ddc6a 2008-09-20T21:10:13-07:00 2008-09-20T21:10:13-07:00 inherit_views no longer requires the exitsnce of an action method (ie. it will render inherited templates if they exist, when there is no action defined) d978804feb60c1a6de14c47d2fe49b87d5d58bc2 Ian White ian.w.white@gmail.com