tournament 3.0.3 → 3.1.0

data/History.txt

@@ -1,3 +1,8 @@
+== 3.1.0 / 2009-03-12
+* Account for multiple pools when saving/loading possibility yaml file.
+* Update restful_authentication to latest version.
+* Add ability to reset passwords.
+
 == 3.0.3 / 2009-03-11
 * Fix bug with bad string encoding and prince xml for pdf generation.
 

data/lib/tournament/bracket.rb

@@ -1,9 +1,13 @@
 # Class representing a bracket in a tournament.
 class Tournament::Bracket
-  attr_reader :name  # The name of the bracket
-  attr_reader :teams # The teams in the bracket
-  attr_reader :rounds # The number of rounds in the bracket
-  attr_reader :winners # The winners of each game in the bracket
+  # The name of the bracket
+  attr_reader :name 
+  # The teams in the bracket
+  attr_reader :teams
+  # The number of rounds in the bracket
+  attr_reader :rounds
+  # The winners of each game in the bracket
+  attr_reader :winners
 
   # Marker for an unknown team
   UNKNOWN_TEAM = :unk unless defined?(UNKNOWN_TEAM)
@@ -69,7 +73,7 @@ class Tournament::Bracket
 
   # Returns the number of teams left in the bracket.
   def teams_left
-    return 1 + @winners.inject(0) { |memo, arr| arr.inject(memo) {|memo, team| memo += (team == UNKNOWN_TEAM ? 1 : 0)} }
+    return 1 + @winners.inject(0) { |memo, arr| arr.inject(memo) {|memo2, team| memo2 += (team == UNKNOWN_TEAM ? 1 : 0)} }
   end
 
   # Returns the number of possible outcomes for the bracket

data/lib/tournament/pool.rb

@@ -3,11 +3,16 @@
 # and champions of Region 3 and Region 4 play each
 # other in the final four.
 class Tournament::Pool
-  attr_reader :regions  # The regions in the pool
-  attr_reader :entries  # Tournament::Entry objects for participants
-  attr_reader :payouts  # Hash of payouts by rank
-  attr_accessor :entry_fee  # The amount each entry paid to participate
-  attr_reader :scoring_strategy  # The scoring strategy for the pool
+  # The regions in the pool.
+  attr_reader :regions
+  # Tournament::Entry objects for the participants
+  attr_reader :entries
+  # Hash of payouts by rank
+  attr_reader :payouts
+  # The entry fee
+  attr_accessor :entry_fee
+  # The scoring strategy for the pool
+  attr_reader :scoring_strategy
 
   # Create a new empty pool with no Regions or Entries
   def initialize
@@ -286,9 +291,9 @@ class Tournament::Pool
     picks = (1..num_picks).map {|n| Tournament::Bracket.random_bracket(b.teams)}
     # Play out the bracket
     32.times { |n| b.set_winner(1,n+1, b.matchup(1, n+1)[rand(2)])}
-    16.times { |n| b.set_winner(2,n+1, b.matchup(2, n+1)[rand(2)])}
-    8.times { |n| b.set_winner(3,n+1, b.matchup(3, n+1)[rand(2)])}
-    4.times { |n| b.set_winner(4,n+1, b.matchup(4, n+1)[rand(2)])}
+    10.times { |n| b.set_winner(2,n+1, b.matchup(2, n+1)[rand(2)])}
+#    8.times { |n| b.set_winner(3,n+1, b.matchup(3, n+1)[rand(2)])}
+#4.times { |n| b.set_winner(4,n+1, b.matchup(4, n+1)[rand(2)])}
     #2.times { |n| b.set_winner(5,n+1, b.matchup(5, n+1)[rand(2)])}
     #1.times { |n| b.set_winner(6,n+1, b.matchup(6, n+1)[rand(2)])}
     picks.each_with_index {|p, idx| pool.add_entry Tournament::Entry.new("picker_#{idx}", p) }
@@ -377,8 +382,8 @@ class Tournament::Pool
             else
               out << fmt2 % [round, round_total, scores_str_arr[0]] << "\n"
             end
-            scores_str_arr[1..-1].each do |scores_str|
-              out << fmt3 % scores_str << "\n"
+            scores_str_arr[1..-1].each do |ss2|
+              out << fmt3 % ss2 << "\n"
             end
           else
             out << fmt2 % [round, round_total, scores_str] << "\n"

data/lib/tournament.rb

@@ -7,7 +7,7 @@ unless defined? Tournament
 module Tournament
 
   # :stopdoc:
-  VERSION = '3.0.3'
+  VERSION = '3.1.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/webgui/app/controllers/reports_controller.rb

@@ -1,5 +1,5 @@
 class ReportsController < ApplicationController
-  STATS_DATAFILE = File.expand_path(File.join(RAILS_ROOT, 'db', 'stats.yml')) unless defined?(STATS_DATAFILE)
+  STATS_DATAFILE_NAME = "stats_%d.yml" unless defined?(STATS_DATAFILE_NAME)
   layout 'report'
   def show
     @pool = Pool.find(params[:id])
@@ -9,11 +9,13 @@ class ReportsController < ApplicationController
   end
 
   def possibility
-    if !File.exist?(STATS_DATAFILE)
+    pool_id = params[:id]
+    my_data_file = self.stats_data_file(pool_id)
+    if !File.exist?(my_data_file)
       @message = "The statistics data has not yet been generated.  Please try again later or send an email to #{ADMIN_EMAIL}."
       @stats = []
     else
-      @stats = YAML.load_file(STATS_DATAFILE)
+      @stats = YAML.load_file(my_data_file)
     end
   end
 
@@ -51,11 +53,15 @@ class ReportsController < ApplicationController
         output.flush
       else
         data = stats_thread[:stats]
-        File.open(STATS_DATAFILE, "w") {|f| f.write YAML.dump(data)}
+        File.open(self.stats_data_file(@pool.id), "w") {|f| f.write YAML.dump(data)}
         output.write "Generated file!"
       end
     end
     render :text => reporter
   end
 
+  def stats_data_file(pool_id)
+    File.expand_path(File.join(RAILS_ROOT, 'db', STATS_DATAFILE_NAME % pool_id))
+  end
+
 end

data/webgui/app/controllers/users_controller.rb

@@ -54,4 +54,65 @@ class UsersController < ApplicationController
       redirect_back_or_default(root_path)
     end
   end
+
+  def lost_password
+    case request.method
+    when :post
+      logout_keeping_session!
+      @user = User.new(params[:user])
+      @user.confirming_email = true
+      @user.updating_email = false
+      if valid_for_attributes(@user, ["email","email_confirmation"])
+        user = User.find_by_email(params[:user][:email])
+        if user
+          user.create_password_reset_code
+          UserMailer.deliver_password_reset_notification(user, reset_password_path(:reset_code => user.password_reset_code, :only_path => false))
+        end
+        flash[:notice] = "Reset code sent to #{params[:user][:email]}"
+        redirect_back_or_default('/')
+      else
+        flash[:error] = "Please enter a valid email address"
+      end
+    when :get
+      @user = User.new
+    end
+  end
+
+  def reset_password
+    @user = User.find_by_password_reset_code(params[:reset_code]) unless params[:reset_code].nil?
+    if !@user
+      flash[:error] = "Reset password token invalid, please contact support."
+      redirect_to('/')
+      return
+    else
+      @user.crypted_password = nil
+    end
+    if request.post?
+      if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
+        #self.current_user = @user
+        @user.delete_password_reset_code
+        flash[:notice] = "Password updated successfully for #{@user.email} - You may now log in using your new password."
+        redirect_back_or_default('/')
+      else
+        render :action => :reset_password
+      end
+    end
+  end
+ 
+  # Might be a good addition to AR::Base
+  def valid_for_attributes( model, attributes )
+    unless model.valid?
+      errors = model.errors
+      our_errors = Array.new
+      errors.each do |attr,error|
+        if attributes.include? attr
+          our_errors << [attr,error]
+        end
+      end
+      errors.clear
+      our_errors.each { |attr,error| errors.add(attr,error) }
+      return false unless errors.empty?
+    end
+    return true
+  end
 end

data/webgui/app/models/user.rb

@@ -9,6 +9,8 @@ class User < ActiveRecord::Base
   has_many :pools
   has_and_belongs_to_many :roles
 
+  attr_accessor :updating_email, :confirming_email
+
   validates_presence_of     :login
   validates_length_of       :login,    :within => 3..40
   validates_uniqueness_of   :login
@@ -19,7 +21,9 @@ class User < ActiveRecord::Base
 
   validates_presence_of     :email
   validates_length_of       :email,    :within => 6..100 #r@a.wk
-  validates_uniqueness_of   :email
+  validates_uniqueness_of   :email, :if => :updating_email?
+  validates_presence_of     :email_confirmation, :if => :confirming_email
+  validates_confirmation_of :email, :if => :confirming_email
   validates_format_of       :email,    :with => Authentication.email_regex, :message => Authentication.bad_email_message
 
   before_create :make_activation_code 
@@ -27,7 +31,7 @@ class User < ActiveRecord::Base
   # HACK HACK HACK -- how to do attr_accessible from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
-  attr_accessible :login, :email, :name, :password, :password_confirmation
+  attr_accessible :login, :email, :email_confirmation, :name, :password, :password_confirmation
 
   # Return all users with admin role
   def self.admin_users
@@ -87,11 +91,35 @@ class User < ActiveRecord::Base
   def email=(value)
     write_attribute :email, (value ? value.downcase : nil)
   end
+  
+  def create_password_reset_code
+    @password_reset = true
+    self.password_reset_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
+    self.save(false)
+  end
+
+  def password_recently_reset?
+    @password_reset
+  end 
+
+  def delete_password_reset_code
+    self.password_reset_code = nil
+    self.save(false)
+  end
 
   protected
     
     def make_activation_code
-        self.activation_code = self.class.make_token
+      self.activation_code = self.class.make_token
+    end
+
+    def updating_email?
+      # validate_uniqueness_of email unless specifically set to false
+      if updating_email == false
+        return false
+      else
+        return true
+      end
     end
 
 

data/webgui/app/models/user_mailer.rb

@@ -21,9 +21,16 @@ class UserMailer < ActionMailer::Base
     @body[:content] = content
     @body[:url] = home_url
   end
+
+  def password_reset_notification(user, reset_url)
+    setup_email(user)
+    @subject    = 'Link to reset your password'
+    @body[:url]  = reset_url
+   end
   
   protected
     def setup_email(user)
+      @user = user
       @recipients  = user.email
       @from        = ADMIN_EMAIL
       @subject     = "[#{TOURNAMENT_TITLE}] "

data/webgui/app/views/sessions/new.html.erb

@@ -14,6 +14,8 @@
 
 <p><%= submit_tag 'Log in' %></p>
 <% end -%>
+
+<p><%= link_to " > Lost Password?", lost_password_path %></p>
 <p>
 <i>Don't have an account?</i>
 <br/>

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

@@ -0,0 +1,7 @@
+Request to reset password at <%=TOURNAMENT_TITLE%> received for <%=h @user.login %>
+
+Visit this url to choose a new password:
+
+<%=h @url %>
+
+(Your password will remain the same if you don't follow this link)

data/webgui/app/views/users/lost_password.html.erb

@@ -0,0 +1,20 @@
+<h1>Lost Password</h1>
+<p>
+Please enter the email address that you registered with.  Once you click
+on the Send button, we will send you an email that allows you to change
+your password.
+</p>
+<%= error_messages_for :user, :header_message => "Please review the following errors:", :message => '' %>
+<% form_for :user do |f| -%>
+<table>
+<tr>
+<td align="right"><%= label_tag 'email' %></td>
+<td><%= f.text_field :email %></td>
+</tr>
+<tr>
+<td align="right"><%= label_tag 'email_confirmation' %></td>
+<td><%= f.text_field :email_confirmation %></td>
+</tr>
+</table>
+<p><%= submit_tag 'Send' %></p>
+<% end -%>

data/webgui/app/views/users/reset_password.html.erb

@@ -0,0 +1,15 @@
+<%= error_messages_for :user %>
+
+<h1>Choose a new password</h1>
+
+<% form_for :user do |f| -%>
+<div>
+  New Password: <%= f.password_field :password %>
+</div>
+<div>
+  Confirm Password: <%= f.password_field :password_confirmation %>
+</div>
+<div>
+<%= submit_tag 'Change Password' %>
+</div>
+<% end -%>

data/webgui/config/environments/development.rb

@@ -21,7 +21,7 @@ ActionMailer::Base.smtp_settings = {
   :port  => 25, 
   :domain  => "comcast.net",
   :user_name  => 'doug.seifert@comcast.net',
-  :password  => "ccSBBatl1",
+  :password  => "cfamn2nan",
   :authentication  => :login
 } 
 

data/webgui/config/routes.rb

@@ -35,12 +35,14 @@ ActionController::Routing::Routes.draw do |map|
 
   # See how all your routes lay out with "rake routes"
  
-  # restful_authentication routs 
-  map.logout '/logout', :controller => 'sessions', :action => 'destroy'
-  map.login '/login', :controller => 'sessions', :action => 'new'
-  map.register '/register', :controller => 'users', :action => 'create'
-  map.signup '/signup', :controller => 'users', :action => 'new'
-  map.activate '/activate/:activation_code', :controller => 'users', :action => 'activate', :activation_code => nil
+  # restful_authentication routes 
+  map.logout 'logout', :controller => 'sessions', :action => 'destroy'
+  map.login 'login', :controller => 'sessions', :action => 'new'
+  map.register 'register', :controller => 'users', :action => 'create'
+  map.signup 'signup', :controller => 'users', :action => 'new'
+  map.activate 'activate/:activation_code', :controller => 'users', :action => 'activate', :activation_code => nil
+  map.reset_password 'reset_password/:reset_code', :controller => 'users', :action => 'reset_password'
+  map.lost_password 'lost_password', :controller => 'users', :action => 'lost_password'
   map.resources :users
   map.resource :session
 

data/webgui/db/migrate/20100312053540_add_password_reset_code.rb

@@ -0,0 +1,9 @@
+class AddPasswordResetCode < ActiveRecord::Migration
+  def self.up
+    add_column :users, :password_reset_code, :string, :limit => 40
+  end
+
+  def self.down
+    remove_column :users, :password_reset_code
+  end
+end

data/webgui/db/schema.rb

@@ -0,0 +1,92 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20100312053540) do
+
+  create_table "entries", :force => true do |t|
+    t.string   "name",       :limit => 64,                    :null => false
+    t.binary   "data"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "tie_break"
+    t.integer  "user_id",                  :default => 1,     :null => false
+    t.integer  "pool_id"
+    t.boolean  "completed",                :default => false, :null => false
+  end
+
+  add_index "entries", ["pool_id"], :name => "index_entries_on_pool_id"
+  add_index "entries", ["user_id"], :name => "index_entries_on_user_id"
+
+  create_table "pools", :force => true do |t|
+    t.string   "name",                          :null => false
+    t.binary   "data"
+    t.boolean  "started",    :default => false, :null => false
+    t.datetime "starts_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id"
+    t.boolean  "active",     :default => false, :null => false
+  end
+
+  create_table "regions", :force => true do |t|
+    t.integer  "pool_id"
+    t.string   "name"
+    t.integer  "position"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "roles", :force => true do |t|
+    t.string   "name",       :limit => 32
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "position",                 :default => 0, :null => false
+  end
+
+  create_table "roles_users", :id => false, :force => true do |t|
+    t.integer "role_id"
+    t.integer "user_id"
+  end
+
+  create_table "seedings", :force => true do |t|
+    t.integer  "pool_id"
+    t.integer  "team_id"
+    t.string   "region"
+    t.integer  "seed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "teams", :force => true do |t|
+    t.string   "name"
+    t.string   "short_name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "login",                     :limit => 40
+    t.string   "name",                      :limit => 100, :default => ""
+    t.string   "email",                     :limit => 100
+    t.string   "crypted_password",          :limit => 40
+    t.string   "salt",                      :limit => 40
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "remember_token",            :limit => 40
+    t.datetime "remember_token_expires_at"
+    t.string   "activation_code",           :limit => 40
+    t.datetime "activated_at"
+    t.string   "password_reset_code",       :limit => 40
+  end
+
+  add_index "users", ["login"], :name => "index_users_on_login", :unique => true
+
+end

