Merge pull request #233 from resolve/comment_mailer

Remove seemingly hacky comment_mailer model.

Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.0'
+gem 'refinerycms', '~> 2.0.3'
 
 group :development, :test do
   require 'rbconfig'

app/controllers/refinery/blog/posts_controller.rb

@@ -2,7 +2,7 @@ module Refinery
   module Blog
     class PostsController < BlogController
 
-      caches_page :index
+      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]

app/mailers/refinery/blog/comment_mailer.rb

@@ -5,7 +5,7 @@ module Refinery
       def notification(comment, request)
         @comment = comment
         mail :subject => Blog::Comment::Notification.subject,
-             :recipients => Blog::Comment::Notification.recipients,
+             :to => Blog::Comment::Notification.recipients,
              :from => "\"#{Refinery::Core.site_name}\" <no-reply@#{request.domain}>"
       end
 

app/models/refinery/blog/category.rb

@@ -11,6 +11,8 @@ module Refinery
 
       validates :title, :presence => true, :uniqueness => true
 
+      attr_accessible :title
+
       def post_count
         posts.select(&:live?).count
       end
@@ -20,4 +22,4 @@ module Refinery
 
     end
   end
-end
+end

app/models/refinery/blog/comment_mailer.rb

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

app/models/refinery/categorization.rb

@@ -4,6 +4,7 @@ module Refinery
     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
-
+    
+    attr_accessible :blog_category_id, :blog_post_id
   end
 end

app/views/refinery/blog/categories/show.html.erb

@@ -1,6 +1,6 @@
 <% content_for :body_content_title, @category.title %>
 
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <% if @posts.any? %>
     <section id="blog_posts">
       <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
@@ -13,7 +13,7 @@
   <% end %>
 <% end %>
 
-<% content_for :body_content_right do %>
+<% content_for :side_body do %>
   <%= render :partial => "/refinery/blog/shared/categories" %>
 <% end %>
 

app/views/refinery/blog/posts/archive.html.erb

@@ -1,6 +1,6 @@
 <% content_for :title, "#{t('.blog_archive_for', :date => @archive_date.strftime('%B %Y'))}" %>
 
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <h1><%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %></h1>
   <% if @posts.any? %>
     <section id="blog_posts">

app/views/refinery/blog/posts/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
 
   <% if @posts.any? %>

app/views/refinery/blog/posts/show.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <div id="show_blog_post">
     <%= render 'post' %>
   </div>

app/views/refinery/blog/posts/tagged.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :body_content_title, "#{t('.posts_tagged')} &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
 
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <% if @posts.any? %>
     <section id="blog_posts">
       <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>

app/views/refinery/blog/shared/_body_content_right.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_right do %>
+<% content_for :side_body do %>
   <%= yield(:body_content_right_prepend) %>
   <%= render :partial => "/refinery/blog/shared/rss_feed" %>
   <%= render :partial => "/refinery/blog/shared/categories" %>

lib/refinery/blog/version.rb

@@ -3,7 +3,7 @@ module Refinery
     class Version
       @major = 2
       @minor = 0
-      @tiny  = 1
+      @tiny  = 4
 
       class << self
         attr_reader :major, :minor, :tiny

readme.md

@@ -27,10 +27,14 @@ Next, to install the blog plugin run:
 
     rails generate refinery:blog
 
-Finally migrate your database and you're done.
+Run database migrations:
 
     rake db:migrate
-    
+
+Finally seed your database and you're done.
+
+    rake db:seed
+
 ## Developing & Contributing
 
 The version of Refinery to develop this engine against is defined in the gemspec. To override the version of refinery to develop against, edit the project Gemfile to point to a local path containing a clone of refinerycms.

refinerycms-blog.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',     '~> 2.0.1'
+  s.add_dependency    'refinerycms-core',     '~> 2.0.3'
   s.add_dependency    'refinerycms-settings', '~> 2.0.1'
   s.add_dependency    'filters_spam',         '~> 0.2'
   s.add_dependency    'acts-as-taggable-on'
-  s.add_dependency    'seo_meta',             '~> 1.2.0'
+  s.add_dependency    'seo_meta',             '~> 1.3.0'
   s.add_dependency    'rails_autolink'
 
   # Development dependencies