icu_tournament 1.9.7 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f1c6f7bc5da88c02ef93bb645ea1c66a74a524c9660228b113a9534dda9fe1
-  data.tar.gz: 2aabe2659d391ce17af265bc90bbad37e23b358eb869f2223fa84b8cf33f6ec3
+  metadata.gz: 10ccb760bf0c8acf97cdd786e8a5f3f42c97604094b95b011890fca5a53c6c21
+  data.tar.gz: 29fc8cf00fc3e950bb36a36e26f5ed9ce1c6f23960b35d05172a0ef2597ce579
 SHA512:
-  metadata.gz: cb4e37782391a243362b0852538dd032f5c6a291ea0e404ffa110e28ed2df3593d182a35628f70a3044e915a5ff303959fdf4d344c6e9ebb3066bf9b6640b846
-  data.tar.gz: 932cf6f1d651cda6edf1d7fb93f6dc999be911e2009bcdd7c816ff9dde9ba48f3b80197fdaed81d1a960a7284a4f619e46d379da2e8d30763d107dbe9dd3f36d
+  metadata.gz: 6adf8f1414bbf4514c2cf441964381b5fa7e40397b6ac7ff0e710f158788ae4ff3fc66ebf1dac79f269f797cfb2fe389dedae9c8be06ab2ceb47ba4de11b1ff0
+  data.tar.gz: d2127da4cb39dc6d8bdf18b4832b35dfbf285e0d203d0ec2c0ea162f95c25ddb397dff3db66ba852279642c7ff8da478acd15e664dd44da36a31632ae2673b30

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
 
@@ -235,4 +234,4 @@ module ICU
       end
     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) }

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.9.7"
+    VERSION = "1.9.8"
   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
@@ -371,4 +369,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

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.7
+  version: 1.9.8
 platform: ruby
 authors:
 - Mark Orr
+- David Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
@@ -124,7 +125,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 +157,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: {}
@@ -181,14 +182,14 @@ signing_key:
 specification_version: 4
 summary: For reading and writing files of chess tournament data.
 test_files:
-- spec/result_spec.rb
-- spec/tournament_fcsv_spec.rb
 - spec/team_spec.rb
-- spec/util_spec.rb
 - spec/player_spec.rb
 - spec/tournament_spec.rb
-- spec/tournament_krause_spec.rb
-- spec/tournament_sp_spec.rb
+- spec/tournament_fcsv_spec.rb
 - spec/tie_break_spec.rb
-- spec/spec_helper.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