ruby-poker 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9070959501edf045c9d745325c51573314ecbc11
-  data.tar.gz: 8616e190cbcce32c2ad4f9455df760f0649fbb59
+  metadata.gz: 75efea8a8c606fa75f028780bdefac44f3855d2f
+  data.tar.gz: 3f20045773339569ba68d5bc94ea2308245cd110
 SHA512:
-  metadata.gz: f0dae2e671b57b3c98d092b200544b8e4423adedf4d66a4c360f202e2df39b9ef96f1e62b66286c1a78d1bd8f2cbd4f335df2c8831bffbd14fbccf292bc6a0ba
-  data.tar.gz: deb4dba594571df9ec74a1b368f11d86e10db12003bc849cecf19810eed73d94c252d14c4d77354332399d3876dfb2c5bfd3ef0b8346d0badc893019ddf001bc
+  metadata.gz: 4a9b9fe4f0e15e16981cc377ff0ba96f172537c9c9ea619b2f076515570c29bc27fccdb7d7a0e550cbf4d61581db8181aaac572a007254b6cd84e350ee629f62
+  data.tar.gz: e90a2a1661cfbc8457ff3bac50c945cea85071b6dd3611a98d4f52d947553cbccb8aa474153e142849bf8c5bc540af1269c955e9e51b9d9fd99f07a0dc5fec05

data/CHANGELOG

@@ -1,3 +1,6 @@
+2014-09-01 (1.0.1)
+    * Rearrange full house cards to return correct order when low pairs. (Stuart Hanscombe)
+
 2013-12-28 (1.0.0)
     * Add Gemfile
     * Add "Empty Hand" rank for empty hands. Fixes #1.

data/README.rdoc

@@ -1,4 +1,4 @@
-= Poker library in Ruby
+= Poker library in Ruby  {<img src="https://travis-ci.org/robolson/ruby-poker.png?branch=master" alt="Build Status" />}[https://travis-ci.org/robolson/ruby-poker]
 ===
 
 Author:: {Rob Olson}[https://github.com/robolson]
@@ -39,7 +39,7 @@ Place that line near the beginning of your program. The change is program wide s
 
 == Compatibility
 
-Ruby-Poker is compatible with Ruby 1.8, Ruby 1.9, Ruby 2.0.
+Ruby-Poker is compatible with Ruby 1.8, Ruby 1.9, and Ruby 2.X.
 
 == RDoc
 

data/Rakefile

@@ -3,7 +3,7 @@ Rake::TestTask.new do |t|
   t.libs = ['lib']
   t.verbose = true
   t.warning = true
-  t.test_files = FileList['test/test_card.rb', 'test/test_poker_hand.rb']
+  t.test_files = FileList['test/test_card.rb', 'test/test_poker_hand.rb', 'test/test_full_house.rb']
 end
 
 task :default => :test

data/lib/ruby-poker/poker_hand.rb

@@ -105,15 +105,13 @@ class PokerHand
 
   def full_house?
     if (md = (by_face =~ /(.). \1. \1. (.*)(.). \3./))
-      arranged_hand = arrange_hand(md[0] + ' ' +
-          md.pre_match + ' ' + md[2] + ' ' + md.post_match)
+      arranged_hand = rearrange_full_house(by_face.cards)
       [
         [7, Card::face_value(md[1]), Card::face_value(md[3])],
         arranged_hand
       ]
     elsif (md = (by_face =~ /((.). \2.) (.*)((.). \5. \5.)/))
-      arranged_hand = arrange_hand(md[4] + ' '  + md[1] + ' ' +
-          md.pre_match + ' ' + md[3] + ' ' + md.post_match)
+      arranged_hand = rearrange_full_house(by_face.cards)
       [
         [7, Card::face_value(md[5]), Card::face_value(md[2])],
         arranged_hand
@@ -139,7 +137,6 @@ class PokerHand
   end
 
   def straight?
-    result = false
     if hand.size >= 5
       transform = delta_transform
       # note we can have more than one delta 0 that we
@@ -154,9 +151,10 @@ class PokerHand
       if (md = (/.(.). 1.. 1.. 1.. 1../.match(transform)))
         high_card = Card::face_value(md[1])
         arranged_hand = fix_low_ace_display(md[0] + ' ' + md.pre_match + ' ' + md.post_match)
-        result = [[5, high_card], arranged_hand]
+        return [[5, high_card], arranged_hand]
       end
     end
+    false
   end
 
   def three_of_a_kind?
@@ -505,4 +503,12 @@ class PokerHand
     arranged_hand.gsub(/\s+$/, '')
   end
 
+  def rearrange_full_house(cards)
+    card_array = cards.split.uniq
+    card_hash = Hash[card_array.collect{|c| [c[0], card_array.count{|n| n[0] == c[0]}]}]
+    arranged_hand = card_array.select{|c| c if c[0] == card_hash.key(3)}
+    arranged_hand += card_array.select{|c| c if c[0] == card_hash.key(2)}
+    (arranged_hand + (card_array - arranged_hand)).join(" ")
+  end
+
 end

data/ruby-poker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "ruby-poker"
-  s.version  = "1.0.0"
+  s.version  = "1.0.1"
   s.platform = Gem::Platform::RUBY
   s.summary  = "Poker library in Ruby"
   s.description = "Ruby library for comparing poker hands and determining the winner."
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
                 "Rakefile", 
                 "README.rdoc", 
                 "ruby-poker.gemspec"]
-  s.test_files = ["test/test_helper.rb", "test/test_card.rb", "test/test_poker_hand.rb"]
+  s.test_files = ["test/test_helper.rb", "test/test_card.rb", "test/test_poker_hand.rb", "test/test_full_house.rb"]
   s.require_paths << 'lib'
 
   s.extra_rdoc_files = ["README.rdoc", "CHANGELOG", "LICENSE"]

data/test/test_full_house.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class TestFullHouse < Test::Unit::TestCase
+
+  context "A Full House should return the correct cards from sort_using_rank" do
+
+    setup do
+      @fh_high_pair = PokerHand.new("8h 8d 8c Qh Td Kd Ks")
+      @fh_low_pair = PokerHand.new("8h 8d 8c Qh Td 4h 4d")
+      @fh_high_trips = PokerHand.new("Kh Kd Kc Qh Td 8h 8d")
+      @fh_low_trips = PokerHand.new("4h 4d 4c Qh Td Kd Ks")
+    end
+
+    should "full house #sort_using_rank from seven cards (high pair) should return correct cards" do
+      assert_equal("8h 8d 8c Ks Kd Qh Td", @fh_high_pair.sort_using_rank)
+    end
+
+    should "full house #sort_using_rank from seven cards (low pair) should return correct cards" do
+      assert_equal("8h 8d 8c 4h 4d Qh Td", @fh_low_pair.sort_using_rank)
+    end
+
+    should "full house #sort_using_rank from seven cards (high trips) should return correct cards" do
+      assert_equal("Kh Kd Kc 8h 8d Qh Td", @fh_high_trips.sort_using_rank)
+    end
+
+    should "full house #sort_using_rank from seven cards (low trips) should return correct cards" do
+      assert_equal("4h 4d 4c Ks Kd Qh Td", @fh_low_trips.sort_using_rank)
+    end
+
+  end
+
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ruby-poker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Rob Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: Ruby library for comparing poker hands and determining the winner.
@@ -34,17 +34,18 @@ extra_rdoc_files:
 - LICENSE
 files:
 - CHANGELOG
+- LICENSE
+- README.rdoc
+- Rakefile
 - examples/deck.rb
 - examples/quick_example.rb
 - lib/ruby-poker.rb
 - lib/ruby-poker/card.rb
 - lib/ruby-poker/poker_hand.rb
-- LICENSE
-- Rakefile
-- README.rdoc
 - ruby-poker.gemspec
-- test/test_helper.rb
 - test/test_card.rb
+- test/test_full_house.rb
+- test/test_helper.rb
 - test/test_poker_hand.rb
 homepage: https://github.com/robolson/ruby-poker
 licenses:
@@ -52,28 +53,28 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Ruby Poker Documentation
-- --main
+- "--main"
 - README.rdoc
-- --inline-source
-- -q
+- "--inline-source"
+- "-q"
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Poker library in Ruby
@@ -81,3 +82,4 @@ test_files:
 - test/test_helper.rb
 - test/test_card.rb
 - test/test_poker_hand.rb
+- test/test_full_house.rb