hands 0.0.1 → 0.0.2

data/Gemfile

@@ -4,3 +4,4 @@ gemspec
 
 gem 'rake'
 gem 'rspec', '~>2.7.0'
+gem 'simplecov', :require => false

data/lib/hands.rb

@@ -3,10 +3,10 @@ require 'hands/card'
 require 'hands/hand'
 
 module Hands
-  SUITES = %w{ clubs diamonds hearts spades }
   VALUES = %w{ 2 3 4 5 6 7 8 9 10 j q k a }
   VALUE_DESCRIPTIONS = %w{ two three four five six seven eight nine ten jack queen king ace }
 
-  # See http://www.pagat.com/poker/rules/ranking.html
+  # Reference: http://www.pagat.com/poker/rules/ranking.html
+  SUITES = %w{ clubs diamonds hearts spades } # Reverse alphabetical
   HAND_ORDER = %w{ high_card pair two_pair three_of_a_kind straight flush full_house four_of_a_kind straight_flush }
 end

data/lib/hands/card.rb

@@ -19,7 +19,7 @@ module Hands
         self.value = first[:value] if first[:value]
         self.suite = first[:suite] if first[:suite]
       end
-      
+
       # Set suite
       self.suite = suite if suite
     end

data/lib/hands/hand.rb

@@ -7,7 +7,7 @@ module Hands
     def cards
       @cards ||= []
     end
-        
+
     def <=>(other_hand)
       response = (self.hand_index <=> other_hand.hand_index)
 
@@ -52,7 +52,7 @@ module Hands
     end
 
     def three_of_a_kind
-      nil
+      self.kinds(3)
     end
 
     def straight
@@ -85,28 +85,41 @@ module Hands
       end
       cs
     end
-    
+
     def flush
       # If all of the cards are the same suite, we have a flush
       return nil unless self.suites.length == 1
       self.cards.sort.reverse
     end
-    
+
     def full_house
-      # TODO: Implement
-      nil
+      dupes = self.duplicates
+      return nil unless dupes.length == 2
+
+      a = []
+      b = []
+
+      hand = self.cards.select do |card|
+        if dupes.first == card.value
+          a << card
+        elsif dupes.last == card.value
+          b << card
+        end
+      end
+
+      return nil unless a.length + b.length == 5
+      self.cards.sort.reverse
     end
-    
+
     def four_of_a_kind
-      # TODO: Implement
-      nil
+      self.kinds(4)
     end
-    
+
     def straight_flush
-      # TODO: Implement
-      nil
+      return nil unless self.flush
+      self.straight
     end
-    
+
     protected
 
     def hand_index
@@ -132,5 +145,20 @@ module Hands
       hand << (self.cards - hand).sort.reverse
       hand.flatten
     end
+
+    def kinds(num)
+      dupes = self.duplicates
+      return nil unless dupes.length == 1
+
+      hand = self.cards.select do |card|
+        dupes.include?(card.value)
+      end
+
+      return nil unless hand.length == num
+
+      hand = hand.sort.reverse
+      hand << (self.cards - hand).sort.reverse
+      hand.flatten
+    end
   end
 end

data/lib/hands/version.rb

@@ -1,3 +1,3 @@
 module Hands
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/models/card_spec.rb

@@ -5,40 +5,45 @@ describe Hands::Card do
     card = Hands::Card.new
     card.is_valid?.should eq(false)
     card.is_invalid?.should eq(true)
-    
+
     card.suite = :hearts
     card.is_valid?.should eq(false)
-    
+
     card.value = 9
     card.is_valid?.should eq(true)
-    
+
     card.suite = 17
     card.is_valid?.should eq(false)
   end
-  
+
   it 'should allow for integers instead of characters for high cards' do
     card1 = Hands::Card.new(:value => 11, :suite => :clubs)
-    
     card1.is_valid?.should eq(true)
     card1.value.should eq('j')
-    
+
     card2 = Hands::Card.new(:value => 'j', :suite => :clubs)
     card2.should eq(card1)
   end