data/webgui/doc/README_FOR_APP

@@ -1,5 +1,48 @@
-To build the guides:
+= USING THE WEB GUI:
 
-* Install source-highlighter (http://www.gnu.org/software/src-highlite/source-highlight.html)
-* Install the mizuho gem (http://github.com/FooBarWidget/mizuho/tree/master)
-* Run `rake guides` from the railties directory
+Load the entry page in your brower.  Log in as the admin user you 
+configured during installation.  Click on on the 'All Pools' link on
+the right sidebar.  Create a new pool and fill in the information.
+Each time you save this form, a new blank payouts line will be added
+so that you can configure as many payouts as you desire.
+
+After the basic pool configuration is set up, click on the 'Teams'
+link in the right sidebar.  You are presented with four region
+brackets to fill in.  Keep in mind that the pink region champs will
+play each other in the final four and the light blue region champs
+will play each other in the final four so you can get the bracket 
+right.  The web application is preconfigured with over 300 NCAA
+schools.  The team name fields are auto-complete fields -- type in
+a few letters and pause and you will be presented with a list of
+matching teams.  The Short Name field should be a three letter
+abbreviation for the team.  The abbreviations have to be unique
+across the entire tournament field.
+
+Once the teams are configured, go back to the pool basic information
+form, click the Active check box and save the form.  The pool is now
+ready for entries to be added to it.  Invite your friends to join the pool
+by giving them the url for the entry page.  They will be asked to
+register.  After registering and logging in, they will be able to
+submit entries to your pool.
+
+As the tournament progresses, use the 'Tournament Bracket' link
+on the right sidebar to record the winning teams.  
+
+Use the report links to run reports, etc.
+
+== POSSIBILITY REPORT
+
+After about 21 teams are left in the tournament, you can run the
+possibility report.  This report runs through every possible way the
+tournament can come out and ranks each entry against the possiblity.
+The report lists the "chance to win" for each entry.  The chance
+to win is the percentage of possible outcomes that would result in
+that entry coming in first.
+
+The possibility report requires that a rake task be run on the
+web server.  It is very processor intensive and can take a long
+time to complete.  To generate the possibility report data file,
+run the following command from the web gui install directory
+on the server:
+
+   RAILS_ENV=production rake report:possibilities

data/webgui/lib/tasks/possibility.rake

@@ -10,7 +10,7 @@ namespace :report do
       print "\rCalculating: %3d%% +#{hashes.ljust(20, '-')}+ %5d seconds remaining" % [percentage.to_i, remaining]
     end
     puts
-    stats_yaml_file = File.join(RAILS_ROOT, 'db', 'stats.yml')
+    stats_yaml_file = File.join(RAILS_ROOT, 'db', "stats_#{pool_id}.yml")
     bytes = File.open(stats_yaml_file, "w") {|f| f.write YAML.dump(stats)}
     puts "Wrote #{bytes} bytes to #{stats_yaml_file} ..."
   end

data/webgui/vendor/plugins/restful_authentication/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 rick olson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.