pokerstats 2.0.5 → 2.0.6

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6

data/lib/pokerstats/hand_history.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + "/pokerstars_hand_history_pars
 module Pokerstats
   class HandHistory
     attr_accessor :lines, :source, :position, :stats
+    
     def initialize lines, source, position, parser_class = PokerstarsHandHistoryParser
       @lines = lines
       @source = source

data/lib/pokerstats/pokerstars_hand_history_parser.rb

@@ -66,7 +66,7 @@ module Pokerstats
       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, :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, :board => ""
+ak        @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/lib/pokerstats/stat_aggregator.rb

@@ -0,0 +1,42 @@
+module Pokerstats
+  StatAggregationCount = Struct.new(:items, :total)
+  class StatAggregator
+    def initialize(specification = {})
+      @specification = specification
+      @data = {}
+      @specification.keys.each do |key|
+        @data[key] = StatAggregationCount.new(0, 0)
+      end
+    end
+    
+    def data
+      @data
+    end
+    
+    def apply hash
+      @specification.each do |key, value|
+        puts "applying specification #{key.inspect} with value specification #{value.inspect}"
+        # determine datum value from specification
+        datum = case value
+        when Symbol
+          hash[value]
+        when Proc
+          value.call(hash)
+        else
+          raise RuntimeError, "there is no valid specification for datum #{key.inspect}"
+        end
+        
+        puts "... resulting in datum #{datum.inspect}"
+        # apply datum value to aggregated data
+        unless datum.nil?
+          @data[key].items+=1
+          if datum.kind_of? Numeric
+            @data[key].total+=datum
+          else
+            @data[key].total+=1 if datum
+          end
+        end
+      end
+    end
+  end
+end

data/pokerstats.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pokerstats}
-  s.version = "2.0.5"
+  s.version = "2.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew C. Greenberg"]
-  s.date = %q{2009-10-31}
+  s.date = %q{2009-11-03}
   s.default_executable = %q{checkps}
   s.description = %q{a library for extracting, computing and reporting statistics of poker hands parsed from hand history files}
   s.email = %q{wizardwerdna@gmail.com}
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/pokerstats/poker-edge.rb",
      "lib/pokerstats/pokerstars_file.rb",
      "lib/pokerstats/pokerstars_hand_history_parser.rb",
+     "lib/pokerstats/stat_aggregator.rb",
      "pokerstats.gemspec",
      "spec/file_empty.txt",
      "spec/file_many_hands.txt",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
      "spec/pokerstars_file_spec.rb",
      "spec/pokerstars_hand_history_parser_spec.rb",
      "spec/spec_helper.rb",
