icu_tournament 1.5.13 → 1.6.0

data/lib/icu_tournament/tournament_fcsv.rb

@@ -8,6 +8,7 @@ module ICU
     #
     #   Event,"Isle of Man Masters, 2007"
     #   Start,2007-09-22
+    #   End,2007-09-30
     #   Rounds,9
     #   Website,http://www.bcmchess.co.uk/monarch2007/
     #
@@ -33,6 +34,7 @@ module ICU
     #
     #   tournament.name                                     # => "Isle of Man Masters, 2007"
     #   tournament.start                                    # => "2007-09-22"
+    #   tournament.finish                                   # => "2007-09-30"
     #   tournament.rounds                                   # => 9
     #   tournament.website                                  # => "http://www.bcmchess.co.uk/monarch2007/"
     #
@@ -77,7 +79,7 @@ module ICU
     #
     # Extra condtions, over and above the normal validation rules, apply before any tournament validates or can be serialized in this format.
     #
-    # * the tournament must have a _site_ attribute
+    # * the tournament must have a _site_ attribute and a _finish_ date
     # * there must be at least one player with an _id_ (ICU ID number)
     # * all foreign players (those without an ICU ID) must have a _fed_ attribute (federation)
     # * all ICU players must have a result in every round (even if it is just bye or is unrateable)
@@ -94,7 +96,7 @@ module ICU
     # For example, here are the commands to reproduce the example above. Note that in this format
     # opponents' ratings are FIDE.
     #
-    #   t = ICU::Tournament.new("Isle of Man Masters, 2007", '2007-09-22', :rounds => 9)
+    #   t = ICU::Tournament.new("Isle of Man Masters, 2007", '2007-09-22', :finish => '2007-09-30', :rounds => 9)
     #   t.site = 'http://www.bcmchess.co.uk/monarch2007/'
     #   t.add_player(ICU::Player.new('Anthony',  'Fox',      1, :fide_rating => 2100, :fed => 'IRL', :id => 456))
     #   t.add_player(ICU::Player.new('Peter P.', 'Taylor',   2, :fide_rating => 2209, :fed => 'ENG'))
@@ -136,11 +138,12 @@ module ICU
             case @state
               when 0 then event
               when 1 then start
-              when 2 then rounds
-              when 3 then website
-              when 4 then player
-              when 5 then result
-              when 6 then total
+              when 2 then finish
+              when 3 then rounds
+              when 4 then website
+              when 5 then player
+              when 6 then result
+              when 7 then total
               else raise "internal error - state #{@state} does not exist"
             end
           rescue => err
@@ -149,14 +152,15 @@ module ICU
           end
         end
 
-        unless @state == 4
+        unless @state == 5
           exp = case @state
                 when 0 then "the event name"
                 when 1 then "the start date"
-                when 2 then "the number of rounds"
-                when 3 then "the website address"
-                when 5 then "a result for round #{@round+1}"
-                when 6 then "a total score"
+                when 2 then "the end date"
+                when 3 then "the number of rounds"
+                when 4 then "the website address"
+                when 6 then "a result for round #{@round+1}"
+                when 7 then "a total score"
                 end
           raise "line #{@line}: premature termination - expected #{exp}"
         end
@@ -200,6 +204,7 @@ module ICU
         CSV.generate do |csv|
           csv << ["Event", t.name]
           csv << ["Start", t.start]
+          csv << ["End", t.finish]
           csv << ["Rounds", t.rounds]
           csv << ["Website", t.site]
           t.players.each do |p|
@@ -232,6 +237,7 @@ module ICU
 
       # Additional tournament validation rules for this specific type.
       def validate!(t)
+        raise "missing end date" unless t.finish
         raise "missing site" unless t.site.to_s.length > 0
         icu = t.players.find_all { |p| p.id }
         raise "there must be at least one ICU player (with an ID number)" if icu.size == 0
@@ -266,24 +272,31 @@ module ICU
       end
 
       def start
