icu_tournament 1.1.0 → 1.1.1

data/lib/icu_tournament/player.rb

@@ -15,17 +15,17 @@ Names are automatically cannonicalised (tidied up).
   bobby.last_name                  # => 'Fischer'
 
 In addition, players have a number of optional attributes which can be specified
-via setters or in constructor hash options: _id_ (either FIDE or national),
-_fed_ (federation), _title_, _rating_, _rank_ and _dob_ (date of birth).
+via setters or in constructor hash options: _id_ (local or national ID), _fide_
+(FIDE ID), _fed_ (federation), _title_, _rating_, _rank_ and _dob_ (date of birth).
 
   peter = ICU::Player.new('Peter', 'Svidler', 21, :fed => 'rus', :title => 'g', :rating = 2700)
   peter.dob = '17th June, 1976'
   peter.rank = 1
 
 Some of these values will also be canonicalised to some extent. For example,
-the date of birth conforms to a _yyyy-mm-dd_ format, the chess title will be two
+date of birth will be turned into _yyyy-mm-dd_ format, the chess title will be two
 to three capital letters always ending in _M_ and the federation, if it's three
-letters long, will be upper-cased.
+letters long, will be upcased.
 
   peter.dob                        # => 1976-07-17
   peter.title                      # => 'GM'
@@ -33,17 +33,18 @@ letters long, will be upper-cased.
 
 It is preferable to add results (ICU::Result) to a player via the tournament (ICU::Tournament) object's
 _add_result_ method rather than the method of the same name belonging to player instances. Doing so
