the_gambler 1.1.0 → 1.2.0

data/README.md

@@ -27,7 +27,8 @@ Right now, the following stuff works. Assume anything not mentioned in this list
 
 * Blackjack hand evaluation
 * Poker hand evaluation
-* 5 or 7 card hands
+* 5- or 7-card hands
+* 9-card hands
 
 ## Contributing to `the_gambler`
  

data/Rakefile

@@ -43,3 +43,15 @@ task :default => :spec
 
 require 'yard'
 YARD::Rake::YardocTask.new
+
+namespace :benchmark do
+  require 'the_gambler'
+
+  desc 'Test how long it takes to evaluate a given number of random hands.'
+  task :randoms do
+    10_000_000.times do |i|
+      TheGambler::Hand.new(rand(52), rand(52), rand(52), rand(52), rand(52)).poker_value
+    end
+  end
+end
+

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/the_gambler/card.rb

@@ -8,6 +8,11 @@ module TheGambler
 
     def initialize(arg)
       case arg.class.to_s
+      when 'Card','TheGambler::Card'
+        rank, suit = arg.rank, arg.suit
+      when 'Fixnum'
+        rank = RANKS[arg.zero? ? -1 : arg % 13]
+        suit = SUIT_STRINGS[arg / 13]
       when 'String'
         if arg =~ /([ajqk2-9]|10)([SCHD])/i then
           rank, suit = $1.upcase, $2
@@ -26,8 +31,6 @@ module TheGambler
         else
           raise ArgumentError.new("Invalid hash: #{arg.inspect}")
         end
-      when 'Card','TheGambler::Card'
-        rank, suit = arg.rank, arg.suit
       else
         raise ArgumentError.new("Must supply either a String, an Array, or a Hash, not a #{arg.class.to_s}")
       end

data/lib/the_gambler/poker.rb

@@ -95,19 +95,17 @@ module TheGambler
     end
     
     def straight?
-      # values = contents.map(&:numerical_value).sort
-      # values == (values.min..values.max).to_a or values == [2, 3, 4, 5, 14]
-      nums = contents.map(&:numerical_value)
-      return true if nums.sort == [2, 3, 4, 5, 14]
+      nums = contents.map(&:numerical_value).sort
+      return true if nums == [2, 3, 4, 5, 14]
 
-      (2..14).each_cons(5) do |straight|
-        return true if (nums & straight).count == 5
-      end
+      one_different = nums[1..-1].zip(nums[0..-2]).group_by{|a, b| a - b}[1]
+
+      one_different and one_different.count >= 4
     end
     
     def flush?
       c = contents.group_by(&:suit)
-      !! contents.group_by(&:suit).values.detect{|k| k.count == 5}
+      !! contents.group_by(&:suit).values.detect{|k| k.count >= 5}
     end
     
     def full_house?
@@ -124,7 +122,7 @@ module TheGambler
     end
     
     def royal_flush?
-      contents.sort_by(&:numerical_value).map(&:to_s).join =~ %r{10([SCHD])J\1Q\1K\1A\1}i
+      contents.sort_by(&:numerical_value).map(&:to_s).join =~ %r{10([SCHD]).*J\1.*Q\1.*K\1.*A\1}i
     end
     
   end

data/spec/cards/initialization_spec.rb

@@ -20,6 +20,10 @@ module TheGambler
       it 'can take a Card as its argument' do
         (->{ Card.new(Card.new rank: 'A', suit: 'D') }).should_not raise_error
       end
+
+      it 'can take a Fixnum as its argument' do
+        (->{ Card.new 39 }).should_not raise_error
+      end
       
       describe 'with hash' do
         Card::RANKS.each do |rank|
@@ -57,6 +61,16 @@ module TheGambler
         end
       end
 
+      describe 'with string' do
+        (0..51).each do |i|
+          it "should correctly parse #{i}" do
+            card = Card.new i
+            card.rank.should eq(Card::RANKS[i.zero? ? -1 : i % 13])
+            card.suit.should eq(Card::SUIT_SYMBOLS[i / 13])
+          end
+        end
+      end
+
     end
   
   end

