acpc_poker_types 7.6.4 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e0c8b9dd9b799cb3d4d66b10c803b55d24b748
-  data.tar.gz: bdf963c05df26543a8b5d89634ee375ee29a682b
+  metadata.gz: 440988b04d147e8ebd36f811f4d8c367c13a7972
+  data.tar.gz: 7792be06237f5dfb81ce0a26caf7daae4de70bec
 SHA512:
-  metadata.gz: 8c88d11c93751f0fedf0b600f5a689cd937a024b4db1998ddc3fe72a012e6fba232fe9bb6b4a987d8ff4c3c5bac5b0e3353e6d47fce0881bf847081947af7c7a
-  data.tar.gz: 0e02943c1bc8a3886cecc3871c61f5503c70af412251bd90add21072deed53ad017444f53c8e38bac71eae898d0044c1d532a47f6edd372c0a763c520ef31eea
+  metadata.gz: 8cd0412d181f98f897cf169be1eb70a312f0c3adb922eb44aaa6839b9e04459ec5b0eb4aee614d39ae566dadbab030ea9e54eaf58a9465c09eee3ca3671763d4
+  data.tar.gz: 834f4b9d84959c1917dfe1b1ebe7a7c8ba28612696268d0a3288794368adb341c0ca65e1580eb2d63cdb0cc2f50d8696df04f3f0e8b12363f3e8bd6efca1fba2

data/lib/acpc_poker_types/match_state.rb

@@ -65,6 +65,7 @@ class MatchState < DelegateClass(String)
   COMMUNITY_CARD_SEPARATOR = '/'
   BETTING_SEQUENCE_SEPARATOR = COMMUNITY_CARD_SEPARATOR
   HAND_SEPARATOR = '|'
+  FIELD_SEPARATOR = ':'
 
   class << self; alias_method(:parse, :new) end
 
@@ -88,27 +89,32 @@ class MatchState < DelegateClass(String)
     hand_number,
     betting_sequence,
     all_hole_cards,
-    board_cards
+    board_cards,
+    stack_sizes = nil
   )
-    string = "#{LABEL}:#{position_relative_to_dealer}:#{hand_number}:#{betting_sequence}:#{all_hole_cards}"
+    string = "#{LABEL}#{FIELD_SEPARATOR}#{position_relative_to_dealer}#{FIELD_SEPARATOR}#{hand_number}#{FIELD_SEPARATOR}#{betting_sequence}#{FIELD_SEPARATOR}#{all_hole_cards}"
     string << "/#{board_cards.to_s}" if board_cards && !board_cards.empty?
+    if stack_sizes
+      string << "#{FIELD_SEPARATOR}#{stack_sizes.map { |stack| format('%g', stack) }.join('|')}"
+    end
     string
   end
 
   # @param [String] raw_match_state A raw match state string to be parsed.
   # @raise IncompleteMatchState
   def initialize(raw_match_state, previous_state = nil, game_def = nil)
-    if (
-      %r{#{LABEL}:(\d+):(\d+):([^:]*):([^#{COMMUNITY_CARD_SEPARATOR}\s]+)#{COMMUNITY_CARD_SEPARATOR}*([^\s:]*)}.match(
-        raw_match_state
-      )
-    )
-      @position_relative_to_dealer = $1.to_i
-      @hand_number = $2.to_i
-      @betting_sequence_string = $3
-      @hands_string = $4
-      @community_cards_string = $5
+    fields = raw_match_state.split(FIELD_SEPARATOR)
+    @position_relative_to_dealer = fields[1].to_i
+    @hand_number = fields[2].to_i
+    @betting_sequence_string = fields[3]
+    card_fields = fields[4].split(COMMUNITY_CARD_SEPARATOR)
+    @hands_string = card_fields.shift
+    @community_cards_string = card_fields.join('/')
+    @stack_sizes = nil
+    if fields.length > 5 && fields[5].count(HAND_SEPARATOR) > 0
+      @stack_sizes = fields[5].split(HAND_SEPARATOR).map(&:to_f)
     end
+
     @winning_players = nil
     @str = nil
     @all_hands = nil
@@ -162,7 +168,8 @@ class MatchState < DelegateClass(String)
       @hand_number,
       @betting_sequence_string,
       @hands_string,
-      @community_cards_string
+      @community_cards_string,
+      @stack_sizes
     )
   end
 
@@ -317,7 +324,10 @@ class MatchState < DelegateClass(String)
   # @param game_def [GameDefinition]
   # @return [HandPlayerGroup] The current state of the players.
   def every_action(game_def)
-    @players = players_at_hand_start game_def.chip_stacks, game_def.blinds
+    @players = players_at_hand_start(
+      @stack_sizes || game_def.chip_stacks,
+      game_def.blinds
+    )
 
     @next_to_act = game_def.first_player_positions.first
     @player_acting_sequence = []
@@ -520,4 +530,4 @@ class MatchState < DelegateClass(String)
     self
   end
 end
-end
+end

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '7.6.4'
+  VERSION = '7.7.0'
 end

data/spec/match_state_spec.rb

@@ -120,6 +120,21 @@ describe MatchState do
 
       match_state = partial_match_state + betting + ":" + hands + community_cards
 
+      test_match_state_success match_state
+    end
+    it 'parses an initial match state that contains stack sizes' do
+      partial_match_state = MatchState::LABEL + ":0:22:"
+      betting = ''
+      community_cards = ''
+      hands = arbitrary_hole_card_hand.to_acpc + "|" + arbitrary_hole_card_hand.to_acpc
+
+      stacks = [9001, 222]
+
+      match_state = partial_match_state + betting + ":" + hands + community_cards + ":" + stacks.map(&:to_s).join('|')
+
+      patient = MatchState.parse match_state
+      ap patient: patient.to_s, match_state: match_state
+
       test_match_state_success match_state
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 7.6.4
+  version: 7.7.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process_runner
@@ -256,4 +256,3 @@ test_files:
 - spec/support/dealer_logs/3p.nolimit.h1000.r0.actions.log
 - spec/support/dealer_logs/3p.nolimit.h1000.r0.log
 - spec/support/spec_helper.rb
-has_rdoc: