bridge 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bridge.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bridge.gemspec",
      "lib/bridge.rb",
+     "lib/bridge/card.rb",
      "lib/bridge/contract.rb",
      "lib/bridge/deal.rb",
      "test/helper.rb",
@@ -35,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/qoobaa/bridge}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Contract bridge utilities}
   s.test_files = [
     "test/test_bridge.rb",

data/lib/bridge.rb

@@ -1,3 +1,4 @@
+require "bridge/card"
 require "bridge/deal"
 
 module Bridge
@@ -44,4 +45,8 @@ module Bridge
   def self.card?(string)
     DECK.include?(string)
   end
+
+  def self.compare_cards(first, second)
+    DECK.index(second) <=> DECK.index(first)
+  end
 end

data/lib/bridge/card.rb

@@ -0,0 +1,64 @@
+module Bridge
+  class Card
+    include Comparable
+
+    attr_reader :card
+
+    # Creates a new card
+    def initialize(card)
+      @card = card.to_s.upcase
+      raise ArgumentError, "invalid card: #{card}" unless Bridge.card?(@card)
+    end
+
+    # Returns the suit of the card
+    def suit
+      card[0]
+    end
+
+    # Returns the suit of the card
+    def value
+      card[1]
+    end
+
+    # Compares the card with the other card
+    def <=>(other)
+      case other
+      when Card
+        raise ArgumentError, "comparing card of suit #{suit} with suit #{other.suit}" unless suit == other.suit
+        Bridge.compare_cards(self.card, other.card)
+      when String
+        self <=> Card.new(other)
+      else
+        begin
+          a, b = other.coerce(self)
+          a <=> b
+        rescue
+        end
+      end
+    end
+
+    def eql?(other)
+      self == other && other.instance_of?(Card)
+    end
+
+    def hash
+      @card.hash
+    end
+
+    def coerce(other)
+      [Card.new(other.to_s), self]
+    end
+
+    def inspect
+      card.inspect
+    end
+
+    def to_s
+      @card
+    end
+
+    def to_str
+      @card
+    end
+  end
+end

data/lib/bridge/deal.rb

@@ -22,7 +22,9 @@ module Bridge
     # ==== Example
     #   Bridge::Deal.new(:n => ["HA", ...], :s => ["SA"], ...)
     def initialize(hands)
-      hands.each { |hand, cards| self[hand] = cards }
+      hands.each do |hand, cards|
+        self[hand] = cards.map { |c| Card.new(c) }
+      end
     end
 
     # Converts given id to deal
@@ -30,6 +32,7 @@ module Bridge
       raise ArgumentError, "invalid deal id: #{id}" unless Bridge.deal_id?(id)
       n = []; e = []; s = []; w = []; k = DEALS
       DECK.each_with_index do |card, i|
+        card = Card.new(card)
         x = k * (13 - n.size) / (52 - i)
         if id < x
           n << card
@@ -93,7 +96,7 @@ module Bridge
       if DIRECTIONS.all? { |d| self[d] && self[d].size == 13 }
         cards = (n + e + s + w).uniq
         if cards.size == 52
-          cards.all? { |card| Bridge.card?(card) }
+          cards.all? { |card| Bridge.card?(card.to_s) }
         else
           false
         end
@@ -102,6 +105,10 @@ module Bridge
       end
     end
 
+    def inspect
+      { "N" => n, "E" => e, "S" => s, "W" => w }.inspect
+    end
+
     private
 
     def must_be_direction!(string)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bridge
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,14 +19,16 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
         version: "2"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Useful contract bridge utilities - deal generator, id to deal and deal to id conversion
 email: qoobaa+github@gmail.com
 executables: []
@@ -40,6 +47,7 @@ files:
 - VERSION
 - bridge.gemspec
 - lib/bridge.rb
+- lib/bridge/card.rb
 - lib/bridge/contract.rb
 - lib/bridge/deal.rb
 - test/helper.rb
@@ -59,18 +67,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Contract bridge utilities