Merge pull request #100 from ruby-nord/bug/join-battle

Bug/join battle

Author: r3trofitted

app/controllers/games_controller.rb

@@ -1,10 +1,8 @@
 class GamesController < ApplicationController
-  before_action :set_game,  only: [:show]
-  before_action :join_game, only: [:show], unless: :player_in_game?
+  before_action :set_game, only: [:show]
 
   def show
-    @opponent ||= @game.players.where.not(id: current_player&.id).first || NilPlayer.new
-    return render FinishedGame.template_path if @game.state == 'finished'
+    @game = GameExhibit.new(@game, current_player)
   end
 
   def create
@@ -14,30 +12,12 @@ def create
 
   private
 
-  def join_game
-    return if @game.state == 'finished'
-    enlist = Players::Enlist.new(game: @game, player: current_player)
-
-    if enlist.game_full?
-      return render FullGame.template_path
-    else # try to enter the game
-      payload = enlist.assign_game_to_player!
-      set_current_player(enlist.player)
-
-      ActionCable.server.broadcast "game_#{current_player.game_id}", payload
-    end
-  end
-
-  def player_in_game?
-    current_player && current_player.game == @game
+  def game_params
+    params.require(:game).permit(:name)
   end
 
   def set_game
     @game = Game.find_by(slug: params[:id].parameterize)
     redirect_to root_path unless @game
   end
-
-  def game_params
-    params.require(:game).permit(:name)
-  end
 end

app/controllers/opponent_controller.rb

@@ -0,0 +1,23 @@
+class OpponentController < ApplicationController
+  before_action :set_game,  only: [:create]
+
+  def create
+    @enlist = Players::Enlist.new(game: @game, player: current_player)
+    enlist_player if @enlist.available?
+
+    redirect_to game_path(@game)
+  end
+
+  private
+
+  def enlist_player
+    payload = @enlist.assign_game_to_player!
+    set_current_player(@enlist.player)
+    ActionCable.server.broadcast "game_#{current_player.game_id}", payload
+  end
+
+  def set_game
+    @game = Game.find_by(slug: params[:game_id].parameterize)
+    return redirect_to root_path unless @game
+  end
+end

app/dispatches/bombs/drop.rb

@@ -82,7 +82,7 @@ def successful_payloads
 
     def finish_game
       player.update(won: true)
-      game.update(state: 'finished')
+      game.finished!
     end
   end
 end

app/dispatches/players/enlist.rb

@@ -1,7 +1,5 @@
 module Players
   class Enlist
-    MAX_PLAYERS = 2
-
     private
     attr_reader :game
 
@@ -15,13 +13,13 @@ def initialize(game:, player:)
 
     def assign_game_to_player!
       @player = Player.create!(nickname: nickname, game: game, life: Player::LIFE)
-      @game.update(state: 'running')
+      game.running!
 
       return successful_payload
     end
 
-    def game_full?
-      game.players.count >= MAX_PLAYERS
+    def available?
+      game.state == 'awaiting_opponent' && !game.full?
     end
 
     private

app/exhibits/game_exhibit.rb

@@ -0,0 +1,48 @@
+class GameExhibit < SimpleDelegator
+  def initialize(game, current_player)
+    @current_player = current_player
+    super(game)
+  end
+  
+  def to_partial_path
+    case
+    when finished?
+      "games/finished_game"
+    when awaiting_opponent? && player_is_not_part_of_the_game?
+      "games/awaiting_opponent_game"
+    when running? && player_is_not_part_of_the_game?
+       "games/full_game"
+     else
+       super
+    end
+  end
+  
+  def current_player
+    @current_player
+  end
+  
+  def opponent
+    players.where.not(id: current_player&.id).first || NilPlayer.new
+  end
+  
+   # this method must **not** be delegated to the underlying model; otherwise,
+   # when the object is rendered by `ActionView::PartialRenderer` (eg. when calling `render` from a view), 
+   # `to_partial_path` will be sent to the actual model instead of the exhibit
+  def to_model
+    self
+  end
+
+  def class
+    __getobj__.class
+  end
+  
+  private
+  
+  def player_is_not_part_of_the_game?
+    ! player_is_part_of_the_game?
+  end
+  
+  def player_is_part_of_the_game?
+    @current_player&.plays_in?(__getobj__)
+  end
+end

app/models/awaiting_opponent_game.rb

@@ -0,0 +1,5 @@
+class AwaitingOpponentGame < Game
+  def self.template_path
+    "games/awaiting_opponent"
+  end
+end

app/models/game.rb

@@ -3,13 +3,29 @@
 # - running:  the game is started
 # - finished: game over. A player has destroyed his ennemy mothership
 class Game < ApplicationRecord
-  has_many :players, dependent: :destroy
-  has_many :ships,   through: :players
-  has_many :words,   dependent: :destroy
+  MAX_PLAYERS = 2
+  STATES = [
+    AWAITING_OPPONENT = "awaiting_opponent",
+    RUNNING = "running",
+    FINISHED = "finished"
+  ]
 
   has_one :loser,  -> { where(won: false ) }, class_name: 'Player'
   has_one :winner, -> { where(won: true ) },  class_name: 'Player'
 
+  has_many :players, dependent: :destroy
+  has_many :ships,   through: :players
+  has_many :words,   dependent: :destroy
+
+  STATES.each do |state|
+    define_method("#{state}?") { self.state == state }
+    define_method("#{state}!") { self.update state: state }
+  end
+  
+  def full?
+    players.count >= MAX_PLAYERS
+  end
+  
   def to_param
     slug
   end

app/models/player.rb

@@ -4,4 +4,8 @@ class Player < ApplicationRecord
   belongs_to :game
 
   has_many :ships, dependent: :destroy
+  
+  def plays_in?(game)
+    self.game == game
+  end
 end

app/views/games/_awaiting_opponent_game.html.erb

@@ -0,0 +1,20 @@
+<div class="row">
+  <%= render "games/stars" %>
+  <div class="wrapper">
+    <div class="join_us">
+      <div class="mothership">
+        <div class="ship">
+          <%= render "games/ships/svg/mothership" %>
+        </div>
+      </div>
+    </div>
+    <div class="too_late">
+      <h1>You've been challenged to a battle!</h1>
+      <p>Your opponent is waiting for you. Join the room <strong><%= awaiting_opponent_game.name %></strong> right now!</p>
+
+      <%= form_tag game_opponent_path(awaiting_opponent_game), method: :post do %>
+        <%= submit_tag "Join Game", class: "button green" %>
+      <% end %>
+    </div>
+  </div>
+</div>

app/views/games/_finished_game.html.erb

@@ -0,0 +1,39 @@
+<div class="row">
+  <%= render "games/stars" %>
+  <div class="wrapper">
+    <div class="join_us">
+      <div class="mothership">
+        <div class="ship">
+          <%= render "games/ships/svg/mothership" %>
+        </div>
+      </div>
+    </div>
+    <div class="too_late">
+      <% case finished_game.current_player
+         when finished_game.winner %>
+        <h1>Game Finished, Congratulations! You WON!</h1>
+        <p>
+          You're the master of the <strong><%= finished_game.name %></strong> room
+          where you defeated <strong><%= finished_game.opponent.nickname %></strong>.
+        </p>
+      <% when finished_game.loser %>
+        <h1>Game Finished, You LOSE!</h1>
+        <p>
+          Today wasn't a good day for you in the <strong><%= finished_game.name %></strong> room.
+          Looks like <strong><%= finished_game.opponent.nickname %></strong> ruled this finished_game.
+        </p>
+      <% else %>
+        <h1>Too late! This finished is already finished_game.</h1>
+        <p>
+          You're currently in the <strong><%= finished_game.name %></strong> room
+          where <strong><%= finished_game.players.first.nickname %></strong> and
+          <strong><%= finished_game.players.last.nickname %></strong> had an epic fight deep in the space.
+        </p>
+      <% end %>
+
+      <p>In total, the battle involved <strong><%= finished_game.ships.count %> ships</strong> and <strong><%= finished_game.ships.sum(:damage) %> damages</strong>.</p>
+
+      <%= render 'components/social_links' %>
+    </div>
+  </div>
+</div>