+     "spec/stat_aggregator_spec.rb",
      "spec/zpokerstars_hand_history_parser_integration.rb.txt"
   ]
   s.homepage = %q{http://github.com/wizardwerdna/pokerstats}
@@ -67,7 +69,8 @@ Gem::Specification.new do |s|
      "spec/player_statistics_spec.rb",
      "spec/pokerstars_file_spec.rb",
      "spec/pokerstars_hand_history_parser_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/stat_aggregator_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/stat_aggregator_spec.rb

@@ -0,0 +1,119 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/stat_aggregator')
+
+describe Pokerstats::StatAggregator do
+
+  STAT_SPECIFICATION_HASH = {
+    :t_data_items => lambda{|hash| 1},
+    :t_zero_numeric_items => lambda{|hash| hash[:numeric_item].nil? ? nil : hash[:numeric_item].zero?},
+    :t_numeric_item => :numeric_item,
+    :t_boolean_item => :is_boolean_item
+  }
+
+  DATA_ITEM_WITH_ZERO_NUMERIC_AND_TRUE_BOOLEAN      = {:numeric_item => 0,    :is_boolean_item => true}
+  DATA_ITEM_WITH_NON_ZERO_NUMERIC_AND_FALSE_BOOLEAN = {:numeric_item => 2,    :is_boolean_item => false}
+  DATA_ITEM_WITH_NIL_NUMERIC_AND_TRUE_BOOLEAN       = {:numeric_item => nil,  :is_boolean_item => true}
+  ALL_DATA_ITEMS = [
+    DATA_ITEM_WITH_ZERO_NUMERIC_AND_TRUE_BOOLEAN,
+    DATA_ITEM_WITH_NON_ZERO_NUMERIC_AND_FALSE_BOOLEAN,
+    DATA_ITEM_WITH_NIL_NUMERIC_AND_TRUE_BOOLEAN
+  ]
+  
+  before(:each) do
+    @stat_aggregator = Pokerstats::StatAggregator.new(STAT_SPECIFICATION_HASH)
+  end
+  
+  context "when created" do
+    it "generates data with the correct initial values" do
+      data = @stat_aggregator.data
+      STAT_SPECIFICATION_HASH.each do |key, value|
+        data[key].items.should be_zero
+        data[key].total.should be_zero
+      end
+    end
+  end
+
+  context "after applying a non-null zero numeric and boolean true result" do
+    before(:each) do
+      EXPECTED_AGGREGATION_REPORT_FOR_ZERO_NUMERIC_AND_TRUE_BOOLEAN = {
+        :t_data_items         => Pokerstats::StatAggregationCount.new(1, 1),
+        :t_zero_numeric_items => Pokerstats::StatAggregationCount.new(1, 1),
+        :t_numeric_item       => Pokerstats::StatAggregationCount.new(1, 0),
+        :t_boolean_item       => Pokerstats::StatAggregationCount.new(1, 1)    
+      }
+      @applied = @stat_aggregator.apply DATA_ITEM_WITH_ZERO_NUMERIC_AND_TRUE_BOOLEAN
+    end
+    it "generates data with the correct applied values with a numeric and a boolean true result" do
+      @stat_aggregator.data.should == EXPECTED_AGGREGATION_REPORT_FOR_ZERO_NUMERIC_AND_TRUE_BOOLEAN
+    end
+  end
+  
+  context "after applying a non-null non-zero numeric and boolean false result" do
+    before(:each) do
+      EXPECTED_AGGREGATION_REPORT_FOR_NON_ZERO_NUMERIC_AND_FALSE_BOOLEAN = {
+        :t_data_items         => Pokerstats::StatAggregationCount.new(1, 1),
+        :t_zero_numeric_items => Pokerstats::StatAggregationCount.new(1, 0),
+        :t_numeric_item       => Pokerstats::StatAggregationCount.new(1, 2),
+        :t_boolean_item       => Pokerstats::StatAggregationCount.new(1, 0)    
+      }
+      @applied = @stat_aggregator.apply DATA_ITEM_WITH_NON_ZERO_NUMERIC_AND_FALSE_BOOLEAN
+    end
+    it "generates data with the correct applied values with a numeric and a boolean true result" do
+      @stat_aggregator.data.should == EXPECTED_AGGREGATION_REPORT_FOR_NON_ZERO_NUMERIC_AND_FALSE_BOOLEAN
+    end
+  end
+  
+  context "after applying a non-null non-zero numeric and boolean false result" do
+    before(:each) do
+      EXPECTED_AGGREGATION_REPORT_FOR_NIL_NUMERIC_AND_TRUE_BOOLEAN = {
+        :t_data_items         => Pokerstats::StatAggregationCount.new(1, 1),
+        :t_zero_numeric_items => Pokerstats::StatAggregationCount.new(0, 0),
+        :t_numeric_item       => Pokerstats::StatAggregationCount.new(0, 0),
+        :t_boolean_item       => Pokerstats::StatAggregationCount.new(1, 1)    
+      }
+      @applied = @stat_aggregator.apply DATA_ITEM_WITH_NIL_NUMERIC_AND_TRUE_BOOLEAN
+    end
+    it "generates data with the correct applied values with a numeric and a boolean true result" do
+      @stat_aggregator.data.should == EXPECTED_AGGREGATION_REPORT_FOR_NIL_NUMERIC_AND_TRUE_BOOLEAN
+    end
+  end
+  
+  context "after applying the full set of data" do
+    before(:each) do
+      EXPECTED_AGGREGATION_REPORT = {
+        :t_data_items         => Pokerstats::StatAggregationCount.new(3, 3),
+        :t_zero_numeric_items => Pokerstats::StatAggregationCount.new(2, 1),
+        :t_numeric_item       => Pokerstats::StatAggregationCount.new(2, 2),
+        :t_boolean_item       => Pokerstats::StatAggregationCount.new(3, 2)
+      }
+      ALL_DATA_ITEMS.each{|item| @stat_aggregator.apply item}
+    end
+    it "generates data with the correct applied values with a numeric and a boolean true result" do
+      puts ALL_DATA_ITEMS.to_yaml
+      puts EXPECTED_AGGREGATION_REPORT.to_yaml
+      puts @stat_aggregator.data.to_yaml
+      @stat_aggregator.data.should == EXPECTED_AGGREGATION_REPORT
+    end
+  end
+end
+
+# @aggreation_specification_hash = {
+#   :t_hands => {|hash| 1}
+#   :t_vpip => {|hash| hash[:paid].zero?}
+#   :t_posted => :posted
+#   :t_posted, :posted
+#   :t_paid, :paid
+#   :t_won, :won
+#   :t_preflop_passive, :preflop_passive
+#   :t_preflop_aggressive, :preflop_aggressive
+#   :t_postflop_passive, :postflop_passive
+#   :t_postflop_aggressive, :postflop_aggressive
+#   :t_blind_attack_opportunity, :is_blind_attack_opportunity
+#   :t_blind_attack_opportunity_taken, :is_blind_attack_opportunity_taken
+#   :t_blind_defense_opportunity, :is_blind_defense_opportunity
+#   :t_blind_defense_opportunity_taken, :is_blind_defense_opportunity_taken
+#   :t_pfr_opportunity, :is_pfr_opportunity
+#   :t_pfr_opportunity_taken, :is_pfr_opportunity_taken
+#   :t_cbet_opportunity, :is_cbet_opportunity
+#   :t_cbet_opportunity_taken, :is_cbet_opportunity_taken
+# }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pokerstats
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Andrew C. Greenberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 -07:00
+date: 2009-11-03 00:00:00 -08:00
 default_executable: checkps
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - lib/pokerstats/poker-edge.rb
 - lib/pokerstats/pokerstars_file.rb
 - lib/pokerstats/pokerstars_hand_history_parser.rb
+- lib/pokerstats/stat_aggregator.rb
 - pokerstats.gemspec
 - spec/file_empty.txt
 - spec/file_many_hands.txt
@@ -87,6 +88,7 @@ files:
 - spec/pokerstars_file_spec.rb
 - spec/pokerstars_hand_history_parser_spec.rb
 - spec/spec_helper.rb
+- spec/stat_aggregator_spec.rb
 - spec/zpokerstars_hand_history_parser_integration.rb.txt
 has_rdoc: true
 homepage: http://github.com/wizardwerdna/pokerstats
@@ -123,3 +125,4 @@ test_files:
 - spec/pokerstars_file_spec.rb
 - spec/pokerstars_hand_history_parser_spec.rb
 - spec/spec_helper.rb
+- spec/stat_aggregator_spec.rb