-        abort "the 'Start' keyword", 0 unless @r[0].match(/^(Start(\s+Date)?|Date)$/i)
+        abort "the 'Start' keyword", 0 unless @r[0].match(/^(Start(\s+Date)?)$/i)
         abort "the start date",      1 unless @r.size > 1 && @r[1] != ''
         @tournament.start = @r[1]
         @state = 2
       end
 
+      def finish
+        abort "the 'End' keyword",   0 unless @r[0].match(/^(End(\s+Date)?)$/i)
+        abort "the end date",        1 unless @r.size > 1 && @r[1] != ''
+        @tournament.finish = @r[1]
+        @state = 3
+      end
+
       def rounds
         abort "the 'Rounds' keyword", 0 unless @r[0].match(/(Number of )?Rounds$/)
         abort "the number of rounds", 1 unless @r.size > 1 && @r[1].match(/^[1-9]\d*/)
         @tournament.rounds = @r[1]
-        @state = 3
+        @state = 4
       end
 
       def website
         abort "the 'Website' keyword", 0 unless @r[0].match(/^(Web(\s?site)?|Site)$/i)
         abort "the event website",     1 unless @r.size > 1 && @r[1] != ''
         @tournament.site = @r[1]
-        @state = 4
+        @state = 5
       end
 
       def player
@@ -302,7 +315,7 @@ module ICU
           @tournament.add_player(@player)
         end
         @round = 0
-        @state = 5
+        @state = 6
       end
 
       def result
@@ -336,14 +349,14 @@ module ICU
             @tournament.add_result(result)
           end
         end
-        @state = 6 if @round == @tournament.rounds
+        @state = 7 if @round == @tournament.rounds
       end
 
       def total
         points = @player.points
         abort "the 'Total' keyword", 0 unless @r[0].match(/^Total$/i)
         abort "the player's (#{@player.object_id}, #{@player.results.size}) total points to be #{points}", 1 unless @r[1].to_f == points
-        @state = 4
+        @state = 5
       end
 
       def abort(expected, cell)

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.5.13"
+    VERSION = "1.6.0"
   end
 end

data/spec/tournament_fcsv_spec.rb

@@ -22,6 +22,7 @@ module ICU
           @csv = <<CSV
 Event,"Bangor Open, 2003"
 Start,1st July 2003
+End,2003-07-03
 Rounds,4
 Website,http://www.icu.ie/tournaments/display.php?id=371
 
@@ -73,6 +74,7 @@ CSV
           @csv = <<CSV
 Event,"Isle of Man Masters, 2007"
 Start,2007-09-22
+End,2007-09-29
 Rounds,9
 Website,http://www.bcmchess.co.uk/monarch2007/
 
@@ -127,6 +129,7 @@ CSV
           @csv = <<CSV
 Event,"Edinburgh Masters, 2007"
 Start,3rd January 2007
+End,3rd January 2007
 Rounds,2
 Website,http://www.chesscenter.com/twic/twic.html
 
@@ -169,6 +172,7 @@ CSV
           @csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,09/03/2001
 Rounds,2
 Website,http://www.federscacchi.it/
 
@@ -211,6 +215,7 @@ CSV
 
  Event," Bratto Open, 2001 "
 Start, 7th  March  2001
+  End  ,2001/03/   07
  Rounds, 2
   Website, http://www.federscacchi.it/
 Player ,3364 , ui Laighleis, gearoidin
@@ -258,6 +263,7 @@ CSV
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,7th March 2001
 Rounds,2
 Website,http://www.federscacchi.it/
 
@@ -288,6 +294,7 @@ CSV
         it "the event should come first" do
           csv = <<CSV
 Start,7th March 2001
+End,7th March 2001
 Event,"Bratto Open, 2001"
 Rounds,2
 Website,http://www.federscacchi.it/
@@ -295,9 +302,10 @@ CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 1.*event/i)
         end
 
-        it "the start should come second" do
+        it "the start should come next" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
+End,7th March 2001
 Rounds,2
 Start,7th March 2001
 Website,http://www.federscacchi.it/
@@ -305,52 +313,69 @@ CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 2.*start/i)
         end
 
-        it "the number of rounds should come third" do
+        it "the end should come next" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+Rounds,2
+Start,7th March 2001
+Website,http://www.federscacchi.it/
+CSV
+          lambda { @f.parse!(csv) }.should raise_error(/line 3.*end/i)
+        end
+
+        it "the number of rounds should come next" do
+          csv = <<CSV
+Event,"Bratto Open, 2001"
+Start,7th March 2001
+End,7th March 2001
 Website,http://www.federscacchi.it/
 Rounds,2
 CSV
-          lambda { @f.parse!(csv) }.should raise_error(/line 3.*rounds/i)
+          lambda { @f.parse!(csv) }.should raise_error(/line 4.*rounds/i)
         end
 
         it "there should be a web site" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,7th March 2001
 Rounds,2
 
 CSV
-          lambda { @f.parse!(csv) }.should raise_error(/line 4.*site/i)
+          lambda { @f.parse!(csv) }.should raise_error(/line 5.*site/i)
         end
 
         it "should have at least one player" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,7th March 2001
 Rounds,2
 Website,http://www.federscacchi.it/
+
 CSV
-          lambda { @f.parse!(csv) }.should raise_error(/line 4.*no players/i)
+          lambda { @f.parse!(csv) }.should raise_error(/line 6.*no players/i)
         end
 
         it "the player needs to have a valid ID number" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,7th March 2001
 Rounds,2
 Website,http://www.federscacchi.it/
 
 Player,0,Ui Laighleis,Gearoidin
 CSV
-          lambda { @f.parse!(csv) }.should raise_error(/line 6.*number/i)
+          lambda { @f.parse!(csv) }.should raise_error(/line 7.*number/i)
         end
 
         it "should have the right number of results for each player" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,7th March 2001
 Rounds,2
 Website,http://www.federscacchi.it/
 
@@ -358,13 +383,14 @@ Player,3364,Ui Laighleis,Gearoidin
 1,=,W,Kasparov,Gary,2800,GM,RUS
 Total,0.5
 CSV
-          lambda { @f.parse!(csv) }.should raise_error(/line 8.*round/i)
+          lambda { @f.parse!(csv) }.should raise_error(/line 9.*round/i)
         end
 
         it "should have correct totals" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,7th March 2001
 Rounds,2
 Website,http://www.federscacchi.it/
 
@@ -373,14 +399,14 @@ Player,3364,Ui Laighleis,Gearoidin
 2,=,B,Orr,Mark,2100,IM,IRL
 Total,1.5
 CSV
-          lambda { @f.parse!(csv) }.should raise_error(/line 9.*total/i)
+          lambda { @f.parse!(csv) }.should raise_error(/line 10.*total/i)
         end
 
-
         it "players who match by name and federation should match in all other details" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
 Start,7th March 2001
+End,7th March 2001
 Rounds,2
 Website,http://www.federscacchi.it/
 
@@ -394,7 +420,7 @@ Player,1350,Orr,Mark
 2,=,B,Kasparov,Gary,2850,GM,RUS
 Total,1.0
 CSV
-          lambda { @f.parse!(csv) }.should raise_error(/line 13.*same name.*conflicting/i)
+          lambda { @f.parse!(csv) }.should raise_error(/line 14.*same name.*conflicting/i)
         end
       end
 
@@ -403,6 +429,7 @@ CSV
           @csv = <<CSV
 Event,"Edinburgh Masters, 2007"
 Start,2007-08-09
+End,2007-08-09
 Rounds,2
 Website,http://www.chesscenter.com/twic/twic.html
 
@@ -430,6 +457,7 @@ CSV
           @csv = <<CSV
 Event,"Isle of Man Masters, 2007"
 Start,2007-09-22
+End,2007-09-30
 Rounds,9
 Website,http://www.bcmchess.co.uk/monarch2007/
 
