bridge 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/bridge.gemspec

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

data/lib/bridge/bid.rb

@@ -53,6 +53,14 @@ module Bridge
       Bridge.modifier?(bid)
     end
 
+    def small_slam?
+      level.to_i == 6
+    end
+
+    def grand_slam?
+      level.to_i == 7
+    end
+
     def contract?
       Bridge.contract?(bid)
     end

data/lib/bridge/score.rb

@@ -1,19 +1,15 @@
 module Bridge
   class Score
-    attr_reader :tricks, :contract, :declarer, :vulnerable
+    attr_reader :tricks, :contract, :vulnerable
 
     # Creates new score object
     #
     # ==== Example
-    #   Bridge::Score.new(:contract => "7SXX", :declarer => "S", :vulnerable => "BOTH", :tricks => 13)
+    #   Bridge::Score.new(:contract => "7SXX", :vulnerable => true, :tricks => "=")
     def initialize(options = {})
-      options[:vulnerable] ||= "NONE"
-      options[:contract].gsub!(/(X+)/, "")
-      @modifier = $1.nil? ? 1 : $1.to_s.size * 2
-      @tricks = options[:tricks]
-      @contract = Bridge::Bid.new(options[:contract])
-      @vulnerable = options[:vulnerable] if Bridge::VULNERABILITIES.include?(options[:vulnerable].upcase)
-      @declarer = options[:declarer] if Bridge::DIRECTIONS.include?(options[:declarer].upcase)
+      @contract, @modifier = split_contract(options[:contract])
+      @tricks = calculate_tricks(options[:tricks].to_s) if (0..13).to_a.include?(calculate_tricks(options[:tricks].to_s))
+      @vulnerable = options[:vulnerable] || false
     end
 
     # Returns nr of overtricks or undertricks. 0 if contract was made without them
@@ -34,22 +30,7 @@ module Bridge
     #private
 
     def vulnerable?
-      case vulnerable
-      when "BOTH"
-        true
-      when "NONE"
-        false
-      else
-        vulnerable.split('').include?(declarer)
-      end
-    end
-
-    def small_slam?
-      contract.level.to_i == 6
-    end
-
-    def grand_slam?
-      contract.level.to_i == 7
+      @vulnerable == true
     end
 
     def tricks_to_make_contract
@@ -79,7 +60,7 @@ module Bridge
     end
 
     def grand_slam_bonus
-      if made? and grand_slam?
+      if made? and contract.grand_slam?
         vulnerable? ? 1500 : 1000
       else
         0
@@ -87,7 +68,7 @@ module Bridge
     end
 
     def small_slam_bonus
-      if made? and small_slam?
+      if made? and contract.small_slam?
         vulnerable? ? 750 : 500
       else
         0
@@ -160,5 +141,23 @@ module Bridge
         0
       end
     end
+
+    def calculate_tricks(tricks)
+      if tricks =~ /\A\+\d\Z/
+        tricks_to_make_contract + tricks[1..1].to_i
+      elsif tricks =~ /\A-\d\Z/
+        tricks_to_make_contract - tricks[1..1].to_i
+      elsif tricks =~ /\A=\Z/
+        tricks_to_make_contract.to_i
+      else
+        tricks.to_i
+      end
+    end
+
+    def split_contract(contract)
+      contract = contract.gsub(/(X+)/, "")
+      modifier = $1.nil? ? 1 : $1.to_s.size * 2
+      [Bridge::Bid.new(contract), modifier]
+    end
   end
 end

data/test/test_bid.rb

@@ -124,4 +124,12 @@ class TestBid < Test::Unit::TestCase
   test "1NT is a nt bid" do
     assert Bridge::Bid.new("1NT").nt?
   end
+
+  test "6NT is a small slam" do
+    assert Bridge::Bid.new("6NT").small_slam?
+  end
+
+  test "7NT is a grand slam" do
+    assert Bridge::Bid.new("7NT").grand_slam?
+  end
 end

data/test/test_score.rb