-  
+
+  it 'should not allow invalid values' do
+    card = Hands::Card.new
+    card.value = 'p'
+    card.value.should eql(nil)
+  end
+
   it 'should be comparable' do
     card1 = Hands::Card.new(:value => 2, :suite => :hearts)
     card2 = Hands::Card.new(:value => 3, :suite => :clubs)
-    
+
     (card2 > card1).should eq(true)
     (card1 < card2).should eq(true)
-    
+
     card1.value = 3
     (card1 == card2).should eq(true)
     (card1.<=>(card2, true)).should eq(1)
     (card2.<=>(card1, true)).should eq(-1)
   end
-  
+
   it 'should be sortable' do
     c2 = Hands::Card.new(:value => 2, :suite => :hearts)
     c3 = Hands::Card.new(:value => 3, :suite => :hearts)
@@ -53,8 +58,17 @@ describe Hands::Card do
     cQ = Hands::Card.new(:value => 'q', :suite => :hearts)
     cK = Hands::Card.new(:value => 'k', :suite => :hearts)
     cA = Hands::Card.new(:value => 'a', :suite => :hearts)
-    
+
     cards = [c2, c3, c4, c5, c6, c7, c8, c9, c10, cJ, cQ, cK, cA]
     cards.sort.should eq(cards)    
   end
+
+  it 'should include description in inspect' do
+    card = Hands::Card[2, :hearts]
+    card.inspect.include?('Two of Hearts').should eql(true)
+
+    card = Hands::Card.new
+    card.description.should eql('invalid')
+    card.inspect.include?('invalid').should eql(false)
+  end
 end

data/spec/models/hand_spec.rb

@@ -5,7 +5,7 @@ describe Hands::Hand do
     pair = Hands::Hand.new
     pair << Hands::Card[2, :hearts]
     pair << Hands::Card[2, :clubs]
-    
+
     flush = Hands::Hand.new
     flush << Hands::Card[6, :hearts]
     flush << Hands::Card[7, :hearts]
@@ -14,24 +14,24 @@ describe Hands::Hand do
     flush << Hands::Card[4, :hearts]
     (flush > pair).should eq(true)
   end
-  
+
   it 'should order same types of hands' do
     small_pair = Hands::Hand.new
     small_pair << Hands::Card[2, :hearts]
     small_pair << Hands::Card[2, :clubs]
-    
+
     large_pair = Hands::Hand.new
     large_pair << Hands::Card['A', :hearts]
     large_pair << Hands::Card['A', :clubs]
     (large_pair > small_pair).should eq(true)
-    
+
     small_kicker = Hands::Hand.new
     small_kicker << Hands::Card['A', :spades]
     small_kicker << Hands::Card['A', :diamonds]
     small_kicker << Hands::Card[2, :diamonds]
     small_kicker << Hands::Card[3, :diamonds]
     small_kicker << Hands::Card[4, :diamonds]
-    
+
     big_kicker = Hands::Hand.new
     big_kicker << Hands::Card['A', :hearts]
     big_kicker << Hands::Card['A', :clubs]
@@ -40,17 +40,17 @@ describe Hands::Hand do
     big_kicker << Hands::Card[7, :diamonds]
     (big_kicker > small_kicker).should eq(true)
   end
-  
+
   it 'should collect suites' do
     hand = Hands::Hand.new
     hand << Hands::Card[2, :hearts]
     hand << Hands::Card[2, :clubs]
     hand.suites.should eq([:hearts, :clubs])
-    
+
     hand << Hands::Card[3, :clubs]
     hand.suites.should eq([:hearts, :clubs])
   end
-  
+
   it 'should recognize high card' do
     hand = Hands::Hand.new
     hand << Hands::Card[2, :hearts]
@@ -62,7 +62,7 @@ describe Hands::Hand do
     hand.pair.should eql(nil)
     hand.two_pair.should eql(nil)
   end
-  
+
   it 'should recognize a pair' do
     hand = Hands::Hand.new
     hand << Hands::Card[9, :hearts]
@@ -73,7 +73,7 @@ describe Hands::Hand do
     hand.pair.collect(&:value).should eq([9, 9, 7, 4, 2])
     hand.two_pair.should eql(nil)
   end
