icu_tournament 1.5.4 → 1.5.5

data/lib/icu_tournament/tournament.rb

@@ -73,6 +73,20 @@ module ICU
   #
   # See ICU::Player and ICU::Result for more details about players and results.
   #
+  # == Tournament Dates
+  #
+  # A tournament start date is mandatory and supplied in the constructor. Finish and round dates are optional.
+  # To supply a finish date, supply it in constructor arguments or set it explicityly.
+  #
+  #   t = ICU::Tournament.new('Bangor Masters', '2009-11-09', :finish => '2009-11-11')
+  #   t.finish = '2009-11-11'
+  #
+  # To set round dates, add the correct number in the correct order one at a time.
+  #
+  #   t.add_round_date('2009-11-09')
+  #   t.add_round_date('2009-11-10')
+  #   t.add_round_date('2009-11-11')
+  #
   # == Validation
   #
   # A tournament can be validated with either the <em>validate!</em> or _invalid_ methods.
@@ -213,7 +227,6 @@ module ICU
       parsed_date = Util.parsedate(round_date)
       raise "invalid round date (#{round_date})" unless parsed_date
       @round_dates << parsed_date
-      @round_dates.sort!
     end
 
     # Return the date of a given round, or nil if unavailable.
@@ -472,8 +485,12 @@ module ICU
       raise "start date (#{start}) is after end date (#{finish})" if @start && @finish && @start > @finish
       if @round_dates.size > 0
         raise "the number of round dates (#{@round_dates.size}) does not match the number of rounds (#{@rounds})" unless @round_dates.size == @rounds
-        raise "the date of the first round (#{@round_dates[0]}) comes before the start (#{@start}) of the tournament" if @start && @start > @round_dates[0]
-        raise "the date of the last round (#{@round_dates[-1]}) comes after the end (#{@finish}) of the tournament" if @finish && @finish < @round_dates[-1]
+        raise "the date of the first round (#{@round_dates[0]}) does not match the start (#{@start}) of the tournament" if @start && @start != @round_dates[0]
+        raise "the date of the last round (#{@round_dates[-1]}) does not match the end (#{@finish}) of the tournament" if @finish && @finish != @round_dates[-1]
+        (2..@round_dates.size).to_a.each do |r|
+          #puts "#{@round_dates[r-2]} => #{@round_dates[r-1]}"
+          raise "the date of round #{r-1} (#{@round_dates[r-2]}) is after the date of round #{r} (#{@round_dates[r-1]}) of the tournament" if @round_dates[r-2] > @round_dates[r-1]
+        end
         @finish = @round_dates[-1] unless @finish
       end
     end

data/lib/icu_tournament/tournament_krause.rb

@@ -251,7 +251,7 @@ module ICU
               when '102' then @tournament.arbiter = @data       # arbiter(s)
               when '112' then @tournament.deputy = @data        # deputy(ies)
               when '122' then @tournament.time_control = @data  # time control
-              when '132' then add_round_dates                   # round dates
+              when '132' then add_round_dates(arg)              # round dates
               else raise "invalid DIN #{din}"
             end
           rescue => err
@@ -372,7 +372,7 @@ module ICU
         lines
       end
 
-      def add_player(arg={})
+      def add_player(arg)
         raise "player record less than minimum length" if @line.length < 99
 
         # Prepare player details.
@@ -491,7 +491,8 @@ module ICU
         @tournament.add_team(team)
       end
 
-      def add_round_dates
+      def add_round_dates(arg)
+        return if arg[:round_dates].to_s == 'ignore'
         raise "round dates record less than minimum length" if @line.length < 99
         index = 87
         american = nil

data/lib/icu_tournament/version.rb

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

data/spec/tournament_krause_spec.rb

@@ -176,7 +176,7 @@ KRAUSE
 022 Las Vegas
 032 USA
 042 2008-06-07
-052 2008-06-10
+052 2008-06-09
 092 All-Play-All
 102 Hans Scmidt
 112 Gerry Graham, Herbert Scarry
@@ -297,7 +297,7 @@ REORDERED
         end
       end
 
-      context "serialisation of a manually build tournament" do
+      context "serialisation of a manually built tournament" do
         before(:all) do
           @krause = <<KRAUSE
 012 Las Vegas National Open
@@ -453,12 +453,13 @@ KRAUSE
 012 Gonzaga Classic
 022 Dublin
 032 IRL
