merge blog features that got deleted when repo was renamed.

6 files changed, 50 insertions, 2 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 240df61..da6cf3e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -64,6 +64,22 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  #
+  # same as render page, but returns the string
+  #
+  def page_body(page)
+    begin
+      render_to_string :template => page.template_path
+    rescue ActionView::MissingTemplate => exc
+      begin
+        render_to_string :template => page.template_path(DEFAULT_LOCALE)
+      rescue
+        raise exc
+      end
+    end
+  end
+  helper_method :page_body
+
   ##
   ## INITIALIZATION
   ##
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index c86f313..d4fa09a 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -9,7 +9,10 @@ class PagesController < ApplicationController
   def show
     @page = StaticPage.find(params[:page])
     if @page
-      render_page(@page)
+      respond_to do |format|
+        format.atom { render_atom_feed(@page) }
+        format.all { render_page(@page) }
+      end
     else
       raise PageNotFound.new
     end
@@ -25,5 +28,16 @@ class PagesController < ApplicationController
     end
   end
 
+  def render_atom_feed(root)
+    if root
+      @pages = root.all_children.order_by(:posted_at, :direction => :desc).limit(PAGINATION_SIZE)
+      if @pages.any?
+        render :file => 'layouts/blog/feed', :layout => false, :content_type => 'application/atom+xml'
+      else
+        render_404
+      end
+    end
+  end
+
 end
 
diff --git a/app/helpers/blog_helper.rb b/app/helpers/blog_helper.rb
index 9e58fc8..42e6f9c 100644
--- a/app/helpers/blog_helper.rb
+++ b/app/helpers/blog_helper.rb
@@ -12,4 +12,7 @@ module BlogHelper
     end
   end
 
+  def news_feed_link
+    link_to(image_tag('/img/feed-icon-14x14.png'), "/#{I18n.locale}/news.atom")
+  end
 end
diff --git a/app/views/errors/not_found.atom b/app/views/errors/not_found.atom
new file mode 100644
index 0000000..8347208
--- /dev/null
+++ b/app/views/errors/not_found.atom
@@ -0,0 +1 @@
+not found
\ No newline at end of file
diff --git a/app/views/layouts/blog/feed.atom.builder b/app/views/layouts/blog/feed.atom.builder
new file mode 100644
index 0000000..a9dbf6a
--- /dev/null
+++ b/app/views/layouts/blog/feed.atom.builder
@@ -0,0 +1,12 @@
+atom_feed(:language => I18n.locale.to_s) do |feed|
+  feed.title "LEAP News"
+  feed.updated @pages.first.props.posted_at
+  @pages.each do |page|
+    feed.entry(page, :url => page_path(page), :updated => page.props.posted_at) do |entry|
+      entry.title page.title
+      entry.summary page.props.preview, :type => 'html'
+      entry.content page_body(page), :type => 'html'
+      entry.author page.props.author
+    end
+  end
+end
diff --git a/app/views/pages/home/en.haml b/app/views/pages/home/en.haml
index c7bb73b..ff266d0 100644
--- a/app/views/pages/home/en.haml
+++ b/app/views/pages/home/en.haml
@@ -24,7 +24,9 @@
   -#  %h2.invert LEAP Blog
   -#  = recent_blog_summaries('blog')
   .span6
-    %h3.first Recent News
+    %h3.first
+      Recent News
+      = news_feed_link
     = recent_blog_summaries('news')
   .span6
     %h3 LEAP Development Roadmap