tic_tac_toes 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973d4205866381b247cee7397ef538d46d26dbd3
-  data.tar.gz: 8383fa3bd6d89f0e1dc082bf15d58e22315c4d16
+  metadata.gz: a6648939399c69e21afbe0a74301745f40b98e31
+  data.tar.gz: dd3b0fd1992b99d8371ec706eef9d8e2d1941873
 SHA512:
-  metadata.gz: 38e1a5192560eb071120b41079ae56a77e442b5fefe60659537868e45eb76277f05ffd74b4510c1d707009c3a5a9bb22582bd30cd66a9fdc67ec6524d471a92f
-  data.tar.gz: 81602fbe1f20241e27b4400815bc4ee3fdbbb1bdaa9622de099134e4b043db4dd640bb6880258b072f7d8e16b0827dc9717904749ff8ae94ca5d4518cbfa0177
+  metadata.gz: f68f75de8e357f772673a96bd0cca5f9c92ed4caf5d1659d9c824008c25bc017aed2675e2ea27eff51ec7c4011e695246d138c95c1a7f4c3f84ecd9b1ac3fa67
+  data.tar.gz: c0aa21b6e2d0c232f55bc79db3cf4b893d76ac1ae3438922235ef4570e8dc6c665988637044d9b39e8d3f6507bdf0e1a1e2d2292a7f7f5739ce8c86ef4ea6350

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tic_tac_toes (0.1.6)
+    tic_tac_toes (0.1.7)
       pg
 
 GEM

data/bin/tic_tac_toes

@@ -13,7 +13,11 @@ require 'tic_tac_toes/core/history'
 
 require 'tic_tac_toes/command_line/runner'
 
-database = 'tic_tac_toes'
+connection = PG.connect(dbname: ENV['TTT_DATABASE'],
+                        host: ENV['TTT_HOST'],
+                        port: ENV['TTT_PORT'],
+                        user: ENV['TTT_USER'],
+                        password: ENV['TTT_PASSWORD'])
 
 prompt = TicTacToes::CommandLine::Prompt
 io = TicTacToes::Core::IO.new(prompt)
@@ -21,7 +25,7 @@ io = TicTacToes::Core::IO.new(prompt)
 player_factory = TicTacToes::Core::PlayerFactory.new(io)
 menu = TicTacToes::CommandLine::Menu.new(io, player_factory)
 
-database_wrapper = TicTacToes::Database::PGWrapper.new(database)
-history = TicTacToes::Core::History.new(database_wrapper)
+storage_wrapper = TicTacToes::Database::PGWrapper.new(connection)
+history = TicTacToes::Core::History.new(storage_wrapper)
 
 TicTacToes::CommandLine::Runner.new(io, menu, history).run

data/lib/tic_tac_toes/core/game_state.rb

@@ -4,6 +4,7 @@ require 'tic_tac_toes/core/move_strategies/types'
 module TicTacToes
   module Core
     class GameState
+      attr_writer :history
       attr_reader :board, :players
 
       def initialize(board, players, history)
@@ -34,7 +35,7 @@ module TicTacToes
       end
 
       def turn_over(move)
-        @history.record_move(move)
+        @history.record_move(move) unless move.nil?
         @players.rotate!
       end
 
@@ -55,6 +56,14 @@ module TicTacToes
         Rules.determine_winner(@board, @players)
       end
 
+      def marshal_dump
+        [@board, @players]
+      end
+
+      def marshal_load(array)
+        @board, @players = array
+      end
+
       private
 
       def record_board_size

data/lib/tic_tac_toes/core/move_strategies/hard_ai.rb

@@ -59,7 +59,7 @@ module TicTacToes
         def self.generate_game_state(space, game_state)
           new_game_state = Marshal.load(Marshal.dump(game_state))
           new_game_state.place_move(space)
-          new_game_state.turn_over([])
+          new_game_state.turn_over(nil)
           new_game_state
         end
 

data/lib/tic_tac_toes/database/pg_wrapper.rb

@@ -4,19 +4,17 @@ require 'tic_tac_toes/core/history'
 module TicTacToes
   module Database
     class PGWrapper
-      def initialize(database)
-        @database = database
+      def initialize(connection)
+        @connection = connection
       end
 
       def record_game_history(history)
-        connection = establish_connection
-        record_game_info(history, connection)
-        record_moves(history, connection)
+        record_game_info(history, @connection)
+        record_moves(history, @connection)
       end
 
       def read_game_histories
-        connection = establish_connection
-        games_result = connection.exec("SELECT * FROM games")
+        games_result = @connection.exec("SELECT * FROM games")
         games = []
 
         games_result.each_row do |row|
@@ -24,7 +22,7 @@ module TicTacToes
           board_size = row[1].to_i
           difficulty = row[2]
           winner = row[3]
-          moves_result = connection.exec("SELECT * FROM moves WHERE game = #{game_id}")
+          moves_result = @connection.exec("SELECT * FROM moves WHERE game = #{game_id}")
 
           history = Core::History.new(self)
 
@@ -44,10 +42,6 @@ module TicTacToes
 
       private
 
