Making use of modules and putting classes under modules.

2 files changed, 88 insertions, 84 deletions

diff --git a/app/controllers/blog/categories_controller.rb b/app/controllers/blog/categories_controller.rb
index 35a87c3..efda778 100644
--- a/app/controllers/blog/categories_controller.rb
+++ b/app/controllers/blog/categories_controller.rb
@@ -1,11 +1,13 @@
-class Blog::CategoriesController < BlogController
+module Blog
+  class CategoriesController < BlogController
 
-  def show
-    @category = BlogCategory.find(params[:id])
-    @blog_posts = @category.posts.live.includes(:comments, :categories).paginate({
-      :page => params[:page],
-      :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
-    })
-  end
+    def show
+      @category = BlogCategory.find(params[:id])
+      @blog_posts = @category.posts.live.includes(:comments, :categories).paginate({
+        :page => params[:page],
+        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+      })
+    end
 
-end
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/blog/posts_controller.rb b/app/controllers/blog/posts_controller.rb
index fd1cd1b..9dc595c 100644
--- a/app/controllers/blog/posts_controller.rb
+++ b/app/controllers/blog/posts_controller.rb
@@ -1,101 +1,103 @@
-class Blog::PostsController < BlogController
+module Blog
+  class PostsController < BlogController
 
-  before_filter :find_all_blog_posts, :except => [:archive]
-  before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
-  before_filter :find_tags
+    before_filter :find_all_blog_posts, :except => [:archive]
+    before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
+    before_filter :find_tags
 
-  respond_to :html, :js, :rss
+    respond_to :html, :js, :rss
 
-  def index
-    respond_with (@blog_posts) do |format|
-      format.html
-      format.rss
+    def index
+      respond_with (@blog_posts) do |format|
+        format.html
+        format.rss
+      end
     end
-  end
 
-  def show
-    @blog_comment = BlogComment.new
+    def show
+      @blog_comment = BlogComment.new
 
-    respond_with (@blog_post) do |format|
-      format.html { present(@blog_post) }
-      format.js { render :partial => 'post', :layout => false }
+      respond_with (@blog_post) do |format|
+        format.html { present(@blog_post) }
+        format.js { render :partial => 'post', :layout => false }
+      end
     end
-  end
 
-  def comment
-    if (@blog_comment = @blog_post.comments.create(params[:blog_comment])).valid?
-      if BlogComment::Moderation.enabled? or @blog_comment.ham?
-        begin
-          Blog::CommentMailer.notification(@blog_comment, request).deliver
-        rescue
-          logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
+    def comment
+      if (@blog_comment = @blog_post.comments.create(params[:blog_comment])).valid?
+        if BlogComment::Moderation.enabled? or @blog_comment.ham?
+          begin
+            Blog::CommentMailer.notification(@blog_comment, request).deliver
+          rescue
+            logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
+          end
         end
+
+        if BlogComment::Moderation.enabled?
+          flash[:notice] = t('thank_you_moderated', :scope => 'blog.posts.comments')
+          redirect_to blog_post_url(params[:id])
+        else
+          flash[:notice] = t('thank_you', :scope => 'blog.posts.comments')
+          redirect_to blog_post_url(params[:id],
+                                    :anchor => "comment-#{@blog_comment.to_param}")
+        end
+      else
+        render :action => 'show'
       end
+    end
 
-      if BlogComment::Moderation.enabled?
-        flash[:notice] = t('thank_you_moderated', :scope => 'blog.posts.comments')
-        redirect_to blog_post_url(params[:id])
+    def archive
+      if params[:month].present?
+        date = "#{params[:month]}/#{params[:year]}"
+        @archive_date = Time.parse(date)
+        @date_title = @archive_date.strftime('%B %Y')
+        @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({
+          :page => params[:page],
+          :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+        })
       else
-        flash[:notice] = t('thank_you', :scope => 'blog.posts.comments')
-        redirect_to blog_post_url(params[:id],
-                                  :anchor => "comment-#{@blog_comment.to_param}")
+        date = "01/#{params[:year]}"
+        @archive_date = Time.parse(date)
+        @date_title = @archive_date.strftime('%Y')
+        @blog_posts = BlogPost.live.by_year(@archive_date).paginate({
+          :page => params[:page],
+          :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+        })
       end
-    else
-      render :action => 'show'
+      respond_with (@blog_posts)
     end
-  end
 
-  def archive
-    if params[:month].present?
-      date = "#{params[:month]}/#{params[:year]}"
-      @archive_date = Time.parse(date)
-      @date_title = @archive_date.strftime('%B %Y')
-      @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({
-        :page => params[:page],
-        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
-      })
-    else
-      date = "01/#{params[:year]}"
-      @archive_date = Time.parse(date)
-      @date_title = @archive_date.strftime('%Y')
-      @blog_posts = BlogPost.live.by_year(@archive_date).paginate({
+    def tagged
+      @tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
+      @tag_name = @tag.name
+      @blog_posts = BlogPost.tagged_with(@tag_name).paginate({
         :page => params[:page],
         :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
       })
     end
-    respond_with (@blog_posts)
-  end
 
-  def tagged
-    @tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
-    @tag_name = @tag.name
-    @blog_posts = BlogPost.tagged_with(@tag_name).paginate({
-      :page => params[:page],
-      :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
-    })
-  end
-
-protected
+  protected
 
-  def find_blog_post
-    unless (@blog_post = BlogPost.find(params[:id])).try(:live?)
-      if refinery_user? and current_user.authorized_plugins.include?("refinerycms_blog")
-        @blog_post = BlogPost.find(params[:id])
-      else
-        error_404
+    def find_blog_post
+      unless (@blog_post = BlogPost.find(params[:id])).try(:live?)
+        if refinery_user? and current_user.authorized_plugins.include?("refinerycms_blog")
+          @blog_post = BlogPost.find(params[:id])
+        else
+          error_404
+        end
       end
     end
-  end
 
-  def find_all_blog_posts
-    @blog_posts = BlogPost.live.includes(:comments, :categories).paginate({
-      :page => params[:page],
-      :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
-    })
-  end
+    def find_all_blog_posts
+      @blog_posts = BlogPost.live.includes(:comments, :categories).paginate({
+        :page => params[:page],
+        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+      })
+    end
 
-  def find_tags
-    @tags = BlogPost.tag_counts_on(:tags)
-  end
+    def find_tags
+      @tags = BlogPost.tag_counts_on(:tags)
+    end
 
-end
+  end
+end
\ No newline at end of file