refinerycms-blog 1.1 → 1.2

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

@@ -3,6 +3,59 @@ class Admin::Blog::PostsController < Admin::BaseController
   crudify :blog_post,
           :title_attribute => :title,
           :order => 'published_at DESC'
+          
+  def uncategorized
+    @blog_posts = BlogPost.uncategorized.paginate({
+      :page => params[:page],
+      :per_page => BlogPost.per_page
+    })
+  end
+  
+  def create
+    # if the position field exists, set this object as last object, given the conditions of this class.
+    if BlogPost.column_names.include?("position")
+      params[:blog_post].merge!({
+        :position => ((BlogPost.maximum(:position, :conditions => "")||-1) + 1)
+      })
+    end
+    
+    if BlogPost.column_names.include?("user_id")
+      params[:blog_post].merge!({
+        :user_id => current_user.id
+      })
+    end
+
+    if (@blog_post = BlogPost.create(params[:blog_post])).valid?
+      (request.xhr? ? flash.now : flash).notice = t(
+        'refinery.crudify.created',
+        :what => "'#{@blog_post.title}'"
+      )
+
+      unless from_dialog?
+        unless params[:continue_editing] =~ /true|on|1/
+          redirect_back_or_default(admin_blog_posts_url)
+        else
+          unless request.xhr?
+            redirect_to :back
+          else
+            render :partial => "/shared/message"
+          end
+        end
+      else
+        render :text => "<script>parent.window.location = '#{admin_blog_posts_url}';</script>"
+      end
+    else
+      unless request.xhr?
+        render :action => 'new'
+      else
+        render :partial => "/shared/admin/error_messages",
+               :locals => {
+                 :object => @blog_post,
+                 :include_object_name => true
+               }
+      end
+    end
+  end
 
   before_filter :find_all_categories,
                 :only => [:new, :edit, :create, :update]

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

@@ -10,7 +10,8 @@ class Admin::Blog::SettingsController < Admin::BaseController
       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>"
+        render :text => "<script type='text/javascript'>parent.window.location = '#{admin_blog_posts_path}';</script>",
+               :layout => false
       end
     end
   end
@@ -20,7 +21,18 @@ class Admin::Blog::SettingsController < Admin::BaseController
     unless request.xhr?
       redirect_back_or_default(admin_blog_posts_path)
     else
-      render :json => {:enabled => enabled}
+      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
 

data/app/controllers/blog/posts_controller.rb

@@ -45,12 +45,23 @@ class Blog::PostsController < BlogController
   end
 
   def archive
-    date = "#{params[:month]}/#{params[:year]}"
-    @archive_date = Time.parse(date)
-    @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({
-      :page => params[:page],
-      :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
-    })
+    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({
+        :page => params[:page],
+        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+      })
+    end
     respond_with (@blog_posts)
   end
 
@@ -67,7 +78,7 @@ protected
   end
 
   def find_all_blog_posts
