icu_tournament 1.3.11 → 1.3.12

data/lib/icu_tournament/tournament.rb

@@ -71,22 +71,28 @@ module ICU
   # * the result round numbers are consistent (no more than one game per player per round)
   # * the tournament dates (start, finish, round dates), if there are any, are consistent
   # * the player ranks are consistent with their scores
+  # * there are no players with duplicate ICU IDs or duplicate FIDE IDs
   #
   # Side effects of calling <em>validate!</em> or _invalid_ include:
   #
   # * the number of rounds will be set if not set already
   # * the finish date will be set if not set already and if there are round dates
   #
-  # Optionally, additional validation checks can be performed given a tournament
-  # parser/serializer. For example:
+  # Optionally, additional validation checks, appropriate for a given
+  # serializer, may be performed. For example:
   #
   #   t.validate!(:type => ICU::Tournament.ForeignCSV.new)
   #
-  # Or equivalently:
+  # or equivalently,
   #
   #   t.validate!(:type => 'ForeignCSV')
   #
-  # Such additional validation is always performed before a tournament is serialized.
+  # which, amongst other tests, checks that there is at least one player with an ICU number and
+  # that all such players have a least one game against a FIDE rated opponent. This is an example
+  # of a specialized check that is only appropriate for a particular serializer. If it raises an
+  # exception then the tournament cannot be serialized that way.
+  #
+  # Validation is automatically performed just before a tournament is serialized.
   # For example, the following are equivalent and will throw an exception if
   # the tournament is invalid according to either the general rules or the rules
   # specific for the type used:
@@ -401,7 +407,17 @@ module ICU
     # Check players.
     def check_players
       raise "the number of players (#{@player.size}) must be at least 2" if @player.size < 2
+      ids = Hash.new
+      fide_ids = Hash.new
       @player.each do |num, p|
+        if p.id
+          raise "duplicate ICU IDs, players #{p.num} and #{ids[p.id]}" if ids[p.id]
+          ids[p.id] = num
+        end
+        if p.fide_id
+          raise "duplicate FIDE IDs, players #{p.num} and #{fide_ids[p.fide_id]}" if fide_ids[p.fide_id]
+          fide_ids[p.fide_id] = num
+        end
         raise "player #{num} has no results" if p.results.size == 0
         p.results.each do |r|
           next unless r.opponent

data/lib/icu_tournament/tournament_sp.rb

@@ -248,8 +248,8 @@ module ICU
           case pair[0]
           when :fed         then val = val && val.match(/^[A-Z]{3}$/i) ? val.upcase : nil
           when :gender      then val = val.to_i > 0 ? %w(M F)[val.to_i-1] : nil
-          when :id          then val = val.to_i > 0 ? val : nil
-          when :fide_id     then val = val.to_i > 0 ? val : nil
+          when :id          then val = val.match(/^\s*([1-9]\d*)\s*$/) ? $1 : nil
+          when :fide_id     then val = val.match(/^\s*([1-9]\d*)\s*$/) ? $1 : nil
           when :rating      then val = val.to_i > 0 ? val : nil
           when :fide_rating then val = val.to_i > 0 ? val : nil
           when :title       then val = val.to_i > 0 ? %w(GM WGM IM WIM FM WFM)[val.to_i-1] : nil

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.3.11"
+    VERSION = "1.3.12"
   end
 end

data/spec/tournament_sp_spec.rb

@@ -162,11 +162,11 @@ module ICU
         end
 
         it "should have correct details for selection of players who got bonuses (in MEMO)" do
-          @t.player(23).sp_signature.should == "Long, Killian|10293|2|1506||2.5|33|123456|WDLLWL|WWBWBB|TFTTTT"
-          @t.player(26).sp_signature.should == "Bradley, Michael|6756|27|1413||3.0|26|123456|DDLWWL|BWWBWW|TFTTTT"
-          @t.player(15).sp_signature.should == "Twomey, Pat|1637|22|1656||4.5|7|123456|WDLWWW|WWWBWB|FFTTTT"
+          @t.player(23).sp_signature.should == "Long, Killian|10293||1506||2.5|33|123456|WDLLWL|WWBWBB|TFTTTT"
+          @t.player(26).sp_signature.should == "Bradley, Michael|6756||1413||3.0|26|123456|DDLWWL|BWWBWW|TFTTTT"
+          @t.player(15).sp_signature.should == "Twomey, Pat|1637||1656||4.5|7|123456|WDLWWW|WWWBWB|FFTTTT"
           @t.player(46).sp_signature.should == "O'Riordan, Pat|10696||900||2.0|42|123456|LDDLDD|BWBWWB|TTTTFT"
-          @t.player(38).sp_signature.should == "Gill, Craig I.|10637|28|1081||2.0|43|123456|LLWDDL|BWBWWB|TTTTFT"
+          @t.player(38).sp_signature.should == "Gill, Craig I.|10637||1081||2.0|43|123456|LLWDDL|BWBWWB|TTTTFT"
         end
 
         it "should have consistent ranks" do

data/spec/tournament_spec.rb

@@ -489,6 +489,12 @@ EOS
         team1.add_member(2)
         @t.invalid.should match(/already.*member/)
       end
+
+      it "should not be valid if two players share the same ICU or FIDE ID" do
+        @t.player(1).id = 1350
+        @t.player(2).id = 1350
+        @t.invalid.should match(/duplicate.*ICU/)
+      end
     end
 
     context "renumbering" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 11
-  version: 1.3.11
+  - 12
+  version: 1.3.12
 platform: ruby
 authors: 
 - Mark Orr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +00:00
+date: 2011-03-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency