battleships 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d52439b82c6283a6c19fb6e5840d113a973a87a
-  data.tar.gz: eb5b4b0fc4387d8761fac470f91b2b26698556db
+  metadata.gz: e54bb56b0b005da4197bc3f710a557028f4c0ed1
+  data.tar.gz: 79c465f53c4dfa22f7015d039a634eb5b6de5c48
 SHA512:
-  metadata.gz: 2aab4da6a19a37045c7f8e66d5790ebdfe738574e0c1f38b68a104abbd9985b0746e4988553f088eba2e53cbd76e520c637fd86878f9214c17734999a3ee72a5
-  data.tar.gz: 354fc770a7337e188fdc92195b4462f8dadfc6a2dceddda2b59d803ebeea37749e1fb3ef4e5a6edc18a83bce4489b0b1c3849af1da8161c4196370e5e4123c70
+  metadata.gz: 2ca989c2bfb96e8ce5606ebae42720acd7b440d00c6fff47014d20e50780ec68a6f138a551d55f901b4fe5a4638b7bc0e95fbf4a6e2c0b93e43fa9d394ca3fae
+  data.tar.gz: 424686bdfc49d3819ad15023b6396cd132c14cf3cd3a635aa4c06f30c75704f213aff74275b75157eab568bb9f80dc6613b4dd2766acc9ec598254ea9d5914d5

data/lib/battleships.rb

@@ -1,5 +1,3 @@
-module Battleships; end
-
 require_relative './battleships/board'
 require_relative './battleships/ship'
 require_relative './battleships/player'

data/lib/battleships/board.rb

@@ -1,101 +1,103 @@
 require_relative 'cell'
 require_relative 'coordinate_handler'
 
-class Battleships::Board
-  SIZE = 10
+module Battleships
+  class Board
+    SIZE = 10
 
-  attr_accessor :width
+    attr_accessor :width
 
-  def initialize
-    @grid = {}
-    @coord_handler = CoordinateHandler.new
-    @ships = []
-    initialize_grid
-  end
+    def initialize
+      @grid = {}
+      @coord_handler = CoordinateHandler.new
+      @ships = []
+      initialize_grid
+    end
 
-  def place_ship ship, coordinate, orientation = :horizontally
-    coords = all_ship_coords ship, coordinate, orientation
+    def place_ship ship, coordinate, orientation = :horizontally
+      coords = all_ship_coords ship, coordinate, orientation
 
-    coords.each { |coord| grid[coord].content = ship }
-    @ships << ship
-  end
+      coords.each { |coord| grid[coord].content = ship }
+      @ships << ship
+    end
 
-  def width
-    SIZE
-  end
+    def width
+      SIZE
+    end
 
-  def height
-    SIZE
-  end
+    def height
+      SIZE
+    end
 
-  def ships
-    # note we do not pass the source array here as it would enable
-    # callers to modify the board's ships, which would break encapsulation.
-    # Instead we return a duplicate.
-    @ships.dup
-  end
+    def ships
+      # note we do not pass the source array here as it would enable
+      # callers to modify the board's ships, which would break encapsulation.
+      # Instead we return a duplicate.
+      @ships.dup
+    end
 
-  def receive_shot coordinate
-    coord_handler.validate coordinate
+    def receive_shot coordinate
+      coord_handler.validate coordinate
 
-    validate_coord_not_shot coordinate
+      validate_coord_not_shot coordinate
 
-    cell = grid[coordinate]
-    cell.receive_shot
+      cell = grid[coordinate]
+      cell.receive_shot
 
-    if cell.content
-      cell.content.sunk? ? :sunk : :hit
-    else
-      :miss
+      if cell.content
+        cell.content.sunk? ? :sunk : :hit
+      else
+        :miss
+      end
     end
-  end
 
-  def [] coordinate
-    coord_handler.validate coordinate
-    grid[coordinate]
-  end
+    def [] coordinate
+      coord_handler.validate coordinate
+      grid[coordinate]
+    end
 
-  def all_ships_sunk?
-    return false if ships.empty?
-    ships.all?(&:sunk?)
-  end
+    def all_ships_sunk?
+      return false if ships.empty?
+      ships.all?(&:sunk?)
+    end
 
-  def inspect
-    to_s
-  end
+    def inspect
+      to_s
+    end
 
-  private
+    private
 
-  attr_reader :grid, :coord_handler
+    attr_reader :grid, :coord_handler
 
-  def initialize_grid
-    coord_handler.each do |coord|
-      grid[coord] = Cell.new
+    def initialize_grid
+      coord_handler.each do |coord|
+        grid[coord] = Cell.new
+      end
     end
-  end
 
-  def all_ship_coords ship, coord, orientation
-    coord_handler.validate coord
+    def all_ship_coords ship, coord, orientation
+      coord_handler.validate coord
 
-    all_coords = coord_handler.from coord, ship.size, orientation
+      all_coords = coord_handler.from coord, ship.size, orientation
 
-    validate_all_ship_coords all_coords, ship.size
-  end
+      validate_all_ship_coords all_coords, ship.size
+    end
 
-  def validate_all_ship_coords coords, size
-    #ship is out of bounds if the ship is larger than the available coords
-    fail 'Out of bounds' if size > coords.length
+    def validate_all_ship_coords coords, size
+      #ship is out of bounds if the ship is larger than the available coords
+      fail 'Out of bounds' if size > coords.length
 
-    validate_all_coords_available coords
-  end
+      validate_all_coords_available coords
+    end
 
-  def validate_all_coords_available coords
-    coords.each do |coord|
-      fail 'Coordinate already occupied' unless grid[coord].empty?
+    def validate_all_coords_available coords
+      coords.each do |coord|
+        fail 'Coordinate already occupied' unless grid[coord].empty?
+      end
     end
-  end
 
-  def validate_coord_not_shot coord
-    fail 'Coordinate has been shot already' if grid[coord].shot?
+    def validate_coord_not_shot coord
+      fail 'Coordinate has been shot already' if grid[coord].shot?
+    end
   end
-end
+end

data/lib/battleships/cell.rb

@@ -1,23 +1,25 @@
-class Battleships::Cell
-  attr_accessor :content
+module Battleships
+  class Cell
+    attr_accessor :content
 
-  def receive_shot
-    @shot = true
-    content.hit unless empty?
-  end
+    def receive_shot
+      @shot = true
+      content.hit unless empty?
+    end
 
-  def shot?
-    @shot
-  end
+    def shot?
+      @shot
+    end
 
-  def empty?
-    !content
-  end
+    def empty?
+      !content
+    end
 
-  def status
-    if shot?
-      return empty? ? :miss : :hit
+    def status
+      if shot?
+        return empty? ? :miss : :hit
+      end
+      :none
     end
-    :none
   end
-end
+end

data/lib/battleships/coordinate_handler.rb

@@ -1,69 +1,71 @@
-class Battleships::CoordinateHandler
-  include Enumerable
+module Battleships
+  class CoordinateHandler
+    include Enumerable
 
-  HORIZONTAL_COORDS = ('A'..'J').to_a
-  VERTICAL_COORDS = (1..10).to_a
-  COORD_REGEX = /^([A-J])([1-9]|10)$/
+    HORIZONTAL_COORDS = ('A'..'J').to_a
+    VERTICAL_COORDS = (1..10).to_a
+    COORD_REGEX = /^([A-J])([1-9]|10)$/
 
-  def each
-    VERTICAL_COORDS.each do |y|
-      HORIZONTAL_COORDS.each do |x|
-        yield coordinate x, y
+    def each
+      VERTICAL_COORDS.each do |y|
+        HORIZONTAL_COORDS.each do |x|
+          yield coordinate x, y
+        end
       end
     end
-  end
 
-  def each_row
-    VERTICAL_COORDS.each do |y|
-      row = HORIZONTAL_COORDS.map do |x|
-        coordinate x, y
+    def each_row
+      VERTICAL_COORDS.each do |y|
+        row = HORIZONTAL_COORDS.map do |x|
+          coordinate x, y
+        end
+        yield row, y
       end
-      yield row, y
     end
-  end
 
-  def validate coord
-    fail 'Invalid coordinate' unless valid? coord
-  end
+    def validate coord
+      fail 'Invalid coordinate' unless valid? coord
+    end
 
-  def valid? coord
-    COORD_REGEX.match coord.to_s
-  end
+    def valid? coord
+      COORD_REGEX.match coord.to_s
+    end
 
-  def from start, size, orientation = :horizontally
-    match = COORD_REGEX.match start
+    def from start, size, orientation = :horizontally
+      match = COORD_REGEX.match start
 
-    x = match.captures.first
-    y = match.captures.last
+      x = match.captures.first
+      y = match.captures.last
 
-    if orientation == :horizontally
-      horizontal_coords_for x, y, size
-    else
-      vertical_coords_for x, y, size
+      if orientation.to_sym == :horizontally
+        horizontal_coords_for x, y, size
+      else
+        vertical_coords_for x, y, size
+      end
     end
-  end
 
-  private
+    private
 
-  def horizontal_coords_for x, y, size
-    x_coords(x, size).map { |x| coordinate x, y }
-  end
+    def horizontal_coords_for x, y, size
+      x_coords(x, size).map { |x| coordinate x, y }
+    end
 
-  def x_coords x, size
-    start = HORIZONTAL_COORDS.index x
-    HORIZONTAL_COORDS.slice start, size
-  end
+    def x_coords x, size
+      start = HORIZONTAL_COORDS.index x
+      HORIZONTAL_COORDS.slice start, size
+    end
 
-  def vertical_coords_for x, y, size
-    y_coords(y, size).map { |y| coordinate x, y }
-  end
+    def vertical_coords_for x, y, size
+      y_coords(y, size).map { |y| coordinate x, y }
+    end
 
-  def y_coords y, size
-    start = VERTICAL_COORDS.index Integer(y)
-    VERTICAL_COORDS.slice start, size
-  end
+    def y_coords y, size
+      start = VERTICAL_COORDS.index Integer(y)
+      VERTICAL_COORDS.slice start, size
+    end
 
-  def coordinate x, y
-    "#{x}#{y}".to_sym
+    def coordinate x, y
+      "#{x}#{y}".to_sym
+    end
   end
-end
+end

data/lib/battleships/game.rb

@@ -1,11 +1,12 @@
-class Battleships::Game
-  BOARD_MARKERS = {
-    miss: '-',
-    hit: '*',
-    none: ' '
-  }.freeze
-
-  BOARD_TEMPLATE = <<TEMPLATE
+module Battleships
+  class Game
+    BOARD_MARKERS = {
+      miss: '-',
+      hit: '*',
+      none: ' '
+    }.freeze
+
+    BOARD_TEMPLATE = <<TEMPLATE
    ABCDEFGHIJ
   ------------
  1|<1>|1
@@ -21,69 +22,70 @@ class Battleships::Game
   ------------
    ABCDEFGHIJ
 TEMPLATE
-  
-  BOARD_TEMPLATE.freeze
+    
+    BOARD_TEMPLATE.freeze
 
-  attr_reader :player_1, :player_2
+    attr_reader :player_1, :player_2
 
-  def initialize(playerClass, boardClass)
-    @player_1 = initialize_player playerClass, boardClass
-    @player_2 = initialize_player playerClass, boardClass
+    def initialize(playerClass, boardClass)
+      @player_1 = initialize_player playerClass, boardClass
+      @player_2 = initialize_player playerClass, boardClass
 
 
-    player_1.opponent = player_2
-    player_2.opponent = player_1
-  end
+      player_1.opponent = player_2
+      player_2.opponent = player_1
+    end
 
-  def initialize_player(playerClass, boardClass)
-    player = playerClass.new
-    player.board = boardClass.new
-    player
-  end
+    def initialize_player(playerClass, boardClass)
+      player = playerClass.new
+      player.board = boardClass.new
+      player
+    end
 
-  def has_winner?
-    players.any?(&:winner?)
-  end
+    def has_winner?
+      players.any?(&:winner?)
+    end
 
-  def winner
-    players.find(&:winner?)
-  end
+    def winner
+      players.find(&:winner?)
+    end
 
-  def own_board_view player
-    create_print player.board do |cell|
-      if cell.empty?
-        BOARD_MARKERS[cell.status]
-      else
-        cell.shot? ? BOARD_MARKERS[:hit] : cell.content.type.to_s.upcase[0]
+    def own_board_view player
+      create_print player.board do |cell|
+        if cell.empty?
+          BOARD_MARKERS[cell.status]
+        else
+          cell.shot? ? BOARD_MARKERS[:hit] : cell.content.type.to_s.upcase[0]
+        end
       end
     end
-  end
 
-  def opponent_board_view player
-    create_print player.opponent.board do |cell|
-      BOARD_MARKERS[cell.status]
+    def opponent_board_view player
+      create_print player.opponent.board do |cell|
+        BOARD_MARKERS[cell.status]
+      end
     end
-  end
 
-  private
+    private
 
-  def players
-    [player_1, player_2]
-  end
+    def players
+      [player_1, player_2]
+    end
 
 
-  def create_print board
-    coord_handler = CoordinateHandler.new
+    def create_print board
+      coord_handler = CoordinateHandler.new
 
-    output = BOARD_TEMPLATE
+      output = BOARD_TEMPLATE
 
-    coord_handler.each_row do |row, number|
-      print_row = row.map do |coord|
-        yield board[coord]
-      end.join('')
-      
-      output = output.sub("<#{number}>", print_row)
+      coord_handler.each_row do |row, number|
+        print_row = row.map do |coord|
+          yield board[coord]
+        end.join('')
+        
+        output = output.sub("<#{number}>", print_row)
+      end
+      output
     end
-    output
   end
-end
+end

data/lib/battleships/player.rb

@@ -1,27 +1,29 @@
-class Battleships::Player
-  attr_accessor :board, :opponent, :name
+module Battleships
+  class Player
+    attr_accessor :board, :opponent, :name
 
-  def place_ship ship, coordinates, orientation = :horizontally
-    board.place_ship ship, coordinates, orientation
-  end
+    def place_ship ship, coordinates, orientation = :horizontally
+      board.place_ship ship, coordinates, orientation
+    end
 
-  def receive_shot coordinates
-    fail 'Player has no board' unless board
-    board.receive_shot coordinates
-  end
+    def receive_shot coordinates
+      fail 'Player has no board' unless board
+      board.receive_shot coordinates
+    end
 
-  def shoot coordinates
-    fail 'Player has no opponent' unless opponent
-    opponent.receive_shot coordinates
-  end
+    def shoot coordinates
+      fail 'Player has no opponent' unless opponent
+      opponent.receive_shot coordinates
+    end
 
-  def winner?
-    fail 'Player has no opponent' unless opponent
-    opponent.all_ships_sunk?
-  end
+    def winner?
+      fail 'Player has no opponent' unless opponent
+      opponent.all_ships_sunk?
+    end
 
-  def all_ships_sunk?
-    fail 'Player has no board' unless board
-    board.all_ships_sunk?
+    def all_ships_sunk?
+      fail 'Player has no board' unless board
+      board.all_ships_sunk?
+    end
   end
-end
+end

data/lib/battleships/ship.rb

@@ -1,45 +1,47 @@
-class Battleships::Ship
-  SIZES = {
-    submarine: 1,
-    destroyer: 2,
-    cruiser: 3,
-    battleship: 4,
-    aircraft_carrier: 5
-  }
-
-  attr_reader :type, :size
-
-  def initialize type
-    @type = type
-    @size = SIZES[type]
-    @hits = 0
-  end
-
-  def hit
-    @hits += 1
-  end
-
-  def sunk?
-    @hits >= size
-  end
-
-  def self.submarine
-    Ship.new(:submarine)
-  end
-
-  def self.destroyer
-    Ship.new(:destroyer)
-  end
-
-  def self.cruiser
-    Ship.new(:cruiser)
-  end
-
-  def self.battleship
-    Ship.new(:battleship)
-  end
-
-  def self.aircraft_carrier
-    Ship.new(:aircraft_carrier)
-  end
-end
+module Battleships
+  class Ship
+    SIZES = {
+      submarine: 1,
+      destroyer: 2,
+      cruiser: 3,
+      battleship: 4,
+      aircraft_carrier: 5
+    }
+
+    attr_reader :type, :size
+
+    def initialize type
+      @type = type.to_sym
+      @size = SIZES[@type]
+      @hits = 0
+    end
+
+    def hit
+      @hits += 1
+    end
+
+    def sunk?
+      @hits >= size
+    end
+
+    def self.submarine
+      Ship.new(:submarine)
+    end
+
+    def self.destroyer
+      Ship.new(:destroyer)
+    end
+
+    def self.cruiser
+      Ship.new(:cruiser)
+    end
+
+    def self.battleship
+      Ship.new(:battleship)
+    end
+
+    def self.aircraft_carrier
+      Ship.new(:aircraft_carrier)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: battleships
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben Forrest