erics_tic_tac_toe 0.5.2 → 1.0.0

data/lib/tic_tac_toe.rb

@@ -18,5 +18,3 @@ end
 require 'tic_tac_toe/board'
 require 'tic_tac_toe/game'
 require 'tic_tac_toe/player'
-require 'tic_tac_toe/presenters/game_presenter'
-require 'tic_tac_toe/presenters/player_presenter'

data/lib/tic_tac_toe/game.rb

@@ -41,6 +41,14 @@ module TicTacToe
       @board.grid
     end
 
+    def decorated_grid
+      grid.each_with_index.map do |row, i|
+        row.each_with_index.map do |cell, j|
+          cell || ((i*3)+(j+1)).to_s
+        end
+      end
+    end
+
     def solved?
       @board.solved?
     end

data/lib/tic_tac_toe/player.rb

@@ -9,5 +9,11 @@ module TicTacToe
       Player::Computer.new(params)
     end
 
+    module MoveJson
+      require 'json'
+      def move_json(move=nil)
+        {:letter => letter, :type => type, :move => move}.to_json
+      end
+    end
   end
 end

data/lib/tic_tac_toe/players/computer_player.rb

@@ -1,8 +1,10 @@
-module TicTacToe
+require 'tic_tac_toe/player'
 
+module TicTacToe
   module Player
-
     class Computer
+      include MoveJson
+
       attr_reader :letter
 
       def initialize(params, solver=Strategy::MinimaxStrategy)
@@ -23,8 +25,5 @@ module TicTacToe
       end
 
     end
-
   end
-
-
 end

data/lib/tic_tac_toe/players/human_player.rb

@@ -1,7 +1,10 @@
-module TicTacToe
+require 'tic_tac_toe/player'
 
+module TicTacToe
   module Player
     class Human
+      include Player::MoveJson
+
       attr_reader :letter
       attr_writer :move
 

data/lib/tic_tac_toe/version.rb

@@ -1,3 +1,3 @@
 module TicTacToe
-  VERSION = '0.5.2'
+  VERSION = '1.0.0'
 end

data/test/game_test.rb

@@ -29,6 +29,16 @@ class GameTest < MiniTest::Unit::TestCase
     assert_equal game.grid, empty_grid
   end
 
+  def test_empty_decorated_grid
+    assert_equal [%w(1 2 3), %w(4 5 6), %w(7 8 9)], TicTacToe::Game.new.decorated_grid
+  end
+
+  def test_decorated_grid_with_moves
+    game = TicTacToe::Game.new([['x', nil, nil], [nil, nil, nil], [nil, nil, nil]])
+
+    assert_equal [%w(x 2 3), %w(4 5 6), %w(7 8 9)], game.decorated_grid
+  end
+
   def test_an_empty_game_is_not_solved
     game = TicTacToe::Game.new
 

data/test/player_test.rb

@@ -32,6 +32,11 @@ module SharedPlayerTests
     refute @player.type.nil?
   end
 
+  def test_has_move_json
+    assert_equal({:letter => 'x', :type => @player.type, :move => '1'}.to_json,
+                 @player.move_json('1'))
+  end
+
 end
 
 class HumanPlayerTest < MiniTest::Unit::TestCase

metadata

@@ -2,7 +2,7 @@
 name: erics_tic_tac_toe
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Eric Koslow
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 -05:00
+date: 2012-11-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,15 +57,11 @@ files:
 - lib/tic_tac_toe/player.rb
 - lib/tic_tac_toe/players/computer_player.rb
 - lib/tic_tac_toe/players/human_player.rb
-- lib/tic_tac_toe/presenters/game_presenter.rb
-- lib/tic_tac_toe/presenters/player_presenter.rb
 - lib/tic_tac_toe/strategies/minimax_strategy.rb
 - lib/tic_tac_toe/strategies/three_by_three_strategy.rb
 - lib/tic_tac_toe/version.rb
 - test/board_test.rb
-- test/game_presentor_test.rb
 - test/game_test.rb
-- test/player_presenter_test.rb
 - test/player_test.rb
 - test/potential_state_test.rb
 - test/solver_test.rb
@@ -102,9 +98,7 @@ specification_version: 3
 summary: A game of Tic Tac Toe
 test_files: 
 - test/board_test.rb
-- test/game_presentor_test.rb
 - test/game_test.rb
-- test/player_presenter_test.rb
 - test/player_test.rb
 - test/potential_state_test.rb
 - test/solver_test.rb

data/lib/tic_tac_toe/presenters/game_presenter.rb

@@ -1,21 +0,0 @@
-module TicTacToe
-
-  module Presenter
-
-    class Game
-      def initialize(game)
-        @game = game
-      end
-
-      def grid
-        @game.grid.each_with_index.map do |row, i|
-          row.each_with_index.map do |cell, j|
-            cell || ((i*3)+(j+1)).to_s
-          end
-        end
-      end
-    end
-
-  end
-
-end

data/lib/tic_tac_toe/presenters/player_presenter.rb

@@ -1,19 +0,0 @@
-require 'json'
-
-module TicTacToe
-
-  module Presenter
-
-    class Player
-      def initialize(player)
-        @player = player
-      end
-
-      def move_json(move=nil)
-        {:letter => @player.letter, :type => @player.type, :move => move}.to_json
-      end
-    end
-
-  end
-
-end

data/test/game_presentor_test.rb

@@ -1,19 +0,0 @@
-require 'test_helper'
-
-class GamePresentorTest < MiniTest::Unit::TestCase
-  def setup
-    @game = TicTacToe::Game.new
-    @presentor = TicTacToe::Presenter::Game.new(@game)
-  end
-
-  def test_grid
-    assert_equal [%w(1 2 3), %w(4 5 6), %w(7 8 9)], @presentor.grid
-  end
-
-  def test_grid_with_moves
-    @game = TicTacToe::Game.new([['x', nil, nil], [nil, nil, nil], [nil, nil, nil]])
-    @presentor = TicTacToe::Presenter::Game.new(@game)
-
-    assert_equal [%w(x 2 3), %w(4 5 6), %w(7 8 9)], @presentor.grid
-  end
-end

data/test/player_presenter_test.rb

@@ -1,15 +0,0 @@
-require 'test_helper'
-
-class PlayerPresenterTest < MiniTest::Unit::TestCase
-  def setup
-    @player_mock = OpenStruct.new(:letter => 'x')
-    @player_mock.instance_eval do
-      def type; "mock" end
-    end
-  end
-
-  def test_move_json
-    assert_equal({:letter => 'x', :type => 'mock', :move => '1'}.to_json,
-                 TicTacToe::Presenter::Player.new(@player_mock).move_json('1'))
-  end
-end