bridge 0.1.0 → 0.1.1

data/README.rdoc

@@ -35,10 +35,12 @@ You can use regexp to check if contract with result is valid:
 will match i.e.
   "1NT=", "2SX+1", "6NTXX-2"
 
-== Imp
+== Points
+
+=== Chicago
 
 You can calculate how many IMP points you won by:
-  Bridge::Imp.new(:hcp => 25, :points => 420, :vulnerable => false).imps
+  Bridge::Points::Chicago.new(:hcp => 25, :points => 420, :vulnerable => false).imps
 
 Arguments:
 * :hcp -- Integer (range between 20 and 40), which means how many honour card points has side

data/lib/bridge/constants.rb

@@ -50,60 +50,61 @@ module Bridge
   # All possible vullnerabilites
   VULNERABILITIES = ["NONE", SIDES, "BOTH"].flatten
 
-  class Imp
-    # values in array: [not-vulnerable, vulnerable]
-    POINTS =
+  module Points
+    IMPS =
       {
-        "20" => [0,    0],
-        "21" => [50,   50],
-        "22" => [70,   70],
-        "23" => [110,  110],
-        "24" => [200,  290],
-        "25" => [300,  440],
-        "26" => [350,  520],
-        "27" => [400,  600],
-        "28" => [430,  630],
-        "29" => [460,  660],
-        "30" => [490,  690],
-        "31" => [600,  900],
-        "32" => [700,  1050],
-        "33" => [900,  1350],
-        "34" => [1000, 1500],
-        "35" => [1100, 1650],
-        "36" => [1200, 1800],
-        "37" => [1300, 1950],
-        "38" => [1300, 1950],
-        "39" => [1300, 1950],
-        "40" => [1300, 1950]
+        0...10      => 0,
+        20...40     => 1,
+        50...80     => 2,
+        90...120    => 3,
+        130...160   => 4,
+        170...210   => 5,
+        220...260   => 6,
+        270...310   => 7,
+        320...360   => 8,
+        370...420   => 9,
+        430...490   => 10,
+        500...590   => 11,
+        600...740   => 12,
+        750...890   => 13,
+        900...1090  => 14,
+        1100...1290 => 15,
+        1300...1490 => 16,
+        1500...1740 => 17,
+        1750...1990 => 18,
+        2000...2240 => 19,
+        2250...2490 => 20,
+        2500...2990 => 21,
+        3000...3490 => 22,
+        3500...3990 => 23,
+        4000...7600 => 24
       }
-
-      IMPS =
+    class Chicago
+      # values in array: [not-vulnerable, vulnerable]
+      POINTS =
         {
-          "0...10"      => 0,
-          "20...40"     => 1,
-          "50...80"     => 2,
-          "90...120"    => 3,
-          "130...160"   => 4,
-          "170...210"   => 5,
-          "220...260"   => 6,
-          "270...310"   => 7,
-          "320...360"   => 8,
-          "370...420"   => 9,
-          "430...490"   => 10,
-          "500...590"   => 11,
-          "600...740"   => 12,
-          "750...890"   => 13,
-          "900...1090"  => 14,
-          "1100...1290" => 15,
-          "1300...1490" => 16,
-          "1500...1740" => 17,
-          "1750...1990" => 18,
-          "2000...2240" => 19,
-          "2250...2490" => 20,
-          "2500...2990" => 21,
-          "3000...3490" => 22,
-          "3500...3990" => 23,
-          "4000...7600" => 24
+          20 => [0,    0],
+          21 => [50,   50],
+          22 => [70,   70],
+          23 => [110,  110],
+          24 => [200,  290],
+          25 => [300,  440],
+          26 => [350,  520],
+          27 => [400,  600],
+          28 => [430,  630],
+          29 => [460,  660],
+          30 => [490,  690],
+          31 => [600,  900],
+          32 => [700,  1050],
+          33 => [900,  1350],
+          34 => [1000, 1500],
+          35 => [1100, 1650],
+          36 => [1200, 1800],
+          37 => [1300, 1950],
+          38 => [1300, 1950],
+          39 => [1300, 1950],
+          40 => [1300, 1950]
         }
+    end
   end
 end