@@ -457,7 +485,8 @@ Player,159,Cafolla,Peter
 9,0,W,Grant,Alan,2223,,SCO
 Total,3.0
 CSV
-          @t = ICU::Tournament.new("Isle of Man Masters, 2007", '2007-09-22')
+          @t = ICU::Tournament.new('Isle of Man Masters, 2007', '2007-09-22')
+          @t.finish = '2007-09-30'
           @t.site = 'http://www.bcmchess.co.uk/monarch2007/'
           @t.rounds = 9
           @t.add_player(ICU::Player.new('Anthony', 'Fox', 1, :id => 456, :fide_rating => 2100, :fed => 'IRL'))
@@ -507,6 +536,7 @@ CSV
           @csv = <<CSV
 Event,"Isle of Man Masters, 2007"
 Start,2007-09-22
+End,2007-09-30
 Rounds,9
 Website,http://www.bcmchess.co.uk/monarch2007/
 
@@ -522,7 +552,8 @@ Player,456,Fox,Anthony
 9,=,W,Phillips,Roy,2271,,MAU
 Total,4.0
 CSV
-          @t = ICU::Tournament.new("Isle of Man Masters, 2007", '2007-09-22')
+          @t = ICU::Tournament.new('Isle of Man Masters, 2007', '2007-09-22')
+          @t.finish = '2007-09-30'
           @t.site = 'http://www.bcmchess.co.uk/monarch2007/'
           @t.add_player(ICU::Player.new('Anthony', 'Fox', 1, :id => 456, :fide_rating => 2100, :fed => 'IRL'))
           @t.add_player(ICU::Player.new('Peter P.', 'Taylor', 2, :fide_rating => 2209, :fed => 'ENG'))
@@ -555,6 +586,7 @@ CSV
           @csv = <<CSV
 Event,"Brätto Open, 2001"
 Start,7th March 2001
+End,9th March 2001
 Rounds,2
 Website,http://www.federscacchi.it/
 
@@ -643,6 +675,7 @@ CSV
         before(:each) do
           @p = ICU::Tournament::ForeignCSV.new
           @t = ICU::Tournament.new("Isle of Man Masters, 2007", '2007-09-22')
+          @t.finish = '2007-09-30'
           @t.site = 'http://www.bcmchess.co.uk/monarch2007/'
           @t.add_player(ICU::Player.new('Anthony', 'Fox', 1, :id => 456))
           @t.add_player(ICU::Player.new('Peter', 'Cafolla', 2, :id => 159))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_tournament
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000Z
+date: 2012-06-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
-  requirement: &70135277126160 !ruby/object:Gem::Requirement
+  requirement: &70184876559320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135277126160
+  version_requirements: *70184876559320
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70135277125480 !ruby/object:Gem::Requirement
+  requirement: &70184876558560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135277125480
+  version_requirements: *70184876558560
 - !ruby/object:Gem::Dependency
   name: icu_name
-  requirement: &70135277124700 !ruby/object:Gem::Requirement
+  requirement: &70184876557580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135277124700
+  version_requirements: *70184876557580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70135277123960 !ruby/object:Gem::Requirement
+  requirement: &70184876556580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135277123960
+  version_requirements: *70184876556580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70135277112660 !ruby/object:Gem::Requirement
+  requirement: &70184876555960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135277112660
+  version_requirements: *70184876555960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135277111900 !ruby/object:Gem::Requirement
+  requirement: &70184876555020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135277111900
+  version_requirements: *70184876555020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70135277111340 !ruby/object:Gem::Requirement
+  requirement: &70184876553900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135277111340
+  version_requirements: *70184876553900
 description: Convert files of chess tournament data in different formats to ruby classes
   and vice-versa.
 email: mark.j.l.orr@googlemail.com
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1249342061197821456
+      hash: 4507010155843698143
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1249342061197821456
+      hash: 4507010155843698143
 requirements: []
 rubyforge_project: icu_tournament
 rubygems_version: 1.8.10