poker-ranking 1.0.8 → 1.1.0

data/lib/hand.rb

@@ -57,6 +57,10 @@ module PokerRanking
       hand_type.name
     end
 
+    def cards_used
+      hand_type.cards_used.sort_by! { |card| card.value }
+    end
+
     def ==(other)
       cards == other.cards
     end
@@ -64,6 +68,7 @@ module PokerRanking
     def data
       {
           cards: @cards.map { |card| card.data },
+          cards_used: cards_used.map { |card| card.data },
           rank: rank,
           value: value,
           second_value: second_value,

data/lib/hand_type/base.rb

@@ -52,7 +52,46 @@ module PokerRanking
         kickers[0..number_of_kickers-1]
       end
 
+      def cards_for_values_and_kickers(*values)
+        result = cards.select { |card| not values.include? card.value }
+        values.reverse.each do |value|
+          result += cards.select { |card| card.value == value }
+        end
+        result[-5..-1]
+      end
+
+      def straight_value_of(card_set)
+        cards_in_straight = cards_in_straight(card_set)
+
+        cards_in_straight.empty? ? 0 : cards_in_straight[-1].value
+      end
+
+      def cards_in_straight(card_set)
+        return [] if card_set.empty?
+
+        cards_in_streak = []
+        cards_in_straight = []
+        last_value = 0
 
+        if card_set[-1].rank == 'Ace'
+          cards_in_streak << card_set[-1]
+          last_value = 1
+        end
+
+        card_set.each do |card|
+          if cards_in_streak.empty? or card.value == last_value + 1
+            cards_in_streak << card
+          elsif card.value > last_value
+            cards_in_streak = [card]
+          end
+          last_value = cards_in_streak[-1].value
+
+          if cards_in_streak.length >= 5
+            cards_in_straight = cards_in_streak.clone
+          end
+        end
+        cards_in_straight
+      end
     end
   end
 end

data/lib/hand_type/flush.rb

@@ -6,7 +6,7 @@ module PokerRanking
 
       def handles?
         count = { 'Hearts' => 0, 'Clubs' => 0, 'Diamonds' => 0, 'Spades' => 0 }
-        @cards.each do |card|
+        cards.each do |card|
           count[card.suit] += 1
         end
 
@@ -27,7 +27,7 @@ module PokerRanking
       #only use kickers that are of the suit
       def kickers
         kick = []
-        @cards.reverse.each do |card|
+        cards.reverse.each do |card|
           if card.suit == @flush_suit
             kick << card.value
           end
@@ -42,6 +42,10 @@ module PokerRanking
       def name
         'flush'
       end
+
+      def cards_used
+        cards.select { |card| card.suit == @flush_suit }[-5..-1]
+      end
     end
   end
 end

data/lib/hand_type/four_of_a_kind.rb

@@ -27,6 +27,10 @@ module PokerRanking
       def name
         'four of a kind'
       end
+
+      def cards_used
+        cards_for_values_and_kickers value
+      end
     end
   end
 end

data/lib/hand_type/full_house.rb

@@ -26,6 +26,10 @@ module PokerRanking
       def name
         'full house'
       end
+
+      def cards_used
+        cards_for_values_and_kickers value, second_value
+      end
     end
   end
 end

data/lib/hand_type/high_card.rb

@@ -13,6 +13,10 @@ module PokerRanking
       def name
         'high card'
       end
+
+      def cards_used
+        cards_for_values_and_kickers
+      end
     end
   end
 end

data/lib/hand_type/pair.rb

@@ -22,6 +22,10 @@ module PokerRanking
       def name
         'pair'
       end
+
+      def cards_used
+        cards_for_values_and_kickers value
+      end
     end
   end
 end

data/lib/hand_type/straight.rb

@@ -3,7 +3,7 @@ module PokerRanking
     class Straight < Base
 
       def handles?
-        straight_value > 0
+        value > 0
       end
 
       def rank
@@ -11,45 +11,16 @@ module PokerRanking
       end
 
       def value
-        straight_value
+        straight_value_of cards
       end
 
       def name
         'straight'
       end
 
-      private
-
-      def straight_value
-        count = 1
-        last_value = 0
-        value = 0
-
-        if has_ace()
-          count += 1
-          last_value = 1
-        end
-
-        @cards.each do |card|
-          if card.value == last_value + 1
-            count += 1
-          else
-            count = 1
-          end
-          last_value = card.value
-
-          if count >= 5
-            value = card.value
-          end
-        end
-        value
+      def cards_used
+        cards_in_straight(cards)[-5..-1]
       end
-
-      def has_ace
-        @cards[-1].rank == 'Ace'
-      end
-
-
     end
   end
 end

data/lib/hand_type/straight_flush.rb

@@ -14,7 +14,7 @@ module PokerRanking
 
       def value
         SUITS.each do |suit|
-          value_for_suit = straight_value_for_suit(suit)
+          value_for_suit = straight_value_of(cards.select { |card| card.suit == suit })
           return value_for_suit if value_for_suit > 0
         end
         0
@@ -24,41 +24,11 @@ module PokerRanking
         'straight flush'
       end
 
-      private
-
-      def straight_value_for_suit(suit)
-        count = 1
-        last_value = 0
-        value = 0
-
-        if has_ace_of_suit(suit)
-          count += 1
-          last_value = 1
-        end
-
-        cards.each do |card|
-          if card.suit == suit
-            if card.value == last_value + 1
-              count += 1
-            else
-              count = 1
-            end
-            last_value = card.value
-
-            if count >= 5
-              value = card.value
-            end
-          end
-        end
-        value
-      end
-
-      def has_ace_of_suit(suit)
-        cards.each do |card|
-          return true if card.value == 14 && card.suit == suit
+      def cards_used
+        SUITS.each do |suit|
+          straight_in_suite = cards_in_straight(cards.select { |card| card.suit == suit })
+          return straight_in_suite[-5..-1] if straight_in_suite.length >= 5
         end
-
-        false
       end
     end
   end

data/lib/hand_type/three_of_a_kind.rb

@@ -23,6 +23,9 @@ module PokerRanking
         'three of a kind'
       end
 
+      def cards_used
+        cards_for_values_and_kickers value
+      end
     end
   end
 end

data/lib/hand_type/two_pair.rb

@@ -31,12 +31,16 @@ module PokerRanking
         'two pairs'
       end
 
+      def cards_used
+        cards_for_values_and_kickers value, second_value
+      end
+
       private
 
       def has_two_pair?
         pair_count = 0
         last_value = 0
-        @cards.each do |card|
+        cards.each do |card|
           if card.value == last_value
             pair_count += 1
           end

data/lib/poker_ranking.rb

@@ -2,5 +2,5 @@ require_relative 'hand'
 require_relative 'card'
 
 module PokerRanking
-  VERSION = '1.0.8'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poker-ranking
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Created for the lean poker project
 email: rafael@ordog.tk
 executables: []