-allows mirrored results to be added to both players with one method call (e.g. one player won, the
+allows mirrored results to be added to both players with one call (e.g. one player won, so the
 other lost). A player's results can later be retieved via the _results_ accessor.
 
 Total scores is available via the _points_ method.
 
   peter.points                     # => 5.5
 
-A player's _id_ is their ID number in some external database (typically either ICU or FIDE).
+A player can have up to two ID numbers (both positive integers or nil): _id_ (local or national ID,
+such as ICU number) and _fide_ (FIDE ID).
 
-  peter.id = 16790                 # ICU, or
-  peter.id = 4102142               # FIDE
+  peter.id = 16790                 # ICU
+  peter.fide = 4102142             # FIDE
 
 Players can be compared to see if they're roughly or exactly the same, which may be useful in detecting duplicates.
 If the names match and the federations don't disagree then two players are equal according to the _==_ operator.
@@ -56,7 +57,7 @@ The player number is irrelevant.
   john1 == john2                   # => true (federations don't disagree because one is unset)
   john2 == john3                   # => false (federations disagree)
 
-If, in addition, _rating_, _dob_, _gender_ and _id_ do not disagree then two players are equal
+If, in addition, _rating_, _dob_, _gender_, _id_ and _fide_ do not disagree then two players are equal
 according to the stricter criteria of _eql?_.
 
   mark1 = ICU::Player.new('Mark', 'Orr', 31, :fed = 'IRL', :rating => 2100)
@@ -69,7 +70,7 @@ according to the stricter criteria of _eql?_.
 The presence of two players in the same tournament that are equal according to _==_ but unequal
 according to _eql?__ is likely to indicate a data entry error.
 
-If two instances represent the same player and are equal according to _==_ then the _id_, _rating_,
+If two instances represent the same player and are equal according to _==_ then the _id_, _fide_, _rating_,
 _title_ and _fed_ attributes of the two can be merged. For example:
 
   fox1 = ICU::Player.new('Tony', 'Fox', 12, :id => 456)
@@ -89,7 +90,7 @@ All other attributes are unaffected.
     
     extend ICU::Accessor
     attr_integer :num
-    attr_positive_or_nil :id, :rating, :rank
+    attr_positive_or_nil :id, :fide, :rating, :rank
     attr_date_or_nil :dob
     
     attr_reader :results, :first_name, :last_name, :fed, :title, :gender
@@ -99,7 +100,7 @@ All other attributes are unaffected.
       self.first_name = first_name
       self.last_name  = last_name
       self.num        = num
-      [:id, :fed, :title, :rating, :rank, :dob, :gender].each do |atr|
+      [:id, :fide, :fed, :title, :rating, :rank, :dob, :gender].each do |atr|
         self.send("#{atr}=", opt[atr]) unless opt[atr].nil?
       end
       @results = []
@@ -193,11 +194,11 @@ All other attributes are unaffected.
       true
     end
     
-    # Strict equality test. Passes if the playes are loosly equal and also if their ID, rating, gender and title are not different.
+    # Strict equality test. Passes if the playes are loosly equal and also if their IDs, rating, gender and title are not different.
     def eql?(other)
       return true if equal?(other)
       return false unless self == other
-      [:id, :rating, :title, :gender].each do |m|
+      [:id, :fide, :rating, :title, :gender].each do |m|
         return false if self.send(m) && other.send(m) && self.send(m) != other.send(m)
       end
       true
@@ -206,7 +207,7 @@ All other attributes are unaffected.
     # Merge in some of the details of another player.
     def merge(other)
       raise "cannot merge two players that are not equal" unless self == other
-      [:id, :rating, :title, :fed, :gender].each do |m|
+      [:id, :fide, :rating, :title, :fed, :gender].each do |m|
         self.send("#{m}=", other.send(m)) unless self.send(m)
       end
     end

data/lib/icu_tournament/tournament.rb

@@ -395,17 +395,19 @@ in which case any options supplied to this method will be silently ignored.
       type = format.to_s
       raise "Invalid format" unless type.match(/^(SwissPerfect|Krause|ForeignCSV)$/);
       parser = "ICU::Tournament::#{format}".constantize.new
-      if type == 'SwissPerfect'
-        parser.parse_file!(file, opts)
-      else
+      if type == 'ForeignCSV'
+        # Doesn't take options.
         parser.parse_file!(file)
+      else
+        # The others can take options.
+        parser.parse_file!(file, opts)
       end
     end
 
     # Convenience method to serialise the tournament into a supported format.
     # Throws an exception unless the name of a supported format is supplied
     # or if the tournament is unsuitable for serialisation in that format.
-    def serialize(format)
+    def serialize(format, arg={})
       serializer = case format.to_s.downcase
         when 'krause'       then ICU::Tournament::Krause.new
         when 'foreigncsv'   then ICU::Tournament::ForeignCSV.new
@@ -413,7 +415,7 @@ in which case any options supplied to this method will be silently ignored.
         when ''             then raise "no format supplied"
         else raise "unsupported serialisation format: '#{format}'"
       end
-      serializer.serialize(self)
+      serializer.serialize(self, arg)
     end
 
     private

data/lib/icu_tournament/tournament_fcsv.rb

@@ -205,7 +205,7 @@ For example, here are the commands to reproduce the example above.
       end
 
       # Serialise a tournament back into CSV format.
-      def serialize(t)
+      def serialize(t, arg={})
         t.validate!(:type => self)
         Util::CSV.generate do |csv|
           csv << ["Event", t.name]

data/lib/icu_tournament/tournament_krause.rb

@@ -49,8 +49,17 @@ A player can be retrieved from the tournament via the _players_ array or by send
   daffy.rating                      # => 2200
   daffy.fed                         # => "IRL"
   daffy.id                          # => 7654321
+  daffy.fide                        # => nil
   daffy.dob                         # => "1937-04-17"
 
+By default, ID numbers in the input are interpreted as local IDs. If, instead, they should be interpreted as
+FIDE IDs, add the following option:
+
+  tournament = parser.parse_file('tournament.tab', :fide => true)
+  daffy = tournament.player(2)
+  daffy.id                          # => nil
+  daffy.fide                        # => 7654321
+
 If the ranking numbers are missing from the file or inconsistent (e.g. player A is ranked above player B
 but has less points than player B) they are recalculated as a side effect of the parse.
 
@@ -77,6 +86,12 @@ Or alternatively, by the _serialize_ method of the tournament object if the name
 
   krause = tournament.serialize('Krause')
 
+By default, local (ICU) IDs are used for the serialization, but both methods accept an option that
+causes FIDE IDs to be used instead:
+
+  krause = parser.serialize(tournament, :fide => true)
+  krause = parser.serialize(tournament, :fide => true)
+
 The following lists Krause data identification numbers, their description and, where available, their corresponding
 attributes in an ICU::Tournament instance.
 
@@ -102,7 +117,7 @@ attributes in an ICU::Tournament instance.
       attr_reader :error, :comments
 
       # Parse Krause data returning a Tournament on success or raising an exception on error.
-      def parse!(krs)
+      def parse!(krs, arg={})
         @lineno = 0
         @tournament = Tournament.new('Dummy', '2000-01-01')
         @name_set, @start_set = false, false
@@ -116,7 +131,7 @@ attributes in an ICU::Tournament instance.
           next if line == ''   # skip blank lines
           @line = line         # remember this line for later
 
-          # Does it havea DIN or is it just a comment?
+          # Does it have a DIN or is it just a comment?
           if @line.match(/^(\d{3}) (.*)$/)
             din = $1           # data identification number (DIN)
             @data = $2         # the data after the DIN
@@ -128,7 +143,7 @@ attributes in an ICU::Tournament instance.
           # Process the line given the DIN.
           begin
             case din
-              when '001' then add_player                        # player and results record
+              when '001' then add_player(arg)                   # player and results record
               when '012' then set_name                          # name (mandatory)
               when '013' then add_team                          # team name and members
               when '022' then @tournament.city = @data          # city
@@ -172,9 +187,9 @@ attributes in an ICU::Tournament instance.
 
       # Parse Krause data returning a Tournament on success or a nil on failure.
       # In the case of failure, an error message can be retrived via the <em>error</em> method.
-      def parse(krs)
+      def parse(krs, arg={})
         begin
-          parse!(krs)
+          parse!(krs, arg)
         rescue => ex
           @error = ex.message
           nil
@@ -182,15 +197,15 @@ attributes in an ICU::Tournament instance.
       end
 
       # Same as <em>parse!</em> except the input is a file name rather than file contents.
-      def parse_file!(file)
+      def parse_file!(file, arg={})
         krause = open(file) { |f| f.read }
-        parse!(krause)
+        parse!(krause, arg)
       end
 
       # Same as <em>parse</em> except the input is a file name rather than file contents.
-      def parse_file(file)
+      def parse_file(file, arg={})
         begin
-          parse_file!(file)
+          parse_file!(file, arg)
         rescue => ex
           @error = ex.message
           nil
@@ -198,7 +213,7 @@ attributes in an ICU::Tournament instance.
       end
 
       # Serialise a tournament back into Krause format.
-      def serialize(t)
+      def serialize(t, arg={})
         t.validate!(:type => self)
         krause = ''
         krause << "012 #{t.name}\n"
@@ -221,7 +236,7 @@ attributes in an ICU::Tournament instance.
           t.round_dates.each{ |d| krause << d.sub(/^../, '  ') }
           krause << "\n"
         end
-        t.players.each{ |p| krause << p.to_krause(rounds) }
+        t.players.each{ |p| krause << p.to_krause(rounds, arg) }
         krause
       end
 
@@ -242,7 +257,7 @@ attributes in an ICU::Tournament instance.
         @start_set = true
       end
 
-      def add_player
+      def add_player(arg={})
         raise "player record less than minimum length" if @line.length < 99
 
         # Player details.
@@ -254,10 +269,10 @@ attributes in an ICU::Tournament instance.
           :title  => @data[6, 3],
           :rating => @data[44, 4],
           :fed    => @data[49, 3],
-          :id     => @data[53, 11],
           :dob    => @data[65, 10],
           :rank   => @data[81, 4],
         }
