4 files changed, 37 insertions, 3 deletions

@@ -0,0 +1,32 @@
+module VotesHelper
+
+  def voters_list(votes, html = false)
+    voters = votes.select {|v| !v.liker_url.nil?}.map do |v|
+      if html
+        tag.strong(link_to v.liker_name, v.liker_url)
+      else
+        "#{v.liker_name} (#{v.liker_url})"
+      end
+    end
+
+    anons = votes.select {|v| v.liker_url.nil?}.size
+    if anons > 0
+      if voters.empty? && anons == 1
+        if html
+          voters << tag.strong("A guest")
+        else
+          voters << "A guest"
+        end
+      else
+        if html
+          voters << tag.strong(pluralize(anons, "guest"))
+        else
+          voters << pluralize(anons, "guest")
+        end
+      end
+    end
+
+    to_sentence(voters)
+  end
+
+end
@@ -1,4 +1,6 @@
 class VoteMailer < ApplicationMailer
+  helper :votes
+
   def daily_report_email
     @entries = params[:votes].group_by { |v| "#{v.votable_type}_#{v.votable_id}" }.values
     # weird way of getting the admin's email
@@ -3,6 +3,6 @@
 %ul
   - @entries.each do |entry|
     %li
-      %strong= pluralize(entry.size, "person")
-      left an upvote on
+      = voters_list(entry, html: true)
+      upvoted
       = link_to entry.first.votable.title, entry.first.votable, style: "font-weight: bold; font-style: italic"
@@ -1,5 +1,5 @@
 Users have upvoted content on Four Island in the last day!
 
 <% @entries.each do |entry| %>
-- <%= pluralize(entry.size, "person") %> left an upvote on <%= entry.first.votable.title %> (<%= url_for(entry.first.votable) %>)
+- <%= voters_list(entry) %> upvoted <%= entry.first.votable.title %> (<%= url_for(entry.first.votable) %>)
 <% end %>