icu_tournament 1.0.10 → 1.0.11

data/lib/icu_tournament/tournament_sp.rb

@@ -50,10 +50,18 @@ ratings or IDs are required instead, use the options _id_ and _rating_. For exam
   tournament.player(2).id         # =>  12379 (ICU ID)
   tournament.player(2).rating     # =>  2556  (ICU rating)
 
-  tournament = parser.parse_file('ncc', :start => '2010-05-08', :id => :intl, :rating => :intl)
+  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)
 
+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:
+
+  tournament = parser.parse_file('ncc', :start => '2010-05-08', :fed == 'skip')    # => silently skips invalid federations
+  tournament = parser.parse_file('ncc', :start => '2010-05-08', :fed == 'ignore')  # => ignores all federations
+
+Note that federations that don't match 3 letters are always silently skipped.
+
 Because the data is in three parts, some of which are in a legacy binary format, serialization to this format is
 not supported. Instead, a method is provided to serialize any tournament type into the text export format of
 <em>SwissPerfect</em>, an example of which is shown below.
@@ -277,6 +285,10 @@ See ICU::Tournament for more about tie-breaks.
           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
+          if pair[0] == :fed && val && arg[:fed]
+            val = nil if arg[:fed].to_s == 'ignore'
+            val = nil if arg[:fed].to_s == 'skip' && !ICU::Federation.find(val)
+          end
           hash[pair[0]] = val unless val.nil? || val == ''
           hash
         end

data/lib/icu_tournament/version.rb

@@ -1,5 +1,5 @@
 module ICU
   class Tournament
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

data/spec/tournament_sp_spec.rb

@@ -193,7 +193,7 @@ module ICU
         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 = @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"
@@ -201,6 +201,33 @@ module ICU
         end
       end
 
+      context "Drogheda Section A, 2010, with an invalid federation" do
+
+        before(:each) do
+          @p = ICU::Tournament::SwissPerfect.new
+        end
+
+        it "should not parse because of the invalid federation" do
+          t = @p.parse_file(SAMPLES + 'drog_a.zip', :start => "2010-06-04")
+          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
+          t.player(5).fed.should be_nil
+          t.player(6).fed.should be_nil
+        end
+      end
+
       context "Non-existant ZIP file" do
 
         before(:all) do
@@ -272,7 +299,7 @@ module ICU
           @t.player(67).signature.should == "Lee, Shane|780|1633|1.0|52|134|DLD|WWW|TTT"
         end
       end
-      
+
       context "ZIP file without a ZIP ending" do
 
         before(:all) do
@@ -287,7 +314,7 @@ module ICU
           lambda { @p.parse_file!(SAMPLES + 'nccz.piz', :zip => true, :start => "2010-05-08") }.should_not raise_error
         end
       end
-      
+
       context "Defaulting the start date" do
 
         before(:all) do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Mark Orr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +01:00
+date: 2010-09-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency