sanichi-chess_icu 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,4 +1,4 @@
 * 0.2.0 2009-04-11
 * Early version that just reads and writes foreign CSV files and has some basic name and date utilities.
 * 0.3.1 2009-05-04
-* Can now read and write Krause files and deals properly with federations.
+* Can now read and write Krause files and deals properly with federations.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 2
+:patch: 3

data/lib/tournament.rb

@@ -182,7 +182,7 @@ raise an exception if the players it references through their tournament numbers
     # * no two players have the same rank
     # * the highest rank is 1
     # * the lowest rank is equal to the total of players
-    def ranking_consistent?
+    def ranking_consistent?(option={})
       # No two players can have the same rank.
       ranks = Hash.new
       @player.values.each do |p|
@@ -192,7 +192,10 @@ raise an exception if the players it references through their tournament numbers
         end
       end
       
-      # Every player has to have a rank.
+      # The special case of complete absence of ranking information is an option.
+      return true if ranks.size == 0 && option[:allow_none]
+
+      # Otherwie, every player has to have a rank.
       return false unless ranks.size == @player.size
 
       # The higest and lowest ranks respectively should be 1 and the number of players.
@@ -223,5 +226,27 @@ raise an exception if the players it references through their tournament numbers
         v[0].rank = i + 1
       end
     end
+
+    # Raise an exception if a tournament is not valid.
+    def validate!
+      error = invalid
+      raise error if error
+    end
+
+    # Is a tournament invalid? Either returns false (if it's valid) or an error message.
+    # Covers all the ways a tournament can be invalid not already enforced by the setters.
+    def invalid
+      # There must be at least two players.
+      return "number of players (#{@player.size}) must be at least 2" if @player.size < 2
+
+      # Every player must have at least one result.
+      @player.each { |num, p| return "player #{num} has no results" if p.results.size == 0 }
+
+      # The ranking should be consistent, with the proviso that no ranking at all is allowed.
+      return "ranking is not consistent" unless ranking_consistent?(:allow_none => true)
+
+      # If there is a start date and an end date, the start should not come after the end.
+      return "start date (#{start}) is after end date (#{finish})" if start && finish && start > finish
+    end
   end
 end

data/lib/tournament_fcsv.rb

@@ -137,6 +137,8 @@ A tournament can be serialized back to CSV format (the reverse of parsing) with
         end
         raise "line #{@line}: no players found in file" if @tournament.players.size == 0
         
+        @tournament.validate!
+
         @tournament
       end
       

data/lib/tournament_krause.rb

@@ -149,8 +149,11 @@ The following lists Krause data identification numbers, their description and, w
           end
         end
         
-        # Validate the data now that we have everything.
-        validate
+        # Now that we have everything, perform final checks and tidy ups.
+        finish_up
+        
+        # Finally, exercise the tournament object's own internal validation.
+        @tournament.validate!
         
         @tournament
       end
@@ -237,25 +240,19 @@ The following lists Krause data identification numbers, their description and, w
         @comments << "\n"
       end
       
-      def validate
-        # Certain attributes are mandatory.
+      def finish_up
+        # Certain attributes are mandatory and should have been specifically set.
         raise "tournament name missing"       unless @name_set
         raise "tournament start date missing" unless @start_set
-        
-        # There must be at least two players.
-        raise "minimum number of players is 2" if @tournament.players.length < 2
-        
-        # Every player must have at least one result.
-        @tournament.players.each { |p| raise "player #{p.num} has no results" if p.results.size == 0 }
-        
-        # Rerank the tournament if there are no ranking values or if there are but they're not consistent.
-        @tournament.rerank unless @tournament.ranking_consistent?
 
         # Set the number of rounds.
         @tournament.rounds = @tournament.players.inject(0) do |pa, p|
           pm = p.results.inject(0){ |ra, r| ra < r.round ? r.round : ra }
           pa < pm ? pm : pa
         end
+
+        # Rerank the tournament if there are no ranking values or if there are, but they're not consistent.
+        @tournament.rerank unless @tournament.ranking_consistent?
       end
     end
   end

data/spec/tournament_krause_spec.rb

@@ -237,6 +237,11 @@ KRAUSE
         end
 
         it "blanking the start date should cause an error" do
+          @k.sub!('2008-02-01', '2008-02-04')
+          lambda { t = @p.parse!(@k) }.should raise_error(/start.*after.*end/)
+        end
+
+        it "the start cannot be later than the end date" do
           @k.sub!('2008-02-01', '')
           lambda { t = @p.parse!(@k) }.should raise_error(/start date missing/)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sanichi-chess_icu
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Mark Orr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency