icu_tournament 1.3.4 → 1.3.5

data/lib/icu_tournament/player.rb

@@ -3,13 +3,28 @@ module ICU
   # A player in a tournament must have a first name, a last name and a number
   # which is unique in the tournament but otherwise arbitary.
   #
-  #   bobby = ICU::Player.new('robert j', 'fischer', 17)
+  #   bobby = ICU::Player.new(' robert  j ', 'fischer', 17)
   #
   # Names are automatically cannonicalised (tidied up).
   #
   #   bobby.first_name                 # => 'Robert J.'
   #   bobby.last_name                  # => 'Fischer'
   #
+  # But the original untidied (other than white space cleanup and the addition of a comma
+  # to separate last name from first name) is avaiable from the _original_name_ method:
+  #
+  #   bobby.original_name              # => "fischer, robert j"
+  #
+  # This original name, set via the constructor, is unchanged by subsequent calls to
+  # the setter methods _first_name_ or _last_name.
+  #
+  #   booby.first_name = 'Robert James'
+  #   bobby.original_name              # => "fischer, robert j"
+  #
+  #  You can reset _orignal_name_, if necessary, and this does not affect either _first_name_ or _last_name_.
+  #
+  #   bobby.original_name = "Fischer, Robert James"
+  #
   # In addition, players have a number of optional attributes which can be specified
   # via setters or in constructor hash options: _id_ (local or national ID), _fide_
   # (FIDE ID), _fed_ (federation), _title_, _rating_ (local rating), _fide_rating,
@@ -87,12 +102,13 @@ module ICU
     attr_positive_or_nil :id, :fide_id, :rating, :fide_rating, :rank
     attr_date_or_nil :dob
 
-    attr_reader :results, :first_name, :last_name, :fed, :title, :gender
+    attr_reader :results, :first_name, :last_name, :original_name, :fed, :title, :gender
 
     # Constructor. Must supply both names and a unique number for the tournament.
     def initialize(first_name, last_name, num, opt={})
       self.first_name = first_name
       self.last_name  = last_name
+      @original_name  = Name.new(first_name, last_name).original
       self.num        = num
       [:id, :fide_id, :fed, :title, :rating, :fide_rating, :rank, :dob, :gender].each do |atr|
         self.send("#{atr}=", opt[atr]) unless opt[atr].nil?
@@ -114,6 +130,11 @@ module ICU
       @last_name = name.last
     end
 
+    # Reset the original name.
+    def original_name=(original_name)
+      @original_name = ICU::Util.to_utf8(original_name)
+    end
+
     # Return the full name, last name first.
     def name
       "#{last_name}, #{first_name}"

data/lib/icu_tournament/tournament_krause.rb

@@ -261,7 +261,9 @@ module ICU
 
         # Player details.
         num = @data[0, 4]
-        nam = Name.new(@data[10, 32])
+        nam = @data[10, 32]
+        nams = nam.split(/,/)
+        raise "missing comma in name #{nam.trim}" unless nams.size > 1
         opt =
         {
           :gender => @data[5, 1],
@@ -272,7 +274,7 @@ module ICU
         }
         opt[arg[:fide] ? :fide_id : :id] = @data[53, 11]
         opt[arg[:fide] ? :fide_rating : :rating] = @data[44, 4]
-        player = Player.new(nam.first, nam.last, num, opt)
+        player = Player.new(nams.last, nams.first, num, opt)
         @tournament.add_player(player)
 
         # Results.

data/lib/icu_tournament/tournament_spx.rb

@@ -296,6 +296,7 @@ module ICU
 
         # Create the player and add it to the tournament.
         player = Player.new(name.first, name.last, num, opt)
+        player.original_name = name.original
         @tournament.add_player(player)
 
         # Save the results for later processing.

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
   end
 end

data/spec/player_spec.rb

@@ -18,6 +18,7 @@ module ICU
         p = Player.new('Mark', 'Orr', 1)
         p.first_name.should == 'Mark'
         p.last_name.should == 'Orr'
+        p.original_name.should == 'Orr, Mark'
       end
 
       it "should be resettable via accessors" do
@@ -26,6 +27,7 @@ module ICU
         p.last_name= 'Kasparov'
         p.first_name.should == 'Gary'
         p.last_name.should == 'Kasparov'
+        p.original_name.should == 'Orr, Mark'
       end
 
       it "should not contain invalid characters" do
@@ -33,7 +35,7 @@ module ICU
         lambda { Player.new('Mark', '*!', 1) }.should raise_error(/invalid last name/)
       end
 
-      it "should not have empty last name" do
+      it "should not have empty last name or first name" do
         lambda { Player.new('Mark', '', 1) }.should raise_error(/invalid last name/)
         lambda { Player.new('', 'Orr', 1) }.should raise_error(/invalid first name/)
       end
@@ -50,6 +52,16 @@ module ICU
         p.name.should == 'Orr, Z.'
         p.last_name = "  o   meFiSto  "
         p.name.should == "O'Mefisto, Z."
+        p.original_name.should == 'ORR, maRk J l'
+      end
+
+      it "the original name is resetable" do
+        p = Player.new('Mark', 'Orr', 1)
+        p.name.should == 'Orr, Mark'
+        p.original_name.should == 'Orr, Mark'
+        p.original_name = 'Cronin, April'
+        p.name.should == 'Orr, Mark'
+        p.original_name.should == 'Cronin, April'
       end
     end
 

data/spec/tournament_fcsv_spec.rb

@@ -237,6 +237,12 @@ CSV
           check_player(2, 'Gary',      'Kasparov',     1, 0, 0.5, :fide_rating => 2800, :fed => 'RUS', :title => 'GM')
           check_player(3, 'Mark',      'Orr',          1, 0, 0.5, :fide_rating => 2100, :fed => 'IRL', :title => 'IM')
         end
+        
+        it "should still have original names" do
+          @t.player(1).original_name.should == "ui Laighleis, gearoidin"
+          @t.player(2).original_name.should == "kasparov, gary"
+          @t.player(3).original_name.should == "Orr, Mark"
+        end
       end
 
       context "#parse" do

data/spec/tournament_krause_spec.rb

@@ -441,6 +441,29 @@ KRAUSE
           @t.name.should == "Läs Végas National Opeñ"
         end
       end
+      
+      context "preserving original names" do
+        before(:all) do
+          @k = <<KRAUSE
+012 Las Vegas National Open
+042 2008-06-07
+001    1 w    ui   laighleis,GEAROIDIN                                           1.0          2 b 0     3 w 1
+001    2 m  m ORR, mark                                                          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 canonicalise names but also preserve originals" do
+          @t = @p.parse!(@k)
+          check_player(1, 'Gearoidin', 'Ui Laighleis')
+          check_player(2, 'Mark', 'Orr')
+          check_player(3, 'Viktor', 'Bologan')
+          @t.player(1).original_name.should == "ui laighleis, GEAROIDIN"
+          @t.player(2).original_name.should == "ORR, mark"
+          @t.player(3).original_name.should == "BOLOGAN, VIKTOR"
+        end
+      end
 
       context "parsing files" do
         before(:each) do

data/spec/tournament_sp_spec.rb

@@ -44,6 +44,11 @@ module ICU
           @t.player(56).sp_signature.should == "McDonnell, Cathal|||498||0.0|54|1|L|-|F"                          # last
         end
 
+        it "original names should be preserved" do
+          @t.player(2).original_name.should == "MULLOOLY, neil m"
+          @t.player(4).original_name.should == "Gallagher, Mark"
+        end
+
         it "should have consistent ranks" do
           @t.players.map{ |p| p.rank }.sort.join('').should == (1..@t.players.size).to_a.join('')
         end

data/spec/tournament_spx_spec.rb

@@ -186,7 +186,7 @@ EXPORT
         end
       end
 
-      context "invisible bonuses extreme example" do
+      context "extreme invisible bonuses example" do
         before(:each) do
           @x = <<EXPORT
 No	Name          	Total	1  	2  	3
@@ -206,6 +206,32 @@ EXPORT
         end
       end
 
+      context "preservation of original names" do
+        before(:each) do
+          @x = <<EXPORT
+No	Name          	Total	1  	2  	3
+
+1 	daffy  duck    	2.0  	0: 	3:W	2:D
+2 	MOUSE,  minerva	1.5  	3:D	0: 	1:D
+3 	mouse,  MICKEY 	1.0  	2:D	1:L	0:D
+EXPORT
+          @p = ICU::Tournament::SPExport.new
+          @t = @p.parse!(@x, :name => "Mickey Mouse Masters", :start => "2012-01-01")
+        end
+
+        it "players should have canonicalised names" do
+          @t.player(1).name.should == 'Duck, Daffy'
+          @t.player(2).name.should == 'Mouse, Minerva'
+          @t.player(3).name.should == 'Mouse, Mickey'
+        end
+
+        it "players should have original names" do
+          @t.player(1).original_name.should == 'daffy duck'
+          @t.player(2).original_name.should == 'MOUSE, minerva'
+          @t.player(3).original_name.should == 'mouse, MICKEY'
+        end
+      end
+
       context "odds and ends" do
         before(:each) do
           @x = <<EXPORT

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: ruby
 authors: 
 - Mark Orr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 +00:00
+date: 2011-02-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency