icu_tournament 1.2.7 → 1.2.8

data/lib/icu_tournament/tournament_fcsv.rb

@@ -125,9 +125,10 @@ module ICU
       attr_reader :error
 
       # Parse CSV data returning a Tournament on success or raising an exception on error.
-      def parse!(csv)
+      def parse!(csv, arg={})
         @state, @line, @round, @sum, @error = 0, 0, nil, nil, nil
         @tournament = Tournament.new('Dummy', '2000-01-01')
+        csv = ICU::Util.to_utf8(csv) unless arg[:is_utf8]
 
         CSV.parse(csv, :row_sep => :auto) do |r|
           @line += 1                            # increment line number
@@ -184,8 +185,8 @@ module ICU
 
       # Same as <em>parse!</em> except the input is a file name rather than file contents.
       def parse_file!(file)
-        csv = open(file) { |f| f.read }
-        parse!(csv)
+        csv = ICU::Util.read_utf8(file)
+        parse!(csv, :is_utf8 => true)
       end
 
       # Same as <em>parse</em> except the input is a file name rather than file contents.

data/lib/icu_tournament/tournament_krause.rb

@@ -117,6 +117,7 @@ module ICU
         @name_set, @start_set = false, false
         @comments = ''
         @results = Array.new
+        krs = ICU::Util.to_utf8(krs) unless arg[:is_utf8]
 
         # Process all lines.
         krs.each_line do |line|
@@ -192,7 +193,8 @@ module ICU
 
       # Same as <em>parse!</em> except the input is a file name rather than file contents.
       def parse_file!(file, arg={})
-        krause = open(file) { |f| f.read }
+        krause = ICU::Util.read_utf8(file)
+        arg[:is_utf8] = true
         parse!(krause, arg)
       end
 

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.2.7"
+    VERSION = "1.2.8"
   end
 end

data/spec/tournament_fcsv_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ICU
@@ -15,7 +16,7 @@ module ICU
         p.results.select{|r| r.rateable}.size.should == rateable
         p.points.should == points
       end
-      
+
       context "a typical tournament" do
         before(:all) do
           @csv = <<CSV
@@ -34,27 +35,27 @@ CSV
           @f = ICU::Tournament::ForeignCSV.new
           @t = @f.parse!(@csv)
         end
-        
+
         it "should have a name" do
           @t.name.should == 'Bangor Open, 2003'
         end
-        
+
         it "should have a start date" do
           @t.start.should == '2003-07-01'
         end
-        
+
         it "should have a number of rounds" do
           @t.rounds.should == 4
         end
-        
+
         it "should have a website" do
           @t.site.should == 'http://www.icu.ie/tournaments/display.php?id=371'
         end
-        
+
         it "should have some players" do
           @t.should have(4).players
         end
-        
+
         it "should have correct player details" do
           check_player(1, 'Gearoidin', 'Ui Laighleis', 4, 3, 2.0, :id => 3364)
           check_player(2, 'April',     'Cronin',       1, 0, 1.0, :rating => 2005, :fed => 'IRL')
@@ -62,7 +63,7 @@ CSV
           check_player(4, 'Linda',     'Powell',       1, 0, 0.0, :rating => 1850, :fed => 'WLS')
         end
       end
-      
+
       context "the rdoc example tournament" do
         before(:all) do
           @csv = <<CSV
@@ -89,26 +90,26 @@ CSV
           @o = @t.players.reject { |o| o.num == 1 }
           @r = @t.player(2)
         end
-        
+
         it "should have correct basic details" do
           @t.name.should == 'Isle of Man Masters, 2007'
           @t.start.should == '2007-09-22'
           @t.rounds.should == 9
           @t.site.should == 'http://www.bcmchess.co.uk/monarch2007/'
         end
-        
+
         it "should have the right number of players in the right order" do
           @t.players.size.should == 9
           @t.players.inject(''){ |a,o| a << o.num.to_s }.should == '123456789'
         end