@@ -3,223 +3,240 @@ require "helper"
 class TestScore < Test::Unit::TestCase
 
   def setup
-    @score = Bridge::Score.new(:contract => "1S", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    @score = Bridge::Score.new(:contract => "1S", :vulnerable => false, :tricks => 9)
   end
 
   test "valid score" do
     assert_false @score.contract.nil?
-    assert_false @score.declarer.nil?
     assert_false @score.vulnerable.nil?
     assert_false @score.tricks.nil?
   end
 
-  test "default vulnerable set to NONE" do
-    score = Bridge::Score.new(:contract => "1S", :declarer => "N", :tricks => 9)
-    assert_equal "NONE", score.vulnerable
+  test "default vulnerable set to false" do
+    score = Bridge::Score.new(:contract => "1S", :tricks => 9)
+    assert_equal false, score.vulnerable
   end
 
   test "return modifier and contract when doubled" do
-    score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4SX", :tricks => 9)
     assert_equal 2, score.instance_variable_get(:@modifier)
     assert_equal "4S", score.contract.to_s
   end
 
   test "return modifier and contract when redoubled" do
-    score = Bridge::Score.new(:contract => "4SXX", :declarer => "N", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4SXX", :tricks => 9)
     assert_equal 4, score.instance_variable_get(:@modifier)
     assert_equal "4S", score.contract.to_s
   end
 
   test "return tricks to make contract" do
     assert_equal 7, @score.tricks_to_make_contract
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :tricks => 9)
+    score = Bridge::Score.new(:contract => "6S", :tricks => 9)
     assert_equal 12, score.tricks_to_make_contract
   end
 
   test "return made contract?" do
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :tricks => 9)
+    score = Bridge::Score.new(:contract => "6S", :tricks => 9)
     assert_false score.made?
-    score = Bridge::Score.new(:contract => "3NT", :declarer => "N", :vulnerable => "BOTH", :tricks => 3)
+    score = Bridge::Score.new(:contract => "3NT", :vulnerable => true, :tricks => 3)
     assert_false score.made?
-    score = Bridge::Score.new(:contract => "7NT", :declarer => "N", :vulnerable => "BOTH", :tricks => 13)
+    score = Bridge::Score.new(:contract => "7NT", :vulnerable => true, :tricks => 13)
     assert score.made?
-    score = Bridge::Score.new(:contract => "3NT", :declarer => "N", :vulnerable => "BOTH", :tricks => 11)
+    score = Bridge::Score.new(:contract => "3NT", :vulnerable => true, :tricks => 11)
     assert score.made?
   end
 
   test "return result" do
     assert_equal 2, @score.result
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :tricks => 12)
+    score = Bridge::Score.new(:contract => "6S", :tricks => 12)
     assert_equal 0, score.result
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :tricks => 10)
+    score = Bridge::Score.new(:contract => "6S", :tricks => 10)
     assert_equal -2, score.result
   end
 
   test "return vulnerable" do
     assert_false @score.vulnerable?
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :vulnerable => "BOTH", :tricks => 12)
+    score = Bridge::Score.new(:contract => "6S", :vulnerable => true, :tricks => 12)
     assert score.vulnerable?
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :vulnerable => "NS", :tricks => 10)
-    assert score.vulnerable?
-    score = Bridge::Score.new(:contract => "6S", :declarer => "E", :vulnerable => "NS", :tricks => 10)
+    score = Bridge::Score.new(:contract => "6S", :vulnerable => false, :tricks => 10)
     assert_false score.vulnerable?
   end
+
+  test "calculate tricks with plus" do
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => "+1")
+    assert_equal 11, score.tricks
+  end
+
+  test "calculate tricks with minus" do
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => "-4")
+    assert_equal 6, score.tricks
+  end
+
+  test "calculate tricks with equal sign" do
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => "=")
+    assert_equal 10, score.tricks
+  end
+
+  test "not set tricks if value out of range" do
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => 15)
+    assert_nil score.tricks
+  end
 end
 
 class TestScorePoints < Test::Unit::TestCase
 
   test "game bonus" do
-    score = Bridge::Score.new(:contract => "3S", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    score = Bridge::Score.new(:contract => "3S", :vulnerable => false, :tricks => 9)
     assert_equal 50, score.game_bonus
-    score = Bridge::Score.new(:contract => "4S", :declarer => "N", :vulnerable => "NONE", :tricks => 10)
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => false, :tricks => 10)
     assert_equal 300, score.game_bonus
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :vulnerable => "NONE", :tricks => 12)
+    score = Bridge::Score.new(:contract => "6S", :vulnerable => false, :tricks => 12)
     assert_equal 300, score.game_bonus
-    score = Bridge::Score.new(:contract => "3NT", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "3NT", :vulnerable => true, :tricks => 9)
     assert_equal 500, score.game_bonus
-    score = Bridge::Score.new(:contract => "3NT", :declarer => "N", :vulnerable => "BOTH", :tricks => 3)
+    score = Bridge::Score.new(:contract => "3NT", :vulnerable => true, :tricks => 3)
     assert_equal 0, score.game_bonus
-    score = Bridge::Score.new(:contract => "3SX", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "3SX", :vulnerable => true, :tricks => 9)
     assert_equal 500, score.game_bonus
   end
 
   test "small slam bonus" do
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :vulnerable => "NONE", :tricks => 12)
+    score = Bridge::Score.new(:contract => "6S", :vulnerable => false, :tricks => 12)
     assert_equal 500, score.small_slam_bonus
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :vulnerable => "BOTH", :tricks => 12)
+    score = Bridge::Score.new(:contract => "6S", :vulnerable => true, :tricks => 12)
     assert_equal 750, score.small_slam_bonus
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :vulnerable => "BOTH", :tricks => 10)
+    score = Bridge::Score.new(:contract => "6S", :vulnerable => true, :tricks => 10)
     assert_equal 0, score.small_slam_bonus
   end
 
   test "grand slam bonus" do
-    score = Bridge::Score.new(:contract => "7S", :declarer => "N", :vulnerable => "NONE", :tricks => 13)
+    score = Bridge::Score.new(:contract => "7S", :vulnerable => false, :tricks => 13)
     assert_equal 1000, score.grand_slam_bonus
-    score = Bridge::Score.new(:contract => "7S", :declarer => "N", :vulnerable => "BOTH", :tricks => 13)
+    score = Bridge::Score.new(:contract => "7S", :vulnerable => true, :tricks => 13)
     assert_equal 1500, score.grand_slam_bonus
-    score = Bridge::Score.new(:contract => "7S", :declarer => "N", :vulnerable => "BOTH", :tricks => 11)
+    score = Bridge::Score.new(:contract => "7S", :vulnerable => true, :tricks => 11)
     assert_equal 0, score.grand_slam_bonus
-    score = Bridge::Score.new(:contract => "6S", :declarer => "N", :vulnerable => "BOTH", :tricks => 13)
+    score = Bridge::Score.new(:contract => "6S", :vulnerable => true, :tricks => 13)
     assert_equal 0, score.grand_slam_bonus
   end
 
   test "doubled and redoubled cotract made bonus" do
-    score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :tricks => 10)
+    score = Bridge::Score.new(:contract => "4SX", :tricks => 10)
     assert_equal 50, score.doubled_bonus
-    score = Bridge::Score.new(:contract => "4SXX", :declarer => "N", :tricks => 10)
+    score = Bridge::Score.new(:contract => "4SXX", :tricks => 10)
     assert_equal 100, score.redoubled_bonus
     assert_equal 0, score.doubled_bonus
   end
 
   test "vulnerable undertrick points" do
-    score = Bridge::Score.new(:contract => "4S", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => 9)
     assert_equal -100, score.vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4SX", :vulnerable => true, :tricks => 9)
     assert_equal -200, score.vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :vulnerable => "BOTH", :tricks => 7)
+    score = Bridge::Score.new(:contract => "4SX", :vulnerable => true, :tricks => 7)
     assert_equal -800, score.vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SXX", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4SXX", :vulnerable => true, :tricks => 9)
     assert_equal -400, score.vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SXX", :declarer => "N", :vulnerable => "BOTH", :tricks => 7)
+    score = Bridge::Score.new(:contract => "4SXX", :vulnerable => true, :tricks => 7)
     assert_equal -1600, score.vulnerable_undertrick_points
   end
 
   test "not vulnerable undertrick points" do
-    score = Bridge::Score.new(:contract => "4S", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => false, :tricks => 9)
     assert_equal -50, score.not_vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4SX", :vulnerable => false, :tricks => 9)
     assert_equal -100, score.not_vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :vulnerable => "NONE", :tricks => 7)
+    score = Bridge::Score.new(:contract => "4SX", :vulnerable => false, :tricks => 7)
     assert_equal -500, score.not_vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SXX", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    score = Bridge::Score.new(:contract => "4SXX", :vulnerable => false, :tricks => 9)
     assert_equal -200, score.not_vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SXX", :declarer => "N", :vulnerable => "NONE", :tricks => 7)
+    score = Bridge::Score.new(:contract => "4SXX", :vulnerable => false, :tricks => 7)
     assert_equal -1000, score.not_vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :vulnerable => "NONE", :tricks => 6)
+    score = Bridge::Score.new(:contract => "4SX", :vulnerable => false, :tricks => 6)
     assert_equal -800, score.not_vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4SXX", :declarer => "N", :vulnerable => "NONE", :tricks => 6)
+    score = Bridge::Score.new(:contract => "4SXX", :vulnerable => false, :tricks => 6)
     assert_equal -1600, score.not_vulnerable_undertrick_points
-    score = Bridge::Score.new(:contract => "4S", :declarer => "N", :vulnerable => "NONE", :tricks => 6)
+    score = Bridge::Score.new(:contract => "4S", :vulnerable => false, :tricks => 6)
     assert_equal -200, score.not_vulnerable_undertrick_points
   end
 
   test "overtrick points" do
-    score = Bridge::Score.new(:contract => "2S", :declarer => "N", :vulnerable => "NONE", :tricks => 10)
+    score = Bridge::Score.new(:contract => "2S", :vulnerable => false, :tricks => 10)
     assert_equal 60, score.overtrick_points
