icu_tournament 1.9.5 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74df6f6b05bbaf0a54ce055e247c4ece9e64ec16
-  data.tar.gz: 427004e7f6b7fab5a6b632fd3b4ea38a21ffcdfe
+SHA256:
+  metadata.gz: c9f5ebb60437a28fd66022167c933153271bcd138c47503b3a6082f8ffb2c235
+  data.tar.gz: e59666cca208d270d61b787625c356779003c289836bb613ecfa63542a12ff6f
 SHA512:
-  metadata.gz: 027f715f83f6eeab51c8aeab5d42b9bacd004cebcd8557c8f0792c160c1ebc4ed55641d670ea41173e8dacaf19ca1e53d32546a0f07048661e71281ddc3732d5
-  data.tar.gz: eb3fe4ae2559df38e4a127aa571e0956833626bea49f0dda5a59cde0ad625c29e433e3a2b48139f75a9ab675d79cbb2db88b0a5df07f9225f04d0c5418fb66ea
+  metadata.gz: 53991697d9454d160f34b4e30139f08965af76ed53833b671a15a927f829707fed16242dca1640acb878e7a6c90311fb43c985a4395776e37a38d7acd0cf083d
+  data.tar.gz: b580e1fd42864b5fbc363a33f0efa44c380e05cba236d308b7d968663b04d1c81bd97fb847a300e71db154e3f5ae872f4b2c5654ebf4e455d65b7262adc873c7

data/README.rdoc

@@ -4,7 +4,7 @@ For reading or writing files of chess tournament data. Original project name on
 
 == Install
 
-For Ruby 1.9.2, 1.9.3, 2.0.0 (version 1.1.2 was the last compatible with Ruby 1.8.7).
+For Ruby 1.9.2, 1.9.3, 2.0.0, 2.2.1 (version 1.1.2 was the last compatible with Ruby 1.8.7).
 
   gem install icu_tournament
 