-  
+
   it 'should recognize two pair'  do
     hand = Hands::Hand.new
     hand << Hands::Card[7, :hearts]
@@ -84,9 +84,17 @@ describe Hands::Hand do
     hand.two_pair.collect(&:value).should eq([9, 9, 7, 7, 4])
     hand.two_pair.should eql(hand.pair)
   end
-   
-  it 'should recognize three of a kind'
-  
+
+  it 'should recognize three of a kind' do
+    hand = Hands::Hand.new
+    hand << Hands::Card[7, :hearts]
+    hand << Hands::Card[7, :spades]
+    hand << Hands::Card[7, :diamonds]
+    hand << Hands::Card[3, :hearts]
+    hand << Hands::Card[9, :clubs]
+    hand.best_hand[:type].should eq('three_of_a_kind')
+  end
+
   it 'should recognize a straight' do
     hand1 = Hands::Hand.new
     hand1 << Hands::Card[2, :hearts]
@@ -95,7 +103,7 @@ describe Hands::Hand do
     hand1 << Hands::Card[5, :hearts]
     hand1 << Hands::Card[6, :clubs]
     hand1.best_hand[:type].should eq('straight')
-    
+
     hand2 = Hands::Hand.new
     hand2 << Hands::Card['A', :hearts]
     hand2 << Hands::Card[2, :spades]
@@ -103,7 +111,7 @@ describe Hands::Hand do
     hand2 << Hands::Card[4, :hearts]
     hand2 << Hands::Card[5, :clubs]
     hand2.best_hand[:type].should eq('straight')
-    
+
     hand3 = Hands::Hand.new
     hand3 << Hands::Card[10, :hearts]
     hand3 << Hands::Card['J', :spades]
@@ -111,7 +119,7 @@ describe Hands::Hand do
     hand3 << Hands::Card['K', :hearts]
     hand3 << Hands::Card['A', :clubs]
     hand3.best_hand[:type].should eq('straight')
-    
+
     hand4 = Hands::Hand.new
     hand4 << Hands::Card['J', :spades]
     hand4 << Hands::Card['Q', :diamonds]
@@ -120,7 +128,7 @@ describe Hands::Hand do
     hand4 << Hands::Card[2, :hearts]  
     hand4.best_hand[:type].should eq('high_card')
   end
-  
+
   it 'should recognize a flush' do
     hand = Hands::Hand.new
     hand << Hands::Card[6, :hearts]
@@ -130,11 +138,37 @@ describe Hands::Hand do
     hand << Hands::Card[4, :hearts]
     hand.best_hand[:type].should eq('flush')
   end
-  
-  it 'should recognize a full house'
-  it 'should recognize four of a kind'
-  it 'should recognize a straight flush'
-  
+
+  it 'should recognize a full house' do
+    hand = Hands::Hand.new
+    hand << Hands::Card[7, :hearts]
+    hand << Hands::Card[7, :spades]
+    hand << Hands::Card[7, :diamonds]
+    hand << Hands::Card[9, :spades]
+    hand << Hands::Card[9, :clubs]
+    hand.best_hand[:type].should eq('full_house')
+  end
+
+  it 'should recognize four of a kind' do
+    hand = Hands::Hand.new
+    hand << Hands::Card[7, :hearts]
+    hand << Hands::Card[7, :spades]
+    hand << Hands::Card[7, :diamonds]
+    hand << Hands::Card[7, :clubs]
+    hand << Hands::Card[9, :clubs]
+    hand.best_hand[:type].should eq('four_of_a_kind')
+  end
+
+  it 'should recognize a straight flush' do
+    hand = Hands::Hand.new
+    hand << Hands::Card[2, :hearts]
+    hand << Hands::Card[3, :hearts]
+    hand << Hands::Card[4, :hearts]
+    hand << Hands::Card[5, :hearts]
+    hand << Hands::Card[6, :hearts]
+    hand.best_hand[:type].should eq('straight_flush')
+  end
+
   it 'should recognize the best hand'  do
     hand = Hands::Hand.new
     hand << Hands::Card[7, :hearts]

data/spec/spec_helper.rb

@@ -1,2 +1,5 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'rspec'
 require 'hands'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hands
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: