icu_tournament 1.5.0 → 1.5.1

data/lib/icu_tournament/tournament_krause.rb

@@ -392,6 +392,9 @@ module ICU
         # Ratings are assumed to be local unless otherwise specified.
         rating = @data[44, 4].to_i
         opt[arg[:fide] ? :fide_rating : :rating] = rating if rating > 0 && rating < 4000
+        
+        # Obviously wrong DOBs should just be ignored.
+        opt[:dob] = '' unless opt[:dob].match(/\d/);
 
         # IDs can be determined to be FIDE or ICU on the basis of their size.
         id = @data[53, 11].to_i
@@ -430,6 +433,7 @@ module ICU
           full_byes << round
           return 0.0
         end
+        data = "#{data} -" if data.match(/^\d+ (w|b|-)$/)
         raise "invalid result '#{data}'" unless data.match(/^(0{1,4}|[1-9]\d{0,3}) (w|b|-) (1|0|=|\+|-)$/)
         opponent = $1.to_i
         colour   = $2

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

data/spec/tournament_krause_spec.rb

@@ -259,7 +259,7 @@ KRAUSE
           check_player(2, 'Mark',      'Orr',          :rating => nil, :fide_rating => 2258)
           check_player(3, 'Viktor',    'Bologan',      :rating => nil, :fide_rating => 2663)
         end
-        
+
         it "should auto-detect FIDE or ICU IDs based on size, the option has no effect" do
           @t = @p.parse(@krause)
           check_player(1, 'Gearoidin', 'Ui Laighleis', :id => nil,  :fide_id => 2501171)
@@ -285,9 +285,10 @@ KRAUSE
 012 Las Vegas National Open
 042 2008-06-07
 001    1 m  m Orr,Mark                          2258 IRL                         2.0    1     2 w 1               3 b 1
-001    2 w    Ui Laighleis,Gearoidin            1985 IRL                         1.0    2     1 b 0     3 w 1          
+001    2 w    Ui Laighleis,Gearoidin            1985 IRL                         1.0    2     1 b 0     3 w 1          #
 001    3 m  g Bologan,Viktor                    2663 MDA                         0.0    3               2 b 0     1 w 0
 REORDERED
+          @reordered.sub!('#', '')
         end
 
         it "should serialise correctly after renumbering by rank" do
@@ -301,10 +302,11 @@ REORDERED
           @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    1 w    Ui Laighleis,Gearoidin            1985 IRL     2501171 1964-06-10  1.0          2 b 0     3 w 1          #
 001    2    m Orr,Mark                          2258 IRL     2500035 1955-11-09  2.0          1 w 1               3 b 1
 001    3    g Bologan,Viktor                    2663 MDA    13900048 1971-01-01  0.0                    1 b 0     2 w 0
 KRAUSE
+          @krause.sub!('#', '')
           @p = ICU::Tournament::Krause.new
           @t = ICU::Tournament.new('Las Vegas National Open', '2008-06-07')
           @t.add_player(ICU::Player.new('Gearoidin', 'Ui Laighleis', 1, :rating => 1985, :id => 2501171,  :dob => '1964-06-10', :fed => 'IRL', :gender => 'f'))
@@ -327,10 +329,11 @@ KRAUSE
 012 Las Vegas National Open
 042 2008-06-07
 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
-001    1 w    Ui Laighleis,Gearoidin            1985 IRL        3364 1964-06-10  1.0    2     2 b 0     3 w 1          
+001    1 w    Ui Laighleis,Gearoidin            1985 IRL        3364 1964-06-10  1.0    2     2 b 0     3 w 1          #
 001    2    m Orr,Mark                          2258 IRL        1350 1955-11-09  2.0    1     1 w 1               3 b 1
 001    3    g Svidler,Peter                     2663 RUS       16790 1971-01-01  0.0    3               1 b 0     2 w 0
 KRAUSE
+          @k.sub!('#', '')
           @p = ICU::Tournament::Krause.new
           @t = @p.parse(@k)
         end
@@ -376,7 +379,7 @@ KRAUSE
           text.should match(/001    2    m Orr,Mark                          2258 IRL        1350 1955-11-09  2.0    1/)
           text.should match(/001    3    g Svidler,Peter                     2663 RUS       16790 1971-01-01  0.0    3/)
         end
-        
+
         it "the :only and :except options are logical opposites" do
           @t.serialize('Krause', :only => [:gender, :title, :rating]).should == @t.serialize('Krause', :except => [:fed, :id, "dob", :rank])
           @t.serialize('Krause', :only => [:gender]).should == @t.serialize('Krause', :except => [:fed, :id, :dob, :rank, :title, :rating])
@@ -392,10 +395,11 @@ KRAUSE
 012 Las Vegas National Open
 042 2008-06-07
 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
-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 Orr,Mark                          2258 IRL     2500035 1955-11-09  2.0    1     1 w 1               3 b 1
 001    3    g Svidler,Peter                     2663 RUS     4102142 1971-01-01  0.0    3               1 b 0     2 w 0
 KRAUSE
+          @k.gsub!('#', '')
           @p = ICU::Tournament::Krause.new
           @t = @p.parse(@k, :fide => true)
         end
@@ -566,7 +570,7 @@ KRAUSE
           @t.name.should == "Läs Végas National Opeñ"
         end
       end
-      
+
       context "preserving original names" do
         before(:all) do
           @k = <<KRAUSE
@@ -774,6 +778,16 @@ KRAUSE
           file = "#{@s}/bunratty_challengers_2011.tab"
           lambda { @p.parse_file!(file, :fed => :ignore) }.should_not raise_error
         end
+
+        it "should handle Irish Intermediate Championships 2011" do
+          file = "#{@s}/irish_intermediate_champs_2011.tab"
+          lambda { @p.parse_file!(file) }.should_not raise_error
+        end
+
+        it "should handle Irish Junior Championships 2011" do
+          file = "#{@s}/irish_junior_champs_2011.tab"
+          lambda { @p.parse_file!(file) }.should_not raise_error
+        end
       end
     end
   end

metadata

@@ -1,137 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: icu_tournament
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.5.1
   prerelease: 
-  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Mark Orr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-06 00:00:00.000000000 +01:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dbf
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161738940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161738940
+- !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2161738220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161738220
+- !ruby/object:Gem::Dependency
   name: icu_name
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2161737640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161737640
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2161736720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161736720
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2161735980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161735980
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2161735360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161735360
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2161734780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161734780
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2161734340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161734340
+- !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2161733820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161733820
+- !ruby/object:Gem::Dependency
   name: growl
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2161733380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-description: Convert files of chess tournament data in different formats to ruby classes and vice-versa.
+  version_requirements: *2161733380
+description: Convert files of chess tournament data in different formats to ruby classes
+  and vice-versa.
 email: mark.j.l.orr@googlemail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENCE
 - README.rdoc
-files: 
+files:
 - lib/icu_tournament/federation.rb
 - lib/icu_tournament/player.rb
 - lib/icu_tournament/result.rb
@@ -159,40 +158,38 @@ files:
 - spec/util_spec.rb
 - LICENCE
 - README.rdoc
+has_rdoc: true
 homepage: http://github.com/sanichi/icu_tournament
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3338096865289385673
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2393290451362669331
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3338096865289385673
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2393290451362669331
 requirements: []
-
 rubyforge_project: icu_tournament
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: For reading and writing files of chess tournament data.
-test_files: 
+test_files:
 - spec/federation_spec.rb
 - spec/player_spec.rb
 - spec/result_spec.rb