+        opt[arg[:fide] ? :fide : :id] = @data[53, 11]
         player = Player.new(nam.first, nam.last, num, opt)
         @tournament.add_player(player)
 
@@ -320,7 +335,7 @@ attributes in an ICU::Tournament instance.
 
   class Player
     # Format a player's 001 record as it would appear in a Krause formatted file (including the final newline).
-    def to_krause(rounds)
+    def to_krause(rounds, arg)
       krause = '001'
       krause << sprintf(' %4d', @num)
       krause << sprintf(' %1s', case @gender; when 'M' then 'm'; when 'F' then 'w'; else ''; end)
@@ -328,7 +343,7 @@ attributes in an ICU::Tournament instance.
       krause << sprintf(' %-33s', "#{@last_name},#{@first_name}")
       krause << sprintf(' %4s', @rating)
       krause << sprintf(' %3s', @fed)
-      krause << sprintf(' %11s', @id)
+      krause << sprintf(' %11s', arg[:fide] ? @fide : @id)
       krause << sprintf(' %10s', @dob)
       krause << sprintf(' %4.1f', points)
       krause << sprintf(' %4s', @rank)

data/lib/icu_tournament/tournament_sp.rb

@@ -43,16 +43,19 @@ If no start date is supplied it will default to 2000-01-01, and can be reset lat
   tournament.start                # => '2000-01-01'
   tournament.start = '2010-07-03'
 
-By default, the parser extracts local ratings and IDs from the SwissPerfect files. If international
-ratings or IDs are required instead, use the options _id_ and _rating_. For example:
+SwissPerfect files have slots for both local and international IDs and these, if present
+and if intergers are copied to the _id_ and _fide_ attributes respectively.
+
+By default, the parser extracts the local rating from the SwissPerfect files and not the international one.
+If international ratings are required instead, set the _rating_ option to "intl". For example:
 
   tournament = parser.parse_file('ncc', :start => '2010-05-08')
   tournament.player(2).id         # =>  12379 (ICU ID)
-  tournament.player(2).rating     # =>  2556  (ICU rating)
+  tournament.player(2).fide       # =>  1205064 (FIDE ID)
+  tournament.player(2).rating     # =>  2556 (ICU rating)
 
-  tournament = parser.parse_file('ncc', :start => '2010-05-08', :id => 'intl', :rating => 'intl')
-  tournament.player(2).id         # =>  1205064 (FIDE ID)
-  tournament.player(2).rating     # =>  2530    (FIDE rating)
+  tournament = parser.parse_file('ncc', :start => '2010-05-08', :rating => 'intl')
+  tournament.player(2).rating     # =>  2530 (FIDE rating)
 
 By default, the parse will fail completely if the ".trn" file contains any invalid federations (see ICU::Federation).
 There are two alternative behaviours controlled by setting the _fed_ option:
@@ -109,7 +112,8 @@ See ICU::Tournament for more about tie-breaks.
         :fed        => "FEDER",
         :first_name => "FIRSTNAME",
         :gender     => "SEX",
-        :id         => ["LOC_ID", "INTL_ID"],
+        :id         => "LOC_ID",
+        :fide       => "INTL_ID",
         :last_name  => "SURNAME",
         :num        => "ID",
         :rank       => "ORDER",
