tournament 2.2.2 → 2.3.0

data/History.txt

@@ -1,3 +1,6 @@
+== 2.3.0 / 2009-03-20
+* Add ability for admin to send emails to participants.  Needs work.
+
 == 2.2.1 / 2009-03-19
 * Bug fixes and minor display enhancement.
 

data/Manifest.txt

@@ -62,6 +62,7 @@ webgui/app/views/admin/bracket.html.erb
 webgui/app/views/admin/entries.html.erb
 webgui/app/views/admin/index.html.erb
 webgui/app/views/admin/pool.html.erb
+webgui/app/views/admin/recap.html.erb
 webgui/app/views/entry/index.html.erb
 webgui/app/views/entry/print.erb
 webgui/app/views/entry/print.html.erb
@@ -79,6 +80,7 @@ webgui/app/views/shared/_admins.html.erb
 webgui/app/views/shared/_bracket.html.erb
 webgui/app/views/teams/choose.html.erb
 webgui/app/views/user_mailer/activation.erb
+webgui/app/views/user_mailer/recap.erb
 webgui/app/views/user_mailer/signup_notification.erb
 webgui/app/views/users/_user_bar.html.erb
 webgui/app/views/users/new.html.erb

data/Rakefile

@@ -20,7 +20,7 @@ PROJ.authors = 'Douglas A. Seifert'
 PROJ.email = 'doug+rubyforge@dseifert.net'
 PROJ.url = 'http://www.dseifert.net/code/tournament'
 PROJ.rubyforge.name = 'tournament'
-PROJ.version = '2.2.2'
+PROJ.version = '2.3.0'
 PROJ.group_id = 5863
 
 PROJ.spec.opts << '--color'

data/webgui/app/controllers/admin_controller.rb

@@ -30,6 +30,19 @@ class AdminController < ApplicationController
     @pools = Pool.find(:all)
   end
 
+  def recap
+    if request.post?
+      begin
+        UserMailer.deliver_recap(User.find(:all) - [current_user], params[:subject], params[:content], root_path(:only_path => false))
+        flash[:notice] = "Email was delivered."
+      rescue Exception => e
+        flash[:error] = "Email could not be delivered: #{e}"
+        logger.error "Could not send recap email: #{e}"
+        e.backtrace.each{|b| logger.error(b)}
+      end
+    end
+  end
+
   def pool
     @available_scoring_strategies = Tournament::ScoringStrategy.available_strategies.map{|n| Tournament::ScoringStrategy.strategy_for_name(n)}
     @pool = params[:id] ? Pool.find(params[:id]) : Pool.new

data/webgui/app/models/user_mailer.rb

@@ -1,25 +1,32 @@
 class UserMailer < ActionMailer::Base
   def signup_notification(user, activation_url)
     setup_email(user)
+    @body[:user] = user
     @subject    += 'Please activate your new account'
-  
-    #@body[:url]  = "#{TOURNAMENT_FQ_WEBROOT}/activate/#{user.activation_code}"
     @body[:url]  = activation_url
-  
   end
   
   def activation(user, home_url)
     setup_email(user)
+    @body[:user] = user
     @subject    += 'Your account has been activated!'
     @body[:url]  = home_url
   end
+
+  def recap(users, subject, content, home_url)
+    setup_email(users[0])
+    @recipients = ADMIN_EMAIL
+    @bcc = users.map{|u| u.email}
+    @subject << subject
+    @body[:content] = content
+    @body[:url] = home_url
+  end
   
   protected
     def setup_email(user)
-      @recipients  = "#{user.email}"
+      @recipients  = user.email
       @from        = ADMIN_EMAIL
       @subject     = "[#{TOURNAMENT_TITLE}] "
       @sent_on     = Time.now
-      @body[:user] = user
     end
 end

data/webgui/app/views/admin/recap.html.erb

@@ -0,0 +1,15 @@
+<h1>Send a Recap Email</h1>
+<form action="<%=url_for :action => 'recap'%>" method="POST">
+<table border="0">
+<tr>
+<td>Subject</td>
+<td><%= text_field_tag 'subject', '', :size => 50%></td>
+</tr>
+<tr>
+<td>Body</td>
+<td><%= text_area_tag 'content', '', :rows => 15, :cols => 70%></td>
+</tr>
+</table>
+<%= token_tag %>
+<input type="submit" value="Send" name="Send"/>
+</form>

data/webgui/app/views/pool/index.html.erb

@@ -7,9 +7,10 @@
 <small>
 <% if current_user && pool.user_id == current_user.id %>
 &nbsp;
+<%= link_to '[Bracket]', :controller => 'admin', :action => 'bracket', :id => pool.id %>
+<%= link_to '[Recap]', :controller => 'admin', :action => 'recap'%>
 <%= link_to '[Edit]', :controller => 'admin', :action => 'pool', :id => pool.id %>
 <%= link_to '[Entries]', :controller => 'admin', :action => 'entries', :id => pool.id %>
-<%= link_to '[Bracket]', :controller => 'admin', :action => 'bracket', :id => pool.id %>
 <% end %>
 <%= link_to '[Leader Board]', :controller => 'reports', :action => 'show', :id => pool.id, :report => 'leader' %>
 <%= link_to '[Reports]', :controller => 'reports', :action => 'show', :id => pool.id %>

data/webgui/app/views/user_mailer/recap.erb

@@ -0,0 +1,4 @@
+<%= @content %>
+
+To check the latest results, as always, go here:
+<%=h @url %>

data/webgui/config/environment.rb

@@ -44,7 +44,7 @@ Rails::Initializer.run do |config|
   # Make Time.zone default to the specified zone, and make Active Record store time values
   # in the database in UTC, and return them converted to the specified local zone.
   # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
-  config.time_zone = 'UTC'
+  config.time_zone = 'Pacific Time (US & Canada)'
 
   # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
   # All files from config/locales/*.rb,yml are added automatically.

data/webgui/test/functional/admin_controller_test.rb

@@ -1,8 +1,19 @@
 require 'test_helper'
 
 class AdminControllerTest < ActionController::TestCase
+  include AuthenticatedTestHelper
+  fixtures :users, :roles, :roles_users
   # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  test "send recap" do
+    login_as :admin
+    post(:recap, {:subject => 'subject', :content => 'content'})
+    assert_response :success
+    assert_equal 1, ActionMailer::Base.deliveries.size, "There should have been an email sent."
+    mail = ActionMailer::Base.deliveries.first
+    assert_equal [ADMIN_EMAIL], mail.to
+    recips = User.find(:all).delete_if{|u| u.has_role?(:admin)}.map{|u| u.email}
+    assert_equal recips, mail.bcc
+    assert_equal "[#{TOURNAMENT_TITLE}] subject", mail.subject
+    assert_match /content/, mail.body
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tournament
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-19 00:00:00 -07:00
+date: 2009-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - webgui/app/views/admin/entries.html.erb
 - webgui/app/views/admin/index.html.erb
 - webgui/app/views/admin/pool.html.erb
+- webgui/app/views/admin/recap.html.erb
 - webgui/app/views/entry/index.html.erb
 - webgui/app/views/entry/print.erb
 - webgui/app/views/entry/print.html.erb
@@ -158,6 +159,7 @@ files:
 - webgui/app/views/shared/_bracket.html.erb
 - webgui/app/views/teams/choose.html.erb
 - webgui/app/views/user_mailer/activation.erb
+- webgui/app/views/user_mailer/recap.erb
 - webgui/app/views/user_mailer/signup_notification.erb
 - webgui/app/views/users/_user_bar.html.erb
 - webgui/app/views/users/new.html.erb