just_go 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e75ebd41948471c4f4ca768b14afa0151840af
-  data.tar.gz: f199d796daf821fc9fa7d0a656dfbe687e87d466
+  metadata.gz: 3568fe557bc13eac0b6624be0f70c8868daf9f44
+  data.tar.gz: 0c1602d15cd4f2ded0a9f60f0ffd4d0dd47d3cd2
 SHA512:
-  metadata.gz: 4c165f3cd84e3646dcc53988490b4af3ac1e6144181b8e343c04722975000e76271cc0b64c2d85dd17bbced347840f1fe3a2eab3a5d7f190270f835b45aa809c
-  data.tar.gz: 5d07ae4529f1a95cd4e113fc5e9300bad9e14c2e81bcd6877e7ca6c14656bd4e115a2b6b8eaa85a0c5eb72ac29f1130d76fe48593d50ef062350b298b35eb4f9
+  metadata.gz: e88f9f93b01f2c9580609fc4ff3d56d4d1826af09c5ff0bd927cdd287fdabcb0adaed5f067a5f007fb22a52f13af57c911645096d6edef4ed8e81ce94d955755
+  data.tar.gz: f73808ab7000e09f88e862624654922d5fd61d4c32bef8e47f421169fd05c6a9e28a0c90711bb0eda550390107e4d61b5644acd62496d9ac6be1f2d97e2f5279

data/lib/just_go/game_state.rb

@@ -1,4 +1,5 @@
 require 'just_go/point_set'
+require 'just_go/player_stat'
 require 'just_go/errors/not_players_turn_error'
 require 'just_go/errors/point_not_empty_error'
 require 'just_go/errors/point_not_found_error'
@@ -13,11 +14,11 @@ module JustGo
   class GameState
     BOARD_SIZE = 19
 
-    def initialize(current_player_number: , points: , previous_state: nil, player_stats: nil)
+    def initialize(current_player_number: , points: , previous_state: nil, player_stats: [])
       @current_player_number = current_player_number
       @points = JustGo::PointSet.new(points: points)
       @previous_state = previous_state
-      @player_stats = player_stats
+      @player_stats = player_stats.map { |ps| JustGo::PlayerStat.new(ps) }
       @errors = []
       @last_change = {}
     end
@@ -55,7 +56,7 @@ module JustGo
         current_player_number: current_player_number,
         points: points.as_json,
         previous_state: previous_state,
-        player_stats: player_stats
+        player_stats: player_stats.map(&:as_json)
       }
     end
 
@@ -79,13 +80,13 @@ module JustGo
         if dupped.minify == @previous_state
           @errors.push JustGo::KoRuleViolationError.new 
         else
-          @player_stats.detect { |p| p[:player_number] == next_player_number }[:passed] = false 
+          @player_stats.detect { |p| p.player_number == next_player_number }.mark_as_continuing 
           
           @previous_state = points.minify
 
           stone_count = points.perform_move(point, player_number)
 
-          @player_stats.detect { |pc| pc[:player_number] == player_number }[:prisoner_count] += stone_count
+          @player_stats.detect { |pc| pc.player_number == player_number }.add_to_prisoner_count(stone_count)
 
           pass_turn
         end
@@ -98,8 +99,8 @@ module JustGo
       if current_player_number != player_number
         @errors.push JustGo::NotPlayersTurnError.new
       else
-        @player_stats.detect { |p| p[:player_number] == player_number }[:passed] = true 
-        next_player_passed = @player_stats.detect { |p| p[:player_number] == next_player_number }[:passed] 
+        @player_stats.detect { |ps| ps.player_number == player_number }.mark_as_passed 
+        next_player_passed = @player_stats.detect { |ps| ps.player_number == next_player_number }.passed 
         if next_player_passed 
           points.mark_territories
         else
@@ -118,7 +119,7 @@ module JustGo
     end
 
     def winner
-      if @player_stats.map { |ps| ps[:passed] }.all?
+      if @player_stats.map { |ps| ps.passed }.all?
         score.max_by { |_player, score| score }.first
       else
         nil
@@ -132,7 +133,7 @@ module JustGo
     end
 
     def prisoner_count(player_number)
-      player_stats.detect { |pc| pc[:player_number] == player_number }[:prisoner_count]
+      player_stats.detect { |ps| ps.player_number == player_number }.prisoner_count
     end
 
     def territory_count(player_number)

data/lib/just_go/player_stat.rb

@@ -0,0 +1,36 @@
+module JustGo
+  # = PlayerStat
+  # 
+  # Place to store a players statistics
+  class PlayerStat
+    def initialize(player_number: , prisoner_count: 0, passed: false)
+      @player_number = player_number
+      @prisoner_count = prisoner_count
+      @passed = passed
+    end
+
+    attr_reader :player_number
+    attr_reader :prisoner_count
+    attr_reader :passed
+
+    def as_json
+      {
+        player_number: player_number,
+        prisoner_count: prisoner_count,
+        passed: passed
+      }
+    end
+
+    def mark_as_passed 
+      @passed = true
+    end
+
+    def mark_as_continuing 
+      @passed = false
+    end
+
+    def add_to_prisoner_count(number)
+      @prisoner_count += number
+    end
+  end
+end

data/lib/just_go/version.rb

@@ -1,4 +1,4 @@
 module JustGo
   # :nodoc:
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: just_go
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - lib/just_go/errors/point_not_empty_error.rb
 - lib/just_go/errors/point_not_found_error.rb
 - lib/just_go/game_state.rb
+- lib/just_go/player_stat.rb
 - lib/just_go/point.rb
 - lib/just_go/point_set.rb
 - lib/just_go/stone.rb