-    score = Bridge::Score.new(:contract => "2SX", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    score = Bridge::Score.new(:contract => "2SX", :vulnerable => false, :tricks => 9)
     assert_equal 100, score.overtrick_points
-    score = Bridge::Score.new(:contract => "2SXX", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    score = Bridge::Score.new(:contract => "2SXX", :vulnerable => false, :tricks => 9)
     assert_equal 200, score.overtrick_points
-    score = Bridge::Score.new(:contract => "2S", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "2S", :vulnerable => true, :tricks => 9)
     assert_equal 30, score.overtrick_points
-    score = Bridge::Score.new(:contract => "2SX", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "2SX", :vulnerable => true, :tricks => 9)
     assert_equal 200, score.overtrick_points
-    score = Bridge::Score.new(:contract => "2SXX", :declarer => "N", :vulnerable => "BOTH", :tricks => 9)
+    score = Bridge::Score.new(:contract => "2SXX", :vulnerable => true, :tricks => 9)
     assert_equal 400, score.overtrick_points
   end
 
   test "return 90 points for 1S=" do
-    score = Bridge::Score.new(:contract => "3S", :declarer => "N", :vulnerable => "NONE", :tricks => 9)
+    score = Bridge::Score.new(:contract => "3S", :vulnerable => false, :tricks => 9)
     assert_equal 140, score.points
   end
 
   test "return 70 points for 2S=" do
-    score = Bridge::Score.new(:contract => "2NT", :declarer => "N", :vulnerable => "NONE", :tricks => 8)
+    score = Bridge::Score.new(:contract => "2NT", :vulnerable => false, :tricks => 8)
     assert_equal 120, score.points
   end
 
   test "return 80 points for 2D+2" do
-    score = Bridge::Score.new(:contract => "2D", :declarer => "N", :vulnerable => "NONE", :tricks => 10)
+    score = Bridge::Score.new(:contract => "2D", :vulnerable => false, :tricks => 10)
     assert_equal 130, score.points
   end
 
   test "return 1400 points for 5CXX+1" do
-    score = Bridge::Score.new(:contract => "5CXX", :declarer => "N", :vulnerable => "BOTH", :tricks => 12)
+    score = Bridge::Score.new(:contract => "5CXX", :vulnerable => true, :tricks => 12)
     assert_equal 1400, score.points
   end
 
   test "return 1700 points for 3NTX-7" do
-    score = Bridge::Score.new(:contract => "3NTX", :declarer => "N", :vulnerable => "NONE", :tricks => 2)
+    score = Bridge::Score.new(:contract => "3NTX", :vulnerable => false, :tricks => 2)
     assert_equal -1700, score.points
   end
 
   test "return -7600 points for 7NTXX-13" do
-    score = Bridge::Score.new(:contract => "7NTXX", :declarer => "N", :vulnerable => "BOTH", :tricks => 0)
+    score = Bridge::Score.new(:contract => "7NTXX", :vulnerable => true, :tricks => 0)
     assert_equal -7600, score.points
   end
 
   test "return -7600 points for 7NT-13" do
-    score = Bridge::Score.new(:contract => "7NT", :declarer => "N", :vulnerable => "NONE", :tricks => 0)
+    score = Bridge::Score.new(:contract => "7NT", :vulnerable => false, :tricks => 0)
     assert_equal -650, score.points
   end
 
   test "return -1300 points for 7NT-13" do
-    score = Bridge::Score.new(:contract => "7NT", :declarer => "N", :vulnerable => "BOTH", :tricks => 0)
+    score = Bridge::Score.new(:contract => "7NT", :vulnerable => true, :tricks => 0)
     assert_equal -1300, score.points
   end
 
   test "return -3500 points for 7NTX-13" do
-    score = Bridge::Score.new(:contract => "7NTX", :declarer => "N", :vulnerable => "NONE", :tricks => 0)
+    score = Bridge::Score.new(:contract => "7NTX", :vulnerable => false, :tricks => 0)
     assert_equal -3500, score.points
   end
 
   test "return -3800 points for 7NTX-13" do
-    score = Bridge::Score.new(:contract => "7NTX", :declarer => "N", :vulnerable => "BOTH", :tricks => 0)
+    score = Bridge::Score.new(:contract => "7NTX", :vulnerable => true, :tricks => 0)
     assert_equal -3800, score.points
   end
 
   test "return -7000 points for 7NTXX-13" do
-    score = Bridge::Score.new(:contract => "7NTXX", :declarer => "N", :vulnerable => "NONE", :tricks => 0)
+    score = Bridge::Score.new(:contract => "7NTXX", :vulnerable => false, :tricks => 0)
     assert_equal -7000, score.points
   end
 
   test "return 1340 points for 1CX+6" do
-    score = Bridge::Score.new(:contract => "1CX", :declarer => "N", :vulnerable => "BOTH", :tricks => 13)
+    score = Bridge::Score.new(:contract => "1CX", :vulnerable => true, :tricks => 13)
     assert_equal 1340, score.points
   end
 
   test "return 740 points for 1CX+6" do
-    score = Bridge::Score.new(:contract => "1CX", :declarer => "N", :vulnerable => "NONE", :tricks => 13)
+    score = Bridge::Score.new(:contract => "1CX", :vulnerable => false, :tricks => 13)
     assert_equal 740, score.points
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -90,10 +90,10 @@ signing_key:
 specification_version: 3
 summary: Contract bridge utilities
 test_files: 
-- test/test_bridge.rb
-- test/test_trick.rb
-- test/test_deal.rb
 - test/helper.rb
-- test/test_score.rb
 - test/test_bid.rb
 - test/test_card.rb
+- test/test_trick.rb
+- test/test_deal.rb
+- test/test_bridge.rb
+- test/test_score.rb