refinerycms-blog 2.0.4 → 4.0.0

data/app/controllers/refinery/blog/admin/categories_controller.rb

@@ -4,8 +4,14 @@ module Refinery
       class CategoriesController < ::Refinery::AdminController
 
         crudify :'refinery/blog/category',
-                :order => 'title ASC'
+                include: [:translations],
+                order: 'refinery_blog_category_translations.title ASC'
 
+        private
+
+        def category_params
+          params.require(:category).permit(:title)
+        end
       end
     end
   end

data/app/controllers/refinery/blog/admin/comments_controller.rb

@@ -3,8 +3,6 @@ module Refinery
     module Admin
       class CommentsController < ::Refinery::AdminController
 
-        cache_sweeper Refinery::BlogSweeper
-
         crudify :'refinery/blog/comment',
                 :title_attribute => :name,
                 :order => 'published_at DESC'
@@ -12,35 +10,35 @@ module Refinery
         def index
           @comments = Refinery::Blog::Comment.unmoderated.page(params[:page])
 
-          render :action => 'index'
+          render :index
         end
 
         def approved
-          unless params[:id].present?
-            @comments = Refinery::Blog::Comment.approved.page(params[:page])
+          @comments = Refinery::Blog::Comment.approved.page(params[:page])
+
+          render :index
+        end
 
-            render :action => 'index'
-          else
-            @comment = Refinery::Blog::Comment.find(params[:id])
-            @comment.approve!
-            flash[:notice] = t('approved', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
+        def approve
+          @comment = Refinery::Blog::Comment.find(params[:id])
+          @comment.approve!
+          flash[:notice] = t('approved', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
 
-            redirect_to refinery.url_for(:action => params[:return_to] || 'index', :id => nil)
-          end
+          redirect_to refinery.blog_admin_comments_path
         end
 
         def rejected
-          unless params[:id].present?
-            @comments = Refinery::Blog::Comment.rejected.page(params[:page])
+          @comments = Refinery::Blog::Comment.rejected.page(params[:page])
+
+          render :index
+        end
 
-            render :action => 'index'
-          else
-            @comment = Refinery::Blog::Comment.find(params[:id])
-            @comment.reject!
-            flash[:notice] = t('rejected', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
+        def reject
+          @comment = Refinery::Blog::Comment.find(params[:id])
+          @comment.reject!
+          flash[:notice] = t('rejected', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
 
-            redirect_to refinery.url_for(:action => params[:return_to] || 'index', :id => nil)
-          end
+          redirect_to refinery.blog_admin_comments_path
         end
 
       end

data/app/controllers/refinery/blog/admin/posts_controller.rb

@@ -3,15 +3,17 @@ module Refinery
     module Admin
       class PostsController < ::Refinery::AdminController
 
-        cache_sweeper Refinery::BlogSweeper
-
         crudify :'refinery/blog/post',
-                :order => 'published_at DESC'
+                order: 'published_at DESC',
+                include: [:translations, :author]
+
+        before_action :find_all_categories,
+                      only: [:new, :edit, :create, :update]
 
-        before_filter :find_all_categories,
-                      :only => [:new, :edit, :create, :update]
+        before_action :find_all_authors,
+                      only: [:new, :edit, :create, :update]
 
-        before_filter :check_category_ids, :only => :update
+        before_action :check_category_ids, only: :update
 
         def uncategorized
           @posts = Refinery::Blog::Post.uncategorized.page(params[:page])
@@ -32,19 +34,15 @@ module Refinery
           render :json => @tags.flatten
         end
 
-        def new
-          @post = ::Refinery::Blog::Post.new(:author => current_refinery_user)
-        end
-
         def create
           # if the position field exists, set this object as last object, given the conditions of this class.
           if Refinery::Blog::Post.column_names.include?("position")
-            params[:post].merge!({
+            post_params.merge!({
               :position => ((Refinery::Blog::Post.maximum(:position, :conditions => "")||-1) + 1)
             })
           end
 
-          if (@post = Refinery::Blog::Post.create(params[:post])).valid?
+          if (@post = Refinery::Blog::Post.create(post_params)).valid?
             (request.xhr? ? flash.now : flash).notice = t(
               'refinery.crudify.created',
               :what => "'#{@post.title}'"
@@ -57,7 +55,7 @@ module Refinery
                 unless request.xhr?
                   redirect_to :back
                 else
-                  render :partial => "/shared/message"
+                  render "/shared/message"
                 end
               end
             else
@@ -65,7 +63,7 @@ module Refinery
             end
           else
             unless request.xhr?
-              render :action => 'new'
+              render :new
             else
               render :partial => "/refinery/admin/error_messages",
                      :locals => {
@@ -76,9 +74,39 @@ module Refinery
           end
         end
 
+        def delete_translation
+          find_post
+          @post.translations.find_by_locale(params[:locale_to_delete]).destroy
+          flash[:notice] = ::I18n.t('delete_translation_success', :scope => 'refinery.blog.admin.posts.post')
+          redirect_to refinery.blog_admin_posts_path
+        end
+
+      private
+
+        def post_params
+          params.require(:post).permit(permitted_post_params)
+        end
+
+        def permitted_post_params
+          [
+            :title, :body, :custom_teaser, :tag_list,
+            :draft, :published_at, :custom_url, :user_id, :username, :browser_title,
+            :meta_description, :source_url, :source_url_title, :category_ids => []
+          ]
+        end
+
       protected
+
+        def find_post
+          @post = Refinery::Blog::Post.friendly.joins(:translations).find(params[:id])
+        end
+
         def find_all_categories
-          @categories = Refinery::Blog::Category.find(:all)
+          @categories = Refinery::Blog::Category.all
+        end
+
+        def find_all_authors
+          @authors = Refinery::Blog.user_class.all if (!Refinery::Blog.user_class.nil? && Refinery::Blog.user_class.column_names.include?('username'))
         end
 
         def check_category_ids

data/app/controllers/refinery/blog/blog_controller.rb

@@ -2,16 +2,42 @@ module Refinery
   module Blog
     class BlogController < ::ApplicationController
 
-      include ControllerHelper
-
       helper :'refinery/blog/posts'
-      before_filter :find_page, :find_all_blog_categories
+      before_action :find_page, :find_all_blog_categories
 
       protected
 
-        def find_page
-          @page = Refinery::Page.find_by_link_url("/blog")
+      def find_all_blog_categories
+        @categories = Refinery::Blog::Category.translated
+      end
+
+      def find_blog_post
+        unless (@post = post_finder_scope.with_globalize.friendly.find(params[:id])).try(:live?)
+          if current_refinery_user && current_refinery_user.has_plugin?("refinerycms_blog")
+            @post = post_finder_scope.friendly.find(params[:id])
+          else
+            error_404
+          end
         end
+      end
+
+      def find_all_blog_posts
+        @posts = post_finder_scope.live.includes(
+          :comments, :categories, :translations
+        ).with_globalize.newest_first.page(params[:page])
+      end
+
+      def find_page
+        @page = Refinery::Page.find_by(link_url: Refinery::Blog.page_url)
+      end
+
+      def find_tags
+        @tags = post_finder_scope.live.tag_counts_on(:tags)
+      end
+
+      def post_finder_scope
+        Refinery::Blog::Post
+      end
     end
   end
 end

data/app/controllers/refinery/blog/categories_controller.rb

@@ -2,9 +2,16 @@ module Refinery
   module Blog
     class CategoriesController < BlogController
 
-      def show
-        @category = Refinery::Blog::Category.find(params[:id])
-        @posts = @category.posts.live.includes(:comments, :categories).page(params[:page])
+      before_action :find_category, :find_all_blog_posts, only: :show
+
+      private
+
+      def find_category
+        @category = Refinery::Blog::Category.friendly.find(params[:id])
+      end
+
+      def post_finder_scope
+        @category.posts
       end
 
     end

data/app/controllers/refinery/blog/posts_controller.rb

@@ -1,71 +1,78 @@
+require 'responders'
+
 module Refinery
   module Blog
     class PostsController < BlogController
 
-      caches_page :index, :unless => proc {|c| c.refinery_user_signed_in? || c.flash.any? || params[:page].present? }
-
-      before_filter :find_all_blog_posts, :except => [:archive]
-      before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
-      before_filter :find_tags
+      before_action :find_all_blog_posts, except: [:archive]
+      before_action :find_blog_post, only: [:show, :comment, :update_nav]
+      before_action :find_tags
 
       respond_to :html, :js, :rss
 
       def index
-        # Rss feeders are greedy. Let's give them every blog post instead of paginating.
-        (@posts = Post.live.includes(:comments, :categories).all) if request.format.rss?
+        if request.format.rss?
+          @posts = if params["max_results"].present?
+            # limit rss feed for services (like feedburner) who have max size
+            Post.recent(params["max_results"])
+          else
+            Post.newest_first.live.includes(:comments, :categories)
+          end
+        end
         respond_with (@posts) do |format|
           format.html
-          format.rss
+          format.rss { render layout: false }
         end
       end
 
       def show
         @comment = Comment.new
 
-        @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical?
-        
-        @post.increment!(:access_count, 1)
+        @canonical = refinery.url_for(locale: Refinery::I18n.current_frontend_locale) if canonical?
+
+        Post.increment_counter(:access_count, @post.id)
 
         respond_with (@post) do |format|
           format.html { present(@post) }
-          format.js { render :partial => 'post', :layout => false }
+          format.js { render partial: 'post', layout: false }
         end
       end
 
       def comment
-        if (@comment = @post.comments.create(params[:comment])).valid?
+        @comment = @post.comments.create(comment_params)
+        if @comment.valid?
           if Comment::Moderation.enabled? or @comment.ham?
             begin
-              CommentMailer.notification(@comment, request).deliver
+              CommentMailer.notification(@comment, request).deliver_now
             rescue
               logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
             end
           end
 
           if Comment::Moderation.enabled?
-            flash[:notice] = t('thank_you_moderated', :scope => 'refinery.blog.posts.comments')
+            flash[:notice] = t('thank_you_moderated', scope: 'refinery.blog.posts.comments')
             redirect_to refinery.blog_post_url(params[:id])
           else
-            flash[:notice] = t('thank_you', :scope => 'refinery.blog.posts.comments')
+            flash[:notice] = t('thank_you', scope: 'refinery.blog.posts.comments')
             redirect_to refinery.blog_post_url(params[:id],
-                                      :anchor => "comment-#{@comment.to_param}")
+                                      anchor: "comment-#{@comment.to_param}")
           end
         else
-          render :action => 'show'
+          render :show
         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')
-          @posts = Post.live.by_archive(@archive_date).page(params[:page])
+          archive_date = Time.parse(date)
+          @date_title = ::I18n.l(archive_date, format: '%B %Y')
+          @posts = Post.live.by_month(archive_date).page(params[:page])
         else
           date = "01/#{params[:year]}"
-          @archive_date = Time.parse(date)
-          @date_title = @archive_date.strftime('%Y')
-          @posts = Post.live.by_year(@archive_date).page(params[:page])
+          archive_date = Time.parse(date)
+          @date_title = ::I18n.l(archive_date, format: '%Y')
+          @posts = Post.live.by_year(archive_date).page(params[:page])
         end
         respond_with (@posts)
       end
@@ -73,11 +80,18 @@ module Refinery
       def tagged
         @tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
         @tag_name = @tag.name
-        @posts = Post.tagged_with(@tag_name).page(params[:page])
+        @posts = Post.live.newest_first.distinct.tagged_with(@tag_name).page(params[:page])
+      end
+
+    private
+
+      def comment_params
+        params.require(:comment).permit(:name, :email, :message)
       end
 
+    protected
       def canonical?
-        ::Refinery.i18n_enabled? && ::Refinery::I18n.default_frontend_locale != ::Refinery::I18n.current_frontend_locale
+        Refinery::I18n.default_frontend_locale != Refinery::I18n.current_frontend_locale
       end
     end
   end

data/app/helpers/refinery/blog/controller_helper.rb

@@ -1,29 +1,8 @@
 module Refinery
   module Blog
     module ControllerHelper
-    
-      protected
-    
-        def find_blog_post
-          unless (@post = Refinery::Blog::Post.find(params[:id])).try(:live?)
-            if refinery_user? and current_refinery_user.authorized_plugins.include?("refinerycms_blog")
-              @post = Refinery::Blog::Post.find(params[:id])
-            else
-              error_404
-            end
-          end
-        end
-    
-        def find_all_blog_posts
-          @posts = Refinery::Blog::Post.live.includes(:comments, :categories).page(params[:page])
-        end
 
-        def find_tags
-          @tags = Refinery::Blog::Post.tag_counts_on(:tags)
-        end
-        def find_all_blog_categories
-          @categories = Refinery::Blog::Category.all
-        end
+      
     end
   end
 end

data/app/helpers/refinery/blog/posts_helper.rb

@@ -11,11 +11,11 @@ module Refinery
 
       def blog_post_teaser(post)
         if post.respond_to?(:custom_teaser) && post.custom_teaser.present?
-         post.custom_teaser.html_safe
+          post.custom_teaser.html_safe
         else
-         truncate(post.body, {
-           :length => Refinery::Blog.post_teaser_length,
-           :preserve_html_tags => true
+          truncate(post.body, {
+            :length => Refinery::Blog.post_teaser_length,
+            :preserve_html_tags => true
           }).html_safe
         end
       end
@@ -28,6 +28,11 @@ module Refinery
         Refinery::Blog::Post.published_dates_older_than(cutoff)
       end
 
+      def avatar_url(email, options = {:size => 60})
+        require 'digest/md5'
+        "http://gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s.strip.downcase)}?s=#{options[:size]}.jpg"
+      end
+
       class ArchiveWidget
         delegate :t, :link_to, :refinery, :render, :to => :view_context
         attr_reader :view_context

data/app/models/refinery/blog/categorization.rb

@@ -0,0 +1,11 @@
+module Refinery
+  module Blog
+    class Categorization < ActiveRecord::Base
+
+      self.table_name = 'refinery_blog_categories_blog_posts'
+      belongs_to :blog_post, :class_name => 'Refinery::Blog::Post', :foreign_key => :blog_post_id
+      belongs_to :blog_category, :class_name => 'Refinery::Blog::Category', :foreign_key => :blog_category_id
+
+    end
+  end
+end