bridge 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/bridge.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]
@@ -40,11 +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_card.rb",
-     "test/test_deal.rb",
+    "test/test_bridge.rb",
      "test/test_bid.rb",
-     "test/helper.rb",
-     "test/test_bridge.rb"
+     "test/test_card.rb",
+     "test/test_deal.rb",
+     "test/helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bridge.rb

@@ -6,10 +6,19 @@ module Bridge
   # Number of possible deals in bridge
   DEALS = 53_644_737_765_488_792_839_237_440_000
 
+  # Card values - from A to 2
+  CARD_VALUES = %w(A K Q J T 9 8 7 6 5 4 3 2)
+
+  # Trumps
+  TRUMPS = %w(S H D C)
+
+  # No trump string
+  NO_TRUMP = "NT"
+
   # Array with card strings in the bridge deck (AKQJT98765432, four
   # suits). Contains "SA", "HT", etc.
-  DECK = %w(S H D C).inject([]) do |d, s|
-    d += %w(A K Q J T 9 8 7 6 5 4 3 2).map { |c| s + c }
+  DECK = TRUMPS.inject([]) do |d, s|
+    d += CARD_VALUES.map { |c| s + c }
   end
 
   # Direction strings "N", "E", "S" and "W"
@@ -17,7 +26,7 @@ module Bridge
 
   # Possible contracts in ascending order. Contains "1C", "6NT", etc.
   CONTRACTS = %w(1 2 3 4 5 6 7).inject([]) do |b, l|
-    b += %w(C D H S NT).map { |s| l + s }
+    b += (TRUMPS.reverse + [NO_TRUMP]).map { |s| l + s }
   end
 
   # Pass string
@@ -79,4 +88,8 @@ module Bridge
   def self.bid?(string)
     BIDS.include?(string)
   end
+
+  def self.trump?(string)
+    TRUMPS.include?(string)
+  end
 end

data/lib/bridge/bid.rb

@@ -20,6 +20,10 @@ module Bridge
       bid[1..-1] if contract?
     end
 
+    def trump
+      suit if Bridge.trump?(suit)
+    end
+
     def pass?
       Bridge.pass?(bid)
     end

data/test/test_bid.rb

@@ -96,4 +96,12 @@ class TestBid < Test::Unit::TestCase
   test "PASS and XX are not equal" do
     assert_not_equal Bridge::Bid.new("PASS"), Bridge::Bid.new("XX")
   end
+
+  test "1S returns S trump" do
+    assert_equal "S", Bridge::Bid.new("1S").trump
+  end
+
+  test "5NT returns nil trump" do
+    assert_nil Bridge::Bid.new("5NT").trump
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -86,8 +86,8 @@ signing_key:
 specification_version: 3
 summary: Contract bridge utilities
 test_files: 
+- test/test_bridge.rb
+- test/test_bid.rb
 - test/test_card.rb
 - test/test_deal.rb
-- test/test_bid.rb
 - test/helper.rb
-- test/test_bridge.rb