bridge 0.0.24 → 0.0.25

data/lib/bridge/deal.rb

@@ -142,13 +142,22 @@ module Bridge
 
     def sort_by_color(trump = nil)
       DIRECTIONS.inject({}) do |sorted, direction|
-        splitted_colors = split_colors(direction)
+        splitted_colors = cards_for(direction)
+        splitted_colors.reject! { |trump, cards| cards.empty? }
         sorted_colors = sort_colors(splitted_colors.keys, trump)
         sorted[direction] = sorted_colors.map { |color| splitted_colors.delete(color) }.flatten
         sorted
       end
     end
 
+    def cards_for(direction)
+      TRUMPS.inject({}) do |colors, trump|
+        cards = self[direction].select { |card| card.suit == trump }
+        colors[trump] = cards
+        colors
+      end
+    end
+
     private
 
     def must_be_direction!(string)
@@ -160,14 +169,6 @@ module Bridge
       instance_variable_set("@#{direction.to_s.downcase}", cards)
     end
 
-    def split_colors(direction)
-      TRUMPS.inject({}) do |colors, trump|
-        cards = self[direction].select { |card| card.suit == trump }
-        colors[trump] = cards unless cards.empty?
-        colors
-      end
-    end
-
     def sort_colors(colors, trump = nil)
       black = ["S", "C"] & colors
       red = ["H", "D"] & colors

data/lib/bridge/version.rb

@@ -1,3 +1,3 @@
 module Bridge
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/test/test_deal.rb

@@ -145,14 +145,15 @@ class TestDealSort < Test::Unit::TestCase
                  "H" => @deal.n.select { |c| c.suit == "H" },
                  "D" => @deal.n.select { |c| c.suit == "D" },
                  "C" => @deal.n.select { |c| c.suit == "C" } }
-    assert_equal expected, @deal.send(:split_colors, "N")
+    assert_equal expected, @deal.cards_for("N")
   end
 
   test "return colors as key only if cards are present on hand" do
     expected = { "S" => @deal.e.select { |c| c.suit == "S" },
+                 "H" => [],
                  "D" => @deal.e.select { |c| c.suit == "D" },
                  "C" => @deal.e.select { |c| c.suit == "C" } }
-    assert_equal expected, @deal.send(:split_colors, "E")
+    assert_equal expected, @deal.cards_for("E")
   end
 
   test "return sorted 4 colors" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bridge
 version: !ruby/object:Gem::Version 
-  hash: 47
   prerelease: false
   segments: 
   - 0
   - 0
-  - 24
-  version: 0.0.24
+  - 25
+  version: 0.0.25
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -16,16 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: bundler
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424063
         segments: 
         - 1
         - 0
@@ -34,7 +33,6 @@ dependencies:
         - 5
         version: 1.0.0.rc.5
   type: :development
-  name: bundler
   prerelease: false
   version_requirements: *id001
 description: Useful contract bridge utilities - deal generator, id to deal and deal to id conversion
@@ -81,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -289614348859351753
       segments: 
       - 0
       version: "0"
@@ -90,7 +88,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3