-        
+
         it "should have the right details for the main player" do
           @p.name.should == "Fox, Anthony"
           @p.results.size == 9
           @p.results.find_all{ |r| r.rateable }.size.should == 8
           @p.points.should == 4.0
         end
-        
+
         it "should have the right details for the opponents" do
           @o.size.should == 8
           @o.find_all{ |o| o.results.size == 1}.size.should == 8
@@ -116,7 +117,7 @@ CSV
           @r.results[0].rateable.should be_false
         end
       end
-    
+
       context "a tournament with more than one player" do
         before(:all) do
           @csv = <<CSV
@@ -158,7 +159,7 @@ CSV
           check_player(5, 'Bobby',     'Fischer',      1, 0, 0.0, :rating => 2700, :fed => 'USA', :title => 'GM')
         end
       end
-      
+
       context "a tournament where someone is both a player and an opponent" do
         before(:all) do
           @csv = <<CSV
@@ -199,11 +200,11 @@ CSV
           check_player(4, 'April',     'Cronin',       1, 0, 0.5, :rating => 2005, :fed => 'IRL')
         end
       end
-      
+
       context "a file that contains spurious white space and other untidiness" do
         before(:all) do
           @csv = <<CSV
-          
+
  Event," Bratto Open, 2001 "
 Start, 7th  March  2001
  Rounds, 2
@@ -237,7 +238,7 @@ CSV
           check_player(3, 'Mark',      'Orr',          1, 0, 0.5, :rating => 2100, :fed => 'IRL', :title => 'IM')
         end
       end
-      
+
       context "#parse" do
         before(:each) do
           @f = ICU::Tournament::ForeignCSV.new
@@ -258,7 +259,7 @@ CSV
           @f.parse(csv).should be_an_instance_of(ICU::Tournament)
           @f.error.should be_nil
         end
-        
+
         it "should not throw an exception but return nil on error" do
           @f.parse(' ').should be_nil
           @f.error.should match(/event/)
@@ -269,11 +270,11 @@ CSV
         before(:each) do
           @f = ICU::Tournament::ForeignCSV.new
         end
-        
+
         it "a blank file is invalid" do
           lambda { @f.parse!(' ') }.should raise_error(/event/i)
         end
-        
+
         it "the event should come first" do
           csv = <<CSV
 Start,7th March 2001
@@ -283,7 +284,7 @@ Website,http://www.federscacchi.it/
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 1.*event/i)
         end
-        
+
         it "the start should come second" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -293,7 +294,7 @@ Website,http://www.federscacchi.it/
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 2.*start/i)
         end
-        
+
         it "the number of rounds should come third" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -303,7 +304,7 @@ Rounds,2
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 3.*rounds/i)
         end
-        
+
         it "there should be a web site" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -313,7 +314,7 @@ Rounds,2
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 4.*site/i)
         end
-        
+
         it "should have at least one player" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -323,7 +324,7 @@ Website,http://www.federscacchi.it/
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 4.*no players/i)
         end
-        
+
         it "the player needs to have a valid ID number" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -335,7 +336,7 @@ Player,0,Ui Laighleis,Gearoidin
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 6.*number/i)
         end
-        
+
         it "should have the right number of results for each player" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -349,7 +350,7 @@ Total,0.5
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 8.*round/i)
         end
-        
+
         it "should have correct totals" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -364,8 +365,8 @@ Total,1.5
 CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 9.*total/i)
         end
-        
-        
+
+
         it "players who match by name and federation should match in all other details" do
           csv = <<CSV
 Event,"Bratto Open, 2001"
@@ -386,7 +387,7 @@ CSV
           lambda { @f.parse!(csv) }.should raise_error(/line 13.*same name.*conflicting/i)
         end
       end
-      
+
       context "serialisation of simple tournament" do
         before(:each) do
           @csv = <<CSV
@@ -413,7 +414,7 @@ CSV
           @f.serialize(@t).should == @csv
         end
       end
