From d37ef11f63904b0daa0dcf240dd5a55025423af3 Mon Sep 17 00:00:00 2001
From: Jamie Winsor <jamie@enmasse.com>
Date: Mon, 19 Sep 2011 15:35:47 -0700
Subject: Abstract filter methods into controller helpers

This will enable users to include the controller helper into their
own controllers to perform common functions - such as finding a blog
post or listing all blog posts.
---
 app/controllers/refinery/blog/posts_controller.rb | 23 ++---------------------
 app/controllers/refinery/blog_controller.rb       |  7 ++-----
 2 files changed, 4 insertions(+), 26 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb
index 3041439..a885d18 100644
--- a/app/controllers/refinery/blog/posts_controller.rb
+++ b/app/controllers/refinery/blog/posts_controller.rb
@@ -1,6 +1,8 @@
 module Refinery
   module Blog
     class PostsController < BlogController
+
+      include BlogControllerHelper
       
       caches_page :index
 
@@ -71,27 +73,6 @@ module Refinery
         @tag_name = @tag.name
         @blog_posts = Refinery::BlogPost.tagged_with(@tag_name).page(params[:page])
       end
-
-    protected
-
-      def find_blog_post
-        unless (@blog_post = Refinery::BlogPost.find(params[:id])).try(:live?)
-          if refinery_user? and current_user.authorized_plugins.include?("refinerycms_blog")
-            @blog_post = Refinery::BlogPost.find(params[:id])
-          else
-            error_404
-          end
-        end
-      end
-
-      def find_all_blog_posts
-        @blog_posts = Refinery::BlogPost.live.includes(:comments, :categories).page(params[:page])
-      end
-
-      def find_tags
-        @tags = Refinery::BlogPost.tag_counts_on(:tags)
-      end
-
     end
   end
 end
diff --git a/app/controllers/refinery/blog_controller.rb b/app/controllers/refinery/blog_controller.rb
index cbafdeb..b875b44 100644
--- a/app/controllers/refinery/blog_controller.rb
+++ b/app/controllers/refinery/blog_controller.rb
@@ -1,5 +1,7 @@
 module Refinery
   class BlogController < ::ApplicationController
+    
+    include BlogControllerHelper
 
     helper :'refinery/blog_posts'
     before_filter :find_page, :find_all_blog_categories
@@ -9,10 +11,5 @@ module Refinery
     def find_page
       @page = Refinery::Page.find_by_link_url("/blog")
     end
-
-    def find_all_blog_categories
-      @blog_categories = Refinery::BlogCategory.all
-    end
-
   end
 end
-- 
cgit v1.2.3