From d37ef11f63904b0daa0dcf240dd5a55025423af3 Mon Sep 17 00:00:00 2001 From: Jamie Winsor 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 ++---- app/helpers/refinery/blog_controller_helper.rb | 28 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 app/helpers/refinery/blog_controller_helper.rb 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 diff --git a/app/helpers/refinery/blog_controller_helper.rb b/app/helpers/refinery/blog_controller_helper.rb new file mode 100644 index 0000000..2edc2f6 --- /dev/null +++ b/app/helpers/refinery/blog_controller_helper.rb @@ -0,0 +1,28 @@ +module Refinery + module BlogControllerHelper + + 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 + + def find_all_blog_categories + @blog_categories = Refinery::BlogCategory.all + end + end +end -- cgit v1.2.3 From c40eb83af3c85e15314fab75cf66e2ffe3ab2ed7 Mon Sep 17 00:00:00 2001 From: Jamie Winsor Date: Mon, 19 Sep 2011 18:35:58 -0700 Subject: remove duplicate BlogControllerHelper include --- app/controllers/refinery/blog/posts_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index a885d18..ad576a5 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -1,8 +1,6 @@ module Refinery module Blog class PostsController < BlogController - - include BlogControllerHelper caches_page :index -- cgit v1.2.3 From de4cc6b9efdba3e1eeb398f01a46331b80895314 Mon Sep 17 00:00:00 2001 From: Jamie Winsor Date: Mon, 19 Sep 2011 18:43:09 -0700 Subject: Namespace BlogControllerHelper to Blog::ControllerHelper --- app/controllers/refinery/blog_controller.rb | 2 +- app/helpers/refinery/blog/controller_helper.rb | 30 ++++++++++++++++++++++++++ app/helpers/refinery/blog_controller_helper.rb | 28 ------------------------ 3 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 app/helpers/refinery/blog/controller_helper.rb delete mode 100644 app/helpers/refinery/blog_controller_helper.rb diff --git a/app/controllers/refinery/blog_controller.rb b/app/controllers/refinery/blog_controller.rb index b875b44..314c919 100644 --- a/app/controllers/refinery/blog_controller.rb +++ b/app/controllers/refinery/blog_controller.rb @@ -1,7 +1,7 @@ module Refinery class BlogController < ::ApplicationController - include BlogControllerHelper + include Blog::ControllerHelper helper :'refinery/blog_posts' before_filter :find_page, :find_all_blog_categories diff --git a/app/helpers/refinery/blog/controller_helper.rb b/app/helpers/refinery/blog/controller_helper.rb new file mode 100644 index 0000000..74a189b --- /dev/null +++ b/app/helpers/refinery/blog/controller_helper.rb @@ -0,0 +1,30 @@ +module Refinery + module Blog + module ControllerHelper + + 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 + + def find_all_blog_categories + @blog_categories = Refinery::BlogCategory.all + end + end + end +end diff --git a/app/helpers/refinery/blog_controller_helper.rb b/app/helpers/refinery/blog_controller_helper.rb deleted file mode 100644 index 2edc2f6..0000000 --- a/app/helpers/refinery/blog_controller_helper.rb +++ /dev/null @@ -1,28 +0,0 @@ -module Refinery - module BlogControllerHelper - - 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 - - def find_all_blog_categories - @blog_categories = Refinery::BlogCategory.all - end - end -end -- cgit v1.2.3 From be7d341532c0e5fc92d2822eea924956ab704d54 Mon Sep 17 00:00:00 2001 From: Jamie Winsor Date: Mon, 19 Sep 2011 18:48:29 -0700 Subject: Namespace BlogController into Blog::BaseController --- app/controllers/refinery/blog/base_controller.rb | 17 +++++++++++++++++ app/controllers/refinery/blog/categories_controller.rb | 2 +- app/controllers/refinery/blog/posts_controller.rb | 2 +- app/controllers/refinery/blog_controller.rb | 15 --------------- 4 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 app/controllers/refinery/blog/base_controller.rb delete mode 100644 app/controllers/refinery/blog_controller.rb diff --git a/app/controllers/refinery/blog/base_controller.rb b/app/controllers/refinery/blog/base_controller.rb new file mode 100644 index 0000000..7010283 --- /dev/null +++ b/app/controllers/refinery/blog/base_controller.rb @@ -0,0 +1,17 @@ +module Refinery + module Blog + class BaseController < ::ApplicationController + + include ControllerHelper + + helper :'refinery/blog_posts' + before_filter :find_page, :find_all_blog_categories + + protected + + def find_page + @page = Refinery::Page.find_by_link_url("/blog") + end + end + end +end diff --git a/app/controllers/refinery/blog/categories_controller.rb b/app/controllers/refinery/blog/categories_controller.rb index 57196c3..80e54d9 100644 --- a/app/controllers/refinery/blog/categories_controller.rb +++ b/app/controllers/refinery/blog/categories_controller.rb @@ -1,6 +1,6 @@ module Refinery module Blog - class CategoriesController < BlogController + class CategoriesController < BaseController def show @category = Refinery::BlogCategory.find(params[:id]) diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index ad576a5..7b09329 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -1,6 +1,6 @@ module Refinery module Blog - class PostsController < BlogController + class PostsController < BaseController caches_page :index diff --git a/app/controllers/refinery/blog_controller.rb b/app/controllers/refinery/blog_controller.rb deleted file mode 100644 index 314c919..0000000 --- a/app/controllers/refinery/blog_controller.rb +++ /dev/null @@ -1,15 +0,0 @@ -module Refinery - class BlogController < ::ApplicationController - - include Blog::ControllerHelper - - helper :'refinery/blog_posts' - before_filter :find_page, :find_all_blog_categories - - protected - - def find_page - @page = Refinery::Page.find_by_link_url("/blog") - end - end -end -- cgit v1.2.3 From 362088d0272d6d61824b0539e201356cf9219dc0 Mon Sep 17 00:00:00 2001 From: Jamie Winsor Date: Mon, 19 Sep 2011 18:50:38 -0700 Subject: Fix indent on protected methods --- app/helpers/refinery/blog/controller_helper.rb | 36 +++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/helpers/refinery/blog/controller_helper.rb b/app/helpers/refinery/blog/controller_helper.rb index 74a189b..2b2add4 100644 --- a/app/helpers/refinery/blog/controller_helper.rb +++ b/app/helpers/refinery/blog/controller_helper.rb @@ -4,27 +4,27 @@ module Refinery 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 + 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 - - def find_all_blog_posts - @blog_posts = Refinery::BlogPost.live.includes(:comments, :categories).page(params[:page]) - 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 - - def find_all_blog_categories - @blog_categories = Refinery::BlogCategory.all - end + def find_tags + @tags = Refinery::BlogPost.tag_counts_on(:tags) + end + + def find_all_blog_categories + @blog_categories = Refinery::BlogCategory.all + end end end end -- cgit v1.2.3 From 1b51e2343d477d2065c016d77ef73d527cb37b0e Mon Sep 17 00:00:00 2001 From: Jamie Winsor Date: Mon, 19 Sep 2011 18:57:17 -0700 Subject: setting indentation to 'rails way' for protected and private classes --- app/controllers/refinery/blog/base_controller.rb | 6 ++-- app/helpers/refinery/blog/controller_helper.rb | 36 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/controllers/refinery/blog/base_controller.rb b/app/controllers/refinery/blog/base_controller.rb index 7010283..01892d1 100644 --- a/app/controllers/refinery/blog/base_controller.rb +++ b/app/controllers/refinery/blog/base_controller.rb @@ -9,9 +9,9 @@ module Refinery protected - def find_page - @page = Refinery::Page.find_by_link_url("/blog") - end + def find_page + @page = Refinery::Page.find_by_link_url("/blog") + end end end end diff --git a/app/helpers/refinery/blog/controller_helper.rb b/app/helpers/refinery/blog/controller_helper.rb index 2b2add4..74a189b 100644 --- a/app/helpers/refinery/blog/controller_helper.rb +++ b/app/helpers/refinery/blog/controller_helper.rb @@ -4,27 +4,27 @@ module Refinery 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 + 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 - 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 - def find_all_blog_categories - @blog_categories = Refinery::BlogCategory.all - 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 + + def find_all_blog_categories + @blog_categories = Refinery::BlogCategory.all + end end end end -- cgit v1.2.3