added custom partials to aggregators, added test and refactored some methods

4 files changed, 49 insertions, 5 deletions

diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 9800471..7747609 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -33,6 +33,8 @@ module ContentHelper
           options[splitted_data[0].to_sym] = splitted_data[1].gsub(/\"/, "")
         end
         
+        options[:partial] = select_partial( options[:partial] )
+        
         content.sub(tag, render_collection(options))
       else
         content
@@ -47,8 +49,31 @@ module ContentHelper
   # from Page.aggregate(options) with a given partial
   def render_collection options
     render(
-      :partial => 'content/article', 
-      :collection => Page.aggregate(options)
+      :partial => options[:partial], 
+      :collection => Page.aggregate(options),
+      :as => :page
+    )
+  end
+  
+  private
+  
+  # Either return a custom partial path if it exsits or default to the standard
+  # partial
+  def select_partial partial
+    if partial && partial_exists?( partial )
+      return "custom_templates/partials/#{partial}"
+    else
+      return 'content/article'
+    end
+  end
+
+  # Check if a custom partial exists in the proper location
+  def partial_exists? partial
+    File.exist?(
+      File.join( 
+        RAILS_ROOT, 'app', 'views', 'custom_templates', 'partials', "_#{partial}.html.erb"
+      )
     )
   end
+  
 end
diff --git a/app/views/content/_article.html.erb b/app/views/content/_article.html.erb
index 009d639..e2f2877 100644
--- a/app/views/content/_article.html.erb
+++ b/app/views/content/_article.html.erb
@@ -1,6 +1,6 @@
 <div class="teaserruler">
   <hr/>
 </div>
-<h2><%= article.title %></h2>
-<h3><%= date_for_page article %>, <%= @page.user.login %></h3>
-<p><%= article.abstract %></p>
\ No newline at end of file
+<h2><%= page.title %></h2>
+<h3><%= date_for_page page %>, <%= page.user.login %></h3>
+<p><%= page.abstract %></p>
\ No newline at end of file
diff --git a/app/views/custom_templates/partials/_sidebar_title_only.html.erb b/app/views/custom_templates/partials/_sidebar_title_only.html.erb
new file mode 100644
index 0000000..819d9ae
--- /dev/null
+++ b/app/views/custom_templates/partials/_sidebar_title_only.html.erb
@@ -0,0 +1,3 @@
+<h2 class="sidebar_headline">
+  <%= page.title %>
+</h2>
\ No newline at end of file
diff --git a/test/functional/content_controller_test.rb b/test/functional/content_controller_test.rb
index cb6ad04..c374a83 100644
--- a/test/functional/content_controller_test.rb
+++ b/test/functional/content_controller_test.rb
@@ -51,6 +51,22 @@ class ContentControllerTest < ActionController::TestCase
     assert_select("h2", "two")
   end
   
+  def test_page_containing_aggregator_with_custom_template
+    fill_pages_with_content
+    
+    new_node = create_node_under_root "fnord"
+    draft = new_node.find_or_create_draft @user1
+    draft.body = '<aggregate tags="update" limit="20" partial="sidebar_title_only" />'
+    draft.save
+    new_node.publish_draft!
+    
+    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    assert_response :success
+    
+    assert_select(".sidebar_headline", "one")
+    assert_select(".sidebar_headline", "two")
+  end
+  
   
   
   protected