acpc_dealer_data 0.1.2 → 0.1.3

data/lib/acpc_dealer_data/action_messages.rb

@@ -81,15 +81,18 @@ class ActionMessages
     end
   end
 
-  def self.parse_file(acpc_log_file_path, player_names, game_def_directory)
-    File.open(acpc_log_file_path, 'r') do |file| 
-      ActionMessages.parse file, player_names, game_def_directory
+  class LogFile < File
+  end
+
+  def self.parse_file(acpc_log_file_path, player_names, game_def_directory, num_hands=nil)
+    LogFile.open(acpc_log_file_path, 'r') do |file| 
+      ActionMessages.parse file, player_names, game_def_directory, num_hands
     end
   end
 
   alias_new :parse
 
-  def initialize(acpc_log_statements, player_names, game_def_directory)
+  def initialize(acpc_log_statements, player_names, game_def_directory, num_hands=nil)
     @final_score = nil
     @match_def = nil
     @data = acpc_log_statements.inject([]) do |accumulating_data, log_line|
@@ -102,6 +105,7 @@ class ActionMessages
             accumulating_data.empty? || 
             accumulating_data.last.first[:state].hand_number != parsed_message[:state].hand_number
           )
+            break accumulating_data if accumulating_data.length == num_hands
             accumulating_data << []
           end
 

data/lib/acpc_dealer_data/hand_results.rb

@@ -41,15 +41,18 @@ class HandResults
     end
   end
 
-  def self.parse_file(acpc_log_file_path, player_names, game_def_directory)
-    File.open(acpc_log_file_path, 'r') do |file| 
-      HandResults.parse file, player_names, game_def_directory
+  class LogFile < File
+  end
+
+  def self.parse_file(acpc_log_file_path, player_names, game_def_directory, num_hands=nil)
+    LogFile.open(acpc_log_file_path, 'r') do |file| 
+      HandResults.parse file, player_names, game_def_directory, num_hands
     end
   end
 
   alias_new :parse
 
-  def initialize(acpc_log_statements, player_names, game_def_directory)
+  def initialize(acpc_log_statements, player_names, game_def_directory, num_hands=nil)
     @final_score = nil
     @match_def = nil
     
@@ -60,6 +63,7 @@ class HandResults
         parsed_message = HandResults.parse_state(log_line)
         if parsed_message
           accumulating_data << parsed_message
+          break accumulating_data if accumulating_data.length == num_hands
         else
           @final_score = HandResults.parse_score(log_line) unless @final_score
         end

data/lib/acpc_dealer_data/poker_match_data.rb

@@ -32,19 +32,57 @@ class PokerMatchData
   )
 
   # @returns [PokerMatchData]
-  def self.parse_files(action_messages_file, result_messages_file, player_names, dealer_directory)
-    parsed_action_messages = Celluloid::Future.new { ActionMessages.parse_file action_messages_file, player_names, dealer_directory }
-    parsed_hand_results = Celluloid::Future.new { HandResults.parse_file result_messages_file, player_names, dealer_directory }
+  def self.parse_files(action_messages_file, result_messages_file, player_names, dealer_directory, num_hands=nil)
+    parsed_action_messages = Celluloid::Future.new do
+      ActionMessages.parse_file(
+        action_messages_file, 
+        player_names, 
+        dealer_directory,
+        num_hands
+      )
+    end
+    parsed_hand_results = Celluloid::Future.new do 
+      HandResults.parse_file(
+        result_messages_file, 
+        player_names, 
+        dealer_directory,
+        num_hands
+      )
+    end
 
-    PokerMatchData.new parsed_action_messages.value, parsed_hand_results.value, player_names, dealer_directory
+    PokerMatchData.new(
+      parsed_action_messages.value, 
+      parsed_hand_results.value, 
+      player_names, 
+      dealer_directory
+    )
   end
 
   # @returns [PokerMatchData]
-  def self.parse(action_messages, result_messages, player_names, dealer_directory)
-    parsed_action_messages = Celluloid::Future.new { ActionMessages.parse action_messages, player_names, dealer_directory }
-    parsed_hand_results = Celluloid::Future.new { HandResults.parse result_messages, player_names, dealer_directory }
+  def self.parse(action_messages, result_messages, player_names, dealer_directory, num_hands=nil)
+    parsed_action_messages = Celluloid::Future.new do
+      ActionMessages.parse(
+        action_messages,
+        player_names,
+        dealer_directory,
+        num_hands
+      )
+    end
+    parsed_hand_results = Celluloid::Future.new do
+      HandResults.parse(
+        result_messages,
+        player_names,
+        dealer_directory,
+        num_hands
+      )
+    end
 
-    PokerMatchData.new parsed_action_messages.value, parsed_hand_results.value, player_names, dealer_directory
+    PokerMatchData.new(
+      parsed_action_messages.value,
+      parsed_hand_results.value,
+      player_names,
+      dealer_directory
+    )
   end
 
   def initialize(parsed_action_messages, parsed_hand_results, player_names, dealer_directory)
@@ -57,8 +95,6 @@ class PokerMatchData
     end
 
     if (
-      parsed_action_messages.final_score.nil? ||
-      parsed_hand_results.final_score.nil? ||
       parsed_action_messages.final_score != parsed_hand_results.final_score
     )
       raise FinalScoresDoNotMatch
@@ -66,7 +102,9 @@ class PokerMatchData
 
     @match_def = parsed_hand_results.match_def
 
-    set_chip_distribution! parsed_hand_results.final_score
+    if parsed_hand_results.final_score
+      set_chip_distribution! parsed_hand_results.final_score
+    end
 
     set_data! parsed_action_messages, parsed_hand_results
 
@@ -96,7 +134,7 @@ class PokerMatchData
   def all_in?(seat=@seat) @players[seat].all_in? end
   def active?(seat=@seat) @players[seat].active? end
 
-  def for_every_hand!(num_hands=@data.length)
+  def for_every_hand!
     initialize_players!
 
     @data.each_index do |i|
@@ -111,11 +149,9 @@ class PokerMatchData
       end
 
       yield @hand_number
-
-      break if @hand_number + 1 >= num_hands
     end
 
-    if @hand_number == @data.length && @chip_distribution != @players.map { |p| p.chip_balance }
+    if @chip_distribution && @chip_distribution != @players.map { |p| p.chip_balance }
       raise PlayerDataInconsistent, "chip distribution: #{@chip_distribution}, player balances: #{@players.map { |p| p.chip_balance }}"
     end
 

data/lib/acpc_dealer_data/version.rb

@@ -1,3 +1,3 @@
 module AcpcDealerData
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/action_messages_spec.rb

@@ -18,6 +18,7 @@ describe ActionMessages do
     @patient = nil
     @match_def = nil
     @player_names = nil
+    @no_final_score = false
   end
 
   describe '::parse_to_message' do
@@ -109,46 +110,96 @@ describe ActionMessages do
   end
 
   describe 'properly parses ACPC log statements' do
-    it 'from file' do
-      skip "Not sure how to test this easily when GameDefinition needs to open a file as well"
+    describe 'from file' do
+      it 'when every hand is desired' do
+        init_data do |action_messages|
+          file_name = 'file_name'
+          ActionMessages::LogFile.expects(:open).with(file_name, 'r').yields(
+            action_messages
+          ).returns(
+            ActionMessages.parse(
+              action_messages,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY
+            )
+          )
 