@@ -74,3 +74,7 @@ On error, the _parse_ method returns _nil_ and an error message can be retrieved
 == Author
 
 Mark Orr, rating officer for the Irish Chess Union (ICU[http://icu.ie]).
+
+== Current Maintainer
+
+David Murray, rating officer for the Irish Chess Union. Contact ratings@icu.ie.

data/lib/icu_tournament/player.rb

@@ -119,7 +119,6 @@ module ICU
     # Canonicalise and set the first name(s).
     def first_name=(first_name)
       name = Name.new(first_name, 'Last')
-      raise "invalid first name" unless name.first.length > 0
       @first_name = name.first
     end
 
@@ -154,6 +153,7 @@ module ICU
       @title << 'M' if @title.match(/[A-LN-Z]$/)
       @title = 'IM' if @title == 'M'
       @title = 'WIM' if @title == 'WM'
+      @title = '' if @title.match(/^(AFM|AIM|AGM)$/)
       @title = nil if @title == ''
       raise "invalid chess title (#{title})" unless @title.nil? || @title.match(/^W?[GIFCN]M$/)
     end
@@ -235,4 +235,4 @@ module ICU
       end
     end
   end
-end
+end

data/lib/icu_tournament/result.rb

@@ -129,7 +129,7 @@ module ICU
     def opponent=(opponent)
       @opponent = case opponent
         when nil     then nil
-        when Fixnum  then opponent
+        when Integer then opponent
         when /^\s*$/ then nil
         else opponent.to_i
       end
@@ -198,4 +198,4 @@ module ICU
       true
     end
   end
-end
+end

data/lib/icu_tournament/tournament.rb

@@ -379,6 +379,44 @@ module ICU
       self
     end
 
+    # Make an educated guess at round dates.
+    # If only one round, it is on the start date
+    # If start and end date match, all rounds are on that day
+    # If there are exactly two rounds, round 1 on the start day, round 2 on the finish day
+    # If there are between n and 2n rounds in n consecutive days, then
+    #    start with one round a day, switch to two rounds a day when that's needed
+    # If there are 7 rounds Saturday - Sunday > 1 week: two on the first 3 weekend dates, one on the final Sunday
+    # This covers most Irish tournaments. Returns an empty array if it could not guess
+    def guess_round_dates
+      return [@start] if rounds == 1
+      return [] if @finish.nil?
+
+      round_dates = []
+      start_date = ::Date.parse(@start)
+      finish_date = ::Date.parse(@finish)
+      ndays = (finish_date - start_date).to_i + 1
+      if ndays == 1
+        rounds.times { round_dates << start }
+      elsif rounds == 2
+        round_dates << start
+        round_dates << finish
+      elsif ndays <= rounds and rounds <= ndays * 2
+        double_rounds = rounds - ndays
+        (0...ndays).each do |r|
+          round_dates << start_date + r
+          if r >= (ndays - double_rounds)
+            round_dates << start_date + r
+          end
+        end
+      elsif rounds == 7 and start_date.wday == 6 and finish_date.wday == 0 and ndays > 7
+        2.times { round_dates << start_date }
+        2.times { round_dates << start_date + 1 }
+        2.times { round_dates << finish_date - 1 }
+        round_dates << finish_date
+      end
+      return round_dates
+    end
+
     # Is a tournament invalid? Either returns false (if it's valid) or an error message.
     # Has the same _rerank_ option as validate!.
     def invalid(options={})

data/lib/icu_tournament/tournament_fcsv.rb

@@ -336,7 +336,7 @@ module ICU
             if old_player.id
               old_player.merge(opponent)
               old_result = @player.find_result(@round)
-              raise "missing result for player (#{@player.name}) in round #{@round}" unless old_result
+              raise "result for player (#{@player.name}) in round #{@round} does not match previous result for opponent (#{old_player.name})" unless old_result
               raise "mismatched results for player (#{old_player.name}): #{result.inspect} #{old_result.inspect}" unless result.eql?(old_result)
             else
               old_result = old_player.find_result(@round)

data/lib/icu_tournament/tournament_krause.rb

@@ -326,9 +326,13 @@ module ICU
           krause << "\n"
         end
         rounds = t.last_round
-        if t.round_dates.size == rounds && rounds > 0
+        round_dates = t.round_dates
+        if round_dates.empty?
+          round_dates = t.guess_round_dates.map { |d| d.to_s }
+        end
+        if round_dates.size == rounds && rounds > 0
           krause << "132 #{' ' * 85}"
-          t.round_dates.each{ |d| krause << d.sub(/^../, '  ') }
+          round_dates.each{ |d| krause << d.sub(/^../, '  ') }
           krause << "\n"
         end
         t.players.each{ |p| krause << p.to_krause(rounds, arg) }
@@ -433,11 +437,18 @@ 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
-        score    = $3
+        data = "#{data} -" if data.match(/^(\d+)? (w|b|-)$/)
+        if data.match(/^(0{1,4}|[1-9]\d{0,3}) (w|b|-) (1|0|=|\+|-)$/)
+          opponent = $1.to_i
+          colour   = $2
+          score    = $3
+        elsif data.match(/- (1|0|=|\+|-)$/)
+          opponent = 0
+          colour = "-"
+          score = $1
+        else
+          raise "invalid result '#{data}'"
+        end
         options  = Hash.new
         options[:opponent] = opponent unless opponent == 0
         options[:colour]   = colour   unless colour == '-'
@@ -459,7 +470,7 @@ module ICU
         return false unless total <= sum + full_byes.size * 1.0 + half_byes.size * 0.5
         full_byes.each_index do |i|
           bye = full_byes[i]
-          if bye.class == Fixnum
+          if bye.class == Integer
             # Round number - create a half-point bye in that round.
             result = Result.new(bye, player, '=')
             @results << ['none', player, "extra bye for player #{player} in round #{bye}", result]

data/lib/icu_tournament/util.rb

@@ -72,7 +72,7 @@ module ICU
         names.each do |name|
           attr_accessor(name) do |val|
             tmp = val.to_i
-            raise "invalid integer (#{val}) for #{name}" unless val.is_a?(Fixnum) || (val.is_a?(::String) && val.include?(tmp.to_s))
+            raise "invalid integer (#{val}) for #{name}" unless val.is_a?(Integer) || (val.is_a?(::String) && val.include?(tmp.to_s))
             tmp
           end
         end
@@ -83,7 +83,7 @@ module ICU
           attr_accessor(name) do |val|
             tmp = case val
               when nil      then nil
-              when Fixnum   then val
+              when Integer   then val
               when /^\s*$/  then nil
               else val.to_i
             end
@@ -108,7 +108,7 @@ module ICU
           attr_accessor(name) do |val|
             tmp = case val
               when nil      then nil
-              when Fixnum   then val
+              when Integer   then val
               when /^\s*$/  then nil
               else val.to_i
             end
@@ -166,4 +166,4 @@ module ICU
       end
     end
   end
-end
+end

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.9.5"
+    VERSION = "1.11.0"
   end
 end

data/spec/player_spec.rb

@@ -31,13 +31,11 @@ module ICU
       end
 
       it "should not contain invalid characters" do
-        expect { Player.new('12', 'Orr', 1) }.to raise_error(/invalid first name/)
         expect { Player.new('Mark', '*!', 1) }.to raise_error(/invalid last name/)
       end
 
-      it "should not have empty last name or first name" do
+      it "should not have empty last name" do
         expect { Player.new('Mark', '', 1) }.to raise_error(/invalid last name/)
-        expect { Player.new('', 'Orr', 1) }.to raise_error(/invalid first name/)
       end
 
       it "both names can be returned together" do
@@ -135,6 +133,10 @@ module ICU
         expect(Player.new('Eamon', 'Keogh', 6, :title => 'nm').title).to eq('NM')
         expect { Player.new('Mark', 'Orr', 3, :title => 'Dr') }.to raise_error(/invalid chess title/)
       end
+
+      it "should ignore Arena titles" do
+        expect(Player.new('Darko', 'Polimac', 3, :title => 'AGM').title).to be_nil
+      end
     end
 
     context "rating" do
@@ -371,4 +373,4 @@ module ICU
       end
     end
   end
-end
+end

data/spec/tournament_krause_spec.rb

@@ -299,6 +299,10 @@ REORDERED
 
       context "serialisation of a manually built tournament" do
         before(:all) do
+          @dates = <<DATES
+132                                                                                        08-06-07  08-06-08  08-06-09
+DATES
+          @dates.strip!
           @krause = <<KRAUSE
 012 Las Vegas National Open
 042 2008-06-07
@@ -321,6 +325,15 @@ KRAUSE
         it "should serialise" do
           expect(@output).to eq(@krause)
         end
+
+        it "should add round dates" do
+          @t.rounds = 3
+          @t.finish = ::Date.parse('2008-06-09')
+          output = @p.serialize(@t)
+          expect(output).not_to eq(@krause)
+          expect(output).to match(@dates)
+        end
+
       end
 
       context "customised serialisation with ICU IDs" do
@@ -807,6 +820,12 @@ KRAUSE
           expect { @p.parse_file!(file) }.not_to raise_error
         end
 
+        it "should handle Cork Major 2018 (Swiss Master format)" do
+          file = "#{@s}/cork_major_2018_swissmaster.tab"
+          @t = @p.parse_file(file, :fed => :ignore)
+          check_results(1, 6, 3.5)
+        end
+
         it "should handle a file with a BOM" do
           file = "#{@s}/armstrong_2012_with_bom.tab"
           expect { @p.parse_file!(file) }.not_to raise_error

data/spec/tournament_spec.rb

@@ -210,6 +210,53 @@ EOS
       end
     end
 
+    context "guess round date" do
+      before(:each) do
+        @ennis = Tournament.new('Ennis Shield Round 1', '2019-09-24', :rounds => 1)
+        @u12 = Tournament.new('Leinster U12', '2019-01-05', :finish => '2019-01-05', :rounds => 4)
+        @armstrong = Tournament.new('Armstrong Cup Rounds 1-2', '2019-09-28', :finish => '2019-10-14', :rounds => 2)
+        @irish = Tournament.new('Irish Championship', '2019-08-03', :finish => '2019-08-11', :rounds => 9)
+        @malahide = Tournament.new('Malahide Millenium', '2019-05-04', :finish => '2019-05-06', :rounds => 6)
+        @gonzaga = Tournament.new('Gonzaga Classic', '2019-01-25', :finish => '2019-01-27', :rounds => 5)
+        @sona = Tournament.new('Sona Super Cup U14', '2018-10-20', :finish => '2018-11-25', :rounds => 7)
+      end
+
+      it "should get one round date when only one round" do
+        guess = @ennis.guess_round_dates
+        expect(guess.join('|')).to eq('2019-09-24')
+      end
+
+      it "should get all rounds on right day when only one day" do
+        guess = @u12.guess_round_dates
+        expect(guess.join('|')).to eq('2019-01-05|2019-01-05|2019-01-05|2019-01-05')
+      end
+
+      it "two rounds" do
+        guess = @armstrong.guess_round_dates
+        expect(guess.join('|')).to eq('2019-09-28|2019-10-14')
+      end
+
+      it "9 rounds in 9 days" do
+        guess = @irish.guess_round_dates
+        expect(guess.join('|')).to eq('2019-08-03|2019-08-04|2019-08-05|2019-08-06|2019-08-07|2019-08-08|2019-08-09|2019-08-10|2019-08-11')
+      end
+
+      it "6 rounds in 3 days" do
+        guess = @malahide.guess_round_dates
+        expect(guess.join('|')).to eq('2019-05-04|2019-05-04|2019-05-05|2019-05-05|2019-05-06|2019-05-06')
+      end
+
+      it "5 rounds in 3 days" do
+        guess = @gonzaga.guess_round_dates
+        expect(guess.join('|')).to eq('2019-01-25|2019-01-26|2019-01-26|2019-01-27|2019-01-27')
+      end
+
+      it "7 rounds in 2 weekends" do
+        guess = @sona.guess_round_dates
+        expect(guess.join('|')).to eq('2018-10-20|2018-10-20|2018-10-21|2018-10-21|2018-11-24|2018-11-24|2018-11-25')
+      end
+    end
+
     context "site" do
       it "defaults to nil" do
         expect(Tournament.new('Edinburgh Masters', '2009-11-09').site).to be_nil

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: icu_tournament
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.11.0
 platform: ruby
 authors:
 - Mark Orr
+- David Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
@@ -58,14 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +131,7 @@ dependencies:
         version: '4.2'
 description: Convert files of chess tournament data in different formats to ruby classes
   and vice-versa.
-email: mark.j.l.orr@googlemail.com
+email: davidmurray11@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -156,7 +163,7 @@ files:
 - spec/tournament_spec.rb
 - spec/tournament_spx_spec.rb
 - spec/util_spec.rb
-homepage: http://github.com/sanichi/icu_tournament
+homepage: http://github.com/dbtmurray/icu_tournament
 licenses:
 - MIT
 metadata: {}
@@ -168,27 +175,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: icu_tournament
-rubygems_version: 2.4.5
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: For reading and writing files of chess tournament data.
 test_files:
-- spec/player_spec.rb
-- spec/result_spec.rb
-- spec/spec_helper.rb
 - spec/team_spec.rb
-- spec/tie_break_spec.rb
-- spec/tournament_fcsv_spec.rb
-- spec/tournament_krause_spec.rb
-- spec/tournament_sp_spec.rb
+- spec/player_spec.rb
 - spec/tournament_spec.rb
+- spec/tournament_fcsv_spec.rb
+- spec/tie_break_spec.rb
 - spec/tournament_spx_spec.rb
+- spec/result_spec.rb
 - spec/util_spec.rb
+- spec/spec_helper.rb
+- spec/tournament_sp_spec.rb
+- spec/tournament_krause_spec.rb