-042 2008-02-01
-052 2008-02-03
+042 2008-02-21
+052 2008-02-25
 062 12
 092 Swiss
 102 Michael Germaine, mlgermaine@eircom.net
 122 120 minutes per player per game
+132                                                                                        08.02.21  08.02.22  08.02.23  08.02.24  08.02.25
 001    1      Griffiths,Ryan Rhys                    IRL     2502054 1993-12-20  4.0    1  0000 - =     3 b 1     8 w 1     5 b =     7 w 1
 001    2      Hotak,Marian                           SVK    14909677             3.5    2     3 w 0     6 b =    11 w 1     8 b 1     5 w 1
 001    3      Duffy,Seamus                           IRL                         3.0    3     2 b 1     1 w 0     4 w 1     6 b =     8 w =
@@ -480,8 +481,7 @@ KRAUSE
         end
 
         it "removing the line on which the tournament name is specified should cause an error" do
-          @k.sub!('012 Gonzaga Classic', '')
-          lambda { @p.parse!(@k) }.should raise_error(/name missing/)
+          lambda { @p.parse!(@k.sub('012 Gonzaga Classic', '')) }.should raise_error(/name missing/)
         end
 
         it "blanking the tournament name should cause an error" do
@@ -489,45 +489,53 @@ KRAUSE
           lambda { @p.parse!(@k) }.should raise_error(/name missing/)
         end
 
+        it "the start cannot be later than the end date" do
+          lambda { @p.parse!(@k.sub('2008-02-21', '2008-03-21')) }.should raise_error(/start.*after.*end/)
+        end
+
         it "blanking the start date should cause an error" do
-          @k.sub!('2008-02-01', '2008-02-04')
-          lambda { @p.parse!(@k) }.should raise_error(/start.*after.*end/)
+          lambda { @p.parse!(@k.sub('2008-02-21', '')) }.should raise_error(/start date missing/)
         end
 
-        it "the start cannot be later than the end date" do
-          @k.sub!('2008-02-01', '')
-          lambda { @p.parse!(@k) }.should raise_error(/start date missing/)
+        it "the first and last round dates should match the tournament start and end dates" do
+          lambda { @p.parse!(@k.sub('08.02.21', '08.02.20')) }.should raise_error(/first round.*not match.*start/)
+          lambda { @p.parse!(@k.sub('08.02.21', '08.02.22')) }.should raise_error(/first round.*not match.*start/)
+          lambda { @p.parse!(@k.sub('08.02.25', '08.02.24')) }.should raise_error(/last round.*not match.*end/)
+          lambda { @p.parse!(@k.sub('08.02.25', '08.02.26')) }.should raise_error(/last round.*not match.*end/)
+        end
+
+        it "the round dates should never decrease" do
+          lambda { @p.parse!(@k.sub('08.02.24', '08.02.22')) }.should raise_error(/round 3.*after.*round 4/)
+        end
+
+        it "bad round dates can be ignored" do
+          lambda { @p.parse!(@k.sub('08.02.21', '08.02.20'), :round_dates => "ignore") }.should_not raise_error
+          lambda { @p.parse!(@k.sub('08.02.24', '08.02.22'), :round_dates => "ignore") }.should_not raise_error
         end
 
         it "creating a duplicate player number should cause an error" do
-          @k.sub!('  2  ', '  1  ')
-          lambda { @p.parse!(@k) }.should raise_error(/player number/)
+          lambda { @p.parse!(@k.sub('  2  ', '  1  ')) }.should raise_error(/player number/)
         end
 
         it "creating a duplicate rank number should not cause an error becuse the tournament will be reranked" do
-          @k.sub!('4.0    1', '4.0    2')
-          t = @p.parse!(@k)
+          t = @p.parse!(@k.sub('4.0    1', '4.0    2'))
           t.player(1).rank.should == 1
         end
 
         it "referring to a non-existant player number should cause an error" do
-           @k.sub!(' 3 b 1', '33 b 1')
-           lambda { @p.parse!(@k) }.should raise_error(/opponent number/)
+           lambda { @p.parse!(@k.sub(' 3 b 1', '33 b 1')) }.should raise_error(/opponent number/)
         end
 
         it "inconsistent colours should cause an error" do
-           @k.sub!('3 b 1', '3 w 1')
-           lambda { @p.parse!(@k) }.should raise_error(/result/)
+           lambda { @p.parse!(@k.sub('3 b 1', '3 w 1')) }.should raise_error(/result/)
         end
 
         it "inconsistent scores should cause an error" do