@@ -145,7 +149,7 @@ See ICU::Tournament for more about tie-breaks.
       end
 
       # Serialise a tournament to SwissPerfect text export format.
-      def serialize(t)
+      def serialize(t, arg={})
         t.validate!(:type => self)
 
         # Ensure a nice set of numbers.
@@ -287,6 +291,7 @@ See ICU::Tournament for more about tie-breaks.
           when :fed    then val = val && val.match(/^[A-Z]{3}$/i) ? val.upcase : nil
           when :gender then val = val.to_i > 0 ? %w(M F)[val.to_i-1] : nil
           when :id     then val = val.to_i > 0 ? val : nil
+          when :fide   then val = val.to_i > 0 ? val : nil
           when :rating then val = val.to_i > 0 ? val : nil
           when :title  then val = val.to_i > 0 ? %w(GM WGM IM WIM FM WFM)[val.to_i-1] : nil
           end

data/lib/icu_tournament/version.rb

@@ -1,5 +1,5 @@
 module ICU
   class Tournament
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/player_spec.rb

@@ -63,18 +63,30 @@ module ICU
       end
     end
     
-    context "ID" do
+    context "local ID" do
       it "defaults to nil" do
         Player.new('Mark', 'Orr', 3).id.should be_nil
       end
 
       it "should be a positive integer" do
         Player.new('Mark', 'Orr', 3, :id => 1350).id.should == 1350
-        Player.new('Gary', 'Kasparov', 4, :id => '4100018').id.should == 4100018
+        Player.new('Stephen', 'Brady', 4, :id => ' 90 ').id.should == 90
         lambda { Player.new('Mark', 'Orr', 3, :id => ' 0 ') }.should raise_error(/invalid positive integer/)
       end
     end
-    
+
+    context "FIDE ID" do
+      it "defaults to nil" do
+        Player.new('Stephen', 'Brady', 1).fide.should be_nil
+      end
+
+      it "should be a positive integer" do
+        Player.new('Stephen', 'Brady', 1, :fide => 2500124).fide.should == 2500124
+        Player.new('Gary', 'Kasparov', 2, :fide => '4100018').fide.should == 4100018
+        lambda { Player.new('Mark', 'Orr', 3, :fide => ' 0 ') }.should raise_error(/invalid positive integer/)
+      end
+    end
+
     context "federation" do
       it "defaults to nil" do
         Player.new('Mark', 'Orr', 3).fed.should be_nil
@@ -212,8 +224,8 @@ module ICU
     context "merge" do
       before(:each) do
         @p1 = Player.new('Mark', 'Orr', 1, :id => 1350)
-        @p2 = Player.new('Mark', 'Orr', 2, :rating => 2100, :title => 'IM', :fed => 'IRL')
-        @p3 = Player.new('Gearoidin', 'Ui Laighleis', 3, :rating => 1600, :title => 'WIM', :fed => 'IRL')
+        @p2 = Player.new('Mark', 'Orr', 2, :rating => 2100, :title => 'IM', :fed => 'IRL', :fide => 2500035)
+        @p3 = Player.new('Gearoidin', 'Ui Laighleis', 3, :rating => 1600, :title => 'WIM', :fed => 'IRL', :fide =>  2501171)
       end
       
       it "takes on the ID, rating, title and fed of the other player but not the player number" do
@@ -223,6 +235,7 @@ module ICU
         @p1.rating.should == 2100
         @p1.title.should == 'IM'
         @p1.fed.should == 'IRL'
+        @p1.fide.should == 2500035
       end
       
       it "should have a kind of symmetry" do

data/spec/tournament_krause_spec.rb

@@ -7,21 +7,17 @@ module ICU
         p = @t.player(num)
         p.first_name.should == first
         p.last_name.should  == last
-        p.gender.should     == other[:gender]
-        p.title.should      == other[:title]
-        p.rating.should     == other[:rating]
-        p.fed.should        == other[:fed]
-        p.id.should         == other[:id]
-        p.dob.should        == other[:dob]
-        p.rank.should       == other[:rank]
+        [:gender, :title, :rating, :fed, :id, :fide, :dob, :rank].each do |key|
+          p.send(key).should == other[key] if other.has_key?(key)
+        end
       end
-      
+
       def check_results(num, results, points)
         p = @t.player(num)
         p.results.size.should == results
         p.points.should == points
       end
-      
+
       context "a typical tournament" do
         before(:all) do
           krause = <<KRAUSE
@@ -41,54 +37,54 @@ module ICU
 0         1         2         3         4         5         6         7         8         9         0         1         2
 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
 132                                                                                        08.06.07  08.06.08  08.06.09
-001    1 w    Ui Laighleis,Gearoidin            1985 IRL     2501171 1964.06.10  1.0    2     2 b 0     3 w 1          
+001    1 w    Ui Laighleis,Gearoidin            1985 IRL     2501171 1964.06.10  1.0    2     2 b 0     3 w 1
 001    2 m  m Orr,Mark                          2258 IRL     2500035 1955.11.09  2.0    1     1 w 1               3 b 1
 001    3 m  g Bologan,Viktor                    2663 MDA    13900048 1971.01.01  0.0    3               1 b 0     2 w 0
 KRAUSE
           @p = ICU::Tournament::Krause.new
           @t = @p.parse!(krause)
         end
-        
+
         it "should have a name, city and federation" do
           @t.name.should == 'Las Vegas National Open'
           @t.city.should == 'Las Vegas'
           @t.fed.should  == 'USA'
         end
-        
+
         it "should have start and end dates" do
           @t.start.should  == '2008-06-07'
           @t.finish.should == '2008-06-09'
         end
-        
+
         it "should have a number of rounds, a type and a time control" do
           @t.rounds.should       == 3
           @t.last_round.should   == 3
           @t.type.should         == 'All-Play-All'
           @t.time_control.should == '60 in 2hr, 30 in 1hr, rest in 1hr'
         end
-        
+
         it "should have an arbiter and deputies" do
           @t.arbiter.should == 'Hans Scmidt'
           @t.deputy.should  == 'Gerry Graham, Herbert Scarry'
         end
-        
+
         it "should have players and their details" do
           @t.should have(3).players
           check_player(1, 'Gearoidin', 'Ui Laighleis', :gender => 'F', :rating => 1985, :fed => 'IRL', :id =>  2501171, :dob => '1964-06-10', :rank => 2)
           check_player(2, 'Mark', 'Orr',               :gender => 'M', :rating => 2258, :fed => 'IRL', :id =>  2500035, :dob => '1955-11-09', :rank => 1, :title => 'IM')
           check_player(3, 'Viktor', 'Bologan',         :gender => 'M', :rating => 2663, :fed => 'MDA', :id => 13900048, :dob => '1971-01-01', :rank => 3, :title => 'GM')
         end
-        
+
         it "should have correct results for each player" do
           check_results(1, 2, 1.0)
           check_results(2, 2, 2.0)
           check_results(3, 2, 0.0)
         end
-        
+
         it "should have correct round dates" do
           @t.round_dates.join('|').should == '2008-06-07|2008-06-08|2008-06-09'
         end
-        
+
         it "the parser should retain comment lines" do
           comments = <<COMMENTS
 062 3
@@ -100,7 +96,7 @@ COMMENTS
           @p.comments.should == comments
         end
       end
-      
+
       context "the documentation example" do
         before(:all) do
           krause = <<KRAUSE
@@ -109,7 +105,7 @@ COMMENTS
 042 2009.09.09
 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
 132                                                                                        09.09.09  09.09.10  09.09.11
-001    1 w    Mouse,Minerva                     1900 USA     1234567 1928.05.15  1.0    2     2 b 0     3 w 1          
+001    1 w    Mouse,Minerva                     1900 USA     1234567 1928.05.15  1.0    2     2 b 0     3 w 1
 001    2 m  m Duck,Daffy                        2200 IRL     7654321 1937.04.17  2.0    1     1 w 1               3 b 1
 001    3 m  g Mouse,Mickey                      2600 USA     1726354 1928.05.15  0.0    3               1 b 0     2 w 0
 KRAUSE
@@ -129,7 +125,7 @@ KRAUSE
         end
 
         it "should have a number of rounds" do
-          @t.rounds.should       == 3
+          @t.rounds.should == 3
         end
 
         it "should have players and their details" do
@@ -149,7 +145,7 @@ KRAUSE
           @p.comments.should == "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\n"
         end
       end
-      
+
       context "the README serialisation example" do
         before(:all) do
           @t = ICU::Tournament.new('World Championship', '1972-07-11')
@@ -166,12 +162,12 @@ KRAUSE
         it "should produce a valid tournament" do
           @t.invalid.should be_false
         end
-        
+
         it "should produce output that looks reasonable" do
           @k.should match(/Fischer,Robert J\./)
         end
       end
-      
+
       context "serialisation" do
         before(:each) do
           @krause = <<KRAUSE
@@ -193,17 +189,28 @@ KRAUSE
 001    4   wg Cramling,Pia                      2500 SWE     1700030 1963-04-23  0.5    3            0000 - =     1 w 0
 KRAUSE
           @p = ICU::Tournament::Krause.new
-          @t = @p.parse!(@krause)
-          @q = ICU::Tournament::Krause.new
         end
 
         it "should serialize back to the original if the input is fully canonicalised" do
-          @q.serialize(@t).should == @krause
+          t = @p.parse!(@krause)
+          ICU::Tournament::Krause.new.serialize(t).should == @krause
         end
-        
+
         it "should serialize using the convenience method of the tournament object" do
-          @t.serialize('Krause').should == @krause
+          t = @p.parse!(@krause)
+          t.serialize('Krause').should == @krause
+        end
+
+        it "should not serialize coorectly if mixed ID types are used" do
+          t = @p.parse!(@krause, :fide => true)
+          t.serialize('Krause').should_not == @krause
         end
+
+        it "should serialize coorectly if FIDE IDs are used consistently" do
+          t = @p.parse!(@krause, :fide => true)
+          t.serialize('Krause', :fide => true).should == @krause
+        end
+
       end
 
       context "auto-ranking" do
@@ -225,13 +232,40 @@ KRAUSE
           @t.player(3).rank.should == 3
         end
       end
-      
+
+      context "local or FIDE IDs" do
+        before(:each) do
+          @krause = <<KRAUSE
+012 Las Vegas National Open
+042 2008-06-07
+001    1 w    Ui Laighleis,Gearoidin            1985 IRL     2501171 1964-06-10  1.0          2 b 0     3 w 1
+001    2 m  m Orr,Mark                          2258 IRL     2500035 1955-11-09  2.0          1 w 1               3 b 1
+001    3 m  g Bologan,Viktor                    2663 MDA             1971-01-01  0.0                    1 b 0     2 w 0
+KRAUSE
+          @p = ICU::Tournament::Krause.new
+        end
+
+        it "should have local IDs by default" do
+          @t = @p.parse(@krause)
+          check_player(1, 'Gearoidin', 'Ui Laighleis', :id => 2501171, :fide => nil)
+          check_player(2, 'Mark',      'Orr',          :id => 2500035, :fide => nil)
+          check_player(3, 'Viktor',    'Bologan',      :id => nil,     :fide => nil)
+        end
+
+        it "should have FIDE IDs if option is used" do
+          @t = @p.parse(@krause, :fide => true)
+          check_player(1, 'Gearoidin', 'Ui Laighleis', :fide => 2501171, :id => nil)
+          check_player(2, 'Mark',      'Orr',          :fide => 2500035, :id => nil)
+          check_player(3, 'Viktor',    'Bologan',      :fide => nil,     :id => nil)
+        end
+      end
+
       context "renumbering" do
         before(:all) do
           @krause = <<KRAUSE
 012 Las Vegas National Open
 042 2008-06-07
-001   10 w    Ui Laighleis,Gearoidin            1985 IRL                         1.0         20 b 0    30 w 1
+001   10 w    Ui Laighleis,Gearoidin            1985 IRL                         1.0         20 b 0    30 w 1          
 001   20 m  m Orr,Mark                          2258 IRL                         2.0         10 w 1              30 b 1
 001   30 m  g Bologan,Viktor                    2663 MDA                         0.0                   10 b 0    20 w 0
 KRAUSE
@@ -245,7 +279,7 @@ KRAUSE
 001    3 m  g Bologan,Viktor                    2663 MDA                         0.0    3               2 b 0     1 w 0
 REORDERED
         end
-      
+
         it "should serialise correctly after renumbering by rank" do
           @t.renumber
           @p.serialize(@t).should == @reordered

data/spec/tournament_sp_spec.rb

