bugfix, misc cleanup

* change 'steve' to 'steven' in hand list
* detect Ace-bottomed straights
* add Casey to player list

gameday.html

@@ -54,7 +54,7 @@
   <td>10</td>
 </tr>
 <tr class="odd">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/ts.gif">
 <img src="img/js.gif">
@@ -218,14 +218,14 @@
   <td>25</td>
 </tr>
 <tr class="even">
-  <td><br/>[casey]</td>
+  <td>Casey Lowe<br/>[casey]</td>
   <td colspan="1">
 <img src="img/2h.gif">
 <img src="img/3h.gif">
 <img src="img/4h.gif">
 <img src="img/5h.gif">
 <img src="img/ah.gif">
-<br/>flush (7)</td>
+<br/>straight flush (20)</td>
   <td colspan="1">
 <img src="img/3d.gif">
 <img src="img/8d.gif">
@@ -233,11 +233,11 @@
 <img src="img/qs.gif">
 <img src="img/qc.gif">
 <br/> (0)</td>
-  <td>7</td>
+  <td>20</td>
-  <td>7</td>
+  <td>20</td>
 </tr>
 <tr class="odd">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/2s.gif">
 <img src="img/3s.gif">
@@ -255,7 +255,7 @@
   <td>28</td>
 </tr>
 <tr class="even">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/5s.gif">
 <img src="img/9s.gif">
@@ -274,7 +274,7 @@
   <td>35</td>
 </tr>
 <tr class="odd">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/6h.gif">
 <img src="img/6d.gif">
@@ -333,18 +333,20 @@
   <td>Dundee Reyno<br/>[dundee]</td>
   <td colspan="1">
 <img src="img/2h.gif">
-<img src="img/2c.gif">
-<img src="img/as.gif">
-<img src="img/ah.gif">
-<img src="img/ad.gif">
-<br/>full house (10)</td>
-  <td colspan="1">
 <img src="img/3h.gif">
 <img src="img/4h.gif">
 <img src="img/5h.gif">
+<img src="img/ah.gif">
+<br/>straight flush (20)</td>
+  <td colspan="1">
+<img src="img/2c.gif">
+<img src="img/2c.gif">
+<img src="img/as.gif">
+<img src="img/ad.gif">
+<img src="img/ad.gif">
 <br/> (0)</td>
-  <td>10</td>
+  <td>20</td>
-  <td>10</td>
+  <td>20</td>
 </tr>
 <tr class="odd">
   <td>Stéphanie Plante<br/>[stephanie]</td>
@@ -572,7 +574,7 @@
   <td>62</td>
 </tr>
 <tr class="odd">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/7s.gif">
 <img src="img/7h.gif">
@@ -590,7 +592,7 @@
   <td>45</td>
 </tr>
 <tr class="even">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/2c.gif">
 <img src="img/5c.gif">
@@ -609,7 +611,7 @@
   <td>52</td>
 </tr>
 <tr class="odd">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="2">
 <img src="img/5h.gif">
 <img src="img/6h.gif">
@@ -666,21 +668,21 @@
 <tr class="even">
   <td>Randy Yumul<br/>[randy]</td>
   <td colspan="1">
-<img src="img/2s.gif">
 <img src="img/2h.gif">
 <img src="img/3s.gif">
-<img src="img/as.gif">
+<img src="img/4d.gif">
+<img src="img/5c.gif">
 <img src="img/ah.gif">
-<br/> (0)</td>
+<br/>straight (5)</td>
   <td colspan="1">
+<img src="img/2s.gif">
 <img src="img/3d.gif">
 <img src="img/4h.gif">
-<img src="img/4d.gif">
 <img src="img/5s.gif">
-<img src="img/5c.gif">
+<img src="img/as.gif">
-<br/> (0)</td>
+<br/>straight (5)</td>
-  <td>0</td>
+  <td>10</td>
-  <td>15</td>
+  <td>25</td>
 </tr>
 <tr class="odd">
   <td>Jen Gratz<br/>[jen]</td>
@@ -768,9 +770,9 @@
 <img src="img/9h.gif">
 <img src="img/th.gif">
 <img src="img/ah.gif">