-      def establish_connection
-        PG.connect(dbname: @database)
-      end
-
       def record_game_info(history, connection)
         connection.exec("INSERT INTO games (board_size, difficulty, winner) VALUES (
           #{history.board_size},

data/lib/tic_tac_toes/tasks/destroy_databases.rake

@@ -4,6 +4,6 @@ desc 'Drop Tic_tac_toes production and test databases'
 task :destroy_databases do
   connection = PG.connect(dbname: "postgres")
 
-  connection.exec("DROP DATABASE tic_tac_toes")
-  connection.exec("DROP DATABASE tic_tac_toes_test")
+  connection.exec("DROP DATABASE #{ENV['TTT_DATABASE']}")
+  connection.exec("DROP DATABASE #{ENV['TTT_TEST_DATABASE']}")
 end

data/lib/tic_tac_toes/tasks/set_up_databases.rake

@@ -1,23 +1,29 @@
 require 'pg'
 
-PRODUCTION_DATABASE = 'tic_tac_toes'
-TEST_DATABASE = 'tic_tac_toes_test'
-
-desc 'Set up tic_tac_toes production and test databases'
+desc 'Set up Tic_tac_toes production and test databases'
 task :set_up_databases do
   create_databases
   create_production_tables
 end
 
+desc 'Set up just Tic_tac_toes production tables'
+task :set_up_tables do
+  create_production_tables
+end
+
 def create_databases
   connection = PG.connect(dbname: "postgres")
 
-  connection.exec("CREATE DATABASE #{PRODUCTION_DATABASE}")
-  connection.exec("CREATE DATABASE #{TEST_DATABASE}")
+  connection.exec("CREATE DATABASE #{ENV['TTT_DATABASE']}")
+  connection.exec("CREATE DATABASE #{ENV['TTT_TEST_DATABASE']}")
 end
 
 def create_production_tables
-  connection = PG.connect(dbname: "#{PRODUCTION_DATABASE}")
+  connection = PG.connect(dbname: ENV['TTT_DATABASE'],
+                          host: ENV['TTT_HOST'],
+                          port: ENV['TTT_PORT'],
+                          user: ENV['TTT_USER'],
+                          password: ENV['TTT_PASSWORD'])
 
   connection.exec("CREATE TABLE games (
     id serial primary key,

data/lib/tic_tac_toes/version.rb

@@ -1,3 +1,3 @@
 module TicTacToes
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/tic_tac_toes/database/pg_wrapper_spec.rb

@@ -2,28 +2,30 @@ require 'tic_tac_toes/database/pg_wrapper'
 require 'pg'
 
 describe TicTacToes::Database::PGWrapper do
-  database = "tic_tac_toes_test"
-
-  let(:pg_wrapper) { TicTacToes::Database::PGWrapper.new(database) }
-  let(:history1)   { double("history 1",
-                     :board_size => 9,
-                     :difficulty => 'Medium AI',
-                     :moves => [["X", 1], ["O", 4]],
-                     :winner => "X") }
-  let(:history2)   { double("history 2",
-                     :board_size => 16,
-                     :difficulty => 'Easy AI',
-                     :moves => [["&", 14]],
-                     :winner => "*") }
-
   before do
-    connection = PG.connect(dbname: database)
-    connection.exec("CREATE TABLE games (
+    @connection = PG.connect(dbname: ENV['TTT_TEST_DATABASE'],
+                             host: ENV['TTT_HOST'],
+                             port: ENV['TTT_PORT'],
+                             user: ENV['TTT_USER'],
+                             password: ENV['TTT_PASSWORD'])
+    @pg_wrapper = TicTacToes::Database::PGWrapper.new(@connection)
+    @history1 = double('history1',
+                       board_size: 9,
+                       difficulty: 'Medium AI',
+                       moves: [['X', 1], ['O', 4]],
+                       winner: 'X')
+    @history2 = double('history2',
+                       board_size: 16,
+                       difficulty: 'Easy AI',
+                       moves: [['&', 14]],
+                       winner: '*')
+
+    @connection.exec("CREATE TABLE games (
       id serial primary key,
       board_size integer,
       difficulty varchar,
       winner varchar)")
-    connection.exec("CREATE TABLE moves (
+    @connection.exec("CREATE TABLE moves (
       game integer REFERENCES games (id),
       number integer,
       token varchar,
@@ -31,10 +33,10 @@ describe TicTacToes::Database::PGWrapper do
   end
 
   describe '#record_game_history and #read_games' do
-    it "records and reads a history object to and from the database" do
-      pg_wrapper.record_game_history(history1)
+    it 'records and reads a history object to and from the database' do
+      @pg_wrapper.record_game_history(@history1)
 
-      history_from_database = pg_wrapper.read_game_histories.first
+      history_from_database = @pg_wrapper.read_game_histories.first
 
       expect(history_from_database.board_size).to eq(9)
       expect(history_from_database.difficulty).to eq('Medium AI')
@@ -43,17 +45,16 @@ describe TicTacToes::Database::PGWrapper do
       expect(history_from_database.winner).to eq("X")
     end
 
-    it "records and reads multiple history objects to and from the database" do
-      pg_wrapper.record_game_history(history1)
-      pg_wrapper.record_game_history(history2)
-      histories_from_database = pg_wrapper.read_game_histories
+    it 'records and reads multiple history objects to and from the database' do
+      @pg_wrapper.record_game_history(@history1)
+      @pg_wrapper.record_game_history(@history2)
+      histories_from_database = @pg_wrapper.read_game_histories
       expect(histories_from_database.size).to eq(2)
     end
   end
 
   after do
-    connection = PG.connect(dbname: database)
-    connection.exec("DROP TABLE moves")
-    connection.exec("DROP TABLE games")
+    @connection.exec("DROP TABLE moves")
+    @connection.exec("DROP TABLE games")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tic_tac_toes
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ben Spatafora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler