bridge 0.0.13 → 0.0.14

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   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-26}
+  s.date = %q{2010-03-02}
   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 = [
@@ -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_card.rb",
+    "test/test_bridge.rb",
+     "test/test_trick.rb",
      "test/test_deal.rb",
-     "test/test_bid.rb",
      "test/helper.rb",
-     "test/test_trick.rb",
      "test/test_score.rb",
-     "test/test_bridge.rb"
+     "test/test_bid.rb",
+     "test/test_card.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bridge/bid.rb

@@ -12,7 +12,7 @@ module Bridge
 
     # Returns the level of the bid
     def level
-      bid[0] if contract?
+      bid[0..0] if contract?
     end
 
     # Returns the suit of the bid

data/lib/bridge/card.rb

@@ -12,12 +12,12 @@ module Bridge
 
     # Returns the suit of the card
     def suit
-      card[0]
+      card[0..0]
     end
 
     # Returns the suit of the card
     def value
-      card[1]
+      card[1..1]
     end
 
     # Returns the honour card points

data/lib/bridge/score.rb

@@ -1,11 +1,11 @@
 module Bridge
   class Score
-    attr_reader :tricks, :contract, :declarer, :modifier, :vulnerable
+    attr_reader :tricks, :contract, :declarer, :vulnerable
 
     # Creates new score object
     #
     # ==== Example
-    #   Bridge::Score.new(:contract => "7SXX", :declarer => "S", :vulnerable => "NONE", :tricks => 13)
+    #   Bridge::Score.new(:contract => "7SXX", :declarer => "S", :vulnerable => "BOTH", :tricks => 13)
     def initialize(options = {})
       options[:vulnerable] ||= "NONE"
       options[:contract].gsub!(/(X+)/, "")
@@ -16,33 +16,22 @@ module Bridge
       @declarer = options[:declarer] if Bridge::DIRECTIONS.include?(options[:declarer].upcase)
     end
 
+    # Returns nr of overtricks or undertricks. 0 if contract was made without them
     def result
       tricks - tricks_to_make_contract
     end
 
-    def tricks_to_make_contract
-      contract.level.to_i + 6
-    end
-
-    def doubled?
-      @modifier == 2
-    end
-
-    def redoubled?
-      @modifier == 4
-    end
-
+    # Returns true if contract was made, false otherwise
     def made?
       result >= 0
     end
 
-    def small_slam?
-      contract.level.to_i == 6
+    # Returns points achieved by declarer: + for made contract - if conctract wasn't made
+    def points
+      made? ? (made_contract_points + overtrick_points + bonus) : undertrick_points
     end
 
-    def grand_slam?
-      contract.level.to_i == 7
-    end
+    #private
 
     def vulnerable?
       case vulnerable
@@ -55,8 +44,24 @@ module Bridge
       end
     end
 
-    def points
-      made? ? (made_contract_points + overtrick_points + bonus) : undertrick_points
+    def small_slam?
+      contract.level.to_i == 6
+    end
+
+    def grand_slam?
+      contract.level.to_i == 7
+    end
+
+    def tricks_to_make_contract
+      contract.level.to_i + 6
+    end
+
+    def doubled?
+      @modifier == 2
+    end
+
+    def redoubled?
+      @modifier == 4
     end
 
     def bonus
@@ -110,7 +115,7 @@ module Bridge
     end
 
     def made_contract_points
-      first_trick_points * modifier + (contract.level.to_i - 1) * single_trick_points * modifier
+      first_trick_points * @modifier + (contract.level.to_i - 1) * single_trick_points * @modifier
     end
 
     def overtrick_points
@@ -123,20 +128,10 @@ module Bridge
       end
     end
 
-    def not_vulnerable_overtrick_points
-      if doubled?
-        result * 200
-      elsif redoubled?
-        result * 400
-      else
-        result * single_trick_points
-      end
-    end
-
     # TODO: do some refactoring
     def vulnerable_undertrick_points
       if !made?
-        p = -100 * modifier
+        p = -100 * @modifier
         if result < -1
           return p += (result + 1) * 300 if doubled?
           return p += (result + 1) * 600 if redoubled?
@@ -150,7 +145,7 @@ module Bridge
 
     def not_vulnerable_undertrick_points
       if !made?
-        p = -50 * modifier
+        p = -50 * @modifier
         if [-3, -2].include?(result)
           return p += (result + 1) * 200 if doubled?
           return p += (result + 1) * 400 if redoubled?

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+gem "test-unit"
 require 'test/unit'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_score.rb

@@ -20,13 +20,13 @@ class TestScore < Test::Unit::TestCase
 
   test "return modifier and contract when doubled" do
     score = Bridge::Score.new(:contract => "4SX", :declarer => "N", :tricks => 9)
-    assert_equal 2, score.modifier
+    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)
-    assert_equal 4, score.modifier
+    assert_equal 4, score.instance_variable_get(:@modifier)
     assert_equal "4S", score.contract.to_s
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +01:00
+date: 2010-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,10 +90,10 @@ signing_key:
 specification_version: 3
 summary: Contract bridge utilities
 test_files: 
-- test/test_card.rb
+- test/test_bridge.rb
+- test/test_trick.rb
 - test/test_deal.rb
-- test/test_bid.rb
 - test/helper.rb
-- test/test_trick.rb
 - test/test_score.rb
-- test/test_bridge.rb
+- test/test_bid.rb
+- test/test_card.rb