clean up the controllers to fit the restful api better

Author: jacobsimeon

app/assets/javascripts/brakkit/brakkit-app.js

@@ -9,6 +9,10 @@ Brakkit.alerts = {
     });      
   }
 };
+Brakkit.startup = function(){
+  Brakkit.BracketsController.loadBrackets();  
+};
 $(function(){
   Brakkit.alerts.setHideTimeout();
+  Brakkit.startup();
 });

app/assets/javascripts/brakkit/controllers.js

@@ -5,7 +5,7 @@
 // Brackets
 Brakkit.BracketsController = SC.ArrayProxy.create({
   content : [],
-  selected : {},
+  selected : null,
   addBracket : function(_title){
     var self= this;
     var bracket = Brakkit.Bracket.create({
@@ -17,7 +17,7 @@ Brakkit.BracketsController = SC.ArrayProxy.create({
       self.selectBracket(bracket);
     });
   },
-  getBrackets : function(){
+  loadBrackets : function(){
     var self = this;
     $.getJSON('/brackets',function(data, status, xhr){
       data.forEach(function(value){
@@ -34,42 +34,32 @@ Brakkit.BracketsController = SC.ArrayProxy.create({
   selectBracket : function(bracket){
     //set the current bracket
     Brakkit.BracketsController.set('selected', bracket);
-    $.getJSON('/brackets/' + bracket.get('id'), function(data){
-      Brakkit.TeamsController.getTeams();
-    });
-  },
-  startup : function(){
-    Brakkit.BracketsController.getBrackets();
   }
 });
 Brakkit.BracketController = SC.Object.create({
-  contentBinding : "Brakkit.BracketsController.selected"
-});
-
-$(function(){
-  Brakkit.BracketsController.startup();
+  contentBinding : "Brakkit.BracketsController.selected",
+  calculate : function(){
+    console.log('calculate the bracket');
+  }
 });
 
 //Teams
 Brakkit.TeamsController = SC.ArrayProxy.create({
   content: [],
-  getTeams : function(){
+  loadTeams : function(){
     var self = this;
-    console.log('getting teams');
     var c = [];
-    $.getJSON('/teams', function(data){
-      console.log(data);
-      for(var i=0; i<data.length; i++){
-        c.pushObject(Brakkit.Team.create(data[i]));
-      }
-      
-      // data.forEach(function(value){
-      //   console.log(value);
-      //   c.push(Brakkit.Team.create(value));
-      // });
-    });
+    var bracket = Brakkit.BracketController.get('content');
+    console.log(bracket);
+    if(bracket){
+      bracket.get('teams').forEach(function(value){
+        $.getJSON('/teams/'+value, function(data){
+          c.pushObject(Brakkit.Team.create(data));
+        });
+      });
+    }
     self.set('content', c);
-  }.observes(),
+  }.observes("Brakkit.BracketController.content"),
   addTeam: function(_name, _seed){
     var team = Brakkit.Team.create({
       name : _name,
@@ -98,70 +88,20 @@ Brakkit.TeamsController = SC.ArrayProxy.create({
   }
 });
 
-
-Brakkit.Eliminator = {
-  eliminate : function(from){
-    var divisor = from < 4 ? 2 : 4;
-    if(from % divisor === 0){
-      return 0;
-    }
-    var matches = [];
-    for(var i=0; i <= from/2; i++){
-      if((from - i) % divisor === 0){
-        matches.push(i);
-      }
-    }
-    return matches[matches.length-1];    
-  }
-};
-
 //Rounds
 Brakkit.RoundsController = SC.ArrayProxy.create({
-  setRounds : function(){
-    // var bracket = Brakkit.BracketController.get('content');
-    // var teams = Brakkit.TeamsController.get('content');
-    // var teamsAllocated = 0;
-    // if(bracket && teams){
-    //   var rounds = [];
-    //   var numberOfTeams = teams.get('length');
-    //   //the first round of the tournament has to even out the number of remaining teams
-    //   //make sure we're playing the exact number of teams that, after elimination, will yeild a multiple of 4
-    //   //ex: if there are 17 team, eliminate 5 teams in the first round to yeild 12 remaining teams in the second
-    //   var teamsToEliminate = Brakkit.Eliminator.eliminate(numberOfTeams);
-    //   //Make the teams with the highest seed compete in the first round of elimination
-    //   //teams with higher seeds will automatically advance to the next round
-    //   var seedThreshold = numberOfTeams - teamsToEliminate;
-    //   var teamsInFirstRound = teams.filter(function(item){
-    //     return item.get('seed') > seedThreshold;
-    //   });
-    //   //if we already have a nice number of teams
-    //   if(teamsInFirstRound.length == 0){
-    //     //Add all the teams!
-    //     teamsInFirstRound = teams;
-    //   }
-    //   //create the first round
-    //   rounds.push(
-    //     Brakkit.Round.create({
-    //       teams : teamsInFirstRound
-    //     })
-    //   );
-    //   //create the second round
-    //   if(teamsInFirstRound.length < numberOfTeams){
-    //     var teamsInSecondRound = teams.filter(function(item){
-    //       return item.get('seed') <= seedThreshold;
-    //     })
-    //     rounds.push(
-    //       Brakkit.Round.create({
-    //         teams : teamsInSecondRound
-    //       })
-    //     )
-    //   }
-    //   if(rounds[0].get('teams').length + rounds[1].get('teams').length != numberOfTeams){
-    //     alert("Unable to allocate all teams");
-    //   }
-    //   Brakkit.RoundsController.set('content', rounds);
-  //  }
+  loadRounds : function(){
+    var self = this;
+    var c = [];
+    var bracket = Brakkit.BracketController.get('content');
+    if(bracket){
+      bracket.get('rounds').forEach(function(value){
+        $.getJSON('/rounds/'+value, function(data){
+          c.pushObject(Brakkit.Round.create(data));
+        });
+      });
+    }
+    self.set('content', c);
   }.observes("Brakkit.BracketController.content"),
   content : []
 });
-

app/assets/javascripts/brakkit/models.js

@@ -57,6 +57,7 @@ Brakkit.Record = SC.Object.extend({
 Brakkit.Bracket = Brakkit.Record.extend({
   title : "",
   teams : [],
+  rounds : [],
   committed : false,
   urlRoot : '/brackets',
   attributes : function(){
@@ -88,14 +89,18 @@ Brakkit.Team = Brakkit.Record.extend({
 });
 
 Brakkit.Round = SC.Object.extend({
+  rank: 0,
   matches : []
 });
-Brakkit.Match = SC.Object.extend({
-  first_team : null,
-  second_team : null
+
+Brakkit.Match = Brakkit.Record.extend({
+  teams : [],
+  winner : null,
+  urlRoot : '/matches',
+  attributes : function(){
+    var self = this;
+    return {
+      match : { winner_id : self.winner }
+    };
+  }.property('winner')
 });
-Brakkit.Seed = {
-  next : function(){
-    return Brakkit.TeamsController.get('length') + 1;
-  }
-};

app/assets/javascripts/brakkit/views.js

@@ -38,8 +38,10 @@ Brakkit.NewBracketTitleView = SC.TextField.extend({
     }
   }  
 });
-
-
+Brakkit.GoButtonView = SC.Button.extend({
+  target : "Brakkit.BracketController",
+  action : "calculate"
+})
 //Teams
 Brakkit.AddTeamView = SC.TextField.extend({
   insertNewline: function(){

app/views/home/brackets.html.erb

@@ -14,7 +14,7 @@
       {{#view Brakkit.DeleteSelectedTeamsButtonView id="delete-selected-teams" }}
         Remove Selected
       {{/view}}
-      {{#view SC.Button id="create-bracket-button"}}
+      {{#view Brakkit.GoButtonView id="create-bracket-button"}}
         Go
       {{/view}}
     </script>

db/migrate/20110926034109_add_bracket_id_to_rounds.rb

@@ -0,0 +1,5 @@
+class AddBracketIdToRounds < ActiveRecord::Migration
+  def change
+    add_column :rounds, :bracket_id, :int
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110926031524) do
+ActiveRecord::Schema.define(:version => 20110926034109) do
 
   create_table "brackets", :force => true do |t|
     t.integer  "user_id"
@@ -36,6 +36,7 @@
     t.integer  "rank"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "bracket_id"
   end
 
   create_table "teams", :force => true do |t|