-    @blog_posts = BlogPost.live.paginate({
+    @blog_posts = BlogPost.live.includes(:comments, :categories).paginate({
       :page => params[:page],
       :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
     })

data/app/helpers/blog_posts_helper.rb

@@ -2,23 +2,39 @@ module BlogPostsHelper
   def blog_archive_list
     posts = BlogPost.select('published_at').all_previous
     return nil if posts.blank?
-    html = '<section id="blog_archive_list"><h2>Archives</h2><nav><ul>'
+    html = '<section id="blog_archive_list"><h2>'
+    html << t('blog.shared.archives')
+    html << '</h2><nav><ul>'
     links = []
+    super_old_links = []
 
     posts.each do |e|
-      links << e.published_at.strftime('%m/%Y')
+      if e.published_at >= Time.now.end_of_year.advance(:years => -3)
+        links << e.published_at.strftime('%m/%Y') 
+      else
+        super_old_links << e.published_at.strftime('01/%Y')
+      end
     end
     links.uniq!
+    super_old_links.uniq!
     links.each do |l|
       year = l.split('/')[1]
       month = l.split('/')[0]
       count = BlogPost.by_archive(Time.parse(l)).size
-      text = "#{Date::MONTHNAMES[month.to_i]} #{year} (#{count})"
-      html += "<li>"
-      html += link_to(text, archive_blog_posts_path(:year => year, :month => month))
-      html += "</li>"
+      text = t("date.month_names")[month.to_i] + " #{year} (#{count})"      
+      html << "<li>"
+      html << link_to(text, archive_blog_posts_path(:year => year, :month => month))
+      html << "</li>"
     end
-    html += '</ul></nav></section>'
+    super_old_links.each do |l|
+      year = l.split('/')[1]
+      count = BlogPost.by_year(Time.parse(l)).size
+      text = "#{year} (#{count})"
+      html << "<li>"
+      html << link_to(text, archive_blog_posts_path(:year => year))
+      html << "</li>"
+    end
+    html << '</ul></nav></section>'
     html.html_safe
   end
 

data/app/models/blog_category.rb

@@ -1,23 +1,16 @@
 class BlogCategory < ActiveRecord::Base
 
-  has_and_belongs_to_many :posts, :class_name => 'BlogPost'
+  has_many :categorizations
+  has_many :posts, :through => :categorizations, :source => :blog_post
 
   acts_as_indexed :fields => [:title]
 
-  validates_presence_of :title
-  validates_uniqueness_of :title
+  validates :title, :presence => true, :uniqueness => true
 
   has_friendly_id :title, :use_slug => true
 
-  # this might be able to be optimised a little more
   def post_count
-    count = 0
-
-    self.posts.each do |p|
-      count += 1 if p.live?
-    end
-
-    count
+    posts.select(&:live?).count
   end
 
 end

data/app/models/blog_comment.rb

@@ -1,5 +1,7 @@
 class BlogComment < ActiveRecord::Base
 
+  attr_accessible :name, :email, :message
+
   filters_spam :author_field => :name,
                :email_field => :email,
                :message_field => :body
@@ -10,9 +12,8 @@ class BlogComment < ActiveRecord::Base
 
   alias_attribute :message, :body
 
-  validates_presence_of :name, :message
-  validates_format_of :email,
-                      :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  validates :name, :message, :presence => true
+  validates :email, :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
 
   scope :unmoderated, :conditions => {:state => nil}
   scope :approved, :conditions => {:state => 'approved'}
@@ -38,6 +39,13 @@ class BlogComment < ActiveRecord::Base
     self.state.nil?
   end
 
+  def self.toggle!
+    currently = RefinerySetting.find_or_set(:comments_allowed, true, {
+      :scoping => 'blog'
+    })
+    RefinerySetting.set(:comments_allowed, {:value => !currently, :scoping => 'blog'})
+  end
+
   before_create do |comment|
     unless BlogComment::Moderation.enabled?
       comment.state = comment.ham? ? 'approved' : 'rejected'

data/app/models/blog_post.rb

@@ -1,32 +1,43 @@
 class BlogPost < ActiveRecord::Base
-
-  has_many :comments, :class_name => 'BlogComment'
-  has_and_belongs_to_many :categories, :class_name => 'BlogCategory'
+  
+  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
+  
+  has_many :comments, :class_name => 'BlogComment', :dependent => :destroy
+  
+  has_many :categorizations
+  has_many :categories, :through => :categorizations, :source => :blog_category
 
   acts_as_indexed :fields => [:title, :body]
 
-  validates_presence_of :title
-  validates_uniqueness_of :title
+  validates :title, :presence => true, :uniqueness => true
+  validates :body,  :presence => true
 
   has_friendly_id :title, :use_slug => true
 
   scope :by_archive, lambda { |archive_date|
-    where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month]).order("published_at DESC")
+    where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month])
+  }
+  
+  scope :by_year, lambda { |archive_year|
+    where(['published_at between ? and ?', archive_year.beginning_of_year, archive_year.end_of_year])
   }
 
-  scope :all_previous, where(['published_at <= ?', Time.now.beginning_of_month]).order("published_at DESC")
-
-  scope :live, lambda { where( "published_at < ? and draft = ?", Time.now, false).order("published_at DESC") }
+  scope :all_previous, lambda { where(['published_at <= ?', Time.now.beginning_of_month]) }
 
-  scope :previous, lambda { |i| where(["published_at < ?", i.published_at]).order("published_at DESC").limit(1) }
-  scope :next, lambda { |i| where(["published_at > ?", i.published_at]).order("published_at ASC").limit(1) }
+  scope :live, lambda { where( "published_at <= ? and draft = ?", Time.now, false) }
 
+  scope :previous, lambda { |i| where(["published_at < ? and draft = ?", i.published_at, false]).limit(1) }
+  # next is now in << self
+  
   def next
-    self.class.next(self).first
+    BlogPost.next(self).first
   end
 
   def prev
-    self.class.previous(self).first
+    BlogPost.previous(self).first
   end
 
   def live?
@@ -40,17 +51,27 @@ class BlogPost < ActiveRecord::Base
   end
 
   class << self
+    def next current_record
+      self.send(:with_exclusive_scope) do
+        where(["published_at > ? and draft = ?", current_record.published_at, false]).order("published_at ASC")
+      end
+    end
+    
     def comments_allowed?
       RefinerySetting.find_or_set(:comments_allowed, true, {
         :scoping => 'blog'
       })
     end
+    
+    def uncategorized
+      BlogPost.live.reject { |p| p.categories.any? }
+    end
   end
 
   module ShareThis
     DEFAULT_KEY = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 