-<br/>flush (40)</td>
+<br/>straight flush (80)</td>
-  <td>40</td>
+  <td>80</td>
-  <td>50</td>
+  <td>100</td>
 </tr>
 <tr class="even">
   <td>Mike Skinner<br/>[mike]</td>
@@ -829,22 +831,20 @@
 </tr>
 <tr class="odd">
   <td>Randy Yumul<br/>[randy]</td>
-  <td colspan="1">
+  <td colspan="2">
-<img src="img/3s.gif">
-<img src="img/7s.gif">
-<img src="img/8s.gif">
-<img src="img/9s.gif">
-<img src="img/as.gif">
-<br/>flush (7)</td>
-  <td colspan="1">
 <img src="img/2c.gif">
+<img src="img/3s.gif">
 <img src="img/4c.gif">
 <img src="img/5h.gif">
 <img src="img/6h.gif">
+<img src="img/7s.gif">
+<img src="img/8s.gif">
+<img src="img/9s.gif">
 <img src="img/tc.gif">
-<br/> (0)</td>
+<img src="img/as.gif">
-  <td>7</td>
+<br/>straight (20)</td>
-  <td>22</td>
+  <td>20</td>
+  <td>45</td>
 </tr>
 <tr class="even">
   <td><br/>[cynthia]</td>
@@ -1005,7 +1005,7 @@
 <img src="img/4d.gif">
 <img src="img/5d.gif">
 <img src="img/ad.gif">
-<br/>flush (7)</td>
+<br/>straight flush (20)</td>
   <td colspan="1">
 <img src="img/3h.gif">
 <img src="img/7h.gif">
@@ -1013,27 +1013,27 @@
 <img src="img/jh.gif">
 <img src="img/qs.gif">
 <br/> (0)</td>
-  <td>7</td>
+  <td>20</td>
-  <td>32</td>
+  <td>45</td>
 </tr>
 <tr class="odd">
   <td>Rob Whyte<br/>[rob]</td>
   <td colspan="1">
-<img src="img/4c.gif">
-<img src="img/5c.gif">
-<img src="img/tc.gif">
-<img src="img/jc.gif">
-<img src="img/kc.gif">
-<br/>flush (7)</td>
-  <td colspan="1">
 <img src="img/2d.gif">
 <img src="img/3d.gif">
-<img src="img/qd.gif">
+<img src="img/4c.gif">
+<img src="img/5c.gif">
 <img src="img/ah.gif">
+<br/>straight (5)</td>
+  <td colspan="1">
+<img src="img/tc.gif">
+<img src="img/jc.gif">
+<img src="img/qd.gif">
+<img src="img/kc.gif">
 <img src="img/ad.gif">
-<br/> (0)</td>
+<br/>straight (5)</td>
-  <td>7</td>
+  <td>10</td>
-  <td>39</td>
+  <td>55</td>
 </tr>
 <tr class="even">
   <td>Rob Whyte<br/>[rob]</td>
@@ -1051,7 +1051,7 @@
 <img src="img/kh.gif">
 <br/> (0)</td>
   <td>10</td>
-  <td>49</td>
+  <td>65</td>
 </tr>
 <tr class="odd">
   <td>Jen Gratz<br/>[jen]</td>
@@ -1086,7 +1086,7 @@
 <img src="img/ad.gif">
 <br/> (0)</td>
   <td>21</td>
-  <td>70</td>
+  <td>86</td>
 </tr>
 <tr class="odd">
   <td>Josh Hart<br/>[josh]</td>
@@ -1113,7 +1113,7 @@
 <img src="img/4s.gif">
 <img src="img/5s.gif">
 <img src="img/as.gif">
-<br/>flush (7)</td>
+<br/>straight flush (20)</td>
   <td colspan="1">
 <img src="img/3c.gif">
 <img src="img/4c.gif">
@@ -1121,8 +1121,8 @@
 <img src="img/6c.gif">
 <img src="img/9c.gif">
 <br/>flush (7)</td>