data/spec/hands/poker/nine_card_hands_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+module TheGambler
+  describe Hand do
+    context 'nine-card hands' do
+      it 'should recognize a royal flush within a nine-card hand' do
+        Hand.new(*%w{2D QH 3D KH 4C JH QD 10H AH}).royal_flush?.should be_true
+      end
+
+      it 'should recognize a straight flush within a nine-card hand' do
+        Hand.new(*%w{9H QH KH 4C JH 10H 2D 4H 7D}).straight_flush?.should be_true
+      end
+
+      context 'with four of a kind' do
+        it 'should recognize a four of a kind within a nine-card hand' do
+          Hand.new(*%w{9D 9H 9C 4C 9S 10H 5D QD 7D}).four_of_a_kind?.should be_true
+        end
+
+        it 'should recognize four of a kind and three of a kind at the same time as four of a kind only' do
+          Hand.new(*%w{9D 9H 9C 4C 9S QD 5H 4H 4D}).four_of_a_kind?.should be_true
+        end
+      end
+
+      context 'with a full house' do
+        it 'should recognize a full house within a nine-card hand' do
+          Hand.new(*%w{9D 3D 2C 9H 9H 4C 4H 10H 7D}).full_house?.should be_true
+        end
+
+        it 'should recognize a full house within a nine-card hand' do
+          Hand.new(*%w{9D 9H 9H 4C 4H 2D JH 4H 7D}).full_house?.should be_true
+        end
+      end
+
+      it 'should recognize a flush within a nine-card hand' do
+        Hand.new(*%w{9H QH KH 3D 10H 4C 6H 10H 7D}).flush?.should be_true
+      end
+
+      context 'with a straight' do
+        it 'should recognize a straight within a nine-card hand' do
+          Hand.new(*%w{9D 3C AD QH KH JC 6H 10H 7D}).straight?.should be_true
+        end
+      end
+
+      it 'should recognize a three of a kind within a nine-card hand' do
+        Hand.new(*%w{QD QH QC 4C 3D 6C JH 10H 7D}).three_of_a_kind?.should be_true
+      end
+
+      it 'should recognize a two pair within a nine-card hand' do
+        Hand.new(*%w{9D QH 9H 2D QC 4C 4H 10H QD}).two_pair?.should be_true
+      end
+
+      it 'should recognize a pair within a nine-card hand' do
+        Hand.new(*%w{KD QH KH 2C 5D 4C JH 10H 7D}).one_pair?.should be_true
+      end
+
+      it 'should recognize a high card within a nine-card hand' do
+        Hand.new(*%w{9D QH 3C 6D KH 4C 2H 10H 7D}).high_card?.should be_true
+      end
+
+    end
+  end
+end
+

data/spec/hands/{seven_or_nine_card_spec.rb → poker/seven_card_hands_spec.rb}

@@ -57,6 +57,10 @@ module TheGambler
         Hand.new(*%w{9D QH KH 4C 2H 10H 7D}).high_card?.should be_true
       end
     end
+
+
+
+
   end
 end
 

data/the_gambler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "the_gambler"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["max thom stahl"]
-  s.date = "2012-11-20"
+  s.date = "2012-11-24"
   s.description = "\n    Really common tasks in programs that use playing cards are a pain to implement. This is my\n    implementation. Use it. Or don't.\n  "
   s.email = "max@villainousindustries.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
     "lib/the_gambler/hand.rb",
     "lib/the_gambler/poker.rb",
     "spec/cards/initialization_spec.rb",
-    "spec/decks/deck_spec.rb",
     "spec/hands/hands_spec.rb",
     "spec/hands/poker/hand_flush_spec.rb",
     "spec/hands/poker/hand_four_of_a_kind_spec.rb",
@@ -46,8 +45,8 @@ Gem::Specification.new do |s|
     "spec/hands/poker/hand_three_of_a_kind_spec.rb",
     "spec/hands/poker/hand_two_pair_spec.rb",
     "spec/hands/poker/kicker_cards_spec.rb",
-    "spec/hands/seven_or_nine_card_spec.rb",
-    "spec/players/player_spec.rb",
+    "spec/hands/poker/nine_card_hands_spec.rb",
+    "spec/hands/poker/seven_card_hands_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/shared_examples/shared_poker_hands.rb",
     "spec/the_gambler_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_gambler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,7 +132,6 @@ files:
 - lib/the_gambler/hand.rb
 - lib/the_gambler/poker.rb
 - spec/cards/initialization_spec.rb
-- spec/decks/deck_spec.rb
 - spec/hands/hands_spec.rb
 - spec/hands/poker/hand_flush_spec.rb
 - spec/hands/poker/hand_four_of_a_kind_spec.rb
@@ -145,8 +144,8 @@ files:
 - spec/hands/poker/hand_three_of_a_kind_spec.rb
 - spec/hands/poker/hand_two_pair_spec.rb
 - spec/hands/poker/kicker_cards_spec.rb
-- spec/hands/seven_or_nine_card_spec.rb
-- spec/players/player_spec.rb
+- spec/hands/poker/nine_card_hands_spec.rb
+- spec/hands/poker/seven_card_hands_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/shared_poker_hands.rb
 - spec/the_gambler_spec.rb
@@ -166,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 9032265535672364
+      hash: -448834733471940909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/decks/deck_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-module TheGambler
-  
-  describe Deck do
-    let(:deck) { Deck.new }
-
-    describe '#initialize' do
-      it 'should accept cards as arguments' do
-        pending
-      end
-
-      it 'should accept an array of cards as arguments' do
-        pending
-      end
-
-    end
-
-    describe '#deal' do
-      it 'should deal the first card in the deck' do
-        pending
-      end
-    end
-
-    describe '#shuffle' do
-      it 'should change the ordering of the deck in a random manner' do
-        pending
-      end
-    end
-    
-  end
-  
-end