data/lib/bridge/{imp.rb → points/chicago.rb}

@@ -1,5 +1,5 @@
-module Bridge
-  class Imp
+module Bridge::Points
+  class Chicago
     attr_reader :hcp, :points, :vulnerable
     alias :vulnerable? :vulnerable
 
@@ -16,7 +16,7 @@ module Bridge
 
     # Returns points that side should make with given hcp
     def points_to_make
-      POINTS[hcp.to_s][vulnerable? ? 1 : 0]
+      POINTS[hcp][vulnerable? ? 1 : 0]
     end
 
     # Returns points score relative to hcp
@@ -27,7 +27,7 @@ module Bridge
     # Returns imps (negative or positive) based on given points
     def imps
       IMPS.each do |range, imps|
-        return (imps * sign) if eval(range).include?(points_difference.abs)
+        return (imps * sign) if range.include?(points_difference.abs)
       end
     end
 

data/lib/bridge/version.rb

@@ -1,3 +1,3 @@
 module Bridge
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/bridge.rb

@@ -2,7 +2,7 @@ require "bridge/bid"
 require "bridge/card"
 require "bridge/constants"
 require "bridge/deal"
-require "bridge/imp"
+require "bridge/points/chicago"
 require "bridge/score"
 require "bridge/trick"
 require "bridge/version"

data/test/{test_imp.rb → test_chicago.rb}

@@ -1,39 +1,39 @@
 require "helper"
 
-class TestImp < Test::Unit::TestCase
+class TestChicago < Test::Unit::TestCase
   test "raises ArgumentError when invalid honour card points provided" do
     assert_raises(ArgumentError) do
-      Bridge::Imp.new(:hcp => 15, :points => 100)
+      Bridge::Points::Chicago.new(:hcp => 15, :points => 100)
     end
   end
 
   test "set default vulnerable to false" do
-    imp = Bridge::Imp.new(:hcp => 40, :points => -100)
+    imp = Bridge::Points::Chicago.new(:hcp => 40, :points => -100)
     assert_false imp.vulnerable
   end
 
   test "return vulnerable boolean" do
-    imp = Bridge::Imp.new(:hcp => 20, :points => 100, :vulnerable => true)
+    imp = Bridge::Points::Chicago.new(:hcp => 20, :points => 100, :vulnerable => true)
     assert imp.vulnerable?
   end
 
   test "return points to make when vulnerable" do
-    imp = Bridge::Imp.new(:hcp => 23, :points => 100, :vulnerable => true)
+    imp = Bridge::Points::Chicago.new(:hcp => 23, :points => 100, :vulnerable => true)
     assert_equal 110, imp.points_to_make
   end
 
   test "return points to make when not vulnerable" do
-    imp = Bridge::Imp.new(:hcp => 23, :points => 100, :vulnerable => false)
+    imp = Bridge::Points::Chicago.new(:hcp => 23, :points => 100, :vulnerable => false)
     assert_equal 110, imp.points_to_make
   end
 
   test "return positive imps" do
-    imp = Bridge::Imp.new(:hcp => 21, :points => 100)
+    imp = Bridge::Points::Chicago.new(:hcp => 21, :points => 100)
     assert_equal 2, imp.imps
   end
 
   test "return negative imps" do
-    imp = Bridge::Imp.new(:hcp => 21, :points => -100)
+    imp = Bridge::Points::Chicago.new(:hcp => 21, :points => -100)
     assert_equal -4, imp.imps
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -54,7 +54,7 @@ files:
 - lib/bridge/card.rb
 - lib/bridge/constants.rb
 - lib/bridge/deal.rb
-- lib/bridge/imp.rb
+- lib/bridge/points/chicago.rb
 - lib/bridge/score.rb
 - lib/bridge/trick.rb
 - lib/bridge/version.rb
@@ -62,8 +62,8 @@ files:
 - test/test_bid.rb
 - test/test_bridge.rb
 - test/test_card.rb
+- test/test_chicago.rb
 - test/test_deal.rb
-- test/test_imp.rb
 - test/test_score.rb
 - test/test_trick.rb
 has_rdoc: true
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2761440476130499620
+      hash: -1502047250263406809
       segments: 
       - 0
       version: "0"