sciolyff 0.10.0 → 0.11.0

data/lib/sciolyff/validator/teams.rb

@@ -2,6 +2,7 @@
 
 require 'sciolyff/validator/checker'
 require 'sciolyff/validator/sections'
+require 'sciolyff/validator/canonical'
 
 module SciolyFF
   # Checks for one team in the Teams section of a SciolyFF file
@@ -25,6 +26,7 @@ module SciolyFF
 
     def initialize(rep)
       initialize_teams_info(rep[:Teams])
+      @subdivisions = rep[:Subdivisions]&.map { |s| s[:name] } || []
       @placings = rep[:Placings].group_by { |p| p[:team] }
       @exempt = rep[:Tournament][:'exempt placings'] || 0
     end
@@ -45,6 +47,14 @@ module SciolyFF
         'as another team from the same school'
     end
 
+    def suffix_needed?(team, logger)
+      rep = [team[:school], team[:city], team[:state]]
+      return true unless team[:suffix] && @schools[rep].count == 1
+
+      logger.warn "team number #{team[:number]} may have unnecessary "\
+        "suffix: #{team[:suffix]}"
+    end
+
     def unambiguous_cities_per_school?(team, logger)
       return true unless @schools.keys.find do |other|
         team[:city].nil? && !other[1].nil? &&
@@ -64,18 +74,35 @@ module SciolyFF
         "exempt placings (#{count} insteand of #{@exempt})"
     end
 
+    def matching_subdivision?(team, logger)
+      sub = team[:subdivision]
+      return true if sub.nil? || @subdivisions.include?(sub)
+
+      logger.error "'subdivision: #{sub}' does not match any name in "\
+        'section Subdivisions'
+    end
+
     def in_a_subdivision_if_possible?(team, logger)
-      return true unless @subdivisions && !team[:subdivision]
+      return true unless !@subdivisions.empty? && !team[:subdivision]
 
       logger.warn "missing subdivision for 'team: #{team[:number]}'"
     end
 
+    include Validator::Canonical
+
+    def in_canonical_list?(team, logger)
+      rep = [team[:school], team[:city], team[:state]]
+      return true if canonical?(rep, 'schools.csv', logger)
+
+      location = rep[1..-1].compact.join ', '
+      logger.warn "non-canonical school: #{team[:school]} in #{location}"
+    end
+
     private
 
     def initialize_teams_info(teams)
       @numbers = teams.map { |t| t[:number] }
       @schools = teams.group_by { |t| [t[:school], t[:city], t[:state]] }
-      @subdivisions = teams.find { |t| t[:subdivision] }
     end
   end
 end

data/lib/sciolyff/validator/top_level.rb

@@ -16,6 +16,7 @@ module SciolyFF
     }.freeze
 
     OPTIONAL = {
+      Subdivisions: Array,
       Penalties: Array
     }.freeze
   end

data/lib/sciolyff/validator/tournament.rb

@@ -2,6 +2,7 @@
 
 require 'sciolyff/validator/checker'
 require 'sciolyff/validator/sections'
+require 'sciolyff/validator/range'
 
 module SciolyFF
   # Checks for Tournament section of a SciolyFF file
@@ -19,6 +20,10 @@ module SciolyFF
     OPTIONAL = {
       name: String,
       state: String,
+      medals: Integer,
+      trophies: Integer,
+      bids: Integer,
+      'bids per school': Integer,
       'short name': String,
       'worst placings dropped': Integer,
       'exempt placings': Integer,
@@ -29,6 +34,9 @@ module SciolyFF
 
     def initialize(rep)
       @maximum_place = rep[:Teams].count { |t| !t[:exhibition] }
+      @schools_count = rep[:Teams].uniq do |t|
+        [t[:school], t[:city], t[:state]]
+      end.count
     end
 
     def name_for_not_states_or_nationals?(tournament, logger)
@@ -46,6 +54,34 @@ module SciolyFF
         "('level: #{tournament[:level]}' is not Nationals)"
     end
 
+    def bids_for_regionals_or_states?(tournament, logger)
+      level = tournament[:level]
+
+      if %w[Regionals States].include?(level)
+        return true if tournament.key? :bids
+
+        logger.error "field 'bids:' required for level: #{level}"
+      else
+        return true unless tournament.key? :bids
+
+        logger.error "bids: does not make sense for level: #{level}"
+      end
+    end
+
+    def bids_per_school_positive?(tournament, logger)
+      bids = tournament[:'bids per school']
+      return true if bids.nil? || tournament[:'bids per school'].positive?
+
+      logger.error "'bids per school: #{bids}' is not positive"
+    end
+
+    def bids_per_school_relevant?(tournament, logger)
+      return true unless tournament[:'bids per school'] &&
+                         !tournament.key?(:bids)
+
+      logger.error "field 'bids per school:' not relevant without field 'bids:'"
+    end
+
     def short_name_is_relevant?(tournament, logger)
       return true unless tournament[:'short name'] && !tournament[:name]
 
@@ -61,12 +97,23 @@ module SciolyFF
         "is longer than normal 'name: #{tournament[:name]}'"
     end
 
+    include Validator::Range
+
     def maximum_place_within_range?(tournament, logger)
-      return true if tournament[:'maximum place'].nil? ||
-                     tournament[:'maximum place'].between?(1, @maximum_place)
+      within_range?(tournament, :'maximum place', logger, 1, @maximum_place)
+    end
+
+    def medals_within_range?(tournament, logger)
+      max = [@maximum_place, tournament[:'maximum place']].compact.min
+      within_range?(tournament, :medals, logger, 1, max)
+    end
+
+    def trophies_within_range?(tournament, logger)
+      within_range?(tournament, :trophies, logger, 1, @maximum_place)
+    end
 
-      logger.error "custom 'maximum place: #{tournament[:'maximum place']}' "\
-        "is not within range [1, #{@maximum_place}]"
+    def bids_within_range?(tournament, logger)
+      within_range?(tournament, :bids, logger, 1, @schools_count)
     end
   end
 end

data/sciolyff.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.license  = 'MIT'
   s.name     = 'sciolyff'
   s.summary  = 'A file format for Science Olympiad tournament results.'
-  s.version  = '0.10.0'
+  s.version  = '0.11.0'
   s.executables << 'sciolyff'
   s.add_runtime_dependency 'erubi', '~> 1.9'
   s.add_runtime_dependency 'optimist', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sciolyff
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Em Zhan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -64,9 +64,12 @@ files:
 - bin/sciolyff
 - lib/sciolyff.rb
 - lib/sciolyff/interpreter.rb
+- lib/sciolyff/interpreter/bids.rb
 - lib/sciolyff/interpreter/event.rb
 - lib/sciolyff/interpreter/html.rb
 - lib/sciolyff/interpreter/html/helpers.rb
+- lib/sciolyff/interpreter/html/main.css
+- lib/sciolyff/interpreter/html/main.js
 - lib/sciolyff/interpreter/html/template.html.erb
 - lib/sciolyff/interpreter/model.rb
 - lib/sciolyff/interpreter/penalty.rb
@@ -77,13 +80,16 @@ files:
 - lib/sciolyff/interpreter/tiebreaks.rb
 - lib/sciolyff/interpreter/tournament.rb
 - lib/sciolyff/validator.rb
+- lib/sciolyff/validator/canonical.rb
 - lib/sciolyff/validator/checker.rb
 - lib/sciolyff/validator/events.rb
 - lib/sciolyff/validator/logger.rb
 - lib/sciolyff/validator/penalties.rb
 - lib/sciolyff/validator/placings.rb
+- lib/sciolyff/validator/range.rb
 - lib/sciolyff/validator/raws.rb
 - lib/sciolyff/validator/sections.rb
+- lib/sciolyff/validator/subdivisions.rb
 - lib/sciolyff/validator/teams.rb
 - lib/sciolyff/validator/top_level.rb
 - lib/sciolyff/validator/tournament.rb