battle_boats 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 765cef2a3566e7f824cd2319ec960c90f0d26622
-  data.tar.gz: 1de5b33a33bce1bac1162ad670ca0af38499d277
+  metadata.gz: 92ec7ba406b6f4c837600bb9bf2affc4c0cb7659
+  data.tar.gz: ffaf1cdf4bf9fb2118da2594280443cb2af246fc
 SHA512:
-  metadata.gz: 8a5e7d65fc210a47de5df56a539fa4d53f0fed11d3f7f67b2aa0f2fca733e7b0f061166dbe1f7e42b002529e8f10ddcb1ccdcb075ac4f17ba1aa1d40593a6ca7
-  data.tar.gz: 68ebe43ee2985c47cd9275d71e138ebc085b7074ca76e43bf62edaa4cf8ee96e9885d3e53b14c90b06241abc075bc5f3f9630b732fa8e5b711b655355d7ffe19
+  metadata.gz: 1793feae5f52bbdfe66362f8e13345c06d8a841c2325e81b8c46926e048aa017a4d3823ff5f036775bd2d3291a4adc9a63e6be89043c05974f675ed442dc7cb2
+  data.tar.gz: 64b661bad1fa0e76619afdf586627a2d74190819e3f8390ad3d5e0bb567628053527f0985263ef284279315a7a7845cdc8408970e94e83f906f345db538d3cbf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.7
+### New Features
+- Corrdinate input format is now `<<letter>><<number>>`, eg. `G3`
+- Coordinate input is case insensitive
+
 # 0.0.6
 ### New Features
 - The game is now in color!

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    battle_boats (0.0.6)
+    battle_boats (0.0.7)
 
 GEM
   remote: https://rubygems.org/

data/lib/battle_boats/board.rb

@@ -34,7 +34,7 @@ module BattleBoats
     end
 
     def cell_at(coordinate:)
-      if within_range?(coordinate.row) && within_range?(coordinate.column)
+      if within_range?(coordinate)
         @play_area[coordinate.row.to_i][coordinate.column.to_i]
       end
     end
@@ -59,21 +59,13 @@ module BattleBoats
 
     def validate_position(coordinate:)
       @error_messages.clear
-      if !within_range?(coordinate.row)
-        @error_messages << "The selected row is invalid"
-      end
-      if !within_range?(coordinate.column)
-        @error_messages << "The selected column is invalid"
-      end
-      if @error_messages.empty?
-        if !position_available?(coordinate: coordinate)
-          @error_messages << "That position has already been hit"
-        end
+      if !position_available?(coordinate: coordinate)
+        @error_messages << "That position has already been hit"
       end
     end
 
-    def within_range?(input)
-      if input.to_s =~ /^[0-9]$/
+    def within_range?(coordinate)
+      if coordinate.row.to_s =~ /^[0-9]$/ && coordinate.column.to_s =~ /^[0-9]$/
         true
       else
         false

data/lib/battle_boats/console_ui.rb

@@ -16,9 +16,13 @@ module BattleBoats
     end
 
     def get_coordinate
-      row = get_row
-      column = get_column
-      BattleBoats::Coordinate.new(row: row, column: column)
+      output.puts "Target coordinate: "
+      user_input = input.gets.chomp
+      until valid_input?(user_input)
+        output.puts "Coordinate invalid."
+        user_input = input.gets.chomp
+      end
+      input_to_coordinate(user_input)
     end
 
     def display_status_report(status_report)
@@ -33,15 +37,27 @@ module BattleBoats
 
     attr_reader :output, :input
 
+    def valid_input?(coordinate)
+      coordinate =~ /^[A-J][0-9]$/i
+    end
+
+    def input_to_coordinate(input)
+      input_row = input[0]
+      input_column = input[1]
+      row = row_labels.index(input_row.upcase)
+      column = input_column.to_i
+      BattleBoats::Coordinate.new(row: row, column: column)
+    end
+
     def format_board(board)
       board_string = horizontal_line
       board_string << newline
-      board_string << top_row
+      board_string << column_label
       board_string << horizontal_line
       board_string << newline
       board.play_area.each_with_index do |row, row_number|
         board_string << pipe
-        board_string << "  #{row_number}  "
+        board_string << "  #{row_labels[row_number]}  "
         board_string << pipe
         row.each do |cell|
           board_string << "  #{cell}  "
@@ -54,10 +70,14 @@ module BattleBoats
       board_string
     end
 
-    def top_row
+    def column_label
       "|     |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |\n"
     end
 
+    def row_labels
+      ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"]
+    end
+
     def newline
       "\n"
     end
@@ -69,15 +89,5 @@ module BattleBoats
     def pipe
       "|"
     end
-
-    def get_row
-      output.puts "Target row:"
-      input.gets.chomp
-    end
-
-    def get_column
-      output.puts "Target column:"
-      input.gets.chomp
-    end
   end
 end

data/lib/battle_boats/version.rb

@@ -1,3 +1,3 @@
 module BattleBoats
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battle_boats
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Thomas Countz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler