tournament 3.3.3 → 4.0.0

data/History.txt

@@ -1,3 +1,7 @@
+== 4.0.0 / 2011-03-14
+* 2011 bracket.
+* Upgrade to Rails 2.3.11.
+
 == 3.3.3 / 2010-03-21
 * Show link to possibility report if stats file exists.
 

data/README.rdoc

@@ -20,6 +20,7 @@ basketball tournament pool.
   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
+* FIXME: Can't change name of team after entries have been added
 
 == COMMAND LINE SYNOPSIS:
 
@@ -288,7 +289,7 @@ on the server:
 
    RAILS_ENV=production rake report:possibilities
 
-== SHOES GUI:
+== SHOES GUI (Deprecated):
 
 A GUI for filling out tournment bracket entries is included and is run
 by executing the program "picker".  If no argument is included, a blank
@@ -312,9 +313,9 @@ from played to unknown outcome.
 
 == WEB GUI REQUIREMENTS:
 
-* rails (2.3.5)
+* rails (2.3.11)
 * rake (0.8.7)
-* sqlite3-ruby (1.2.5)
+* sqlite3-ruby (1.3.3) (default active record adapter)
 
 == SHOES GUI REQUIREMENTS:
 
@@ -332,7 +333,7 @@ Verified working on
 
 (The MIT License)
 
-Copyright (c) 2008
+Copyright (c) 2011
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -13,7 +13,7 @@ task :default => 'test:run'
 Bones {
   depend_on 'main'
   depend_on 'rake'
-  depend_on 'rails'
+  depend_on 'rails', :version => "2.3.11"
 
   name 'tournament'
   authors 'Douglas A. Seifert'

data/lib/tournament.rb

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

data/lib/tournament/scoring_strategy.rb

@@ -16,6 +16,22 @@ module Tournament::ScoringStrategy
     end
   end
 
+  class WorldCupSoccer
+    PER_ROUND = [0, 0, 1, 2, 4, 8]
+    def score(pick, winner, loser, round)
+      if winner != Tournament::Bracket::UNKNOWN_TEAM && pick == winner
+        return PER_ROUND[round-1]
+      end
+      return 0
+    end
+    def name
+      'World Cup Soccer'
+    end
+    def description
+      "Each correct pick is worth #{PER_ROUND.join(', ')} per round. First 2 rounds are 'dummy' rounds representing the group play."
+    end
+  end
+
   # Class representing a scoring strategy where correct picks
   # are worth 1 point each, regardless of round
   class ConstantValue
@@ -90,7 +106,7 @@ module Tournament::ScoringStrategy
   # Returns names of available strategies.  The names returned are suitable
   # for use in the strategy_for_name method
   def self.available_strategies
-    return ['basic', 'upset', 'josh_patashnik', 'tweaked_josh_patashnik', 'constant_value']
+    return ['basic', 'world_cup_soccer', 'upset', 'josh_patashnik', 'tweaked_josh_patashnik', 'constant_value']
   end
 
   # Returns an instantiated strategy class for the named strategy.
@@ -100,3 +116,4 @@ module Tournament::ScoringStrategy
   end
 
 end
+

data/webgui/app/controllers/teams_controller.rb

@@ -26,9 +26,13 @@ class TeamsController < ApplicationController
     Pool.transaction do
     [0,1,2,3].each do |region_idx|
       region_hash = params["region#{region_idx}".to_sym]
+      logger.debug("Got region hash: #{region_hash}, index: #{region_idx}")
       next unless region_hash
       region_name = region_hash[:name]
-      next if region_name.blank? || region_hash[:seedings].blank?
+      if region_name.blank? || region_hash[:seedings].blank?
+	flash[:error] = "Please specify name of region #{region_idx+1}"
+        next
+      end
       raise "Illegal input, seedings array contains more than 16 elements" if region_hash[:seedings].length > 16
       region = Region.find_by_pool_id_and_position(@pool.id, region_idx)
       if !region
@@ -48,7 +52,10 @@ class TeamsController < ApplicationController
           team.save!
         end
         logger.debug "Finding Seeding for region #{region.name}, seed #{seeding_hash[:seed]}"
-        existing_seeding = @pool.seedings.find_or_create_by_region_and_seed(region.name, seeding_hash[:seed])
+        existing_seeding = @pool.seedings.find_by_region_and_seed(region.name, seeding_hash[:seed])
+        unless existing_seeding
+           existing_seeding = @pool.seedings.create(:region => region.name, :seed => seeding_hash[:seed], :team_id => team.id)
+        end
         if existing_seeding.team_id != team.id
           logger.debug "  ==> TEAMS ARE DIFF, CHANGING SEEDING: #{existing_seeding.inspect}"
           existing_seeding.team_id = team.id

data/webgui/app/controllers/users_controller.rb

@@ -82,7 +82,7 @@ class UsersController < ApplicationController
     @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('/')
+      redirect_to(root_path)
       return
     else
       @user.crypted_password = nil

data/webgui/app/models/entry.rb

@@ -1,7 +1,7 @@
 class Entry < ActiveRecord::Base
   belongs_to :user
   belongs_to :pool
-  validates_uniqueness_of :name
+  validates_uniqueness_of :name, :scope => :pool_id
   validates_presence_of :tie_break
   validates_presence_of :user_id
   attr_accessor :old_name

data/webgui/app/models/pool.rb

@@ -5,14 +5,14 @@ class Pool < ActiveRecord::Base
   validates_uniqueness_of :name
   before_save :marshal_pool
   belongs_to :user
-  has_many :entries
+  has_many :entries, :dependent => :destroy
   has_many :user_entries, :class_name => 'Entry', :conditions => ['user_id != ?', '#{user_id}'], :include => :user, :order => 'users.login, entries.name'
   has_many :users, :through => :user_entries
   has_many :pending_entries, :class_name => 'Entry', :conditions => ['completed = ? and user_id != ?', false, '#{user_id}']
   has_one :tournament_entry, :class_name => 'Entry', :conditions => ['user_id = \'#{user_id}\'']
-  has_many :seedings
+  has_many :seedings, :dependent => :destroy
   has_many :teams, :through => :seedings
-  has_many :regions, :order => 'position'
+  has_many :regions, :order => 'position', :dependent => :destroy
 
   # Class for collecting payout info from edit pool form
   class PayoutData < FormObject

data/webgui/app/views/layouts/bracket.html.erb

@@ -5,6 +5,7 @@
 <%= javascript_include_tag 'bracket' %>
 <%= stylesheet_link_tag 'main' %>
 <%= stylesheet_link_tag 'bracket' %>
+<%= csrf_meta_tag %>
 </head>
 <body>
 <div id="wrap">

data/webgui/app/views/layouts/default.html.erb

@@ -2,6 +2,7 @@
 <head>
 <title><%=TOURNAMENT_TITLE%></title>
 <%= stylesheet_link_tag 'main' %>
+<%= csrf_meta_tag %>
 </head>
 <body>
 <div id="wrap">

data/webgui/app/views/layouts/print.html.erb

@@ -5,6 +5,7 @@
 <%= javascript_include_tag 'bracket' %>
 <%= stylesheet_link_tag 'main' %>
 <%= stylesheet_link_tag 'bracket' %>
+<%= csrf_meta_tag %>
 </head>
 <body>
 <%= yield %>

data/webgui/app/views/layouts/report.html.erb

@@ -3,6 +3,7 @@
 <title><%=TOURNAMENT_TITLE%></title>
 <%= stylesheet_link_tag 'main' %>
 <%= stylesheet_link_tag 'reports' %>
+<%= csrf_meta_tag %>
 </head>
 <body>
 <div id="wrap">

data/webgui/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -27,7 +27,7 @@ Rails::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
-  config.gem "tournament"
+  config.gem "tournament", :version => "~> 4.0.0"
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.

data/webgui/lib/saves_picks.rb

@@ -18,6 +18,6 @@ module SavesPicks
     logger.debug("SAVING ENTRY PARAMS: #{params[:entry].inspect}")
     entry.attributes = params[:entry]
     logger.debug("DONE SAVING ENTRY PARAMS")
-    entry.completed = true if bracket.complete?
+    entry.completed = bracket.complete?
   end
 end

data/webgui/public/stylesheets/bracket.css

@@ -4,7 +4,7 @@ TABLE.bracket
 	BORDER-TOP: black 1px solid;
 	BORDER-LEFT: black 1px solid;
 	BORDER-BOTTOM: black 1px solid;
-  background: white url(../images/2010FinalFour.jpg) center no-repeat;
+  background: white url(../images/2011FinalFour.jpg) center no-repeat;
 }
 
 TABLE.bracket TH.header