-    class << self
+    class << self      
       def key
         RefinerySetting.find_or_set(:share_this_key, BlogPost::ShareThis::DEFAULT_KEY, {
           :scoping => 'blog'

data/app/models/categorization.rb

@@ -0,0 +1,5 @@
+class Categorization < ActiveRecord::Base
+  set_table_name 'blog_categories_blog_posts'
+  belongs_to :blog_post
+  belongs_to :blog_category
+end

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

@@ -1,6 +1,6 @@
 <nav id='actions' class='multilist'>
   <ul class='search_list'>
-    <li>
+    <li class='not_a_link'>
       <%= render :partial => "/shared/admin/search",
                  :locals => {
                    :url => admin_blog_posts_url
@@ -9,45 +9,51 @@
   </ul>
 
   <ul class='collapsible_menu'>
-    <li>
+    <li class='not_a_link'>
       <%= link_to t('.posts.title'), '#',
                    :class => 'page_copy_icon' %>
     </li>
     <li>
       <%= link_to t('.posts.manage'), admin_blog_posts_path,
                    :class => 'page_icon' %>
-    <li>
-       <%= link_to t('.posts.new'), new_admin_blog_post_url,
-                   :class => 'page_add_icon' %>
-    </li>
-  </ul>
-
-  <ul class='collapsible_menu'>
-    <li>
-      <% if BlogComment.unmoderated.any? %>
-        <% title = t('.comments.title_with_count', :new_count => BlogComment.unmoderated.size) %>
-      <% else %>
-        <% title = t('.comments.title') %>
-      <% end %>
-      <%= link_to title, '#',
-                  :class => 'comments_icon' %>
     </li>
     <li>
-      <%= link_to t('.comments.new'), admin_blog_comments_path,
-                  :class => 'comment_icon' %>
+      <%= link_to t('.posts.uncategorized'), uncategorized_admin_blog_posts_url,
+                  :class => 'page_icon' %>
     </li>
     <li>
-      <%= link_to t('.comments.approved'), approved_admin_blog_comments_path,
-                  :class => 'comment_tick_icon' %>
-    </li>
-    <li>
-      <%= link_to t('.comments.rejected'), rejected_admin_blog_comments_path,
-                  :class => 'comment_cross_icon' %>
+       <%= link_to t('.posts.new'), new_admin_blog_post_url,
+                   :class => 'page_add_icon' %>
     </li>
   </ul>
+  <% if BlogPost.comments_allowed? %>
+    <ul class='collapsible_menu'>
+      <li class='not_a_link'>
+        <% if BlogComment.unmoderated.any? %>
+          <% title = t('.comments.title_with_count', :new_count => BlogComment.unmoderated.size) %>
+        <% else %>
+          <% title = t('.comments.title') %>
+        <% end %>
+        <%= link_to title, '#',
+                    :class => 'comments_icon' %>
+      </li>
+      <li>
+        <%= link_to t('.comments.new'), admin_blog_comments_path,
+                    :class => 'comment_icon' %>
+      </li>
+      <li>
+        <%= link_to t('.comments.approved'), approved_admin_blog_comments_path,
+                    :class => 'comment_tick_icon' %>
+      </li>
+      <li>
+        <%= link_to t('.comments.rejected'), rejected_admin_blog_comments_path,
+                    :class => 'comment_cross_icon' %>
+      </li>
+    </ul>
+  <% end %>
 
   <ul class='collapsible_menu'>
-    <li>
+    <li class='not_a_link'>
       <%= link_to t('.categories.title'), '#',
                   :class => 'folder_icon' %>
     </li>
@@ -62,10 +68,14 @@
   </ul>
 
   <ul class='collapsible_menu'>
-    <li>
+    <li class='not_a_link'>
       <%= link_to t('.settings.title'), admin_blog_settings_path,
                   :class => 'settings_icon' %>
     </li>
+    <li>
+      <%= link_to t('.settings.comments'), comments_admin_blog_settings_url,
+                  :class => "#{BlogPost.comments_allowed? ? 'success' : 'failure'}_icon" %>
+    </li>
     <li>
       <%= link_to t('.settings.moderation'), moderation_admin_blog_settings_url,
                   :class => "#{BlogComment::Moderation.enabled? ? 'success' : 'failure'}_icon" %>

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

@@ -1,6 +1,6 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(category) -%>">
   <span class='title'>
-    <%=h category.title %>
+    <%= category.title %>
     <span class="preview">&nbsp;</span>
   </span>
   <span class='actions'>
@@ -10,7 +10,7 @@
     <%= link_to refinery_icon_tag("delete.png"), admin_blog_category_path(category),
                 :class => "cancel confirm-delete",
                 :title => t('.delete'),
-                :'data-method' => 'delete',
-                :'data-confirm' => t('shared.admin.delete.message', :title => category.title) %>
+                :method => :delete,
+                :confirm => t('shared.admin.delete.message', :title => category.title) %>
   </span>
 </li>