-      init_data do |action_messages|
-        file_name = 'file_name'
-        File.expects(:open).with(file_name, 'r').yields(
-          action_messages
-        ).returns(
-          ActionMessages.parse(
-            action_messages,
+          @patient = ActionMessages.parse_file(
+            file_name,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY
           )
-        )
 
-        @patient = ActionMessages.parse_file(
-          file_name,
-          @player_names,
-          AcpcDealer::DEALER_DIRECTORY
-        )
+          check_patient
+        end
+      end
+      it 'when a particular number of hands is desired' do
+        @no_final_score = true
+        num_hands = 1
+        init_data do |action_messages|
+          file_name = 'file_name'
+          ActionMessages::LogFile.expects(:open).with(file_name, 'r').yields(
+            action_messages
+          ).returns(
+            ActionMessages.parse(
+              action_messages,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY,
+              num_hands
+            )
+          )
+
+          @patient = ActionMessages.parse_file(
+            file_name,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY,
+            num_hands
+          )
+
+          # Fix data to check patient against
+          @final_score = nil
+          @data = @data[0..num_hands-1]
 
-        check_patient
+          check_patient
+        end
       end
     end
-    it 'from array' do
-      init_data do |action_messages|
-        @patient = ActionMessages.parse(
-          action_messages,
-          @player_names,
-          AcpcDealer::DEALER_DIRECTORY
-        )
+    describe 'from array' do
+      it 'when all hands are desired' do
+        init_data do |action_messages|
+          @patient = ActionMessages.parse(
+            action_messages,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY
+          )
 
-        check_patient
+          check_patient
+        end
+      end
+      it 'when a particular number of hands is desired' do
+        @no_final_score = true
+        num_hands = 1
+        init_data do |log_statements|
+          @patient = ActionMessages.parse(
+            log_statements,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY,
+            num_hands
+          )
+
+          # Fix data to check patient against
+          @final_score = nil
+          @data = @data[0..num_hands-1]
+
+          check_patient
+        end
       end
     end
   end
 
   def check_patient
     @patient.data.must_equal @data
-    @patient.final_score.must_equal @final_score    
+    @patient.final_score.must_equal @final_score unless @no_final_score 
     @patient.match_def.must_equal @match_def
   end
 

data/spec/hand_results_spec.rb

@@ -16,6 +16,7 @@ describe HandResults do
     @final_score = nil
     @player_names = nil
     @match_def = nil
+    @no_final_score = false
   end
 
   describe '::parse_state' do
@@ -56,36 +57,96 @@ describe HandResults do
   end
 
   describe 'properly parses ACPC log statements' do
-    it 'from file' do
-      skip "Not sure how to test this easily when GameDefinition needs to open a file as well"
+    describe 'from file' do
+      it 'when every hand is desired' do
+        init_data do |log_statements|
+          file_name = 'file_name'
+          HandResults::LogFile.stubs(:open).with(file_name, 'r').yields(
+            log_statements
+          ).returns(
+            HandResults.parse(
+              log_statements,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY
+            )
+          )
 
-      init_data do |log_statements|
-        file_name = 'file_name'
-        File.stubs(:open).with(file_name, 'r').yields(
-          log_statements
-        ).returns(HandResults.parse(log_statements))
+          @patient = HandResults.parse_file(
+            file_name,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY
+          )
 
-        @patient = HandResults.parse_file file_name
+          check_patient
+        end
+      end
+      it 'when a particular number of hands is desired' do
+        @no_final_score = true
+        num_hands = 3
+        init_data do |log_statements|
+          file_name = 'file_name'
+          HandResults::LogFile.stubs(:open).with(file_name, 'r').yields(
+            log_statements
+          ).returns(
+            HandResults.parse(
+              log_statements,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY,
+              num_hands
+            )
+          )
+
+          @patient = HandResults.parse_file(
+            file_name,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY,
+            num_hands
+          )
 
-        check_patient
+          # Fix data to check patient against
+          @final_score = nil
+          @data = @data[0..num_hands-1]
+
+          check_patient
+        end
       end
     end
-    it 'from array' do
-      init_data do |log_statements|
-        @patient = HandResults.parse(
-          log_statements,
-          @player_names,
-          AcpcDealer::DEALER_DIRECTORY
-        )
-
-        check_patient
+    describe 'from array' do
+      it 'when every hand is desired' do
+        init_data do |log_statements|
+          @patient = HandResults.parse(
+            log_statements,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY
+          )
+
+          check_patient
+        end
+      end
+      it 'when a particular number of hands is desired' do
+        @no_final_score = true
+        num_hands = 3
+        init_data do |log_statements|
+          @patient = HandResults.parse(
+            log_statements,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY,
+            num_hands
+          )
+
+          # Fix data to check patient against
+          @final_score = nil
+          @data = @data[0..num_hands-1]
+
+          check_patient
+        end
       end
     end
   end
 
   def check_patient
     @patient.data.must_equal @data
-    @patient.final_score.must_equal @final_score
+    @patient.final_score.must_equal @final_score unless @no_final_score
     @patient.match_def.must_equal @match_def
   end
 

data/spec/poker_match_data_spec.rb

@@ -22,6 +22,7 @@ describe PokerMatchData do
     @hand_number = nil
     @hand_data_list = nil
     @final_hand = nil
+    @no_chip_distribution = false
   end
 
   describe 'when given action and result messages' do
@@ -85,25 +86,53 @@ describe PokerMatchData do
         end
       end
     end
-    it 'works properly on every hand' do
-      init_data do |action_messages, result_messages|
-
-        @patient = PokerMatchData.parse(
-          action_messages, 
-          result_messages,
-          @player_names,
-          AcpcDealer::DEALER_DIRECTORY
-        )
-        @patient.seat = 0
+    describe 'works properly' do
+      it 'for every hand' do
+        init_data do |action_messages, result_messages|
+
+          @patient = PokerMatchData.parse(
+            action_messages, 
+            result_messages,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY
+          )
+          @patient.seat = 0
 
-        @hand_number = 0
-        @patient.for_every_hand! do
-          @final_hand = @hand_number >= @hand_data_list.length - 1
-          @patient.for_every_turn! do
-            check_patient
+          @hand_number = 0
+          @patient.for_every_hand! do
+            @final_hand = @hand_number >= @hand_data_list.length - 1
+            @patient.for_every_turn! do
+              check_patient
+            end
+
+            @hand_number += 1
           end
+        end
+      end
+      it 'for a particular number of hands' do
+        num_hands = 1
+        @no_chip_distribution = true
+        init_data(num_hands) do |action_messages, result_messages|
+          @chip_distribution = nil
+
+          @patient = PokerMatchData.parse(
+            action_messages, 
+            result_messages,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY,
+            num_hands
+          )
+          @patient.seat = 0
+
+          @hand_number = 0
+          @patient.for_every_hand! do
+            @final_hand = @hand_number >= @hand_data_list.length - 1
+            @patient.for_every_turn! do
+              check_patient
+            end
 
-          @hand_number += 1
+            @hand_number += 1
+          end
         end
       end
     end
@@ -111,13 +140,13 @@ describe PokerMatchData do
 
   def check_patient
     @patient.match_def.must_equal @match_def
-    @patient.chip_distribution.must_equal @chip_distribution
+    @patient.chip_distribution.must_equal @chip_distribution unless @no_chip_distribution
     @patient.hand_number.must_equal @hand_number
     @patient.current_hand.must_equal @hand_data_list[@hand_number]
     @patient.final_hand?.must_equal @final_hand
   end
 
-  def init_data
+  def init_data(num_hands=nil)
     data.each do |game, data_hash|
       @chip_distribution = data_hash[:chip_distribution]
       @match_def_line_index = data_hash[:match_def_line_index]
@@ -130,12 +159,14 @@ describe PokerMatchData do
       action_messages = ActionMessages.parse(
         data_hash[:action_messages],
         @player_names,
-        AcpcDealer::DEALER_DIRECTORY
+        AcpcDealer::DEALER_DIRECTORY,
+        num_hands
       )
       result_messages = HandResults.parse(
         data_hash[:result_messages],
         @player_names,
-        AcpcDealer::DEALER_DIRECTORY 
+        AcpcDealer::DEALER_DIRECTORY,
+        num_hands
       )
 
       @hand_data_list = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_dealer_data
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acpc_dealer
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1076567299815575746
+      hash: -128442043826121202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1076567299815575746
+      hash: -128442043826121202
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24