bridge 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-24}
   s.description = %q{Useful contract bridge utilities - deal generator, id to deal and deal to id conversion}
   s.email = %q{qoobaa+github@gmail.com}
   s.extra_rdoc_files = [
@@ -25,12 +25,13 @@ Gem::Specification.new do |s|
      "VERSION",
      "bridge.gemspec",
      "lib/bridge.rb",
+     "lib/bridge/bid.rb",
      "lib/bridge/card.rb",
-     "lib/bridge/contract.rb",
      "lib/bridge/deal.rb",
      "test/helper.rb",
+     "test/test_bid.rb",
      "test/test_bridge.rb",
-     "test/test_contract.rb",
+     "test/test_card.rb",
      "test/test_deal.rb"
   ]
   s.homepage = %q{http://github.com/qoobaa/bridge}
@@ -39,10 +40,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Contract bridge utilities}
   s.test_files = [
-    "test/test_bridge.rb",
+    "test/test_card.rb",
      "test/test_deal.rb",
+     "test/test_bid.rb",
      "test/helper.rb",
-     "test/test_contract.rb"
+     "test/test_bridge.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bridge.rb

@@ -1,5 +1,6 @@
 require "bridge/card"
 require "bridge/deal"
+require "bridge/bid"
 
 module Bridge
   # Number of possible deals in bridge
@@ -47,6 +48,44 @@ module Bridge
   end
 
   def self.compare_cards(first, second)
+    # DECK has reversed order
     DECK.index(second) <=> DECK.index(first)
   end
+
+  def self.compare_contracts(first, second)
+    CONTRACTS.index(first) <=> CONTRACTS.index(second)
+  end
+
+  def self.pass?(string)
+    PASS == string
+  end
+
+  def self.double?(string)
+    DOUBLE == string
+  end
+
+  def self.redouble?(string)
+    REDOUBLE == string
+  end
+
+  def self.modifier?(string)
+    MODIFIERS.include?(string)
+  end
+
+  def self.contract?(string)
+    CONTRACTS.include?(string)
+  end
+
+  def self.bid?(string)
+    BIDS.include?(string)
+  end
+end
+
+# Constructor shortcuts
+def Bid(string)
+  Bridge::Bid.new(string)
+end
+
+def Card(string)
+  Bridge::Card.new(string)
 end

data/lib/bridge/bid.rb

@@ -0,0 +1,90 @@
+module Bridge
+  class Bid
+    include Comparable
+
+    attr_reader :bid
+
+    # Creates a new bid
+    def initialize(bid)
+      @bid = bid.to_s.upcase
+      raise ArgumentError, "invalid bid: #{bid}" unless Bridge.bid?(@bid)
+    end
+
+    # Returns the level of the bid
+    def level
+      bid[0] if contract?
+    end
+
+    # Returns the suit of the bid
+    def suit
+      bid[1..-1] if contract?
+    end
+
+    def pass?
+      Bridge.pass?(bid)
+    end
+
+    def double?
+      Bridge.double?(bid)
+    end
+
+    def redouble?
+      Bridge.redouble?(bid)
+    end
+
+    def modifier?
+      Bridge.modifier?(bid)
+    end
+
+    def contract?
+      Bridge.contract?(bid)
+    end
+
+    def <=>(other)
+      case other
+      when Bid
+        if contract?
+          raise ArgumentError, "could not compare contract bid with non-contract bid #{other}" unless other.contract?
+          Bridge.compare_contracts(self.bid, other.bid)
+        elsif pass?
+          raise ArgumentError, "could not compare pass bid with non-pass bid #{other}" unless other.pass?
+          bid <=> other.bid
+        elsif double?
+          raise ArgumentError, "could not compare double bid with non-double bid #{other}" unless other.double?
+          bid <=> other.bid
+        elsif redouble?
+          raise ArgumentError, "could not compare redouble bid with non-redouble bid #{other}" unless other.redouble?
+          bid <=> other.bid
+        end
+      when String
+        self <=> Bid.new(other)
+      else
+        begin
+          a, b = other.coerce(self)
+          a <=> b
+        rescue
+        end
+      end
+    end
+
+    def coerce(other)
+      [Bid.new(other.to_s), self]
+    end
+
+    def eql?(other)
+      self == other && other.instance_of?(Bid)
+    end
+
+    def hash
+      bid.hash
+    end
+
+    def to_s
+      bid
+    end
+
+    def inspect
+      bid.inspect
+    end
+  end
+end

data/lib/bridge/card.rb

@@ -42,7 +42,7 @@ module Bridge
     end
 
     def hash
-      @card.hash
+      card.hash
     end
 
     def coerce(other)
@@ -54,11 +54,7 @@ module Bridge
     end
 
     def to_s
-      @card
-    end
-
-    def to_str
-      @card
+      card
     end
   end
 end

data/test/test_bid.rb

@@ -0,0 +1,103 @@
+require "helper"
+
+class TestBid < Test::Unit::TestCase
+  test "pas is not a valid bid" do
+    assert_raises(ArgumentError) do
+      Bridge::Bid.new("pas")
+    end
+  end
+
+  test "case doesn't matter in bid" do
+    Bridge::Bid.new("pass")
+    Bridge::Bid.new("x")
+    Bridge::Bid.new("xx")
+    Bridge::Bid.new("1nt")
+  end
+
+  test "pass is a valid bid" do
+    bid = Bridge::Bid.new("PASS")
+    assert bid.pass?
+    assert_false bid.double?
+    assert_false bid.redouble?
+    assert_false bid.modifier?
+    assert_false bid.contract?
+    assert_nil bid.level
+    assert_nil bid.suit
+  end
+
+  test "double is a valid bid" do
+    bid = Bridge::Bid.new("X")
+    assert_false bid.pass?
+    assert bid.double?
+    assert_false bid.redouble?
+    assert bid.modifier?
+    assert_false bid.contract?
+    assert_nil bid.level
+    assert_nil bid.suit
+  end
+
+  test "redouble is a valid bid" do
+    bid = Bridge::Bid.new("XX")
+    assert_false bid.pass?
+    assert_false bid.double?
+    assert bid.redouble?
+    assert bid.modifier?
+    assert_false bid.contract?
+    assert_nil bid.level
+    assert_nil bid.suit
+  end
+
+  test "1H is a valid bid" do
+    bid = Bridge::Bid.new("1H")
+    assert_false bid.pass?
+    assert_false bid.double?
+    assert_false bid.redouble?
+    assert_false bid.modifier?
+    assert bid.contract?
+    assert_equal "1", bid.level
+    assert_equal "H", bid.suit
+  end
+
+  test "7NT is a valid bid" do
+    bid = Bridge::Bid.new("7NT")
+    assert_false bid.pass?
+    assert_false bid.double?
+    assert_false bid.redouble?
+    assert_false bid.modifier?
+    assert bid.contract?
+    assert_equal "7", bid.level
+    assert_equal "NT", bid.suit
+  end
+
+  test "7NT is greater than 1C" do
+    assert Bridge::Bid.new("7NT") > Bridge::Bid.new("1C")
+    assert_false Bridge::Bid.new("7NT") < Bridge::Bid.new("1C")
+    assert_false Bridge::Bid.new("7NT") == Bridge::Bid.new("1C")
+  end
+
+  test "1S is greater than 1H" do
+    assert Bridge::Bid.new("1S") > Bridge::Bid.new("1H")
+    assert_false Bridge::Bid.new("1S") < Bridge::Bid.new("1H")
+    assert_false Bridge::Bid.new("1S") == Bridge::Bid.new("1H")
+  end
+
+  test "initialize works using shortcut" do
+    Bid("pass")
+  end
+
+  test "comparison of PASS and 1S raises an error" do
+    assert_raises(ArgumentError) do
+      Bridge::Bid.new("PASS") > Bridge::Bid.new("1S")
+    end
+  end
+
+  test "comparison of X and PASS raises an error" do
+    assert_raises(ArgumentError) do
+      Bridge::Bid.new("X") > Bridge::Bid.new("PASS")
+    end
+  end
+
+  test "PASS and XX are not equal" do
+    assert_not_equal Bridge::Bid.new("PASS"), Bridge::Bid.new("XX")
+  end
+end

data/test/test_card.rb

@@ -0,0 +1,33 @@
+require "helper"
+
+class TestCard < Test::Unit::TestCase
+  test "H2 is a valid card" do
+    card = Bridge::Card.new("H2")
+    assert "H", card.suit
+    assert "2", card.value
+  end
+
+  test "ST is a valid card" do
+    card = Bridge::Card.new("ST")
+    assert "S", card.suit
+    assert "T", card.value
+  end
+
+  test "CQ is a valid card" do
+    card = Bridge::Card.new("CQ")
+    assert "C", card.suit
+    assert "Q", card.value
+  end
+
+  test "NT1 is not a valid card" do
+    assert_raises(ArgumentError) do
+      Bridge::Card.new("NT1")
+    end
+  end
+
+  test "1H is not a valid card" do
+    assert_raises(ArgumentError) do
+      Bridge::Card.new("1H")
+    end
+  end
+end

data/test/test_deal.rb

@@ -5,10 +5,10 @@ class TestDeal < Test::Unit::TestCase
     id = 0
     deal = Bridge::Deal.from_id(id)
     assert deal.valid?
-    assert_equal %w(SA SK SQ SJ ST S9 S8 S7 S6 S5 S4 S3 S2), deal.n
-    assert_equal %w(HA HK HQ HJ HT H9 H8 H7 H6 H5 H4 H3 H2), deal.e
-    assert_equal %w(DA DK DQ DJ DT D9 D8 D7 D6 D5 D4 D3 D2), deal.s
-    assert_equal %w(CA CK CQ CJ CT C9 C8 C7 C6 C5 C4 C3 C2), deal.w
+    assert_equal %w(SA SK SQ SJ ST S9 S8 S7 S6 S5 S4 S3 S2).map { |c| Card(c) }, deal.n
+    assert_equal %w(HA HK HQ HJ HT H9 H8 H7 H6 H5 H4 H3 H2).map { |c| Card(c) }, deal.e
+    assert_equal %w(DA DK DQ DJ DT D9 D8 D7 D6 D5 D4 D3 D2).map { |c| Card(c) }, deal.s
+    assert_equal %w(CA CK CQ CJ CT C9 C8 C7 C6 C5 C4 C3 C2).map { |c| Card(c) }, deal.w
     assert_equal id, deal.id
   end
 
@@ -16,10 +16,10 @@ class TestDeal < Test::Unit::TestCase
     id = Bridge::DEALS - 1
     deal = Bridge::Deal.from_id(id)
     assert deal.valid?
-    assert_equal %w(CA CK CQ CJ CT C9 C8 C7 C6 C5 C4 C3 C2), deal.n
-    assert_equal %w(DA DK DQ DJ DT D9 D8 D7 D6 D5 D4 D3 D2), deal.e
-    assert_equal %w(HA HK HQ HJ HT H9 H8 H7 H6 H5 H4 H3 H2), deal.s
-    assert_equal %w(SA SK SQ SJ ST S9 S8 S7 S6 S5 S4 S3 S2), deal.w
+    assert_equal %w(CA CK CQ CJ CT C9 C8 C7 C6 C5 C4 C3 C2).map { |c| Card(c) }, deal.n
+    assert_equal %w(DA DK DQ DJ DT D9 D8 D7 D6 D5 D4 D3 D2).map { |c| Card(c) }, deal.e
+    assert_equal %w(HA HK HQ HJ HT H9 H8 H7 H6 H5 H4 H3 H2).map { |c| Card(c) }, deal.s
+    assert_equal %w(SA SK SQ SJ ST S9 S8 S7 S6 S5 S4 S3 S2).map { |c| Card(c) }, deal.w
     assert_equal id, deal.id
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +01:00
+date: 2010-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,12 +47,13 @@ files:
 - VERSION
 - bridge.gemspec
 - lib/bridge.rb
+- lib/bridge/bid.rb
 - lib/bridge/card.rb
-- lib/bridge/contract.rb
 - lib/bridge/deal.rb
 - test/helper.rb
+- test/test_bid.rb
 - test/test_bridge.rb
-- test/test_contract.rb
+- test/test_card.rb
 - test/test_deal.rb
 has_rdoc: true
 homepage: http://github.com/qoobaa/bridge
@@ -85,7 +86,8 @@ signing_key:
 specification_version: 3
 summary: Contract bridge utilities
 test_files: 
-- test/test_bridge.rb
+- test/test_card.rb
 - test/test_deal.rb
+- test/test_bid.rb
 - test/helper.rb
-- test/test_contract.rb
+- test/test_bridge.rb

data/lib/bridge/contract.rb

@@ -1,23 +0,0 @@
-module Bridge
-  module Contract
-    def self.contracts_compare(first, second)
-      CONTRACTS.index(first) <=> CONTRACTS.index(second)
-    end
-
-    def self.contract?(contract)
-      CONTRACTS.include?(value)
-    end
-
-    def self.pass?(value)
-      value == PASS
-    end
-
-    def self.double?(value)
-      value == DOUBLE
-    end
-
-    def self.redouble?(value)
-      value == REDOUBLE
-    end
-  end
-end

data/test/test_contract.rb

@@ -1,5 +0,0 @@
-require "helper"
-
-class TestContract < Test::Unit::TestCase
-
-end