tkh_mailing_list 0.11.1.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13cd9e4bb9f4dbb9c9798b9c0b281e7e864f6d66
-  data.tar.gz: fb234523d6b24a9401b6aae2573c882f070346cc
+  metadata.gz: 1e3115122bf798f4241b05c7b39ad47495a7d095
+  data.tar.gz: 00d14feea202dabfa8ced3057df3add4a7e02813
 SHA512:
-  metadata.gz: 4df3680e03b4ed38c8e9ef956225eef277cf4a2156e75c97dc54ebd8d38a65e404f9353ebfd93ad26854ebc7199fd1b9ace7f76b9be94515f6abc900a1313496
-  data.tar.gz: 1da8fbbd4d92b998f8117e57c907fe35116f3634665fa8fa5ec854fe81becc66df9154eb2660338a6bc237d71356c03b3cbf54449c2072550b7770416cf8969f
+  metadata.gz: 12003cb493773362c19028628d64eff126d1db7fac472c93158ea061146e2e72192223a3a16c0625411f9fa0e135dcd0abbf0fde468fd5dacbf46d66f5b99e1d
+  data.tar.gz: d464a8186529092245095bf2cb72035ba16eca8b3da346a85a5a8df7879b100cc9bb7a2070586917d3157d57fcebe2e7bdddd3ba1a8e2b56d2ff736bfade494d

data/app/mailers/administration_mailer.rb

@@ -3,9 +3,10 @@ class AdministrationMailer < ActionMailer::Base
 
   default :from => "#{Setting.first.try(:company_name)} <#{Setting.first.try(:contact_email)}>"
 
-  def daily_digest( admin_user, yesterdays_contact_messages )
+  def daily_digest( admin_user, yesterdays_contact_messages, pending_comments )
     @recipient = admin_user
     @contact_messages = yesterdays_contact_messages
+    @pending_comments = pending_comments
     # FIXME - only the email addresses show up. not the names :-(
     recipient = "#{@recipient.name} <#{@recipient.email}>"
     reply_to = "#{Setting.first.try(:company_name)} <#{Setting.first.try(:contact_email)}>"

data/app/models/administration.rb

@@ -3,7 +3,8 @@ class Administration < ActiveRecord::Base
   def self.send_daily_digest
     digest_is_needed = false
     @yesterdays_contact_messages = Contact.yesterdays.chronologically
-    digest_is_needed = true if @yesterdays_contact_messages.count > 0
+    @pending_comments = Comment.pending.by_created
+    digest_is_needed = true if @yesterdays_contact_messages.count > 0 || @pending_comments.count > 0
     if digest_is_needed
       User.administrators.each do |administrator|
         send_message_to_admin(administrator)
@@ -16,10 +17,10 @@ class Administration < ActiveRecord::Base
   def self.send_message_to_admin(recipient)
     # Actually send the email to the administrator
     begin
-      AdministrationMailer.daily_digest( recipient, @yesterdays_contact_messages ).deliver_now
+      AdministrationMailer.daily_digest( recipient, @yesterdays_contact_messages, @pending_comments ).deliver_now
       return 'success'
     rescue Exception => e
-      AdminMailer.rescued_exceptions(e, "Some exception occurred while trying to send to site admin a message from contact form").deliver
+      AdminMailer.rescued_exceptions(e, "Some exception occurred while trying to send to site admin the daily digest.").deliver
       @exception = e
       return 'exception'
     end

data/app/views/administration_mailer/daily_digest.html.erb

@@ -2,14 +2,24 @@
 
 <p>This a summary of what happened yesterday on the <%= Setting.first.try(:site_name) %> website.</p>
 
-<h2>List of messages from the contact form:</h2>
+<% unless @pending_comments.blank?  %>
+  <h2><%= t 'comments.digest_intro' %></h2>
+  <ul>
+    <% @pending_comments.each do |comment| %>
+      <li><%= "from #{comment.author.name}: #{truncate(strip_tags(comment.body), length: 50)}" %></li>
+    <% end %>
+  </ul>
+  <p>You can see and manage these comments at: <%= link_to 'pending comments', pending_comments_url %>.</p>
+<% end %>
 
-<ul>
-  <% @contact_messages.each do |message| %>
-    <li><%= "from #{message.sender_name} <strong>(#{message.sender_email})</strong>: #{truncate(strip_tags(message.body), length: 50)}".html_safe %></li>
-  <% end %>
-</ul>
-
-<p>You can see and manage these messages at: <%= contacts_url %>.</p>
+<% unless @contact_messages.blank?  %>
+  <h2>List of messages from the contact form:</h2>
+  <ul>
+    <% @contact_messages.each do |message| %>
+      <li><%= "from #{message.sender_name} (#{message.sender_email}): #{truncate(strip_tags(message.body), length: 50)}" %></li>
+    <% end %>
+  </ul>
+  <p>You can see and manage these messages at: <%= link_to 'contact messages', contacts_url %>.</p>
+<% end %>
 
 <p>You are receiving this email because you are an administrator of the <%= Setting.first.try(:site_name) %> website.</p>

data/app/views/administration_mailer/daily_digest.text.erb

@@ -1,7 +1,16 @@
 Hi <%= @recipient.friendly_name %>,
 
 This a summary of what happened yesterday on the <%= Setting.first.try(:site_name) %> website.
+<% unless @pending_comments.blank? %>
+<%= t 'comments.digest_intro' %>
 
+<% @pending_comments.each do |comment| %>
+<%= "- from #{comment.author.name}: #{truncate comment.body, length: 50}" %>
+<% end %>
+
+You can see and manage these comments at: <%= pending_comments_url %>
+<% end %>
+<% unless @contact_messages.blank? %>
 List of messages from the contact form:
 
 <% @contact_messages.each do |message| %>
@@ -9,5 +18,6 @@ List of messages from the contact form:
 <% end %>
 
 You can see and manage these messages at: <%= contacts_url %>
+<% end %>
 
 You are receiving this email because you are an administrator of the <%= Setting.first.try(:site_name) %> website.

data/lib/tkh_mailing_list/version.rb

@@ -1,3 +1,3 @@
 module TkhMailingList
-  VERSION = "0.11.1.1"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_mailing_list
 version: !ruby/object:Gem::Version
-  version: 0.11.1.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler