Implement highest and full_of for full house

camillebaldock · Sep 8, 2014 · 8206f58 · 8206f58
1 parent d90e840
commit 8206f58
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/hand.rb b/lib/hand.rb
@@ -36,7 +36,7 @@ def rank
     elsif has_four
       has_four
     elsif full_house
-      { :type => :full_house }
+      full_house
     elsif flush
       flush
     elsif straight
@@ -107,7 +107,13 @@ def has_two
   end
 
   def full_house
-    pips_per_occurence[3] && pips_per_occurence[2]
+    if pips_per_occurence[3] && pips_per_occurence[2]
+      {
+        :type => :full_house, 
+        :highest => pips_per_occurence[3].first, 
+        :full_of => pips_per_occurence[2].first
+      }
+    end
   end
 
   def flush

diff --git a/spec/hand_spec.rb b/spec/hand_spec.rb
@@ -75,6 +75,12 @@
       it "ranks the hand correctly" do
         expect(hand.rank.fetch(:type)).to eq :full_house
       end
+      it "returns the highest correctly" do
+        expect(hand.rank.fetch(:highest)).to eq 5
+      end
+      it "returns the full_of value correctly" do
+        expect(hand.rank.fetch(:full_of)).to eq 6
+      end
     end
 
     context "flush hand" do