app/views/turns/_form.html.erb app/views/turns/edit.html.erb @@ -2,7 +2,7 @@ class GamesController < ApplicationController before_filter :login_required def index - @games = Game.find(:all, :order => "created_at DESC", :include => [:user, :players, :turns]) + @games = Game.find(:all, :order => "created_at DESC") end def show @@ -11,7 +11,7 @@ class GamesController < ApplicationController :all, :conditions => "player_id in (#{@game.player_ids.join(",")})", :order => "position desc", - :include => {:player => :user}, + :include => {:player => [:user, {:game => :players}]}, :limit => params[:all] ? 1000 : (@game.players.size * 4) + @game.turns_in_current_round + 1) end app/controllers/games_controller.rb @@ -11,7 +11,23 @@ class TurnsController < ApplicationController if @turn.save flash[:notice] = 'Turn was successfully created.' - redirect_to(turn.player.game) + redirect_to(@turn.player.game) + else + render :action => "new" + end + end + + def edit + @turn = Turn.find(params[:id]) + @game = @turn.player.game + end + + def update + @turn = Turn.new(params[:turn]) + + if @turn.save + flash[:notice] = 'Turn was successfully created.' + redirect_to(@turn.player.game) else render :action => "new" end app/controllers/turns_controller.rb @@ -32,4 +32,4 @@ class Game < ActiveRecord::Base def turns_in_current_round @turns_in_current_round ||= turns.reverse.select{|t| t.round(self) == current_round }.size end -end +end \ No newline at end of file app/models/game.rb @@ -3,6 +3,16 @@ class Turn < ActiveRecord::Base has_attached_file :game_file validates_attachment_presence :game_file + validate :proper_file_name + def proper_file_name + this_player = player.game.next_player + last_year = player.turns.size == 0 ? 4001 : player.turns.last.year + player_alias = player.turns.size == 0 ? player.user.name : player.game.turns.last.to_player + if game_file_file_name.include?(player_alias) || (ce == "BC" ? year > last_year : last_year > year) + errors.add_to_base("You've uploaded the wrong file, dingbat!") + end + end + before_save :set_position def set_position self.position = player.game.turns.count @@ -24,6 +34,10 @@ class Turn < ActiveRecord::Base TurnNotification.deliver_turn_notification(player.game.next_player, game_file) end + def to_player + game_file_file_name.split(".").first.split("_").last + end + def full_year "#{year} #{ce}" rescue "?" end @@ -37,7 +51,7 @@ class Turn < ActiveRecord::Base end def year - game_file_file_name.split("-")[year_index+1].split("_").first.to_i rescue 0 + game_file_file_name.split("-")[year_index+1].split("_").first.to_i rescue 4000 end def ce #Calendar Era app/models/turn.rb @@ -1,20 +1,6 @@ -<h1>New Turn</h1> - <% form_for(@turn, :html => {:multipart => true}) do |f| %> <%= f.error_messages %> - <%= f.hidden_field :player_id %> - <p> - <b>Game</b><br /> - <%= @turn.game.name %> - </p> - - <p> - <%= f.label :game_file %><br /> - <%= f.file_field :game_file %> - </p> - <p> - <%= f.submit 'Upload' %> - </p> + <%= render :partial => "form", :locals => {:f => f}%> <% end %> -<%= link_to 'Back', current_game %> \ No newline at end of file +<%= link_to 'Back', @game %> \ No newline at end of file app/views/turns/new.html.erb @@ -13,5 +13,7 @@ config.action_controller.consider_all_requests_local = true config.action_view.debug_rjs = true config.action_controller.perform_caching = false +config.action_mailer.delivery_method = :test + # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false \ No newline at end of file config/environments/development.rb 212835b662456d8dafaf513c91a99f2ba0f93d17 Erik Peterson erik@subwindow.com http://github.com/subwindow/Civ4-Game-Repo/commit/13a5b70d90b5bfb88c3278e5ee11b081784a81e0 13a5b70d90b5bfb88c3278e5ee11b081784a81e0 2009-05-20T16:38:37-07:00 2009-05-20T16:38:37-07:00 Various improvements d2f46100f5aa2e7ebe07b09dacd42adb6154f9cd Erik Peterson erik@subwindow.com