-  <td>14</td>
+  <td>27</td>
-  <td>59</td>
+  <td>72</td>
 </tr>
 <tr class="odd">
   <td>Fred Thompson<br/>[fred]</td>
@@ -1143,7 +1143,7 @@
   <td>62</td>
 </tr>
 <tr class="even">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/2s.gif">
 <img src="img/2h.gif">
@@ -1162,7 +1162,7 @@
   <td>103</td>
 </tr>
 <tr class="odd">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/4c.gif">
 <img src="img/4c.gif">
@@ -1181,7 +1181,7 @@
   <td>113</td>
 </tr>
 <tr class="even">
-  <td><br/>[steve]</td>
+  <td>Steven Gher<br/>[steven]</td>
   <td colspan="1">
 <img src="img/2h.gif">
 <img src="img/7h.gif">
@@ -1222,17 +1222,17 @@
   <td>Stéphanie Plante<br/>[stephanie]</td>
   <td colspan="1">
 <img src="img/2c.gif">
+<img src="img/6s.gif">
 <img src="img/6d.gif">
 <img src="img/9s.gif">
 <img src="img/9c.gif">
-<img src="img/as.gif">
 <br/> (0)</td>
   <td colspan="1">
 <img src="img/2s.gif">
 <img src="img/3s.gif">
 <img src="img/4s.gif">
 <img src="img/5s.gif">
-<img src="img/6s.gif">
+<img src="img/as.gif">
 <br/>straight flush (20)</td>
   <td>20</td>
   <td>54</td>
@@ -1658,7 +1658,7 @@
 <img src="img/4h.gif">
 <img src="img/5h.gif">
 <img src="img/ah.gif">
-<br/>flush (7)</td>
+<br/>straight flush (20)</td>
   <td colspan="1">
 <img src="img/ts.gif">
 <img src="img/js.gif">
@@ -1666,8 +1666,8 @@
 <img src="img/ks.gif">
 <img src="img/as.gif">
 <br/>royal flush (21)</td>
-  <td>28</td>
+  <td>41</td>
-  <td>78</td>
+  <td>141</td>
 </tr>
 <tr class="even">
   <td>Jen Gratz<br/>[jen]</td>
@@ -1786,7 +1786,7 @@
 <img src="img/4d.gif">
 <img src="img/5c.gif">
 <img src="img/ah.gif">
-<br/> (0)</td>
+<br/>straight (5)</td>
   <td colspan="1">
 <img src="img/ts.gif">
 <img src="img/th.gif">
@@ -1794,8 +1794,8 @@
 <img src="img/qd.gif">
 <img src="img/qd.gif">
 <br/> (0)</td>
-  <td>0</td>
+  <td>5</td>
-  <td>22</td>
+  <td>50</td>
 </tr>
 <tr class="odd">
   <td>Cathy Waits<br/>[cathy]</td>
@@ -1875,27 +1875,27 @@
 </table>
 <br/><hr/><br/>
 <h1>Total Scores</h1>
+141 - Dundee Reyno [dundee]<br/>
 120 - Jen Gratz [jen]<br/>
 115 - Josh Hart [josh]<br/>
-113 -  [steve]<br/>
+113 - Steven Gher [steven]<br/>
 105 - Eddy Cramm [eddy]<br/>
 101 - Jonathan Leghart [jonathan]<br/>
 98 - Eileen Gher [eileen]<br/>
 95 - Adam Dickinson [adam]<br/>
 94 - Stéphanie Plante [stephanie]<br/>
+86 - Rob Whyte [rob]<br/>
 85 - Aaron Dickinson [aaron]<br/>
 84 - François Bertrand [francois]<br/>
-78 - Dundee Reyno [dundee]<br/>
+72 - Jeff Curley [jeff]<br/>
 71 - Mike Skinner [mike]<br/>
-70 - Rob Whyte [rob]<br/>
 65 - Lonna Leghart [lonna]<br/>
 62 - Fred Thompson [fred]<br/>
 60 -  [cynthia]<br/>
-59 - Jeff Curley [jeff]<br/>
+50 - Randy Yumul [randy]<br/>
 46 - Shaelagh Skinner [shaelagh]<br/>
 36 - Cathy Waits [cathy]<br/>
