badcards 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bd2a394ab84f8470b237ae7b59ae2cea8827ae
-  data.tar.gz: 0823e621b1054fe295846b7c3cc59d801bb14f26
+  metadata.gz: e65c8a32d66371c3b2b62a05d6305df0ea9446c9
+  data.tar.gz: c8dd7c3580ed698e6ab35b62255813e776596764
 SHA512:
-  metadata.gz: 8ab836ea36621bf9c8483a450a4a8a0f2f93df3d93a60924718e876f563d676dbc2a837547d1f788b34cb5ad21fcdffb26c75c3732b1b2ee58421b9227814566
-  data.tar.gz: b02ab2f75477bf3761fbde76f332892c701ce40437975fae2a5804d9473d7dfd28b4adc4e6d27ea9f4fcfcfa0427dd200c58e06361ffafa86d9d519fd9d4332e
+  metadata.gz: f8fd2516fb581527bafcf2c06db13472f23e0076643863eee66becc532b5f02eb6c25d9df7b33ae771ce7dc6ab30607df81ec7c00835159354e89d43a84c1a66
+  data.tar.gz: 7757e906f56989b83827adcc9127ffdf8913f21cf8c409fb8a03eaebbdb290c06e398e009553257d427cc29b7e66804b7389375547e9f2ce7194ddd5bf298bb6

data/README.md

@@ -1,4 +1,5 @@
 # BaDcards
+[![Gem Version](https://badge.fury.io/rb/badcards.png)](http://badge.fury.io/rb/badcards)
 [![Build Status](https://travis-ci.org/BensPotatoes/BaDCards.svg?branch=master)](https://travis-ci.org/BensPotatoes/BaDCards)
 [![Coverage Status](https://coveralls.io/repos/BensPotatoes/BaDCards/badge.png?branch=master)](https://coveralls.io/r/BensPotatoes/BaDCards?branch=master)
 

data/lib/badcards/card.rb

@@ -1,6 +1,19 @@
 class Card
   SUITS = %w[Diamonds Clubs Hearts Spades]
+  SHORT_SUITS = {
+    'D' => 'Diamonds',
+    'C' => 'Clubs',
+    'H' => 'Hearts',
+    'S' => 'Spades'
+  }
+
   VALUES = %w[Ace 2 3 4 5 6 7 8 9 10 Jack Queen King]
+  SHORT_VALUES = {
+    'A' => 'Ace',
+    'J' => 'Jack',
+    'Q' => 'Queen',
+    'K' => 'Jack'
+  }
 
   S3_URLS = {
     "ace+diamonds" => "https://s3-us-west-2.amazonaws.com/badcards/cards/diamond/ace.png",
@@ -61,15 +74,14 @@ class Card
   }
 
   def initialize(value, suit)
-    if !VALUES.include?(value)
+    if !VALUES.include?(value) && !VALUES.include?(SHORT_VALUES[value])
       raise ArgumentError, "Invalid Card value"
     end
-    if !SUITS.include?(suit)
+    if !SUITS.include?(suit) && !SUITS.include?(SHORT_SUITS[suit])
       raise ArgumentError, "Invalid Card suit"
     end
-    @value = value
-    @suit = suit
-    @image = S3_URLS["#{value.downcase}+#{suit.downcase}"]
+    @value = SHORT_VALUES[value] || value
+    @suit = SHORT_SUITS[suit] || suit
   end
 
   def value
@@ -81,7 +93,11 @@ class Card
   end
 
   def img
-    @image
+    S3_URLS["#{value.downcase}+#{suit.downcase}"]
+  end
+
+  def to_s
+    "#{value} of #{suit}"
   end
 
   def self.all_cards

data/lib/badcards/deck.rb

@@ -20,6 +20,17 @@ class Deck
     @cards.first
   end
 
+  def shuffle(num_times = 12)
+    num_times.times do
+      @cards.each_with_index do |card, index|
+        switch = rand(size)
+        @cards[index] = @cards[switch]
+        @cards[switch] = card
+      end
+    end
+    return
+  end
+
   def draw(num_to_draw = 1, hand_for_draw = nil)
     @drawn = []
     num_to_draw.times do

data/lib/badcards/version.rb

@@ -1,3 +1,3 @@
 module Badcards
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/spec/badcards/card_spec.rb

@@ -12,6 +12,16 @@ describe Card do
         make_card(value, suit)
         @card.value.should == value
       end
+
+      it 'should have an image' do
+        make_card(value, suit)
+        @card.img.should == Card::S3_URLS["#{value.downcase}+#{suit.downcase}"]
+      end
+
+      it 'should print neatly' do
+        make_card(value, suit)
+        @card.to_s.should == "#{value} of #{suit}"
+      end
     end
 
     it 'should fail for an invalid suit' do
@@ -21,5 +31,19 @@ describe Card do
     it 'should fail for an invalid value' do
       expect { make_card('fake_value', 'Spades') }.to raise_error
     end
+
+    Card::SHORT_VALUES.each do |short, long|
+      it "should not fail for short value: #{short}" do
+        make_card(short, 'Spades')
+        @card.value.should == long
+      end
+    end
+
+    Card::SHORT_SUITS.each do |short, long|
+      it "should not fail for short suit: #{short}" do
+        make_card('Ace', short)
+        @card.suit.should == long
+      end
+    end
   end
 end

data/spec/badcards/deck_spec.rb

@@ -23,10 +23,10 @@ describe Deck do
           if @match
             found_cards << true
             next
-          else
-            found_cards << false
           end
         end
+        found_cards.all?.should == true
+        found_cards.count.should == 52
       end
     end
 
@@ -41,7 +41,10 @@ describe Deck do
 
   describe 'operation' do
     describe 'shuffling' do
-      pending("can't be tested?")
+      it 'should not fail' do
+        @deck = Deck.new
+        @deck.shuffle
+      end
     end
 
     describe 'drawing' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: badcards
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Benjamin Hsieh, Ben's Potatoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler