icu_tournament 1.5.5 → 1.5.6

data/lib/icu_tournament/tournament_fcsv.rb

@@ -204,6 +204,7 @@ module ICU
           csv << ["Website", t.site]
           t.players.each do |p|
             next unless p.id
+            next unless p.results.size == t.rounds
             csv << []
             csv << ["Player", p.id, p.last_name, p.first_name]
             (1..t.rounds).each do |n|
@@ -236,16 +237,22 @@ module ICU
         raise "there must be at least one ICU player (with an ID number)" if icu.size == 0
         foreign = t.players.find_all { |p| !p.id }
         raise "all foreign players must have a federation" if foreign.detect { |f| !f.fed }
+        enough = false
         icu.each do |p|
           rated = 0
+          results = 0
           (1..t.rounds).each do |r|
             result = p.find_result(r)
-            raise "ICU players must have a result in every round" unless result
-            raise "all opponents of ICU players must have a federation" if result.opponent && !t.player(result.opponent).fed
-            rated += 1 if result.opponent && t.player(result.opponent).fide_rating
+            if result
+              results += 1
+              raise "all opponents of ICU players must have a federation" if result.opponent && !t.player(result.opponent).fed
+              rated += 1 if result.opponent && t.player(result.opponent).fide_rating
+            end
           end
           raise "player #{p.num} (#{p.name}) has no rated opponents" if rated == 0
+          enough = true if results == t.rounds
         end
+        raise "at least one ICU player (with an ID number) must have a result in every round" unless enough
       end
 
       # :enddoc:

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.5.5"
+    VERSION = "1.5.6"
   end
 end

data/spec/tournament_fcsv_spec.rb

@@ -677,11 +677,10 @@ CSV
           @t.invalid(:type => @p).to_s.should match(/federation/)
         end
 
-        it "should fail unless every ICU player has a result in every round" do
-          @t.add_player(ICU::Player.new('Mark', 'Orr', 3, :id => 1350))
-          @t.add_result(ICU::Result.new(1, 3, 'W', :opponent => 30, :colour => 'B'))
-          @t.invalid(:type => @p).to_s.should match(/result/)
-          @t.add_result(ICU::Result.new(2, 3, 'W', :opponent => 10, :colour => 'W'))
+        it "should fail unless at least one ICU player has a result in every round" do
+          @t.add_result(ICU::Result.new(3, 10, 'W', :opponent => 30, :colour => 'W'))
+          @t.invalid(:type => @p).to_s.should match(/at least one.*result.*every/)
+          @t.add_result(ICU::Result.new(3, 1, 'W', :opponent => 20, :colour => 'W'))
           @t.invalid(:type => @p).should be_false
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_tournament
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000Z
+date: 2011-11-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
-  requirement: &70266168398620 !ruby/object:Gem::Requirement
+  requirement: &70177626248320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70266168398620
+  version_requirements: *70177626248320
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70266168397220 !ruby/object:Gem::Requirement
+  requirement: &70177626247820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70266168397220
+  version_requirements: *70177626247820
 - !ruby/object:Gem::Dependency
   name: icu_name
-  requirement: &70266168331460 !ruby/object:Gem::Requirement
+  requirement: &70177626247360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266168331460
+  version_requirements: *70177626247360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70266168330560 !ruby/object:Gem::Requirement
+  requirement: &70177626246980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266168330560
+  version_requirements: *70177626246980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70266168329420 !ruby/object:Gem::Requirement
+  requirement: &70177626292080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266168329420
+  version_requirements: *70177626292080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70266168328480 !ruby/object:Gem::Requirement
+  requirement: &70177626291660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266168328480
+  version_requirements: *70177626291660
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70266168327280 !ruby/object:Gem::Requirement
+  requirement: &70177626291240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266168327280
+  version_requirements: *70177626291240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70266168325800 !ruby/object:Gem::Requirement
+  requirement: &70177626290820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266168325800
+  version_requirements: *70177626290820
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70266168324640 !ruby/object:Gem::Requirement
+  requirement: &70177626290360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266168324640
+  version_requirements: *70177626290360
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70266165709760 !ruby/object:Gem::Requirement
+  requirement: &70177626289940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266165709760
+  version_requirements: *70177626289940
 description: Convert files of chess tournament data in different formats to ruby classes
   and vice-versa.
 email: mark.j.l.orr@googlemail.com
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2742287877822509535
+      hash: 858182748560082174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2742287877822509535
+      hash: 858182748560082174
 requirements: []
 rubyforge_project: icu_tournament
 rubygems_version: 1.8.6