Extract generation code from TileMap

Author: mbuffa

lib/move_your_cedric/application.ex

@@ -15,7 +15,7 @@ defmodule MoveYourCedric.Application do
       {Phoenix.PubSub, name: MoveYourCedric.PubSub},
       # Start the Endpoint (http/https)
       MoveYourCedricWeb.Endpoint,
-      MoveYourCedric.Models.Pathfinder
+      MoveYourCedric.Workers.Pathfinder
     ]
 
     # See https://hexdocs.pm/elixir/Supervisor.html

lib/move_your_cedric/models/tile_map.ex

@@ -4,54 +4,4 @@ defmodule MoveYourCedric.Models.TileMap do
     tiles: [],
     entities: []
   ]
-
-  alias MoveYourCedric.Models.Tile
-  alias MoveYourCedric.Models.Entity
-
-  defmodule Randomizer do
-    defmodule Fake do
-      def tile_type_from_coords(x, y) do
-        if x == 4 and y != 3 and y != 4 do
-          :wall
-        else
-          :clear
-        end
-      end
-    end
-  end
-
-  def build(width \\ 8, height \\ 5) do
-    %__MODULE__{
-      size: [width, height],
-      tiles: build_tiles(width, height),
-      entities: build_entities(width, height)
-    }
-  end
-
-  defp build_tiles(width, height) do
-    Enum.map(1..height, fn y ->
-      Enum.map(1..width, fn x ->
-        %Tile{
-          position: [x - 1, y - 1],
-          type: Randomizer.Fake.tile_type_from_coords(x - 1, y - 1)
-        }
-      end)
-    end)
-  end
-
-  defp build_entities(_width, _height) do
-    [
-      scaffold_player()
-    ]
-  end
-
-  defp scaffold_player() do
-    %Entity{
-      type: "player",
-      name: "Cédric",
-      position: [1, 2],
-      status: MoveYourCedric.Models.Pathfinder.get_status(),
-      target: MoveYourCedric.Models.Pathfinder.get_target()
-    }
-  end
 end

lib/move_your_cedric/models/pathfinder.ex …b/move_your_cedric/workers/pathfinder.exlib/move_your_cedric/models/pathfinder.ex renamed to lib/move_your_cedric/workers/pathfinder.ex lib/move_your_cedric/models/pathfinder.ex renamed to lib/move_your_cedric/workers/pathfinder.ex

@@ -1,4 +1,4 @@
-defmodule MoveYourCedric.Models.Pathfinder do
+defmodule MoveYourCedric.Workers.Pathfinder do
   use GenServer
 
   require Logger

lib/move_your_cedric/workers/small_map_generator.ex

@@ -0,0 +1,52 @@
+defmodule MoveYourCedric.Workers.SmallMapGenerator do
+  alias MoveYourCedric.Models.Entity
+  alias MoveYourCedric.Models.Tile
+  alias MoveYourCedric.Models.TileMap
+
+  defmodule Randomizer do
+    defmodule Fake do
+      def tile_type_from_coords(x, y) do
+        if x == 4 and y != 3 and y != 4 do
+          :wall
+        else
+          :clear
+        end
+      end
+    end
+  end
+
+  def build(width \\ 8, height \\ 5) do
+    %TileMap{
+      size: [width, height],
+      tiles: build_tiles(width, height),
+      entities: build_entities(width, height)
+    }
+  end
+
+  defp build_tiles(width, height) do
+    Enum.map(1..height, fn y ->
+      Enum.map(1..width, fn x ->
+        %Tile{
+          position: [x - 1, y - 1],
+          type: Randomizer.Fake.tile_type_from_coords(x - 1, y - 1)
+        }
+      end)
+    end)
+  end
+
+  defp build_entities(_width, _height) do
+    [
+      scaffold_player()
+    ]
+  end
+
+  defp scaffold_player() do
+    %Entity{
+      type: "player",
+      name: "Cédric",
+      position: [1, 2],
+      status: MoveYourCedric.Workers.Pathfinder.get_status(),
+      target: MoveYourCedric.Workers.Pathfinder.get_target()
+    }
+  end
+end

lib/move_your_cedric_web/live/map_live.ex

@@ -3,11 +3,11 @@ defmodule MoveYourCedricWeb.MapLive do
 
   require Logger
 
-  alias MoveYourCedric.Models.TileMap
-  alias MoveYourCedric.Models.Pathfinder
+  alias MoveYourCedric.Workers.Pathfinder
+  alias MoveYourCedric.Workers.SmallMapGenerator
 
   def mount(_params, _session, socket) do
-    tile_map = TileMap.build()
+    tile_map = SmallMapGenerator.build()
 
     player = tile_map.entities |> Enum.find(fn entity -> entity.type == "player" end)
     Pathfinder.set_position(player.position)