deck-of-cards 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -0,0 +1,14 @@
+PATH
+  remote: .
+  specs:
+    deck-of-cards (0.0.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  deck-of-cards!

data/deck-of-cards.gemspec

@@ -1,13 +1,14 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "deck-of-cards/version"
+$:.push File.expand_path '../lib/deck-of-cards', __FILE__
+require 'card'
+require 'version'
 
 Gem::Specification.new do |s|
-  s.name        = "deck-of-cards"
+  s.name        = 'deck-of-cards'
   s.version     = DeckOfCards::VERSION
-  s.authors     = ["shannon skipper"]
-  s.email       = ["shannonskipper@gmail.com"]
-  s.homepage    = "https://github.com/Havenwood/deck-of-cards"
+  s.authors     = ['shannon skipper']
+  s.email       = ['shannonskipper@gmail.com']
+  s.homepage    = 'https://github.com/Havenwood/deck-of-cards'
   s.summary     = %q{a minimalist 'deck of cards' gem}
   s.description = %q{A minimalist 'deck of cards' Ruby gem.}
 

data/lib/deck-of-cards.rb

@@ -1,15 +1,21 @@
-require_relative 'deck-of-cards/compare_cards'
-require_relative 'deck-of-cards/card'
-require_relative 'deck-of-cards/version'
+$:.unshift File.expand_path '../../lib/deck-of-cards', __FILE__
+
+require 'card'
+require 'version'
 
 class DeckOfCards
   attr_reader :cards
   
+  SUITS = %w[Hearts Spades Diamonds Clubs]
+  RANKS = [*2..10, 'Jack', 'Queen', 'King', 'Ace']
+  
   def initialize
     @cards = []
-    suits = %w[Hearts Spades Diamonds Clubs]
-    ranks = %w[2 3 4 5 6 7 8 9 10 Jack Queen King Ace]
-    suits.product(ranks) { |suit, rank| @cards << Card.new(rank, suit) }
+    SUITS.product(RANKS) { |suit, rank| @cards << Card.new(rank, suit) }
+  end
+  
+  def to_s
+    "#{@cards.count}-card deck."
   end
 
   def shuffle
@@ -17,7 +23,7 @@ class DeckOfCards
   end
   
   def cut
-    @cards.rotate! @cards.count.div 2
+    @cards.rotate! @cards.count / 2
   end
   
   alias split cut

data/lib/deck-of-cards/card.rb

@@ -1,6 +1,4 @@
-class Card
-  include CompareCards
-  
+class Card  
   attr_reader :rank, :suit
   
   def initialize rank, suit
@@ -14,4 +12,25 @@ class Card
   def to_s
     "#{@rank} of #{@suit}"
   end
-end
+  
+  include Comparable
+  
+  def <=> other_card
+    self.value <=> other_card.value
+  end
+  
+  def value
+    case @rank
+    when 'Ace'
+      14
+    when 'King'
+      13
+    when 'Queen'
+      12
+    when 'Jack'
+      11
+    else
+      @rank
+    end
+  end
+end

data/lib/deck-of-cards/version.rb

@@ -1,3 +1,3 @@
 class DeckOfCards
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/test_deck.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+$:.unshift File.expand_path '../../lib/deck-of-cards', __FILE__
 
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'set'
-require_relative '../lib/deck-of-cards'
+require File.expand_path '../../lib/deck-of-cards.rb', __FILE__
 
 describe DeckOfCards do
   before do
@@ -11,7 +12,11 @@ describe DeckOfCards do
     @correct_cards = []
     suits = ["Hearts", "Spades", "Diamonds", "Clubs"]
     ranks = [2, 3, 4, 5, 6, 7, 8, 9, 10, "Jack", "Queen", "King", "Ace"]
-    suits.each { |suit| ranks.each { |rank| @correct_cards << Card.new(rank, suit) } }
+    suits.each do |suit| 
+      ranks.each do |rank|
+        @correct_cards << Card.new(rank, suit)
+      end
+    end
   end
   
   describe "when a deck is created" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deck-of-cards
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies: []
 description: A minimalist 'deck of cards' Ruby gem.
 email:
@@ -19,12 +19,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - deck-of-cards.gemspec
 - lib/deck-of-cards.rb
 - lib/deck-of-cards/card.rb
-- lib/deck-of-cards/compare_cards.rb
 - lib/deck-of-cards/version.rb
 - test/test_deck.rb
 homepage: https://github.com/Havenwood/deck-of-cards

data/lib/deck-of-cards/compare_cards.rb

@@ -1,22 +0,0 @@
-module CompareCards
-  include Comparable
-  
-  def value
-    case @rank
-    when 'Ace'
-      14
-    when 'King'
-      13
-    when 'Queen'
-      12
-    when 'Jack'
-      11
-    else
-      @rank.to_i
-    end
-  end
-  
-  def <=> other_card
-    self.value <=> other_card.value
-  end
-end