Updated gitignore, added player count check and controller existence check for teams

Author: jonmarkgo

.gitignore

@@ -2,3 +2,4 @@
 db/*.sqlite3
 log/*.log
 tmp/
+Gemfile.lock

Gemfile

@@ -4,7 +4,7 @@ gem 'rails', '3.0.7'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
-
+gem 'heroku'
 gem 'sqlite3'
 gem 'rake', '0.8.7'
 # Use unicorn as the web server

Gemfile.lock

@@ -30,9 +30,17 @@ GEM
     activesupport (3.0.7)
     arel (2.0.10)
     builder (2.1.2)
+    configuration (1.2.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    heroku (2.1.4)
+      launchy (>= 0.3.2)
+      rest-client (~> 1.6.1)
+      term-ansicolor (~> 1.0.5)
     i18n (0.5.0)
+    launchy (0.4.0)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -59,7 +67,10 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
     sqlite3 (1.3.3)
+    term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -69,6 +80,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  heroku
   rails (= 3.0.7)
   rake (= 0.8.7)
   sqlite3

app/controllers/players_controller.rb

@@ -79,11 +79,7 @@ def update
   def join_team
     @player = Player.find(params[:id])
 
-    @team = Team.find(params[:team_id])
-
-    if @team.valid?
-      @player.team_id = @team.id
-    end
+    @player.team_id = params[:team_id]
 
     respond_to do |format|
       if @player.save

app/models/team.rb

@@ -1,7 +1,21 @@
 class Team < ActiveRecord::Base
 	belongs_to :game
 	has_one :controller, :class_name => "Player"
+	has_many :players
 
 	validates_associated :controller
 	validates_presence_of :name
+
+    validate :ensure_controller_exists
+    validate :ensure_team_limit
+
+    #Teams must have at least 1 player and no more than 4
+    #We check for >= 2 and <= 5 because the controller counts as a player, and we don't want to include them
+    def ensure_team_limit
+    	errors.add(self, 'cannot have more than 4 or less than 1 player') unless self.players.count >= 2 and self.players.count <= 5
+    end
+
+	def ensure_controller_exists
+    	errors.add(:controller,'must exist') unless self.controller
+  	end
 end