-22 - Randy Yumul [randy]<br/>
+20 - Casey Lowe [casey]<br/>
-7 -  [casey]<br/>
 </div>
 </body>
 </html>

gameday.txt

@@ -1,6 +1,6 @@
 fred,2h2c2cacahqcts9d7d4h
 aaron,4h7h7s7sjsjdjdjhkhks
-steve,tsksqsjsas2dtckc9c6d
+steven,tsksqsjsas2dtckc9c6d
 eileen,5h6s7s2s3c4d8d9dtcjh
 randy,qsqhqc6d6h2s2sth9d3d
 cathy,5c5s5d5s7h8h9hthqckd
@@ -10,9 +10,9 @@ jen,4d4s4cah6h6s6s9c9c
 jen,2h3s4s5c6dtdtcth3c3c
 aaron,thtstc6c6hjsjdjs9dtd
 casey,4h3h2hah5h3dqcqsts8d
-steve,3s2sas4s9s3s2d8h7d7s
+steven,3s2sas4s9s3s2d8h7d7s
-steve,tsqs9s5stskhah3h9h2h
+steven,tsqs9s5stskhah3h9h2h
-steve,kckd6d6c6h5c7hqdqsjh
+steven,kckd6d6c6h5c7hqdqsjh
 francois,5d6d7d8d9d6c7c8c9ctc
 jeff,5h5d3s3h3casts9s8s3s
 dundee,ah2h3h4h5hadadas2c2c
@@ -28,9 +28,9 @@ fred,6s7c8c8skhqhjhth9h5h
 josh,2d3d4d5d6djdjcjh7h7c
 jen,4h4s4c4c6h6d2sjcjsjd
 josh,3s3c3d3h5cahac2h2s2c
-steve,7s7h7h7hqsqdqs5d5c3s
+steven,7s7h7h7hqsqdqs5d5c3s
-steve,9c6c5c2cjcjh9dad2dqc
+steven,9c6c5c2cjcjh9dad2dqc
-steve,6hkhqdjcts9c8dac7s5h
+steven,6hkhqdjcts9c8dac7s5h
 jen,3d3c3skcqdqckskdtstd
 josh,6s6c5h5s5stcjcqckcac
 randy,ahas2h2s3s3d4d4h5c5s
@@ -59,9 +59,9 @@ rob,tcjcqckcacadac7d7d7h
 josh,5h8h8s7s4c3s7s8s9sts
 jeff,5s4s3s2sas3c4c5c6c9c
 fred,6h2d6h2d5d8s9dthqdkd
-steve,3h3c2s2h2dackcqcjctc
+steven,3h3c2s2h2dackcqcjctc
-steve,8c7c4c4c8c6h6d6s4h4s
+steven,8c7c4c4c8c6h6d6s4h4s
-steve,7h2h7dkc9s3c3s3sahah
+steven,7h2h7dkc9s3c3s3sahah
 jen,9sqcadaskskhjdjsjcjh
 stephanie,9c9s2c6s6d5s4s3s2sas
 stephanie,2c3s4d5s6c7s8h9dtsjh

hand.rb

@@ -31,7 +31,11 @@ class Hand
 		ranks.each { |s| rank_counts[s] += 1 }
 
 		# test for straight & flush
-		straight = (ranks.sort == (ranks.min .. ranks.max).to_a)
+		straight = 
+			ranks.sort == (ranks.min .. ranks.max).to_a ||
+			ranks.sort == [2,3,4,5,14]                  ||
+			ranks.sort == [2,3,4,5,6,7,8,9,10,14]
+
 		flush = (suits.sort.uniq.size == 1)
 
 		# rank hand

score.rb

@@ -34,6 +34,7 @@ PlayerNames = {
 	'aaron'     => 'Aaron Dickinson',
 	'adam'      => 'Adam Dickinson',
 	'angel'     => 'Angel Madigan',
+	'casey'     => 'Casey Lowe',
 	'cathy'     => 'Cathy Waits',
 	'dundee'    => 'Dundee Reyno',
 	'eddy'      => 'Eddy Cramm',