-      
+
       context "serialisation of ForeignCSV documentation example" do
         before(:each) do
           @csv = <<CSV
@@ -490,7 +491,7 @@ CSV
           @t.serialize('ForeignCSV').should == @csv
         end
       end
-      
+
       context "serialisation of shortened ForeignCSV documentation example" do
         before(:each) do
           @csv = <<CSV
@@ -538,13 +539,47 @@ CSV
           @t.serialize('ForeignCSV').should == @csv
         end
       end
-      
+
+      context "encoding" do
+        before(:each) do
+          @csv = <<CSV
+Event,"Brätto Open, 2001"
+Start,7th March 2001
+Rounds,2
+Website,http://www.federscacchi.it/
+
+Player,3364,Uì Laighlèis,Gearoìdin
+1,=,W,Kasparov,Gary,2800,GM,RUS
+2,=,B,Örr,Mârk,2100,IM,IRL
+Total,1.0
+CSV
+          @f = ICU::Tournament::ForeignCSV.new
+        end
+
+        it "should parse UTF-8" do
+          lambda { @t = @f.parse!(@csv) }.should_not raise_error
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis', 2, 2, 1.0, :id => 3364)
+          check_player(2, 'Gary', 'Kasparov', 1, 0, 0.5, :rating => 2800, :fed => 'RUS', :title => 'GM')
+          check_player(3, 'Mârk', 'Örr', 1, 0, 0.5, :rating => 2100, :fed => 'IRL', :title => 'IM')
+          @t.name.should == "Brätto Open, 2001"
+        end
+
+        it "should parse Latin-1" do
+          @csv = @csv.encode("ISO-8859-1")
+          lambda { @t = @f.parse!(@csv) }.should_not raise_error
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis', 2, 2, 1.0, :id => 3364)
+          check_player(2, 'Gary', 'Kasparov', 1, 0, 0.5, :rating => 2800, :fed => 'RUS', :title => 'GM')
+          check_player(3, 'Mârk', 'Örr', 1, 0, 0.5, :rating => 2100, :fed => 'IRL', :title => 'IM')
+          @t.name.should == "Brätto Open, 2001"
+        end
+      end
+
       context "parsing files" do
         before(:each) do
           @p = ICU::Tournament::ForeignCSV.new
           @s = File.dirname(__FILE__) + '/samples/fcsv'
         end
-        
+
         it "should error on a non-existant valid file" do
           file = "#{@s}/not_there.csv"
           lambda { @p.parse_file!(file) }.should raise_error
@@ -552,7 +587,7 @@ CSV
           t.should be_nil
           @p.error.should match(/no such file/i)
         end
-        
+
         it "should error on an invalid file" do
           file = "#{@s}/invalid.csv"
           lambda { @p.parse_file!(file) }.should raise_error
@@ -560,7 +595,7 @@ CSV
           t.should be_nil
           @p.error.should match(/expected.*event.*name/i)
         end
-        
+
         it "should parse a valid file" do
           file = "#{@s}/valid.csv"
           lambda { @p.parse_file!(file) }.should_not raise_error
@@ -568,6 +603,24 @@ CSV
           t.should be_an_instance_of(ICU::Tournament)
           t.players.size.should == 16
         end
+
+        it "should parse a file encoded in UTF-8" do
+          file = "#{@s}/utf-8.csv"
+          lambda { @t = @p.parse_file!(file) }.should_not raise_error
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis', 2, 2, 1.0, :id => 3364)
+          check_player(2, 'Gary', 'Kasparov', 1, 0, 0.5, :rating => 2800, :fed => 'RUS', :title => 'GM')
+          check_player(3, 'Mârk', 'Örr', 1, 0, 0.5, :rating => 2100, :fed => 'IRL', :title => 'IM')
+          @t.name.should == "Brätto Open, 2001"
+        end
+
+        it "should parse a file encoded in Latin-1" do
+          file = "#{@s}/latin-1.csv"
+          lambda { @t = @p.parse_file!(file) }.should_not raise_error
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis', 2, 2, 1.0, :id => 3364)
+          check_player(2, 'Gary', 'Kasparov', 1, 0, 0.5, :rating => 2800, :fed => 'RUS', :title => 'GM')
+          check_player(3, 'Mârk', 'Örr', 1, 0, 0.5, :rating => 2100, :fed => 'IRL', :title => 'IM')
+          @t.name.should == "Brätto Open, 2001"
+        end
       end
 
       context "type validation" do

data/spec/tournament_krause_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ICU
@@ -232,7 +233,7 @@ KRAUSE
           @t.player(3).rank.should == 3
         end
       end
-
+      
       context "local or FIDE IDs" do
         before(:each) do
           @krause = <<KRAUSE
@@ -404,6 +405,36 @@ KRAUSE
            lambda { t = @p.parse!(@k) }.should raise_error(/opponent/)
         end
       end
+      
+      context "encoding" do
+        before(:all) do
+          @utf8 = <<KRAUSE
+012 Läs Végas National Opeñ
+042 2008-06-07
+001    1 w    Uì Laighlèis,Gearoìdin                                             1.0          2 b 0     3 w 1
+001    2 m  m Örr,Mârk                                                           2.0          1 w 1               3 b 1
+001    3 m  g Bologan,Viktor                                                     0.0                    1 b 0     2 w 0
+KRAUSE
+          @p = ICU::Tournament::Krause.new
+        end
+
+        it "should handle UTF-8" do
+          @t = @p.parse!(@utf8)
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis')
+          check_player(2, 'Mârk', 'Örr')
+          check_player(3, 'Viktor', 'Bologan')
+          @t.name.should == "Läs Végas National Opeñ"
+        end
+
+        it "should handle Latin-1" do
+          latin1 = @utf8.encode("ISO-8859-1")
+          @t = @p.parse!(latin1)
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis')
+          check_player(2, 'Mârk', 'Örr')
+          check_player(3, 'Viktor', 'Bologan')
+          @t.name.should == "Läs Végas National Opeñ"
+        end
+      end
 
       context "parsing files" do
         before(:each) do
@@ -434,6 +465,24 @@ KRAUSE
           t.should be_an_instance_of(ICU::Tournament)
           t.players.size.should == 12
         end
+
+        it "should parse a file with UTF-8 encoding" do
+          file = "#{@s}/utf-8.tab"
+          lambda { @t = @p.parse_file!(file) }.should_not raise_error
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis')
+          check_player(2, 'Mârk', 'Örr')
+          check_player(3, 'Viktor', 'Bologan')
+          @t.name.should == "Läs Végas National Opeñ"
+        end
+
+        it "should parse a file with Latin-1 encoding" do
+          file = "#{@s}/latin-1.tab"
+          lambda { @t = @p.parse_file!(file) }.should_not raise_error
+          check_player(1, 'Gearoìdin', 'Uì Laighlèis')
+          check_player(2, 'Mârk', 'Örr')
+          check_player(3, 'Viktor', 'Bologan')
+          @t.name.should == "Läs Végas National Opeñ"
+        end
       end
     end
   end

data/spec/tournament_sp_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 SAMPLES = File.dirname(__FILE__) + '/samples/sp/'
 
@@ -25,7 +26,6 @@ module ICU
     describe SwissPerfect do
 
       context "Gonzaga Challengers 2010" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'gonzaga_challengers_2010.trn', :start => "2010-01-29")
@@ -58,7 +58,6 @@ module ICU
       end
 
       context "U19 Junior Championships 2010" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'junior_championships_u19_2010.sco', :start => "2010-04-11")
@@ -91,7 +90,6 @@ module ICU
       end
 
       context "Limerick Club Championship 2009-10" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'LimerickClubChampionship09.ini', :start => "2009-09-15")
@@ -121,7 +119,6 @@ module ICU
       end
 
       context "Junior Inter Provincials U16 2010" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'junior_provincials_u16_2010', :start => "2010-02-02")
@@ -149,7 +146,6 @@ module ICU
       end
 
       context "Mulcahy Cup 2010" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'mulcahy_2010', :start => "2010-01-15")
@@ -174,7 +170,6 @@ module ICU
       end
 
       context "National Club Champiomships 2010" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'ncc', :start => "2010-05-08")
@@ -202,7 +197,6 @@ module ICU
       end
 
       context "Drogheda Section A, 2010, with an invalid federation" do
-
         before(:each) do
           @p = ICU::Tournament::SwissPerfect.new
         end
@@ -212,14 +206,14 @@ module ICU
           t.should be_nil
           @p.error.should match(/invalid federation/i)
         end
-        
+
         it "should parse if instructed to skip bad feds" do
           t = @p.parse_file(SAMPLES + 'drog_a.zip', :start => "2010-06-04", :fed => :skip)
           @p.error.should be_nil
           t.player(5).fed.should be_nil
           t.player(6).fed.should == "ESP"
         end
-        
+
         it "should parse if instructed to skip all feds" do
           t = @p.parse_file(SAMPLES + 'drog_a.zip', :start => "2010-06-04", :fed => 'ignore')
           @p.error.should be_nil
@@ -229,7 +223,6 @@ module ICU
       end
 
       context "Non-existant ZIP file" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'nosuchzipfile.zip', :start => "2010-05-08")
@@ -255,7 +248,6 @@ module ICU
       end
 
       context "ZIP file containing the wrong number of files" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'notenoughfiles.zip', :start => "2010-05-08")
@@ -268,7 +260,6 @@ module ICU
       end
 
       context "ZIP file containing the files with mixed stems" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'mixedstems.zip', :start => "2010-05-08")
@@ -281,7 +272,6 @@ module ICU
       end
 
       context "ZIP file" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'nccz.zip', :start => "2010-05-08")
@@ -301,7 +291,6 @@ module ICU
       end
 
       context "ZIP file without a ZIP ending" do
-
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
         end
@@ -315,8 +304,20 @@ module ICU
         end
       end
 
-      context "Defaulting the start date" do
+      context "Names with accented characters" do
+        before(:all) do
+          @p = ICU::Tournament::SwissPerfect.new
+        end
 
+        it "should parse and the name should be in UTF-8" do
+          lambda { @t = @p.parse_file!(SAMPLES + 'munster_u10_2011.zip', :start => "2011-01-20") }.should_not raise_error
+          @t.player(1).signature.should  == "Kennedy, Stephen|||849|2.0|6|12345|WLWLL|BWBWB|TTTTT"
+          @t.player(4).signature.should  == "Sheehan, Ciarán||||3.0|5|12345|LWWLW|WBWBW|TTTTF"
+          @t.player(10).signature.should  == "Sheehan, Adam||||2.0|7|12345|WLLWL|WBWWB|TTTFT"
+        end
+      end
+
+      context "Defaulting the start date" do
         before(:all) do
           @p = ICU::Tournament::SwissPerfect.new
           @t = @p.parse_file(SAMPLES + 'nccz.zip')

data/spec/tournament_spec.rb

@@ -840,7 +840,7 @@ EOS
       it "should raise exceptions if the wrong type is used" do
         lambda { @c.parse_file!("#{@s}/krause/valid.tab", 'ForeignCSV') }.should raise_error(/expected/)
         lambda { @c.parse_file!("#{@s}/fcsv/valid.csv", 'SwissPerfect') }.should raise_error(/cannot/)
-        lambda { @c.parse_file!("#{@s}/sp/nccz.zip", 'Krause') }.should raise_error(/(missing|invalid byte sequence)/)
+        lambda { @c.parse_file!("#{@s}/sp/nccz.zip", 'Krause') }.should raise_error(/(invalid|conversion)/i)
       end
 
       it "should raise an exception if file does not exist" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 7
-  version: 1.2.7
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - Mark Orr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +00:00
+date: 2011-02-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency