refinerycms-blog 1.0.rc15 → 1.0.rc16

data/app/controllers/blog/posts_controller.rb

@@ -17,6 +17,18 @@ class Blog::PostsController < BlogController
 
   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
+        rescue
+          logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
+        end
+      end
+
       if BlogComment::Moderation.enabled?
         flash[:notice] = t('blog.posts.comments.thank_you_moderated')
         redirect_to blog_post_url(params[:id])

data/app/mailers/blog/comment_mailer.rb

@@ -0,0 +1,11 @@
+class Blog::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
+
+end

data/app/models/blog/comment_mailer.rb

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

data/app/models/blog_comment.rb

@@ -46,7 +46,7 @@ class BlogComment < ActiveRecord::Base
 
   before_create do |comment|
     unless BlogComment::Moderation.enabled?
-      comment.state = comment.spam? ? 'rejected' : 'approved'
+      comment.state = comment.ham? ? 'approved' : 'rejected'
     end
   end
 
@@ -55,8 +55,7 @@ class BlogComment < ActiveRecord::Base
       def enabled?
         RefinerySetting.find_or_set(:comment_moderation, true, {
           :scoping => :blog,
-          :restricted => false,
-          :callback_proc_as_string => nil
+          :restricted => false
         })
       end
 
@@ -64,8 +63,7 @@ class BlogComment < ActiveRecord::Base
         RefinerySetting[:comment_moderation] = {
           :value => !self.enabled?,
           :scoping => :blog,
-          :restricted => false,
-          :callback_proc_as_string => nil
+          :restricted => false
         }
       end
     end
@@ -74,21 +72,33 @@ class BlogComment < ActiveRecord::Base
   module Notification
     class << self
       def recipients
-        RefinerySetting.find_or_set(:comment_notification_recipients,
-                                    (Role[:refinery].users.first.email rescue ''),
-                                    {
-                                      :scoping => :blog,
-                                      :restricted => false,
-                                      :callback_proc_as_string => nil
-                                    })
+        RefinerySetting.find_or_set(:comment_notification_recipients, (Role[:refinery].users.first.email rescue ''),
+        {
+          :scoping => :blog,
+          :restricted => false
+        })
       end
 
       def recipients=(emails)
         RefinerySetting[:comment_notification_recipients] = {
           :value => emails,
           :scoping => :blog,
-          :restricted => false,
-          :callback_proc_as_string => nil
+          :restricted => false
+        }
+      end
+
+      def subject
+        RefinerySetting.find_or_set(:comment_notification_subject, "New inquiry from your website", {
+          :scoping => :blog,
+          :restricted => false
+        })
+      end
+
+      def subject=(subject_line)
+        RefinerySetting[:comment_notification_subject] = {
+          :value => subject_line,
+          :scoping => :blog,
+          :restricted => false
         }
       end
     end

data/app/views/blog/comment_mailer/notification.html.erb

@@ -0,0 +1,17 @@
+<%= t('.greeting') %>,
+
+<%= t('.you_recieved_new_comment') %>
+
+<%= t('.comment_starts') %>
+
+<%= t('.from') %>: <%= @comment.name %>
+<%= t('.email') %>: <%= @comment.email %>
+<%= t('.message') %>:
+<%= @comment.body %>
+
+<%= t('.comment_ends') %>
+
+<%= t('.closing_line') %>,
+<%= RefinerySetting[:site_name] %>
+
+<%= t('.ps') %>

data/config/locales/en.yml

@@ -72,6 +72,17 @@ en:
           moderation: Moderation
           update_notified: Update who gets notified
   blog:
+    comment_mailer:
+      notification:
+        greeting: Hi there
+        you_recieved_new_comment: You just received a new comment on your website.
+        comment_starts: --- comment starts ---
+        comment_ends: --- comment ends ---
+        from: From
+        email: Email
+        message: Message
+        closing_line: Kind Regards
+        ps: P.S. All your comments are stored in the "Blog" section of Refinery under the "Comments" submenu should you ever want to view it later there.
     shared:
       categories:
         title: Categories

data/lib/refinerycms-blog.rb

@@ -42,7 +42,7 @@ module Refinery
 
     class << self
       def version
-        %q{1.0.rc15}
+        %q{1.0.rc16}
       end
     end
   end

data/public/stylesheets/refinery/refinerycms-blog.css

@@ -48,4 +48,8 @@ ul.collapsible_menu li span.arrow {
 }
 ul.collapsible_menu li.closed span.arrow {
   background-image: url('/images/refinerycms-blog/icons/down.gif');
-}
+}
+ul.collapsible_menu > div {
+  width: 93%;
+  margin: 0px auto;
+}

data/readme.md

@@ -11,7 +11,7 @@ Options:
 
 Open up your ``Gemfile`` and add at the bottom this line
 
-    gem 'refinerycms-blog', '~> 1.0.rc15'
+    gem 'refinerycms-blog', '~> 1.0.rc16'
 
 Now run ``bundle install``
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-blog
 version: !ruby/object:Gem::Version 
-  hash: -398340064
+  hash: -398340063
   prerelease: true
   segments: 
   - 1
   - 0
-  - rc15
-  version: 1.0.rc15
+  - rc16
+  version: 1.0.rc16
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +13:00
+date: 2010-11-15 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,8 @@ files:
 - app/controllers/blog/categories_controller.rb
 - app/controllers/blog/posts_controller.rb
 - app/controllers/blog_controller.rb
+- app/mailers/blog/comment_mailer.rb
+- app/models/blog/comment_mailer.rb
 - app/models/blog_category.rb
 - app/models/blog_comment.rb
 - app/models/blog_post.rb
@@ -89,6 +91,7 @@ files:
 - app/views/admin/blog/posts/new.html.erb
 - app/views/admin/blog/settings/notification_recipients.html.erb
 - app/views/blog/categories/show.html.erb
+- app/views/blog/comment_mailer/notification.html.erb
 - app/views/blog/posts/_comment.html.erb
 - app/views/blog/posts/index.html.erb
 - app/views/blog/posts/index.rss.builder