bridge 0.0.20 → 0.0.21

data/README.rdoc

@@ -29,6 +29,11 @@ You can also ask for all possible contracts finished with given points:
   Bridge::Score.with_points(980)
   #=> ["1NTX-11-vulnerable", "2C/DX-12-vulnerable", "6H/S-12"]
 
+You can use regexp to check if contract with result is valid:
+  Bridge::Score::REGEXP
+will match i.e.
+  "1NT=", "2SX+1", "6NTXX-2"
+
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   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-18}
+  s.date = %q{2010-03-22}
   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/helper.rb",
-     "test/test_bid.rb",
-     "test/test_card.rb",
+    "test/test_bridge.rb",
      "test/test_trick.rb",
      "test/test_deal.rb",
-     "test/test_bridge.rb",
-     "test/test_score.rb"
+     "test/helper.rb",
+     "test/test_score.rb",
+     "test/test_bid.rb",
+     "test/test_card.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bridge/score.rb

@@ -2,6 +2,15 @@ module Bridge
   class Score
     attr_reader :tricks, :contract, :vulnerable
 
+    # Checks contract with result, i.e. "1NTX-1", "2S=", "6SXX+1"
+    # on Ruby >= 1.9 there are named groups :contract and :result
+    # on Ruby < 1.9 there are: contract on $1 and result on $5
+    if RUBY_VERSION >= "1.9"
+      REGEXP = Regexp.new %q{\A(?<contract>([1-7])([CDHS]|NT)(X{1,2})?)(?<result>=|\+[1-6]|-([1-9]|1[0-3]))\Z}
+    else
+      REGEXP = Regexp.new %q{\A(([1-7])([CDHS]|NT)(X{1,2})?)(=|\+[1-6]|-([1-9]|1[0-3]))\Z}
+    end
+
     # Creates new score object
     #
     # ==== Example

data/test/test_score.rb

@@ -261,4 +261,62 @@ class TestScoreContracts < Test::Unit::TestCase
   test "return [] if not found" do
     assert_equal [], Bridge::Score.with_points(100)
   end
-end
+end
+
+class TestRegexpScore < Test::Unit::TestCase
+  def setup
+    @regexp = Bridge::Score::REGEXP
+  end
+
+  test "match 1S+1" do
+    assert "1S+1" =~ @regexp
+  end
+
+  test "match 1NT=" do
+    assert "1NT=" =~ @regexp
+  end
+
+  test "not match 8S=" do
+    assert_nil "8S=" =~ @regexp
+  end
+
+  test "not match 1SXXX=" do
+    assert_nil "1SXXX=" =~ @regexp
+  end
+
+  test "not match 1S+7" do
+    assert_nil "1S+7" =~ @regexp
+  end
+
+  test "not match 1S-14" do
+    assert_nil "1S-14" =~ @regexp
+  end
+
+  test "not match 1S-21" do
+    assert_nil "1S-21" =~ @regexp
+  end
+
+  test "case sensitive" do
+    assert_nil "1s-1" =~ @regexp
+  end
+
+  test "return contract for 1NT=" do
+    result = "1NT=".match(@regexp)
+    assert_equal "1NT", RUBY_VERSION >= "1.9" ? result[:contract] : result[1]
+  end
+
+  test "return contract for 1NTXX=" do
+    result = "1NTXX=".match(@regexp)
+    assert_equal "1NTXX", RUBY_VERSION >= "1.9" ? result[:contract] : result[1]
+  end
+
+  test "return result for 1NT=" do
+    result = "1NT=".match(@regexp)
+    assert_equal "=", RUBY_VERSION >= "1.9" ? result[:result] : result[5]
+  end
+
+  test "return result for 1NT+2" do
+    result = "1NT+2".match(@regexp)
+    assert_equal "+2", RUBY_VERSION >= "1.9" ? result[:result] : result[5]
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +01:00
+date: 2010-03-22 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/helper.rb
-- test/test_bid.rb
-- test/test_card.rb
+- test/test_bridge.rb
 - test/test_trick.rb
 - test/test_deal.rb
-- test/test_bridge.rb
+- test/helper.rb
 - test/test_score.rb
+- test/test_bid.rb
+- test/test_card.rb