metadata

@@ -1,96 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tournament
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 3
-  - 3
-  version: 3.3.3
+version: !ruby/object:Gem::Version
+  version: 4.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Douglas A. Seifert
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-21 00:00:00 -07:00
+date: 2011-03-14 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: main
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 2
-        - 0
-        version: 4.2.0
+  requirement: &15442900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
+  version_requirements: *15442900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &15442480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
+  version_requirements: *15442480
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &15442060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.3.11
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bones
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 3
-        - 0
-        version: 3.3.0
+  version_requirements: *15442060
+- !ruby/object:Gem::Dependency
+  name: bones
+  requirement: &15441600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.6.5
   type: :development
-  version_requirements: *id004
-description: |-
-  Small library, command line program and Rails web GUI for managing a NCAA
-  basketball tournament pool.
+  prerelease: false
+  version_requirements: *15441600
+description: ! 'Small library, command line program and Rails web GUI for managing
+  a NCAA
+
+  basketball tournament pool.'
 email: doug@dseifert.net
-executables: 
+executables:
 - benchmark_pool
 - gui.rb
 - picker
 - pool
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - README.rdoc
 - bin/benchmark_pool
 - bin/picker
 - bin/pool
-files: 
+files:
 - History.txt
 - README.rdoc
 - Rakefile
@@ -106,7 +89,6 @@ files:
 - lib/tournament/scoring_strategy.rb
 - lib/tournament/team.rb
 - lib/tournament/webgui_installer.rb
-- pool.dat
 - spec/spec_helper.rb
 - spec/tournament_spec.rb
 - static/shoes-icon.png
@@ -183,6 +165,7 @@ files:
 - 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
@@ -225,6 +208,7 @@ files:
 - webgui/public/favicon.ico
 - webgui/public/images/2009FinalFour.png
 - webgui/public/images/2010FinalFour.jpg
+- webgui/public/images/2011FinalFour.jpg
 - webgui/public/images/rails.png
 - webgui/public/javascripts/application.js
 - webgui/public/javascripts/bracket.js
@@ -361,38 +345,35 @@ files:
 has_rdoc: true
 homepage: http://www.dseifert.net/code/tournament
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --force-update
 - -W
 - http://tournament.rubyforge.org/svn/trunk/%s
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: tournament
-rubygems_version: 1.3.6
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: Small library, command line program and Rails web GUI for managing a NCAA basketball tournament pool
-test_files: 
+summary: Small library, command line program and Rails web GUI for managing a NCAA
+  basketball tournament pool.
+test_files:
 - test/test_tournament.rb
 - test/test_webgui_installer.rb