bridge 0.0.17 → 0.0.18

data/README.rdoc

@@ -2,6 +2,14 @@
 
 Contract bridge utils.
 
+== Bid
+
+== Card
+
+== Deal
+
+== Trick
+
 == Score
 
 You can create Score object passing 3 arguments:

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]
-  s.date = %q{2010-03-05}
+  s.date = %q{2010-03-17}
   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_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/deal.rb

@@ -110,8 +110,13 @@ module Bridge
       end
     end
 
+    # Returns hash with hands
+    def to_hash
+      { "N" => n, "E" => e, "S" => s, "W" => w }
+    end
+
     def inspect
-      { "N" => n, "E" => e, "S" => s, "W" => w }.inspect
+      to_hash.inspect
     end
 
     def honour_card_points(side = nil)

data/lib/bridge/score.rb

@@ -8,7 +8,8 @@ module Bridge
     #   Bridge::Score.new(:contract => "7SXX", :vulnerable => true, :tricks => "=")
     def initialize(options = {})
       @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))
+      @tricks = calculate_tricks(options[:tricks])
+      raise ArgumentError, "invalid tricks: #{@tricks}" unless (0..13).include?(@tricks)
       @vulnerable = options[:vulnerable] || false
     end
 
@@ -149,13 +150,15 @@ module Bridge
     end
 
     def calculate_tricks(tricks)
-      if tricks =~ /\A\+\d\Z/
+      if tricks.kind_of? Numeric
+        tricks
+      elsif 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_make_contract
+      elsif tricks =~ /\A\d[0-3]?\Z/
         tricks.to_i
       end
     end
@@ -168,8 +171,8 @@ module Bridge
 
     def self.all_contracts
       result = {}
-      contracts = %w(1 2 3 4 5 6 7).inject([]) do |b, l|
-        b += ["H/S", "C/D", "NT"].map { |s| l + s }
+      contracts = %w(1 2 3 4 5 6 7).inject([]) do |bids, level|
+        bids += ["H/S", "C/D", "NT"].map { |suit| level + suit }
       end
       (contracts + contracts.map { |c| c + "X" } + contracts.map { |c| c + "XX" }).each do |contract|
         [true, false].each do |vulnerable|

data/test/test_deal.rb

@@ -120,4 +120,9 @@ class TestDeal < Test::Unit::TestCase
     assert_equal "W", deal.owner("H6")
     assert_equal "W", deal.owner("C9")
   end
+
+  test "to_hash returns hash" do
+    deal = Bridge::Deal.from_id(0)
+    assert_equal Hash, deal.to_hash.class
+  end
 end

data/test/test_score.rb

@@ -38,11 +38,11 @@ class TestScore < Test::Unit::TestCase
   test "return made contract?" do
     score = Bridge::Score.new(:contract => "6S", :tricks => 9)
     assert_false score.made?
-    score = Bridge::Score.new(:contract => "3NT", :vulnerable => true, :tricks => 3)
+    score = Bridge::Score.new(:contract => "3NT", :tricks => 3)
     assert_false score.made?
-    score = Bridge::Score.new(:contract => "7NT", :vulnerable => true, :tricks => 13)
+    score = Bridge::Score.new(:contract => "7NT", :tricks => 13)
     assert score.made?
-    score = Bridge::Score.new(:contract => "3NT", :vulnerable => true, :tricks => 11)
+    score = Bridge::Score.new(:contract => "3NT", :tricks => 11)
     assert score.made?
   end
 
@@ -63,23 +63,30 @@ class TestScore < Test::Unit::TestCase
   end
 
   test "calculate tricks with plus" do
-    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => "+1")
+    score = Bridge::Score.new(:contract => "4S", :tricks => "+1")
     assert_equal 11, score.tricks
   end
 
   test "calculate tricks with minus" do
-    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => "-4")
+    score = Bridge::Score.new(:contract => "4S", :tricks => "-4")
     assert_equal 6, score.tricks
   end
 
   test "calculate tricks with equal sign" do
-    score = Bridge::Score.new(:contract => "4S", :vulnerable => true, :tricks => "=")
+    score = Bridge::Score.new(:contract => "4S", :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
+  test "15 is not a valid tricks argument" do
+    assert_raises(ArgumentError) do
+      Bridge::Score.new(:contract => "4S", :tricks => 15)
+    end
+  end
+
+  test "wrong string is not a valid tricks argument" do
+    assert_raises(ArgumentError) do
+      Bridge::Score.new(:contract => "4S", :tricks => "wrong")
+    end
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 +01:00
+date: 2010-03-17 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_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