bridge 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bridge.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]

data/lib/bridge.rb

@@ -80,12 +80,3 @@ module Bridge
     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

@@ -87,4 +87,8 @@ module Bridge
       bid.inspect
     end
   end
+
+  def self.Bid(bid)
+    Bid.new(bid)
+  end
 end

data/lib/bridge/card.rb

@@ -57,4 +57,8 @@ module Bridge
       card
     end
   end
+
+  def self.Card(card)
+    Card.new(card)
+  end
 end

data/lib/bridge/deal.rb

@@ -120,4 +120,8 @@ module Bridge
       instance_variable_set("@#{direction.to_s.downcase}", cards)
     end
   end
+
+  def self.Deal(deal)
+    Deal.new(deal)
+  end
 end

data/test/test_bid.rb

@@ -81,10 +81,6 @@ class TestBid < Test::Unit::TestCase
     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")

data/test/test_card.rb

@@ -30,4 +30,8 @@ class TestCard < Test::Unit::TestCase
       Bridge::Card.new("1H")
     end
   end
+
+  test "ST is lower than SJ" do
+    assert Bridge::Card.new("ST") < Bridge::Card.new("SJ")
+  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).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 %w(SA SK SQ SJ ST S9 S8 S7 S6 S5 S4 S3 S2).map { |c| Bridge::Card.new(c) }, deal.n
+    assert_equal %w(HA HK HQ HJ HT H9 H8 H7 H6 H5 H4 H3 H2).map { |c| Bridge::Card.new(c) }, deal.e
+    assert_equal %w(DA DK DQ DJ DT D9 D8 D7 D6 D5 D4 D3 D2).map { |c| Bridge::Card.new(c) }, deal.s
+    assert_equal %w(CA CK CQ CJ CT C9 C8 C7 C6 C5 C4 C3 C2).map { |c| Bridge::Card.new(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).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 %w(CA CK CQ CJ CT C9 C8 C7 C6 C5 C4 C3 C2).map { |c| Bridge::Card.new(c) }, deal.n
+    assert_equal %w(DA DK DQ DJ DT D9 D8 D7 D6 D5 D4 D3 D2).map { |c| Bridge::Card.new(c) }, deal.e
+    assert_equal %w(HA HK HQ HJ HT H9 H8 H7 H6 H5 H4 H3 H2).map { |c| Bridge::Card.new(c) }, deal.s
+    assert_equal %w(SA SK SQ SJ ST S9 S8 S7 S6 S5 S4 S3 S2).map { |c| Bridge::Card.new(c) }, deal.w
     assert_equal id, deal.id
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"