tournament 1.1.0 → 2.0.0

data/History.txt

@@ -1,3 +1,18 @@
+== 2.0.0 / 2009-02-XX
+* Release Rails GUI for self-service entries and admin
+* Make reports account for tournament tie breaker.
+* YAML format change from version 1.X.  Old pool data won't work
+  with this version.
+* Added Josh Pasternak scoring strategy.  Correct picks are worth
+  the winning team seed number * a per round multiplier.  See
+  http://blogs.tnr.com/tnr/blogs/the_plank/archive/2008/03/27/ncaa-pool-scoring-system-rant.aspx
+  for details.
+* Many library improvements and refactorings.
+* 2.0.1 release with final 2009 NCAA tournament seedings forthcoming
+
+== 1.1.1 / 2008-07-07
+* Update rake tasks to bones-2.0.2
+
 == 1.1.0 / 2008-03-29
 
 * Add ability to configure entry fee and payout amounts

data/Manifest.txt

@@ -10,20 +10,259 @@ lib/tournament.rb
 lib/tournament/bracket.rb
 lib/tournament/entry.rb
 lib/tournament/pool.rb
+lib/tournament/scoring_strategy.rb
 lib/tournament/team.rb
+lib/tournament/webgui_installer.rb
 spec/spec_helper.rb
 spec/tournament_spec.rb
 static/shoes-icon.png
 tasks/ann.rake
-tasks/annotations.rake
 tasks/bones.rake
-tasks/doc.rake
 tasks/gem.rake
+tasks/git.rake
+tasks/jamis.rb
 tasks/manifest.rake
+tasks/notes.rake
 tasks/post_load.rake
+tasks/rdoc.rake
 tasks/rubyforge.rake
 tasks/setup.rb
 tasks/spec.rake
 tasks/svn.rake
 tasks/test.rake
 test/test_tournament.rb
+test/test_webgui_installer.rb
+webgui/README
+webgui/Rakefile
+webgui/app/controllers/admin_controller.rb
+webgui/app/controllers/application.rb
+webgui/app/controllers/entry_controller.rb
+webgui/app/controllers/pool_controller.rb
+webgui/app/controllers/reports_controller.rb
+webgui/app/controllers/sessions_controller.rb
+webgui/app/controllers/teams_controller.rb
+webgui/app/controllers/users_controller.rb
+webgui/app/helpers/admin_helper.rb
+webgui/app/helpers/application_helper.rb
+webgui/app/helpers/entry_helper.rb
+webgui/app/helpers/pool_helper.rb
+webgui/app/helpers/reports_helper.rb
+webgui/app/helpers/sessions_helper.rb
+webgui/app/helpers/teams_helper.rb
+webgui/app/helpers/users_helper.rb
+webgui/app/models/entry.rb
+webgui/app/models/pool.rb
+webgui/app/models/region.rb
+webgui/app/models/role.rb
+webgui/app/models/seeding.rb
+webgui/app/models/team.rb
+webgui/app/models/user.rb
+webgui/app/models/user_mailer.rb
+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/entry/index.html.erb
+webgui/app/views/entry/print.erb
+webgui/app/views/entry/print.html.erb
+webgui/app/views/entry/show.html.erb
+webgui/app/views/layouts/bracket.html.erb
+webgui/app/views/layouts/default.html.erb
+webgui/app/views/layouts/print.html.erb
+webgui/app/views/layouts/report.html.erb
+webgui/app/views/pool/index.html.erb
+webgui/app/views/reports/_report.html.erb
+webgui/app/views/reports/show.html.erb
+webgui/app/views/sessions/new.html.erb
+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/signup_notification.erb
+webgui/app/views/users/_user_bar.html.erb
+webgui/app/views/users/new.html.erb
+webgui/config/boot.rb
+webgui/config/database.yml
+webgui/config/environment.rb
+webgui/config/environments/development.rb
+webgui/config/environments/production.rb
+webgui/config/environments/test.rb
+webgui/config/initializers/inflections.rb
+webgui/config/initializers/mime_types.rb
+webgui/config/initializers/new_rails_defaults.rb
+webgui/config/initializers/pool.rb
+webgui/config/initializers/site_keys.rb
+webgui/config/locales/en.yml
+webgui/config/routes.rb
+webgui/db/development.sqlite3
+webgui/db/migrate/20090216015836_create_entries.rb
+webgui/db/migrate/20090217001611_add_tie_break_to_entry.rb
+webgui/db/migrate/20090217004039_create_users.rb
+webgui/db/migrate/20090217014940_relate_entry_and_user.rb
+webgui/db/migrate/20090218024350_create_roles.rb
+webgui/db/migrate/20090218024657_add_postition_to_roles.rb
+webgui/db/migrate/20090218025240_add_admin_role.rb
+webgui/db/migrate/20090225022928_create_pools.rb
+webgui/db/migrate/20090225030346_associate_pool_and_entry.rb
+webgui/db/migrate/20090225072358_change_pool_data_column.rb
+webgui/db/migrate/20090225072849_add_completed_to_entries.rb
+webgui/db/migrate/20090225074149_add_pool_id_index_to_entries.rb
+webgui/db/migrate/20090225084414_add_user_id_to_pool.rb
+webgui/db/migrate/20090226021913_add_active_to_pools.rb
+webgui/db/migrate/20090226142240_rename_bracket_column_to_data.rb
+webgui/db/migrate/20090301014710_create_teams.rb
+webgui/db/migrate/20090301025902_add_more_teams.rb
+webgui/db/migrate/20090301041526_create_seedings.rb
+webgui/db/migrate/20090301090511_create_regions.rb
+webgui/db/migrate/teams.txt
+webgui/db/pool.yml
+webgui/db/schema.rb
+webgui/db/test.sqlite3
+webgui/doc/README_FOR_APP
+webgui/lib/authenticated_system.rb
+webgui/lib/authenticated_test_helper.rb
+webgui/lib/form_object.rb
+webgui/lib/pdf_helper.rb
+webgui/lib/prince.rb
+webgui/lib/saves_picks.rb
+webgui/lib/tasks/admin.rake
+webgui/public/404.html
+webgui/public/422.html
+webgui/public/500.html
+webgui/public/dispatch.cgi
+webgui/public/dispatch.fcgi
+webgui/public/dispatch.rb
+webgui/public/favicon.ico
+webgui/public/images/2009FinalFour.png
+webgui/public/images/rails.png
+webgui/public/javascripts/application.js
+webgui/public/javascripts/bracket.js
+webgui/public/javascripts/controls.js
+webgui/public/javascripts/dragdrop.js
+webgui/public/javascripts/effects.js
+webgui/public/javascripts/prototype.js
+webgui/public/robots.txt
+webgui/public/stylesheets/bracket-print.css
+webgui/public/stylesheets/bracket.css
+webgui/public/stylesheets/main.css
+webgui/public/stylesheets/prince.css
+webgui/public/stylesheets/prince_landscape.css
+webgui/script/about
+webgui/script/console
+webgui/script/dbconsole
+webgui/script/destroy
+webgui/script/generate
+webgui/script/performance/benchmarker
+webgui/script/performance/profiler
+webgui/script/performance/request
+webgui/script/plugin
+webgui/script/process/inspector
+webgui/script/process/reaper
+webgui/script/process/spawner
+webgui/script/runner
+webgui/script/server
+webgui/test/fixtures/entries.yml
+webgui/test/fixtures/pools.yml
+webgui/test/fixtures/regions.yml
+webgui/test/fixtures/roles.yml
+webgui/test/fixtures/roles_users.yml
+webgui/test/fixtures/seedings.yml
+webgui/test/fixtures/teams.yml
+webgui/test/fixtures/users.yml
+webgui/test/functional/admin_controller_test.rb
+webgui/test/functional/entry_controller_test.rb
+webgui/test/functional/pool_controller_test.rb
+webgui/test/functional/reports_controller_test.rb
+webgui/test/functional/sessions_controller_test.rb
+webgui/test/functional/teams_controller_test.rb
+webgui/test/functional/users_controller_test.rb
+webgui/test/performance/browsing_test.rb
+webgui/test/test_helper.rb
+webgui/test/unit/entry_test.rb
+webgui/test/unit/pool_test.rb
+webgui/test/unit/region_test.rb
+webgui/test/unit/role_test.rb
+webgui/test/unit/seeding_test.rb
+webgui/test/unit/team_test.rb
+webgui/test/unit/user_mailer_test.rb
+webgui/test/unit/user_test.rb
+webgui/vendor/plugins/auto_complete/README
+webgui/vendor/plugins/auto_complete/Rakefile
+webgui/vendor/plugins/auto_complete/init.rb
+webgui/vendor/plugins/auto_complete/lib/auto_complete.rb
+webgui/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb
+webgui/vendor/plugins/auto_complete/test/auto_complete_test.rb
+webgui/vendor/plugins/enumerations_mixin/ATTENTION
+webgui/vendor/plugins/enumerations_mixin/LICENSE
+webgui/vendor/plugins/enumerations_mixin/README_ENUMERATIONS
+webgui/vendor/plugins/enumerations_mixin/init.rb
+webgui/vendor/plugins/enumerations_mixin/lib/active_record/acts/enumerated.rb
+webgui/vendor/plugins/enumerations_mixin/lib/active_record/aggregations/has_enumerated.rb
+webgui/vendor/plugins/enumerations_mixin/lib/active_record/virtual_enumerations.rb
+webgui/vendor/plugins/enumerations_mixin/virtual_enumerations_sample.rb
+webgui/vendor/plugins/restful_authentication/.gitignore
+webgui/vendor/plugins/restful_authentication/CHANGELOG
+webgui/vendor/plugins/restful_authentication/README.textile
+webgui/vendor/plugins/restful_authentication/Rakefile
+webgui/vendor/plugins/restful_authentication/TODO
+webgui/vendor/plugins/restful_authentication/generators/authenticated/USAGE
+webgui/vendor/plugins/restful_authentication/generators/authenticated/authenticated_generator.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/lib/insert_routes.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/_model_partial.html.erb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/activation.erb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/authenticated_system.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/authenticated_test_helper.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/controller.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/helper.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/login.html.erb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/mailer.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/migration.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/model.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/model_controller.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/model_helper.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/model_helper_spec.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/observer.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/signup.html.erb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/signup_notification.erb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/site_keys.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/access_control_spec.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/authenticated_system_spec.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/sessions_controller_spec.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/users_controller_spec.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/spec/fixtures/users.yml
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/spec/helpers/users_helper_spec.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/spec/models/user_spec.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/rest_auth_stories.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/rest_auth_stories_helper.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/ra_navigation_steps.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/ra_resource_steps.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/ra_response_steps.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/user_steps.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/users/accounts.story
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/stories/users/sessions.story
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/test/functional_test.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/test/mailer_test.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/test/model_functional_test.rb
+webgui/vendor/plugins/restful_authentication/generators/authenticated/templates/test/unit_test.rb
+webgui/vendor/plugins/restful_authentication/init.rb
+webgui/vendor/plugins/restful_authentication/install.rb
+webgui/vendor/plugins/restful_authentication/lib/authentication.rb
+webgui/vendor/plugins/restful_authentication/lib/authentication/by_cookie_token.rb
+webgui/vendor/plugins/restful_authentication/lib/authentication/by_password.rb
+webgui/vendor/plugins/restful_authentication/lib/authorization.rb
+webgui/vendor/plugins/restful_authentication/lib/authorization/aasm_roles.rb
+webgui/vendor/plugins/restful_authentication/lib/authorization/stateful_roles.rb
+webgui/vendor/plugins/restful_authentication/lib/trustification.rb
+webgui/vendor/plugins/restful_authentication/lib/trustification/email_validation.rb
+webgui/vendor/plugins/restful_authentication/notes/AccessControl.txt
+webgui/vendor/plugins/restful_authentication/notes/Authentication.txt
+webgui/vendor/plugins/restful_authentication/notes/Authorization.txt
+webgui/vendor/plugins/restful_authentication/notes/RailsPlugins.txt
+webgui/vendor/plugins/restful_authentication/notes/SecurityFramework.graffle
+webgui/vendor/plugins/restful_authentication/notes/SecurityFramework.png
+webgui/vendor/plugins/restful_authentication/notes/SecurityPatterns.txt
+webgui/vendor/plugins/restful_authentication/notes/Tradeoffs.txt
+webgui/vendor/plugins/restful_authentication/notes/Trustification.txt
+webgui/vendor/plugins/restful_authentication/rails/init.rb
+webgui/vendor/plugins/restful_authentication/restful-authentication.gemspec
+webgui/vendor/plugins/restful_authentication/tasks/auth.rake

data/README.txt

@@ -5,24 +5,27 @@ tournament
 
 == DESCRIPTION:
 
-Small library and command line program for managing a NCAA
+Small library, command line program and Rails web GUI for managing a NCAA
 basketball tournament pool.
 
 == FEATURES/PROBLEMS:
 
-* Add NCAA tournament pool entries and save them as YAML
+* Fully functional, self-service web GUI for collecting entries and
+  generating reports
+* Or use command line to add NCAA tournament pool entries and save them as YAML
 * Run a possibilities report for determining who is likely to win
 * Run other reports such as a leader board and entry report
-* Buggy, but functional, Shoes GUI included for creating the entries
-  and updating the tournament results bracket.
-* FIXME: Write a test suite.
+* [DEPRECATED] Buggy, but functional, Shoes GUI included for creating
+  the entries and updating the tournament results bracket.  Useful as an
+  adjunct to the command line script.
+* FIXME: Complete the test suite for the library and command line tool
 
-== SYNOPSIS:
+== COMMAND LINE SYNOPSIS:
 
 The tournament command line program is installed as 'pool'.  The library
-has the 2008 NCAA tournament pre-configured.  If you were to use
-this library for the 2009 NCAA tournament, code changes would be
-necessary. FIXME (add ability to read teams from a simple configuration
+has the 2009 NCAA tournament pre-configured.  If you were to use
+this library for the 2010 NCAA tournament, code changes would be
+necessary. FIXME: (add ability to read teams from a simple configuration
 file).  For usage, just execute
 
    pool --help
@@ -39,14 +42,18 @@ The pool manager would use this program as follows:
 
 1. Choose a scoring strategy.  There are various scoring strategies
    that could be used.  The library comes pre-configured with 
-   two scoring strategies:
+   three scoring strategies:
    1. Basic scoring strategy: each correct pick is worth 2 X the round.
    2. Upset favoring strategy: each correct pick is worth a
       base amount per round plus the seed number of the winner.  As
       pre-configured, the base amounts per round are 3, 5, 11, 19, 30
       and 40 points.
+   3. The Josh Patashnik stratgy: each correct pick is worth the
+      winner's seed number X a round multiplier.  The multipliers
+      are 1, 2, 4, 8, 16 and 32 points.
    If your scoring strategy is not one of the above, you will have to
-   write a class in the Bracket class, in file lib/tournament/bracket.rb.
+   add a class to the ScoringStrategy module, in file
+   lib/tournament/scoring_strategy.rb.
 
 2. Create a directory to hold the pool data and change to it
 
@@ -113,6 +120,129 @@ The pool manager would use this program as follows:
 
         pool report possibility
 
+== WEB GUI:
+
+A Rails web application is available if you don't want to use the
+command line to manage your pool.
+
+=== INSTALLING THE WEB GUI:
+
+The web application can be installed by running the pool command
+as follows
+
+   pool install_webgui --web-dir=/path/to/directory [options]
+
+The above command will copy the Rails app to the specified directory.
+
+There are several options you can provide in addition to --web-dir
+to control how the application is installed:
+
+ * Human readable site name.  This appears as the <title> tag content
+   of pages in the site and is also used in the subject line of any
+   emails sent by the site (as during user registration).
+
+   --site-name="Site Name"  (Default: 'Tournament')
+
+ * Relative url root.  If you will be installing the pool site as
+   a relative url on another virtual host, use this switch.  You
+   will have to configure you virtual host to route requests to this
+   path to Rails.  This is ridiculously easy if you are using
+   modrails and Apache.  Example:
+
+   --relative-root=/my_pool  (Default: empty, no root is set)
+ 
+ * Administrator email address.  The web GUI will send emails
+   when users register for creating entries in a pool. The following
+   sets the from email address on the emails that are sent.
+
+   --admin-email=admin
+
+ * Email server information.  Either edit the config/initializers/pool.rb
+   file after installation, or provide the following options to configure
+   a SMTP server available on your domain.
+
+   --email-server=smtp.myisp.com
+   --email-port=25
+   --email-domain=mydomain.com
+   --email-user=myuser
+   --email-password=mypass
+   --email-auth=login|plain|cram_md5
+
+   See http://guides.rubyonrails.org/action_mailer_basics.html#_action_mailer_configuration
+   for more info on how to configure a Rails app for sending email.
+
+ * The web GUI has the ability to print bracket entries by generating
+   a pdf styled using the web site's bracket stylesheet.  It uses a third
+   party tool called Prince XML to do this.  You are not allowed to
+   use this on a server without paying a license fee, although you
+   can download a trial version for personal use.  It's your call
+   whether or not you want to use this.  Please see http://www.princexml.com/
+   for more details.
+ 
+   --use-princexml=/full/path/to/prince
+
+   If prince is not available on the path you specify, the princexml
+   distribution will be downloaded and installed using the distribution's
+   install.sh script.  In order to do this, the tar program must be
+   available on your installation system.
+
+ * If you use the --use-princexml option, the install script needs to write
+   files to a temp directory, /tmp by default. Use the --tmp-dir option to
+   change this default.  If the specified temp dir does not exist, it will
+   be created.
+
+   --tmp-dir=/path/to/tmp/dir
+
+=== POST-INSTALLATION:
+
+Before being able to run the web gui for the first time, you have to
+prepare the sqlite database and create an admin account.  To do this,
+change to the installation directory and run the following command:
+
+   RAILS_ENV=production rake db:migrate
+
+To create the admin account, change to the web gui installation directory
+and run the following command:
+
+   RAILS_ENV=production rake "admin:create[login,email,name,password]"
+
+In the above command, substitute "login" for the desired admin user's login
+name, "email" for the administrators email address, "name" for the 
+admin user's name (eg, "Joe Admin"), and "password" for the desired
+admin account password
+
+=== USING THE WEB GUI:
+
+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.
+
 == SHOES GUI:
 
 A GUI for filling out tournment bracket entries is included and is run
@@ -134,7 +264,17 @@ from played to unknown outcome.
 == REQUIREMENTS:
 
 * main (2.8.0)
-* shoes-0.r396 (GUI Only)
+
+== WEB GUI REQUIREMENTS:
+
+* rails (2.2.2)
+* rake (0.8.3)
+* sqlite3-ruby (1.2.4)
+
+== SHOES GUI REQUIREMENTS:
+
+Verified working on
+* shoes raisins v1134
 
 == INSTALL:
 

data/Rakefile

@@ -10,21 +10,24 @@ require 'tournament'
 task :default => 'spec:run'
 
 depend_on 'main'
+depend_on 'rake'
+depend_on 'rails'
+depend_on 'sqlite3-ruby'
+
 
 PROJ.name = 'tournament'
 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 = '1.1.0'
+PROJ.rubyforge.name = 'tournament'
+PROJ.version = '2.0.0'
 PROJ.group_id = 5863
 
-PROJ.spec_opts << '--color'
+PROJ.spec.opts << '--color'
 
 PROJ.exclude = %w(tmp$ bak$ ~$ CVS \.svn ^pkg ^doc bin/fake bin/gui_v2.rb)
 PROJ.exclude << '^tags$'
 
-PROJ.rdoc_opts = ["--line-numbers", "--inline-source"]
-PROJ.rdoc_template = "tasks/jamis.rb"
-
+PROJ.rdoc.opts = ["--line-numbers", "--inline-source"]
+PROJ.rdoc.template = "tasks/jamis.rb"
 # EOF

data/bin/gui.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env shoes
 
+Dir.chdir(File.join(File.dirname(__FILE__), '..'))
+
 require 'yaml'
 require File.join('.', 'lib', 'tournament')
 
@@ -28,7 +30,7 @@ Shoes.app :width => WINDOW_WIDTH, :height => 600 do
     load_data
   else
     @entry = Tournament::Entry.new
-    @entry.picks = Tournament::Bracket.new(@pool.bracket.teams)
+    @entry.picks = Tournament::Bracket.new(@pool.scoring_strategy, @pool.tournament_entry.picks.teams)
     #@picks = Tournament::Bracket.random_bracket(Tournament::Pool.ncaa_2008.bracket.teams)
   end