refinerycms-blog 1.0.rc16 → 1.0.1

data/app/controllers/blog/categories_controller.rb

@@ -3,5 +3,5 @@ class Blog::CategoriesController < BlogController
   def show
     @category = BlogCategory.find(params[:id])
   end
-  
-end
+
+end

data/app/controllers/blog/posts_controller.rb

@@ -1,29 +1,23 @@
 class Blog::PostsController < BlogController
 
-  before_filter :find_all_blog_posts
-  before_filter :find_blog_post, :only => [:show, :comment]
+  before_filter :find_all_blog_posts, :except => [:archive]
+  before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
 
   def index
-    respond_to do |format|
-      format.html
-      format.rss
-    end
+    # TODO: respond_to block
   end
 
   def show
     @blog_comment = BlogComment.new
-    present(@page)
+
+    # TODO: respond_to block
   end
 
   def comment
     if (@blog_comment = @blog_post.comments.create(params[:blog_comment])).valid?
       if BlogComment::Moderation.enabled? or @blog_comment.ham?
         begin
-          if Rails.version < '3.0.0'
-            Blog::CommentMailer.deliver_notification(@blog_comment, request)
-          else
-            Blog::CommentMailer.notification(@blog_comment, request).deliver
-          end
+          Blog::CommentMailer.deliver_notification(@blog_comment, request)
         rescue
           logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
         end
@@ -42,10 +36,26 @@ class Blog::PostsController < BlogController
     end
   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)
+    })
+    # TODO: respond_to block
+  end
+
 protected
 
   def find_blog_post
-    @blog_post = BlogPost.live.find(params[:id])
+    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
 
   def find_all_blog_posts

data/app/controllers/blog_controller.rb

@@ -1,5 +1,6 @@
 class BlogController < ApplicationController
-  
+
+  helper :blog_posts
   before_filter :find_page, :find_all_blog_categories
 
 protected
@@ -12,4 +13,4 @@ protected
     @blog_categories = BlogCategory.all
   end
 
-end
+end

data/app/helpers/blog_posts_helper.rb

@@ -0,0 +1,28 @@
+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>'
+    links = []
+
+    posts.each do |e|
+      links << e.published_at.strftime('%m/%Y')
+    end
+    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>"
+    end
+    html += '</ul></nav></section>'
+    html.html_safe
+  end
+
+  def next_or_previous?(post)
+    post.next.present? or post.prev.present?
+  end
+end

data/app/models/blog/comment_mailer.rb

@@ -1 +1 @@
-require File.expand_path('../../../mailers/blog/comment_mailer', __FILE__)
+require File.expand_path('../../../mailers/blog/comment_mailer', __FILE__)

data/app/models/blog_category.rb

@@ -8,16 +8,16 @@ class BlogCategory < ActiveRecord::Base
   validates_uniqueness_of :title
 
   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
   end
-  
+
 end

data/app/models/blog_comment.rb

@@ -14,15 +14,9 @@ class BlogComment < ActiveRecord::Base
   validates_format_of :email,
                       :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
 
-  if Rails.version < '3.0.0'
-    named_scope :unmoderated, :conditions => {:state => nil}
-    named_scope :approved, :conditions => {:state => 'approved'}
-    named_scope :rejected, :conditions => {:state => 'rejected'}
-  else
-    scope :unmoderated, :conditions => {:state => nil}
-    scope :approved, :conditions => {:state => 'approved'}
-    scope :rejected, :conditions => {:state => 'rejected'}
-  end
+  named_scope :unmoderated, :conditions => {:state => nil}
+  named_scope :approved, :conditions => {:state => 'approved'}
+  named_scope :rejected, :conditions => {:state => 'rejected'}
 
   def approve!
     self.update_attribute(:state, 'approved')
@@ -54,17 +48,22 @@ class BlogComment < ActiveRecord::Base
     class << self
       def enabled?
         RefinerySetting.find_or_set(:comment_moderation, true, {
-          :scoping => :blog,
+          :scoping => 'blog',
           :restricted => false
         })
       end
 
       def toggle!
-        RefinerySetting[:comment_moderation] = {
-          :value => !self.enabled?,
-          :scoping => :blog,
+        new_value = {
+          :value => !BlogComment::Moderation.enabled?,
+          :scoping => 'blog',
           :restricted => false
         }
+        if RefinerySetting.respond_to?(:set)
+          RefinerySetting.set(:comment_moderation, new_value)
+        else
+          RefinerySetting[:comment_moderation] = new_value
+        end
       end
     end
   end
@@ -74,34 +73,44 @@ class BlogComment < ActiveRecord::Base
       def recipients
         RefinerySetting.find_or_set(:comment_notification_recipients, (Role[:refinery].users.first.email rescue ''),
         {
-          :scoping => :blog,
+          :scoping => 'blog',
           :restricted => false
         })
       end
 
       def recipients=(emails)
-        RefinerySetting[:comment_notification_recipients] = {
+        new_value = {
           :value => emails,
-          :scoping => :blog,
+          :scoping => 'blog',
           :restricted => false
         }
+        if RefinerySetting.respond_to?(:set)
+          RefinerySetting.set(:comment_notification_recipients, new_value)
+        else
+          RefinerySetting[:comment_notification_recipients] = new_value
+        end
       end
 
       def subject
         RefinerySetting.find_or_set(:comment_notification_subject, "New inquiry from your website", {
-          :scoping => :blog,
+          :scoping => 'blog',
           :restricted => false
         })
       end
 
       def subject=(subject_line)
-        RefinerySetting[:comment_notification_subject] = {
+        new_value = {
           :value => subject_line,
-          :scoping => :blog,
+          :scoping => 'blog',
           :restricted => false
         }
+        if RefinerySetting.respond_to?(:set)
+          RefinerySetting.set(:comment_notification_subject, new_value)
+        else
+          RefinerySetting[:comment_notification_subject] = new_value
+        end
       end
     end
   end
 
-end
+end

data/app/models/blog_post.rb

@@ -10,18 +10,27 @@ class BlogPost < ActiveRecord::Base
 
   has_friendly_id :title, :use_slug => true
 
-  default_scope :order => "published_at DESC"
+  named_scope :by_archive, lambda { |archive_date| {:conditions => ['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month], :order => "published_at DESC"} }
 
-  if Rails.version < '3.0.0'
-    named_scope :live, lambda { {:conditions => ["published_at < ? and draft = ?", Time.now, false]} }
-  else
-    scope :live, lambda { where( "published_at < ? and draft = ?", Time.now, false) }
+  named_scope :all_previous, :conditions => ['published_at <= ?', Time.now.beginning_of_month], :order => "published_at DESC"
+
+  named_scope :live, lambda { {:conditions => ["published_at < ? and draft = ?", Time.now, false], :order => "published_at DESC"} }
+
+  named_scope :previous, lambda { |i| { :conditions => ["published_at < ?", i.published_at], :order => "published_at DESC", :limit => 1 } }
+  named_scope :next, lambda { |i| { :condtions => ["published_at > ?", i.published_at], :order => "published_at ASC", :limit => 1 } }
+
+  def next
+    self.class.next(self).first
+  end
+
+  def prev
+    self.class.previous(self).first
   end
-  
+
   def live?
     !draft and published_at <= Time.now
   end
-  
+
   def category_ids=(ids)
     self.categories = ids.reject{|id| id.blank?}.collect {|c_id|
       BlogCategory.find(c_id.to_i) rescue nil
@@ -31,21 +40,21 @@ class BlogPost < ActiveRecord::Base
   class << self
     def comments_allowed?
       RefinerySetting.find_or_set(:comments_allowed, true, {
-        :scoping => :blog
+        :scoping => 'blog'
       })
     end
   end
-  
+
   module ShareThis
     DEFAULT_KEY = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    
+
     class << self
       def key
         RefinerySetting.find_or_set(:share_this_key, BlogPost::ShareThis::DEFAULT_KEY, {
-          :scoping => :blog
+          :scoping => 'blog'
         })
       end
-      
+
       def enabled?
         key = BlogPost::ShareThis.key
         key.present? and key != BlogPost::ShareThis::DEFAULT_KEY

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

@@ -78,7 +78,12 @@
   </ul>
 
 </nav>
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'refinery/refinerycms-blog' %>
-  <%= javascript_include_tag 'refinery/refinerycms-blog' %>
-<% end %>
+<% if Refinery.version < '0.9.9' %>
+  <% content_for :head do %>
+    <%= stylesheet_link_tag('refinery/refinerycms-blog') %>
+    <%# this javascript is not even required in >= 0.9.9 because we made this sort of menu core. %>
+    <%= javascript_include_tag('refinery/refinerycms-blog') %>
+  <% end %>
+<% else %>
+  <% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog')%>
+<% end %>

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

@@ -1,14 +1,6 @@
 <% form_for [:admin, @blog_category] do |f| -%>
-  <% if Rails.version < '3.0.0'%>
-    <%= f.error_messages %>
-  <% else %>
-    <%= render :partial => "/shared/admin/error_messages",
-               :locals => {
-                 :object => f.object,
-                 :include_object_name => true
-               } %>
-  <% end %>
-  
+  <%= f.error_messages %>
+
   <div class='field'>
     <%= f.label :title -%>
     <%= f.text_field :title, :class => 'larger widest' -%>
@@ -20,4 +12,4 @@
                 :continue_editing => false,
                 :delete_title => t('admin.blog.categories.category.delete')
               } %>
-<% end %>
+<% end %>

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

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

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

@@ -27,4 +27,4 @@
       </p>
     <% end %>
   <% end %>
-</div>
+</div>

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

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

data/app/views/admin/blog/comments/_comment.html.erb

@@ -10,10 +10,10 @@
                 :target => "_blank" unless comment.unmoderated? %>
     <%= link_to refinery_icon_tag('zoom.png'), admin_blog_comment_path(comment),
                 :title => t('.read') %>
-    <%= link_to refinery_icon_tag("cross.png"), 
+    <%= link_to refinery_icon_tag("cross.png"),
                 rejected_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
                 :title => t('.reject') unless comment.rejected? %>
-    <%= link_to refinery_icon_tag("tick.png"), 
+    <%= link_to refinery_icon_tag("tick.png"),
                 approved_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
                 :title => t('.approve') unless comment.approved? %>
   </span>

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

@@ -3,7 +3,7 @@
   <% if searching? %>
     <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
     <% if @blog_comments.any? %>
-      <%=# will_paginate @blog_comments 
+      <%=# will_paginate @blog_comments
       %>
 
       <ul>
@@ -11,19 +11,19 @@
                    :collection => @blog_comments %>
       </ul>
 
-      <%=# will_paginate @blog_comments 
+      <%=# will_paginate @blog_comments
       %>
     <% else %>
       <p><%= t('admin.search_no_results') %></p>
     <% end %>
   <% else %>
     <% if @blog_comments.any? %>
-      <%=# will_paginate @blog_comments 
+      <%=# will_paginate @blog_comments
       %>
 
       <%= render :partial => "sortable_list" %>
 
-      <%=# will_paginate @blog_comments 
+      <%=# will_paginate @blog_comments
       %>
     <% else %>
       <h3>
@@ -32,4 +32,4 @@
       </h3>
     <% end %>
   <% end %>
-</div>
+</div>

data/app/views/admin/blog/comments/show.html.erb

@@ -59,5 +59,8 @@
     </tr>
   </table>
 </div>
-
-<% content_for :head, stylesheet_link_tag('refinery/refinerycms-blog') %>
+<% if Refinery.version < '0.9.9' %>
+  <% content_for :head, stylesheet_link_tag('refinery/refinerycms-blog') %>
+<% else %>
+  <% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog') %>
+<% end %>

data/app/views/admin/blog/posts/_form.css.erb

@@ -0,0 +1,7 @@
+<style type='text/css'>
+  ul.blog_categories, ul.blog_categories li {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+  }
+</style>

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

@@ -1,13 +1,5 @@
 <% form_for [:admin, @blog_post] do |f| -%>
-  <% if Rails.version < '3.0.0'%>
-    <%= f.error_messages %>
-  <% else %>
-    <%= render :partial => "/shared/admin/error_messages",
-               :locals => {
-                 :object => f.object,
-                 :include_object_name => true
-               } %>
-  <% end %>
+  <%= f.error_messages %>
 
   <div class='field'>
     <%= f.label :title -%>
@@ -57,25 +49,13 @@
                 :delete_title => t('admin.blog.posts.post.delete')
               } %>
 <% end -%>
-<% content_for :head do %>
-  <style type='text/css'>
-    ul.blog_categories, ul.blog_categories li {
-      list-style: none;
-      margin: 0px;
-      padding: 0px;
-    }
-  </style>
-  <script type='text/javascript'>
-    $(document).ready(function(){
-      $('#toggle_advanced_options').click(function(e){
-        e.preventDefault();
-
-        $('#more_options').animate({opacity: 'toggle', height: 'toggle'}, 250);
 
-        $('html,body').animate({
-          scrollTop: $('#toggle_advanced_options').parent().offset().top
-        }, 250);
-      });
-    });
-  </script>
-<% end %>
+<% if Refinery.version < '0.9.9' %>
+  <% content_for :head do %>
+    <%= render :partial => 'form.css' %>
+    <%= render :partial => 'form.js' %>
+  <% end %>
+<% else %>
+  <% content_for :stylesheets, render(:partial => 'form.css') -%>
+  <% content_for :javascripts, render(:partial => 'form.js') -%>
+<% end %>