pokerstats 2.0.4 → 2.0.5

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/lib/pokerstats/hand_statistics.rb

@@ -25,7 +25,7 @@ module Pokerstats
     ##
   
     def hand_record
-      raise "#{HAND_RECORD_INCOMPLETE_MESSAGE}: #{(HAND_INFORMATION_KEYS - @hand_information.keys).inspect}" unless (HAND_INFORMATION_KEYS - @hand_information.keys).empty?
+      raise Pokerstats::HandHistoryParseError, "#{HAND_RECORD_INCOMPLETE_MESSAGE}: #{(HAND_INFORMATION_KEYS - @hand_information.keys).inspect}" unless (HAND_INFORMATION_KEYS - @hand_information.keys).empty?
       HAND_INFORMATION_KEYS.inject({}) do |hash, key| 
         hash.merge!(key => @hand_information[key])
       end
@@ -46,9 +46,9 @@ module Pokerstats
     end
 
     def player_records
-      raise PLAYER_RECORDS_NO_PLAYER_REGISTERED if players.empty?
-      raise PLAYER_RECORDS_NO_BUTTON_REGISTERED if button.nil?
-      raise PLAYER_RECORDS_OUT_OF_BALANCE if out_of_balance
+      raise Pokerstats::HandHistoryParseError, PLAYER_RECORDS_NO_PLAYER_REGISTERED if players.empty?
+      raise Pokerstats::HandHistoryParseError, PLAYER_RECORDS_NO_BUTTON_REGISTERED if button.nil?
+      raise Pokerstats::HandHistoryParseError, PLAYER_RECORDS_OUT_OF_BALANCE if out_of_balance
       self.player_records_without_validation
     end
 
@@ -62,7 +62,7 @@ module Pokerstats
   
     def register_player player
       screen_name = player[:screen_name]
-      raise "#{PLAYER_RECORDS_DUPLICATE_PLAYER_NAME}: #{screen_name.inspect}" if players.member?(screen_name)
+      raise Pokerstats::HandHistoryParseError, "#{PLAYER_RECORDS_DUPLICATE_PLAYER_NAME}: #{screen_name.inspect}" if players.member?(screen_name)
       @cached_player_position = nil
       @player_hashes << player
       plugins.each{|each| each.register_player(screen_name, @street_state)}  #why the second parameter?
@@ -169,7 +169,7 @@ module Pokerstats
     end
   
     def register_action(screen_name, description, options={})
-      raise "#{PLAYER_RECORDS_UNREGISTERED_PLAYER}: #{screen_name.inspect}" unless players.member?(screen_name)
+      raise Pokerstats::HandHistoryParseError, "#{PLAYER_RECORDS_UNREGISTERED_PLAYER}: #{screen_name.inspect}" unless players.member?(screen_name)
       plugins.each do |each|
         each.apply_action(
           {:screen_name => screen_name, :description => description, :aggression => aggression(description)}.update(options), 

data/lib/pokerstats/player_statistics.rb

@@ -34,10 +34,10 @@ module Pokerstats
         @aggregate_statistics[each_player] ||= {}
       
         @aggregate_statistics[each_player][:t_hands] ||= 0
-         @aggregate_statistics[each_player][:t_hands] += 1
-         @aggregate_statistics[each_player][:t_vpip] ||= 0
-         @aggregate_statistics[each_player][:t_vpip] += 1 unless reports[each_player][:paid].zero?
-         aggregate_numeric_statistic each_player, reports, :t_posted, :posted
+        @aggregate_statistics[each_player][:t_hands] += 1
+        @aggregate_statistics[each_player][:t_vpip] ||= 0
+        @aggregate_statistics[each_player][:t_vpip] += 1 unless reports[each_player][:paid].zero?
+        aggregate_numeric_statistic each_player, reports, :t_posted, :posted
         aggregate_numeric_statistic each_player, reports, :t_paid, :paid
         aggregate_numeric_statistic each_player, reports, :t_won, :won
         aggregate_numeric_statistic each_player, reports, :t_preflop_passive, :preflop_passive

data/lib/pokerstats/pokerstars_hand_history_parser.rb

@@ -62,11 +62,11 @@ module Pokerstats
     def parse(line)
       case line
       when /PokerStars Game #([0-9]+): Tournament #([0-9]+), (\$[0-9+$]+) ([^\-]*) - Level ([IVXL]+) \((#{CASH})\/(#{CASH})\) - (.*)$/
-        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}, #{$3} #{$4}", :tournament=> $2, :sb=> $6.to_d, :bb=> $7.to_d, :played_at=> Time.parse($8), :street => :prelude
+        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}, #{$3} #{$4}", :tournament=> $2, :sb=> $6.to_d, :bb=> $7.to_d, :played_at=> Time.parse($8), :street => :prelude, :board => ""
       when /PokerStars Game #([0-9]+): +([^(]*) \((#{CASH})\/(#{CASH})\) - (.*)$/
-        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2} (#{$3}/#{$4})", :tournament=> nil, :sb=> cash_to_d($3), :bb=> cash_to_d($4), :played_at=> Time.parse($5), :street => :prelude
+        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2} (#{$3}/#{$4})", :tournament=> nil, :sb=> cash_to_d($3), :bb=> cash_to_d($4), :played_at=> Time.parse($5), :street => :prelude, :board => ""
       when /PokerStars Game #([0-9]+): +([^(]*) \((#{CASH})\/(#{CASH}) USD\) - (.*)$/
-        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2} (#{$3}/#{$4})", :tournament=> nil, :sb=> cash_to_d($3), :bb=> cash_to_d($4), :played_at=> Time.parse($5), :street => :prelude
+        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2} (#{$3}/#{$4})", :tournament=> nil, :sb=> cash_to_d($3), :bb=> cash_to_d($4), :played_at=> Time.parse($5), :street => :prelude, :board => ""
       when /PokerStars Game #([0-9]+):/
         raise HandHistoryParseError, "invalid hand record: #{line}"
       when /\*\*\* HOLE CARDS \*\*\*/

data/pokerstats.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pokerstats}
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew C. Greenberg"]

data/spec/pokerstars_hand_history_parser_spec.rb

@@ -38,10 +38,10 @@ describe PokerstarsHandHistoryParser, "when parsing structural matter" do
       :bb => "20".to_d,
       :played_at => Time.parse("2008/10/31 17:25:42 ET"),
       :tournament => "117620218",
-      :street => :prelude
+      :street => :prelude,
+      :board => "" # due to pokerstars hand history bug (does not have Board record unless flop is seen)
     )
     @parser.parse("PokerStars Game #21650436825: Tournament #117620218, $10+$1 Hold'em No Limit - Level I (10/20) - 2008/10/31 17:25:42 ET")
-    puts @stats.report_hand_information
   end
   
   it "should recognize a tournament header" do
@@ -56,7 +56,8 @@ describe PokerstarsHandHistoryParser, "when parsing structural matter" do
       :bb => "0.50".to_d,
       :played_at => Time.parse("2008/10/31 17:14:44 ET"),
       :tournament => nil,
-      :street => :prelude
+      :street => :prelude,
+      :board => "" # due to pokerstars hand history bug
     )
     @parser.parse("PokerStars Game #21650146783:  Hold'em No Limit ($0.25/$0.50) - 2008/10/31 17:14:44 ET")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pokerstats
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Andrew C. Greenberg