@@ -10,7 +10,7 @@ module ICU
   class Player
     def signature
       [
-        name, id, rating, points, rank,
+        name, id, fide, rating, points, rank,
         results.map{ |r| r.round }.join(''),
         results.map{ |r| r.score }.join(''),
         results.map{ |r| r.colour || "-" }.join(''),
@@ -38,10 +38,10 @@ module ICU
         end
 
         it "should have correct details for selected players" do
-          @t.player(2).signature.should  == "Mullooly, Neil M.|6438|1083|6.0|1|123456|WWWWWW|WBWBWB|TTTTTT" # winner
-          @t.player(4).signature.should  == "Gallagher, Mark|12138|1036|4.0|9|123456|WLWWWL|WBWBWB|FTTTTT"  # had one bye
-          @t.player(45).signature.should == "Catre, Loredan||507|3.5|18|123456|WDLWLW|BWBWBW|FTTTFT"        # had two byes
-          @t.player(56).signature.should == "McDonnell, Cathal||498|0.0|54|1|L|-|F"                         # last
+          @t.player(2).signature.should  == "Mullooly, Neil M.|6438||1083|6.0|1|123456|WWWWWW|WBWBWB|TTTTTT" # winner
+          @t.player(4).signature.should  == "Gallagher, Mark|12138||1036|4.0|9|123456|WLWWWL|WBWBWB|FTTTTT"  # had one bye
+          @t.player(45).signature.should == "Catre, Loredan|||507|3.5|18|123456|WDLWLW|BWBWBW|FTTTFT"        # had two byes
+          @t.player(56).signature.should == "McDonnell, Cathal|||498|0.0|54|1|L|-|F"                         # last
         end
 
         it "should have consistent ranks" do
@@ -71,10 +71,10 @@ module ICU
         end
 
         it "should have correct details for selected players" do
-          @t.player(1).signature.should == "Griffiths, Ryan-Rhys|6897|2225|3.0|1|123|WWW|WWB|TTT"
-          @t.player(2).signature.should == "Flynn, Jamie|5226|1633|2.0|2|123|WLW|WBW|TTT"
-          @t.player(3).signature.should == "Hulleman, Leon|6409|1466|1.0|3|123|LWL|BBW|TTT"
-          @t.player(4).signature.should == "Dunne, Thomas|10914||0.0|4|123|LLL|BWB|TTT"
+          @t.player(1).signature.should == "Griffiths, Ryan-Rhys|6897||2225|3.0|1|123|WWW|WWB|TTT"
+          @t.player(2).signature.should == "Flynn, Jamie|5226||1633|2.0|2|123|WLW|WBW|TTT"
+          @t.player(3).signature.should == "Hulleman, Leon|6409||1466|1.0|3|123|LWL|BBW|TTT"
+          @t.player(4).signature.should == "Dunne, Thomas|10914|||0.0|4|123|LLL|BWB|TTT"
         end
 
         it "should have consistent ranks" do
@@ -103,12 +103,12 @@ module ICU
         end
 
         it "should have correct details for selected players" do
-          @t.player(15).signature.should == "Talazec, Laurent|10692|1570|5.5|1|1234567|WWWDDDW|WWBWBWB|FTTTTTT"  # winner
-          @t.player(6).signature.should  == "Foenander, Phillip|7168|1434|4.0|7|1234567|WLWLLWW|BWBWBWB|TTFFTTT" # had some byes
-          @t.player(19).signature.should == "Wall, Robert|||3.0|14|34567|WWLWL|WWBBW|FTTTT"                       # didn't play 1st 2 rounds
-          @t.player(17).signature.should == "Freeman, Conor|||2.0|16|1234567|DDLWLLL|--BWBWB|FFTTTTT"             # had byes and bonus (in BONUS)
-          @t.player(18).signature.should == "Freeman, Ruiri|||2.0|17|1234567|DDLLLLW|--WBBWB|FFTTTTF"             # had byes and bonus (in BONUS)
-          @t.player(16).signature.should == "O'Connor, David|||1.0|19|123|WLL|WBW|FTF"                            # last
+          @t.player(15).signature.should == "Talazec, Laurent|10692||1570|5.5|1|1234567|WWWDDDW|WWBWBWB|FTTTTTT"  # winner
+          @t.player(6).signature.should  == "Foenander, Phillip|7168||1434|4.0|7|1234567|WLWLLWW|BWBWBWB|TTFFTTT" # had some byes
+          @t.player(19).signature.should == "Wall, Robert||||3.0|14|34567|WWLWL|WWBBW|FTTTT"                       # didn't play 1st 2 rounds
+          @t.player(17).signature.should == "Freeman, Conor||||2.0|16|1234567|DDLWLLL|--BWBWB|FFTTTTT"             # had byes and bonus (in BONUS)
+          @t.player(18).signature.should == "Freeman, Ruiri||||2.0|17|1234567|DDLLLLW|--WBBWB|FFTTTTF"             # had byes and bonus (in BONUS)
+          @t.player(16).signature.should == "O'Connor, David||||1.0|19|123|WLL|WBW|FTF"                            # last
         end
 
         it "should have consistent ranks" do
@@ -133,10 +133,10 @@ module ICU
         end
 
         it "should have correct details for selected players" do
-          @t.player(15).signature.should == "Gupta, Radhika||1247|3.0|1|123|WWW|BBW|TTT"            # won all his games
-          @t.player(18).signature.should == "Hurley, Thomas|6292|820|1.0|14|1|W|B|F"                 # scored just 1 from a bye in R1
-          @t.player(8).signature.should  == "Berney, Mark|10328|1948|2.0|3|23|WW|BW|TT"             # didn't play in round 1
-          @t.player(10).signature.should == "O'Donnell, Conor E.|10792|1073|2.0|10|123|LWW|WBW|TFT"  # got just 1 point for a bye
+          @t.player(15).signature.should == "Gupta, Radhika|||1247|3.0|1|123|WWW|BBW|TTT"            # won all his games
+          @t.player(18).signature.should == "Hurley, Thomas|6292||820|1.0|14|1|W|B|F"                 # scored just 1 from a bye in R1
+          @t.player(8).signature.should  == "Berney, Mark|10328||1948|2.0|3|23|WW|BW|TT"             # didn't play in round 1
+          @t.player(10).signature.should == "O'Donnell, Conor E.|10792||1073|2.0|10|123|LWW|WBW|TFT"  # got just 1 point for a bye
         end
 
         it "should have consistent ranks" do
@@ -161,11 +161,11 @@ module ICU
         end
 
         it "should have correct details for selection of players who got bonuses (in MEMO)" do
-          @t.player(23).signature.should == "Long, Killian|10293|1506|2.5|33|123456|WDLLWL|WWBWBB|TFTTTT"
-          @t.player(26).signature.should == "Bradley, Michael|6756|1413|3.0|26|123456|DDLWWL|BWWBWW|TFTTTT"
-          @t.player(15).signature.should == "Twomey, Pat|1637|1656|4.5|7|123456|WDLWWW|WWWBWB|FFTTTT"
-          @t.player(46).signature.should == "O'Riordan, Pat|10696|900|2.0|42|123456|LDDLDD|BWBWWB|TTTTFT"
-          @t.player(38).signature.should == "Gill, Craig I.|10637|1081|2.0|43|123456|LLWDDL|BWBWWB|TTTTFT"
+          @t.player(23).signature.should == "Long, Killian|10293|2|1506|2.5|33|123456|WDLLWL|WWBWBB|TFTTTT"
+          @t.player(26).signature.should == "Bradley, Michael|6756|27|1413|3.0|26|123456|DDLWWL|BWWBWW|TFTTTT"
+          @t.player(15).signature.should == "Twomey, Pat|1637|22|1656|4.5|7|123456|WDLWWW|WWWBWB|FFTTTT"
+          @t.player(46).signature.should == "O'Riordan, Pat|10696||900|2.0|42|123456|LDDLDD|BWBWWB|TTTTFT"
+          @t.player(38).signature.should == "Gill, Craig I.|10637|28|1081|2.0|43|123456|LLWDDL|BWBWWB|TTTTFT"
         end
 
         it "should have consistent ranks" do
@@ -186,18 +186,18 @@ module ICU
         end
 
         it "should have correct details for selection of players, including ICU IDs" do
-          @t.player(2).signature.should  == "Szabo, Gergely|12379|2530|4.0|4|1234|WWWW|WBWB|TTTT"
-          @t.player(5).signature.should  == "Daly, Colm|295|2314|3.5|7|1234|WWWD|WBWB|TTTT"
-          @t.player(8).signature.should  == "Vega, Marcos Llaneza||2475|3.0|16|1234|DDWW|BWBW|TTTT"
-          @t.player(67).signature.should == "Lee, Shane|780|1633|1.0|52|134|DLD|WWW|TTT"
+          @t.player(2).signature.should  == "Szabo, Gergely|12379|1205064|2530|4.0|4|1234|WWWW|WBWB|TTTT"
+          @t.player(5).signature.should  == "Daly, Colm|295|2500434|2314|3.5|7|1234|WWWD|WBWB|TTTT"
+          @t.player(8).signature.should  == "Vega, Marcos Llaneza||2253585|2475|3.0|16|1234|DDWW|BWBW|TTTT"
+          @t.player(67).signature.should == "Lee, Shane|780||1633|1.0|52|134|DLD|WWW|TTT"
         end
 
-        it "should have correct details for selection of players, including international IDs and ratings when so configured" do
-          @t = @p.parse_file(SAMPLES + 'ncc', :start => "2010-05-08", :id => 'intl', :rating => :intl)
-          @t.player(2).signature.should  == "Szabo, Gergely|1205064||4.0|4|1234|WWWW|WBWB|TTTT"
-          @t.player(5).signature.should  == "Daly, Colm|2500434||3.5|7|1234|WWWD|WBWB|TTTT"
-          @t.player(8).signature.should  == "Vega, Marcos Llaneza|2253585||3.0|16|1234|DDWW|BWBW|TTTT"
-          @t.player(67).signature.should == "Lee, Shane|||1.0|52|134|DLD|WWW|TTT"
+        it "should have correct details for selection of players, including international ratings when so configured" do
+          @t = @p.parse_file(SAMPLES + 'ncc', :start => "2010-05-08", :rating => :intl)
+          @t.player(2).signature.should  == "Szabo, Gergely|12379|1205064||4.0|4|1234|WWWW|WBWB|TTTT"
+          @t.player(5).signature.should  == "Daly, Colm|295|2500434||3.5|7|1234|WWWD|WBWB|TTTT"
+          @t.player(8).signature.should  == "Vega, Marcos Llaneza||2253585||3.0|16|1234|DDWW|BWBW|TTTT"
+          @t.player(67).signature.should == "Lee, Shane|780|||1.0|52|134|DLD|WWW|TTT"
         end
       end
 
@@ -293,10 +293,10 @@ module ICU
         end
 
         it "should have correct details for selection of players, including ICU IDs" do
-          @t.player(2).signature.should  == "Szabo, Gergely|12379|2530|4.0|4|1234|WWWW|WBWB|TTTT"
-          @t.player(5).signature.should  == "Daly, Colm|295|2314|3.5|7|1234|WWWD|WBWB|TTTT"
-          @t.player(8).signature.should  == "Vega, Marcos Llaneza||2475|3.0|16|1234|DDWW|BWBW|TTTT"
-          @t.player(67).signature.should == "Lee, Shane|780|1633|1.0|52|134|DLD|WWW|TTT"
+          @t.player(2).signature.should  == "Szabo, Gergely|12379|1205064|2530|4.0|4|1234|WWWW|WBWB|TTTT"
+          @t.player(5).signature.should  == "Daly, Colm|295|2500434|2314|3.5|7|1234|WWWD|WBWB|TTTT"
+          @t.player(8).signature.should  == "Vega, Marcos Llaneza||2253585|2475|3.0|16|1234|DDWW|BWBW|TTTT"
+          @t.player(67).signature.should == "Lee, Shane|780||1633|1.0|52|134|DLD|WWW|TTT"
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Mark Orr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +01:00
+date: 2010-10-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency