refinerycms-blog 1.6.2 → 1.7.0

data/app/controllers/admin/blog/settings_controller.rb

@@ -1,39 +1,53 @@
-class Admin::Blog::SettingsController < Admin::BaseController
+module Admin
+  module Blog
+    class SettingsController < Admin::BaseController
 
-  def notification_recipients
-    @recipients = BlogComment::Notification.recipients
+      def notification_recipients
+        @recipients = BlogComment::Notification.recipients
 
-    if request.post?
-      BlogComment::Notification.recipients = params[:recipients]
-      flash[:notice] = t('admin.blog.settings.notification_recipients.updated',
-                         :recipients => BlogComment::Notification.recipients)
-      unless request.xhr? or from_dialog?
-        redirect_back_or_default(admin_blog_posts_path)
-      else
-        render :text => "<script type='text/javascript'>parent.window.location = '#{admin_blog_posts_path}';</script>",
-               :layout => false
+        if request.post?
+          BlogComment::Notification.recipients = params[:recipients]
+          flash[:notice] = t('updated', :scope => 'admin.blog.settings.notification_recipients',
+                             :recipients => BlogComment::Notification.recipients)
+          unless request.xhr? or from_dialog?
+            redirect_back_or_default(admin_blog_posts_path)
+          else
+            render :text => "<script type='text/javascript'>parent.window.location = '#{admin_blog_posts_path}';</script>",
+                   :layout => false
+          end
+        end
       end
-    end
-  end
 
-  def moderation
-    enabled = BlogComment::Moderation.toggle!
-    unless request.xhr?
-      redirect_back_or_default(admin_blog_posts_path)
-    else
-      render :json => {:enabled => enabled},
-             :layout => false
-    end
-  end
+      def moderation
+        enabled = BlogComment::Moderation.toggle!
+        unless request.xhr?
+          redirect_back_or_default(admin_blog_posts_path)
+        else
+          render :json => {:enabled => enabled},
+                 :layout => false
+        end
+      end
+
+      def comments
+        enabled = BlogComment.toggle!
+        unless request.xhr?
+          redirect_back_or_default(admin_blog_posts_path)
+        else
+          render :json => {:enabled => enabled},
+                 :layout => false
+        end
+      end
+      
+      def teasers
+        enabled = BlogPost.teaser_enabled_toggle!
+        unless request.xhr?
+          redirect_back_or_default(admin_blog_posts_path)
+        else
+          render :json => {:enabled => enabled},
+                 :layout => false
+        end
+      end
 
-  def comments
-    enabled = BlogComment.toggle!
-    unless request.xhr?
-      redirect_back_or_default(admin_blog_posts_path)
-    else
-      render :json => {:enabled => enabled},
-             :layout => false
     end
   end
-
-end
+end

data/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

data/app/controllers/blog/posts_controller.rb

@@ -1,101 +1,109 @@
-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
+      # Rss feeders are greedy. Let's give them every blog post instead of paginating.
+      (@blog_posts = BlogPost.live.includes(:comments, :categories).all) if request.format.rss?
+      respond_with (@blog_posts) do |format|
+        format.html
+        format.rss
+      end
     end
-  end
 
-  def show
-    @blog_comment = BlogComment.new
-
-    respond_with (@blog_post) do |format|
-      format.html { present(@blog_post) }
-      format.js { render :partial => 'post', :layout => false }
+    def show
+      @blog_comment = BlogComment.new
+      @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical?
+      
+      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('blog.posts.comments.thank_you_moderated')
-        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('blog.posts.comments.thank_you')
-        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)
+    def find_tags
+      @tags = BlogPost.tag_counts_on(:tags)
+    end
+    
+    def canonical?
+      ::Refinery.i18n_enabled? && ::Refinery::I18n.default_frontend_locale != ::Refinery::I18n.current_frontend_locale
+    end
   end
-
-end
+end

data/app/helpers/blog_posts_helper.rb

@@ -1,9 +1,9 @@
 module BlogPostsHelper
   def blog_archive_list
-    posts = BlogPost.select('published_at').all_previous
+    posts = BlogPost.live.select('published_at').all_previous
     return nil if posts.blank?
     html = '<section id="blog_archive_list"><h2>'
-    html << t('blog.shared.archives')
+    html << t('archives', :scope => 'blog.shared')
     html << '</h2><nav><ul>'
     links = []
     super_old_links = []
@@ -20,7 +20,7 @@ module BlogPostsHelper
     links.each do |l|
       year = l.split('/')[1]
       month = l.split('/')[0]
-      count = BlogPost.by_archive(Time.parse(l)).size
+      count = BlogPost.live.by_archive(Time.parse(l)).size
       text = t("date.month_names")[month.to_i] + " #{year} (#{count})"      
       html << "<li>"
       html << link_to(text, archive_blog_posts_path(:year => year, :month => month))
@@ -28,7 +28,7 @@ module BlogPostsHelper
     end
     super_old_links.each do |l|
       year = l.split('/')[1]
-      count = BlogPost.by_year(Time.parse(l)).size
+      count = BlogPost.live.by_year(Time.parse(l)).size
       text = "#{year} (#{count})"
       html << "<li>"
       html << link_to(text, archive_blog_posts_path(:year => year))
@@ -42,6 +42,10 @@ module BlogPostsHelper
     post.next.present? or post.prev.present?
   end
 
+  def blog_post_teaser_enabled?
+    BlogPost.teasers_enabled?
+  end
+
   def blog_post_teaser(post)
     if post.respond_to?(:custom_teaser) && post.custom_teaser.present?
      post.custom_teaser.html_safe

data/app/mailers/blog/comment_mailer.rb

@@ -1,11 +1,13 @@
-class Blog::CommentMailer < ActionMailer::Base
+module Blog
+  class CommentMailer < ActionMailer::Base
 
-  def notification(comment, request)
-    subject     BlogComment::Notification.subject
-    recipients  BlogComment::Notification.recipients
-    from        "\"#{RefinerySetting[:site_name]}\" <no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}>"
-    sent_on     Time.now
-    @comment =  comment
-  end
+    def notification(comment, request)
+      subject     BlogComment::Notification.subject
+      recipients  BlogComment::Notification.recipients
+      from        "\"#{RefinerySetting[:site_name]}\" <no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}>"
+      sent_on     Time.now
+      @comment =  comment
+    end
 
-end
+  end
+end

data/app/models/blog_category.rb

@@ -1,6 +1,6 @@
 class BlogCategory < ActiveRecord::Base
 
-  has_many :categorizations
+  has_many :categorizations, :dependent => :destroy
   has_many :posts, :through => :categorizations, :source => :blog_post
 
   acts_as_indexed :fields => [:title]

data/app/models/blog_post.rb

@@ -8,12 +8,12 @@ class BlogPost < ActiveRecord::Base
   default_scope :order => 'published_at DESC'
   #.first & .last will be reversed -- consider a with_exclusive_scope on these?
 
-  belongs_to :author, :class_name => 'User', :foreign_key => :user_id
+  belongs_to :author, :class_name => 'User', :foreign_key => :user_id, :readonly => true
 
   has_many :comments, :class_name => 'BlogComment', :dependent => :destroy
   acts_as_taggable
 
-  has_many :categorizations
+  has_many :categorizations, :dependent => :destroy
   has_many :categories, :through => :categorizations, :source => :blog_category
 
   acts_as_indexed :fields => [:title, :body]
@@ -26,8 +26,6 @@ class BlogPost < ActiveRecord::Base
                   :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
                   :strip_non_ascii => RefinerySetting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
 
-  attr_accessible :title, :body, :tag_list, :draft, :published_at, :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids, :custom_url, :custom_teaser
-
   scope :by_archive, lambda { |archive_date|
     where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month])
   }
@@ -77,6 +75,19 @@ class BlogPost < ActiveRecord::Base
         :scoping => 'blog'
       })
     end
+    
+    def teasers_enabled?
+      RefinerySetting.find_or_set(:teasers_enabled, true, {
+        :scoping => 'blog'
+      })
+    end
+    
+    def teaser_enabled_toggle!
+      currently = RefinerySetting.find_or_set(:teasers_enabled, true, {
+        :scoping => 'blog'
+      })
+      RefinerySetting.set(:teasers_enabled, {:value => !currently, :scoping => 'blog'})
+    end
 
     def uncategorized
       BlogPost.live.reject { |p| p.categories.any? }

data/app/views/admin/blog/_submenu.html.erb

@@ -85,6 +85,10 @@
                   notification_recipients_admin_blog_settings_url(:dialog => true, :height => 400),
                   :class => 'user_comment_icon' %>
     </li>
+    <li>
+      <%= link_to t('.settings.teasers'),
+                  teasers_admin_blog_settings_url, :class => "#{BlogPost.teasers_enabled? ? 'success' : 'failure'}_icon" %>
+    </li>
   </ul>
 
 </nav>

data/app/views/admin/blog/categories/_category.html.erb

@@ -11,6 +11,6 @@
                 :class => "cancel confirm-delete",
                 :title => t('.delete'),
                 :method => :delete,
-                :confirm => t('shared.admin.delete.message', :title => category.title) %>
+                :confirm => t('message', :scope => 'shared.admin.delete', :title => category.title) %>
   </span>
 </li>

data/app/views/admin/blog/categories/_form.html.erb

@@ -14,6 +14,6 @@
               :locals => {
                 :f => f,
                 :continue_editing => false,
-                :delete_title => t('admin.blog.categories.category.delete')
+                :delete_title => t('delete', :scope => 'admin.blog.categories.category')
               } %>
 <% end %>

data/app/views/admin/blog/categories/index.html.erb

@@ -1,12 +1,12 @@
 <%= render :partial => '/admin/blog/submenu' %>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
+    <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
     <% if @blog_categories.any? %>
       <%= render :partial => "blog_categories",
                  :collection => @blog_categories %>
     <% else %>
-      <p><%= t('admin.search_no_results') %></p>
+      <p><%= t('search_no_results', :scope => 'admin') %></p>
     <% end %>
   <% else %>
     <% if @blog_categories.any? %>
@@ -18,7 +18,7 @@
     <% else %>
       <p>
         <strong>
-          <%= t('.no_items_yet', :create => t('admin.blog.submenu.categories.new')) %>
+          <%= t('.no_items_yet', :create => t('new', :scope => 'admin.blog.submenu.categories')) %>
         </strong>
       </p>
     <% end %>