holdem 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0754af8abb3299e3d216afe08268d3a598d36b7f
-  data.tar.gz: 94286f69b8e84cf14d20c5592cef849621d3ddf0
+  metadata.gz: 6926800d2c8e0220fe8dca45c426cd377616245a
+  data.tar.gz: ea61981ed82d2d411d4ae02ba1b1302f8fd526cc
 SHA512:
-  metadata.gz: b32781200a316d37424ea3723c49ef28fdaf2dc0f13db71a64e213008ab7bb064c08edb21cd59bf3d0b4d6215dd0a108400c98dd7f4bbfb35f93bebdaa1265c7
-  data.tar.gz: aec81c6ca0f148bc738482434c1dc1b8ad2f135beeaba5b3095093ec164c21fe5d5c18a0ea7f219eeaeccc9e8354059d86343a7ff6ac23e0c52468d6d3218f60
+  metadata.gz: 6e588537a1e5971709de0a98ee550c1962fe3134f5677a06d3c9d69d0db57bacb5dec0dc25754eea27775b183356ffdcc3c8b9869d4169f47acdaac6750e1c9a
+  data.tar.gz: 011bd038663f9f731f427fb4e98747f0ff9e3fd59156b796c968a491febdcfb8dc5dbad352bfeaa14af22f046eaeeb6acb69d6815e0b43b1cc662e2e3783c336

data/holdem.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'minitest', '~> 5.4.3'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.0.8'
 end

data/lib/holdem/card.rb

@@ -8,8 +8,8 @@ class Card
   FACE_CARDS  = { 'T' => 10, 'J' => 11, 'Q' => 12, 'K' => 13, 'A' => 14 }
 
   def initialize(card)
-    @rank, @suit = card.split(//)
-    @icon        = ICONS[suit]
+    @rank, @suit = card.chars if card.respond_to?(:chars)
+    @icon = ICONS[suit]
     validate(card)
   end
 

data/lib/holdem/deck.rb

@@ -1,16 +1,23 @@
-class Deck < Array
+require 'forwardable'
+
+class Deck
+  extend Forwardable
+  def_delegators :@deck, :shuffle, :shuffle!, :pop, :size
+  attr_reader :deck
+
   def initialize
+    @deck = []
     build_deck
   end
 
-  # add test for #deal
   alias_method :deal, :pop
+  alias_method :count, :size
 
   private
 
   def build_deck
     Card::RANKS.each do |rank|
-      Card::SUITS.each { |suit| self << Card.new(rank + suit) }
+      Card::SUITS.each { |suit| deck << Card.new(rank + suit) }
     end
   end
 end

data/lib/holdem/poker_hand.rb

@@ -1,10 +1,11 @@
+require 'forwardable'
+
 class PokerHand
   include Comparable
   extend Forwardable
 
-  def_delegators :@poker_rank, :rank, :score
-  rank_methods = [ :straight_flush?, :quads?, :four_of_a_kind?, :boat?,
-                   :full_house?, :flush?, :straight?, :three_of_a_kind?,
+  rank_methods = [ :rank, :score, :straight_flush?, :quads?, :four_of_a_kind?,
+                   :boat?, :full_house?, :flush?, :straight?, :three_of_a_kind?,
                    :trips?, :two_pairs?, :two_pair?, :pair? ]
   def_delegators :@poker_rank, *rank_methods
 
@@ -30,4 +31,4 @@ class PokerHand
   def to_s
     "#{just_cards} -> #{rank}"
   end
-end
+end

data/lib/holdem/poker_rank.rb

@@ -7,15 +7,6 @@ class PokerRank
   end
 
   def build_ranking
-    # return ["Straight flush", straight_flush_score]  if straight_flush?
-    # return ["Four of a kind", four_kind_score]       if four_of_a_kind?
-    # return ["Full House", full_house_score]          if full_house?
-    # return ["Flush", flush_score]                    if flush?
-    # return ["Straight", straight_score]              if straight?
-    # return ["Three of a Kind", three_kind_score]     if three_of_a_kind?
-    # return ["Two Pairs", two_pairs_score]            if two_pairs?
-    # return ["One Pair", pair_score]                  if pair?
-    # 
     case 
       when straight_flush?   then build_straight_flush
       when four_of_a_kind?   then build_four_kind
@@ -136,11 +127,6 @@ class PokerRank
   end
 
   # HELPER METHODS
-
-  def pair_card_values
-    pairs.map { |_count, cards| cards.first.value }
-  end
-
   def high_card
     sorted_cards.first
   end
@@ -160,11 +146,17 @@ class PokerRank
     return suit if count >= 5 
   end
 
+  private
+
+  # helper method to retrieve card value/rank for each pair
   def pair_card(num=1)
     pairs.take(num).map { |_count, cards| cards.last }.last
   end
 
-  #private
+  # helper method to calculate poker scores
+  def pair_card_values
+    pairs.map { |_count, cards| cards.first.value }
+  end
 
   def sorted_cards
     @sorted_cards ||= cards.sort_by { |card| card.value * -1 }

data/lib/holdem/version.rb

@@ -1,3 +1,3 @@
 module Holdem
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/card_test.rb

@@ -1,5 +1,4 @@
-require 'minitest/autorun'
-require 'holdem'
+require_relative 'test_helper'
 
 class CardTest < Minitest::Test
   def setup
@@ -22,13 +21,15 @@ class CardTest < Minitest::Test
     assert_equal 'c', @card4.suit
   end
 
-   def test_has_icons
+   def test_card_icons
     assert_equal '♦', @card1.icon
     assert_equal '♥', @card2.icon
   end
 
   def test_invalid_cards
+    assert_raises(ArgumentError) { Card.new(56) }
     assert_raises(ArgumentError) { Card.new('9k') }
     assert_raises(ArgumentError) { Card.new('d2') }
+    assert_raises(ArgumentError) { Card.new('a card') }
   end
 end

data/test/deck_test.rb

@@ -1,5 +1,4 @@
-require 'minitest/autorun'
-require 'holdem'
+require_relative 'test_helper'
 
 class DeckTest < Minitest::Test
 
@@ -12,14 +11,15 @@ class DeckTest < Minitest::Test
   end
 
   def test_deck_next_card
-    card = @deck.dup.pop
+    card = Deck.new.pop
     assert_equal card, @deck.pop
     assert_equal 51, @deck.size
   end
 
   def test_shuffle
-    unshuffled = @deck.dup
+    unshuffled = @deck
     shuffled = @deck.shuffle
+
     refute_equal unshuffled, shuffled
   end
-end
+end

data/test/poker_hand_test.rb

@@ -1,5 +1,4 @@
-require 'minitest/autorun'
-require 'holdem'
+require_relative 'test_helper'
 
 class PokerHandTest < Minitest::Test
   def setup

data/test/poker_rank_test.rb

@@ -1,5 +1,4 @@
-require 'minitest/autorun'
-require 'holdem'
+require_relative 'test_helper'
 
 class PokerRankingTest < Minitest::Test
 

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'minitest/autorun'
+require "minitest/reporters"
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+require 'holdem'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holdem
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jamie Berczel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.4.3
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.8
 description: A ruby module for creating and comparing Texas Holdem poker hands.
 email:
 - jxberc@gmail.com
@@ -76,6 +90,7 @@ files:
 - test/deck_test.rb
 - test/poker_hand_test.rb
 - test/poker_rank_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -96,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A ruby module for creating and comparing Texas Holdem poker hands.
@@ -105,3 +120,4 @@ test_files:
 - test/deck_test.rb
 - test/poker_hand_test.rb
 - test/poker_rank_test.rb
+- test/test_helper.rb