5 files changed, 87 insertions, 3 deletions

diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 0e1df66..3cf3488 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -1,8 +1,34 @@
 module ContentHelper
   
-  # 
   def date_for_page page
     page.published_at.to_s(:db) rescue page.created_at.to_s(:db)
   end
   
+  def aggregate? content
+    options = {}
+    
+    begin
+      if content =~ /<aggregate([^<>]*)>/
+        tag = $~.to_s
+        matched_data = $1.scan(/\w+\=\"[a-zA-Z\s\/_\d]*\"/)
+        
+        matched_data.each do |data|
+          splitted_data = data.split("=")
+          options[splitted_data[0].to_sym] = splitted_data[1].gsub(/\"/, "")
+        end
+        
+        content.sub(tag, render_collection(options))
+      end
+      
+    rescue
+      content
+    end
+  end
+  
+  def render_collection options
+    render(
+      :partial => 'content/article', 
+      :collection => Page.aggregate(options)
+    )
+  end
 end
diff --git a/app/models/flag.rb b/app/models/flag.rb
new file mode 100644
index 0000000..6d67377
--- /dev/null
+++ b/app/models/flag.rb
@@ -0,0 +1,3 @@
+class Flag < ActiveRecord::Base
+  has_and_belongs_to_many :pages
+end
diff --git a/app/models/page.rb b/app/models/page.rb
index 0fcb4a8..fee20a8 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,7 +1,56 @@
 class Page < ActiveRecord::Base
   
   belongs_to :node
+  has_and_belongs_to_many :flags
   
   acts_as_list :column => :revision, :scope => :node_id
   
-end
+  # Alternativ Queries with one or two inner joins. Loading the Flags themselves
+  # would be another query. Could be faster on larger data sets.
+  #
+  # Single Join:
+  #
+  # Page.find(
+  #   :all, 
+  #   :joins => 'JOIN flags_pages on pages.id = flags_pages.page_id', 
+  #   :include => :flags, 
+  #   :conditions => ['flags_pages.flag_id IN (?)', [1,2]]
+  # )
+  # Two inner joins:
+  #
+  # Page.find(
+  #   :all, 
+  #   :joins => :flags_pages, 
+  #   :conditions => ['flags_pages.flag_id IN (?)', [1,2]]
+  # )
+  named_scope :with_flags, lambda {|flag_names| 
+    if (flags = Flag.find_all_by_name(flag_names)).empty?
+      {}
+    else
+      {:include => :flags, :conditions => ['flags_pages.flag_id IN (?)', flags.map(&:id)] }
+    end
+  }
+
+  # <aggregate 
+  #   flags="updates pressemitteilungen"
+  #   limit="20"
+  #   order_by="published_at"
+  #   order_direction="DESC"
+  # />
+  def self.aggregate options
+    
+    defaults = {
+      :flags            => "",
+      :limit            => 20,
+      :order_by         => "id",
+      :order_direction  => "ASC"
+    }
+    
+    options = defaults.merge options
+    
+    pages = Page.with_flags(options[:flags].split(/\s/)).all(
+      :limit => options[:limit],
+      :order => "#{options[:order_by]} #{options[:order_direction]}"
+    )
+  end
+end
\ No newline at end of file
diff --git a/app/views/content/_article.html.erb b/app/views/content/_article.html.erb
new file mode 100644
index 0000000..1e06787
--- /dev/null
+++ b/app/views/content/_article.html.erb
@@ -0,0 +1,6 @@
+<div class="teaserruler">
+  <hr/>
+</div>
+<h2><%= article.title %></h2>
+<h3><%= date_for_page article %>, gregoa</h3>
+<p><%= article.abstract %></p>
\ No newline at end of file
diff --git a/app/views/content/render_page.html.erb b/app/views/content/render_page.html.erb
index 311d61d..b70f90e 100644
--- a/app/views/content/render_page.html.erb
+++ b/app/views/content/render_page.html.erb
@@ -13,5 +13,5 @@
   <h3><%= date_for_page @page %>, gregoa</h3>
   <hr class="subtitle" />
   <p><em><%= @page.abstract %></em></p>
-  <%= @page.body %>
+  <%= aggregate?(@page.body) %>
 </div>
\ No newline at end of file