bridge 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/bridge.gemspec

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

data/lib/bridge/trick.rb

@@ -1,16 +1,14 @@
 module Bridge
   class Trick
-    attr_reader :cards, :trump, :suit
+    attr_reader :cards, :suit
 
     def initialize(*args)
-      options = args.pop if args.last.is_a?(Hash)
-      @cards = args.flatten.map { |s| Bridge::Card.new(s.to_s) }
+      @cards = args.flatten.map { |c| Bridge::Card.new(c.to_s) }
       @suit = @cards.first.suit
-      @trump = options && options[:trump]
     end
 
-    def winner
-      winner_in_suit(@trump) || winner_in_suit(@suit)
+    def winner(trump = nil)
+      winner_in_suit(trump) || winner_in_suit(@suit)
     end
 
     private

data/test/test_trick.rb

@@ -12,27 +12,27 @@ class TestTrick < Test::Unit::TestCase
   end
 
   test "the highest H card is the winner in S game H trick and single suit" do
-    trick = Bridge::Trick.new("H2", "H5", "H4", "H3", :trump => "S")
-    assert_equal Bridge::Card.new("H5"), trick.winner
+    trick = Bridge::Trick.new("H2", "H5", "H4", "H3")
+    assert_equal Bridge::Card.new("H5"), trick.winner("S")
   end
 
   test "the highest H card is the winner in S game H trick and multiple suits" do
-    trick = Bridge::Trick.new("H2", "D5", "C4", "H3", :trump => "S")
-    assert_equal Bridge::Card.new("H3"), trick.winner
+    trick = Bridge::Trick.new("H2", "D5", "C4", "H3")
+    assert_equal Bridge::Card.new("H3"), trick.winner("S")
   end
 
   test "the only trump is the winner in S game H trick and multiple suits" do
-    trick = Bridge::Trick.new("H2", "D5", "S2", "H3", :trump => "S")
-    assert_equal Bridge::Card.new("S2"), trick.winner
+    trick = Bridge::Trick.new("H2", "D5", "S2", "H3")
+    assert_equal Bridge::Card.new("S2"), trick.winner("S")
   end
 
   test "the highest trump is the winner in S game H trick and multiple suits" do
-    trick = Bridge::Trick.new("H2", "SA", "S2", "H3", :trump => "S")
-    assert_equal Bridge::Card.new("SA"), trick.winner
+    trick = Bridge::Trick.new("H2", "SA", "S2", "H3")
+    assert_equal Bridge::Card.new("SA"), trick.winner("S")
   end
 
   test "the highest trump is the winner in S game S trick and multiple suits" do
-    trick = Bridge::Trick.new("S2", "HA", "CA", "DA", :trump => "S")
-    assert_equal Bridge::Card.new("S2"), trick.winner
+    trick = Bridge::Trick.new("S2", "HA", "CA", "DA")
+    assert_equal Bridge::Card.new("S2"), trick.winner("S")
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"