-           @k.sub!('3 b 1', '3 b =')
-           lambda { @p.parse!(@k) }.should raise_error(/result/)
+           lambda { @p.parse!(@k.sub('3 b 1', '3 b =')) }.should raise_error(/result/)
         end
 
         it "inconsistent totals should cause an error" do
-           @k.sub!('3.5', '4.0')
-           lambda { @p.parse!(@k) }.should raise_error(/total/)
+           lambda { @p.parse!(@k.sub('3.5', '4.0')) }.should raise_error(/total/)
         end
 
         it "invalid federations should cause an error unless an option is used" do
@@ -542,14 +550,12 @@ KRAUSE
         end
 
         it "an invalid DOB is silently ignored" do
-           @k.sub!(/1993-12-20/, '1993      ')
-           lambda { @t = @p.parse!(@k) }.should_not raise_error
+           lambda { @t = @p.parse!(@k.sub(/1993-12-20/, '1993      ')) }.should_not raise_error
            @t.player(1).dob.should be_nil
         end
 
         it "removing any player that somebody else has played should cause an error" do
-           @k.sub!(/^001   12.*$/, '')
-           lambda { @p.parse!(@k) }.should raise_error(/opponent/)
+           lambda { @p.parse!(@k.sub(/^001   12.*$/, '')) }.should raise_error(/opponent/)
         end
       end
 

data/spec/tournament_spec.rb

@@ -202,10 +202,10 @@ EOS
         @t.round_dates.size.should == 0
       end
 
-      it "can be added one by one in any order" do
-        @t.add_round_date('2009-11-11')
+      it "should be added one by one in the correct order" do
         @t.add_round_date('09/11/2009')
         @t.add_round_date('10th November 2009')
+        @t.add_round_date('2009-11-11')
         @t.round_dates.join('|').should == '2009-11-09|2009-11-10|2009-11-11'
       end
     end
@@ -428,12 +428,12 @@ EOS
 
       it "should detect an inconsistent start date" do
         @t.start = '2009-11-10'
-        lambda { @t.validate! }.should raise_error(/first round.*before.*start/)
+        lambda { @t.validate! }.should raise_error(/first round.*not match.*start/)
       end
 
       it "should detect an inconsistent finish date" do
         @t.finish = '2009-11-10'
-        lambda { @t.validate! }.should raise_error(/last round.*after.*end/)
+        lambda { @t.validate! }.should raise_error(/last round.*not match.*end/)
       end
 
       it "should have side effect of setting missing finish date" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_tournament
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000Z
+date: 2011-10-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
-  requirement: &70190448724460 !ruby/object:Gem::Requirement
+  requirement: &70266168398620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70190448724460
+  version_requirements: *70266168398620
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70190448703880 !ruby/object:Gem::Requirement
+  requirement: &70266168397220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70190448703880
+  version_requirements: *70266168397220
 - !ruby/object:Gem::Dependency
   name: icu_name
-  requirement: &70190448702960 !ruby/object:Gem::Requirement
+  requirement: &70266168331460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70190448702960
+  version_requirements: *70266168331460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70190448702120 !ruby/object:Gem::Requirement
+  requirement: &70266168330560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190448702120
+  version_requirements: *70266168330560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70190448701400 !ruby/object:Gem::Requirement
+  requirement: &70266168329420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190448701400
+  version_requirements: *70266168329420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70190448700540 !ruby/object:Gem::Requirement
+  requirement: &70266168328480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190448700540
+  version_requirements: *70266168328480
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70190448699360 !ruby/object:Gem::Requirement
+  requirement: &70266168327280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190448699360
+  version_requirements: *70266168327280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70190448698680 !ruby/object:Gem::Requirement
+  requirement: &70266168325800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190448698680
+  version_requirements: *70266168325800
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70190448697860 !ruby/object:Gem::Requirement
+  requirement: &70266168324640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190448697860
+  version_requirements: *70266168324640
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70190448696860 !ruby/object:Gem::Requirement
+  requirement: &70266165709760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190448696860
+  version_requirements: *70266165709760
 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: 1118276685210611974
+      hash: 2742287877822509535
 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: 1118276685210611974
+      hash: 2742287877822509535
 requirements: []
 rubyforge_project: icu_tournament
 rubygems_version: 1.8.6