sportdb 1.9.5 → 1.9.6

data/Manifest.txt

@@ -16,9 +16,6 @@ lib/sportdb.rb
 lib/sportdb/calc.rb
 lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
-lib/sportdb/console.rb
-lib/sportdb/data/keys.rb
-lib/sportdb/data/models.rb
 lib/sportdb/deleter.rb
 lib/sportdb/finders/date.rb
 lib/sportdb/finders/goals.rb
@@ -29,16 +26,13 @@ lib/sportdb/models/assoc.rb
 lib/sportdb/models/assoc_assoc.rb
 lib/sportdb/models/badge.rb
 lib/sportdb/models/event.rb
-lib/sportdb/models/event_comp.rb
 lib/sportdb/models/event_ground.rb
 lib/sportdb/models/event_team.rb
 lib/sportdb/models/forward.rb
 lib/sportdb/models/game.rb
-lib/sportdb/models/game_comp.rb
 lib/sportdb/models/goal.rb
 lib/sportdb/models/ground.rb
 lib/sportdb/models/group.rb
-lib/sportdb/models/group_comp.rb
 lib/sportdb/models/group_team.rb
 lib/sportdb/models/league.rb
 lib/sportdb/models/person.rb
@@ -69,23 +63,13 @@ lib/sportdb/readers/season.rb
 lib/sportdb/readers/squad.rb
 lib/sportdb/readers/team.rb
 lib/sportdb/schema.rb
-lib/sportdb/service.rb
-lib/sportdb/service/public/style.css
-lib/sportdb/service/public/style.css.scss
-lib/sportdb/service/server.rb
-lib/sportdb/service/views/_debug.erb
-lib/sportdb/service/views/_version.erb
-lib/sportdb/service/views/debug.erb
-lib/sportdb/service/views/index.erb
-lib/sportdb/service/views/layout.erb
+lib/sportdb/standings.rb
 lib/sportdb/stats.rb
-lib/sportdb/updater.rb
 lib/sportdb/utils.rb
 lib/sportdb/utils_date.rb
 lib/sportdb/utils_goals.rb
 lib/sportdb/utils_group.rb
 lib/sportdb/utils_map.rb
-lib/sportdb/utils_record.rb
 lib/sportdb/utils_round.rb
 lib/sportdb/utils_scores.rb
 lib/sportdb/utils_teams.rb
@@ -149,5 +133,6 @@ test/test_round_header.rb
 test/test_scores.rb
 test/test_squad_reader.rb
 test/test_standings.rb
+test/test_standings_ii.rb
 test/test_utils.rb
 test/test_winner.rb

data/Rakefile

@@ -34,6 +34,12 @@ Hoe.spec 'sportdb' do
     ['activerecord-utils'],   # extras e.g. rnd, find_by! for 3.x etc.
     ['fetcher', '>= 0.3'],
 
+    ### sportdb addons
+    ['sportdb-keys'],
+    ['sportdb-console'],
+    ['sportdb-update'],
+    ['sportdb-service'],
+
     ## 3rd party
     ['gli', '>= 2.5.6'],
 

data/lib/sportdb.rb

@@ -55,12 +55,6 @@ require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/models/team_comp'
 
-### note: moved to racing.db !! - delete
-## require 'sportdb/models/race'
-## require 'sportdb/models/record'
-## require 'sportdb/models/run'
-## require 'sportdb/models/track'
-
 
 require 'sportdb/models/stats/alltime_standing'
 require 'sportdb/models/stats/alltime_standing_entry'
@@ -87,13 +81,14 @@ require 'sportdb/utils'
 require 'sportdb/utils_date'
 require 'sportdb/utils_group'
 require 'sportdb/utils_map'
-require 'sportdb/utils_record'
 require 'sportdb/utils_round'
 require 'sportdb/utils_scores'
 require 'sportdb/utils_teams'
 require 'sportdb/utils_goals'
 require 'sportdb/matcher'
-require 'sportdb/calc'
+require 'sportdb/calc'       # fix/todo: obsolete - replace w/ standings
+require 'sportdb/standings'
+
 
 require 'sportdb/finders/goals'   # no: requires FixturesHelpers
 
@@ -108,43 +103,15 @@ require 'sportdb/readers/team'
 require 'sportdb/reader'
 
 
-### note: moved to racing.db !! - delete
-## require 'sportdb/readers/race'
-## require 'sportdb/readers/record'
-## require 'sportdb/readers/race_team'
-## require 'sportdb/readers/track'
-
 
 require 'sportdb/lang'
 
-require 'sportdb/updater'
 require 'sportdb/deleter'
 require 'sportdb/stats'
 
 
-###############
-# optional: for convenience add some finders etc. for known fixtures
-#
-#  only used for sportdb/console.rb
-#   and  sportdb/tasks/test.rb  -> rename to tasks.rb?
-#
-#  todo/fix => remove from here and move into console.rb and tasks.rb
-
-require 'sportdb/data/keys'
-require 'sportdb/data/models'     # add convenience finders for known fixtures
-
-
-
 module SportDb
 
-  def self.banner
-    "sportdb/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
-  end
-
   def self.config_path
     "#{root}/config"
   end
@@ -236,6 +203,7 @@ module SportDb
     Stats.new.props
   end
 
+
   def self.setup_in_memory_db
     # Database Setup & Config
 
@@ -260,43 +228,16 @@ module SportDb
   end # setup_in_memory_db (using SQLite :memory:)
 
 
-  def self.load_plugins
-
-    @found  ||= []
-    @loaded ||= {}
-    @files  ||= Gem.find_files( 'sportdb_plugin.rb' )
+end  # module SportDb
 
-    puts "#{@files.size} plugin files found:"
-    @files.each do |file|
-      puts "  >#{file}<"
-    end
-    
-    ## todo: extract version and name of gem?
-    puts "normalized/match pattern:"
-    @files.each do |file|
-      if file =~ /sportdb-([a-z]+)-(\d\.\d.\d)/
-        puts "  >#{$1}< | >#{$2}<"
-        @found << file
-      else
-        puts "*** error: ignoring plugin script >#{file}< not matching gem naming pattern"
-      end
-    end
-    
-    @found.each do |file|
-      begin
-        puts  "loading plugin script #{file}"
-        require file
-      rescue LoadError => e
-        puts "*** error loading plugin script #{file.inspect}: #{e.message}. skipping..."
-      end
-    end
 
-  end
+#####
+# auto-load/require some addons
 
-end  # module SportDb
+require 'sportdb/update'
+require 'sportdb/service'
 
 
-## SportDb::load_plugins
 
 
 if __FILE__ == $0

data/lib/sportdb/calc.rb

@@ -2,6 +2,11 @@
 
 module SportDb
 
+############
+##
+##  fix/todo: obsolete
+##   - use new Standings class 
+
 
 ##############################################
 # helper/ builds standings table in memory
@@ -13,6 +18,7 @@ module StandingsHelper
   ## todo:
   ##  add team_id to struct - why? why not?  - saves a db lookup?
   class Stats
+     ### fix/todo: change/rename :pos to :rank
      attr_accessor :pos, :played, :won, :lost, :drawn,
                    :goals_for, :goals_against, :pts,
                    :recs

data/lib/sportdb/cli/main.rb

@@ -202,6 +202,8 @@ command [:load, :l] do |c|
 end # command load
 
 
+if defined?( SportDb::Updater )   ## add only if Updater class loaded/defined
+
 desc 'Pull - Auto-update event fixtures from upstream online sources'
 command :pull do |c|
   c.action do |g,o,args|
@@ -214,6 +216,8 @@ command :pull do |c|
   end # action
 end # command pull
 
+end  ## if defined?( SportDb::Updater )
+
 
 
 desc 'Start web service (HTTP JSON API)'
@@ -223,8 +227,9 @@ command [:serve,:server] do |c|
 
     connect_to_db( opts )
 
-    # NB: server (HTTP service) not included in standard default require
-    require 'sportdb/service'
+    # note: server (HTTP service) not included in standard default require
+    ##   -- note - now included!!!
+    ## require 'sportdb/service'
 
 # make sure connections get closed after every request e.g.
 #
@@ -306,11 +311,12 @@ command :test do |c|
     pp o
     puts "g (#{g.class.name}):"
     pp g
-    
-    LogUtils::Logger.root.debug 'test debug msg'
-    LogUtils::Logger.root.info 'test info msg'
-    LogUtils::Logger.root.warn 'test warn msg'
-    
+
+    logger = LogUtils::Logger.root
+    logger.debug 'test debug msg'
+    logger.info 'test info msg'
+    logger.warn 'test warn msg'
+
     puts 'Done.'
   end
 end

data/lib/sportdb/finders/date.rb

@@ -256,13 +256,13 @@ class DateFinder
                    (?<month_es>#{MONTH_ES})
                      \b/x
 
-  # e.g. Ven 8. Août  or [Ven 8. Août]
+  # e.g. Ven 8 Août  or [Ven 8 Août] or Ven 8. Août  or [Ven 8. Août]
   ### note: do NOT consume [] in regex (use lookahead assert)
   FR__WEEKDAY_DD_MONTH__DATE_REGEX = /\b
        (?:#{WEEKDAY_FR})   # note: skip weekday for now; do NOT capture
          \s+
        (?<day>\d{1,2})
-         \.
+         \.?        # note: make dot optional
          \s+
        (?<month_fr>#{MONTH_FR})
          (?=\s+|$|[\]])/x  ## note: allow end-of-string/line too

data/lib/sportdb/matcher.rb

@@ -18,14 +18,6 @@ module Matcher
     match_xxx_for_country( name, 'clubs', &blk )
   end
 
-  def match_tracks_for_country( name, &blk )
-    match_xxx_for_country( name, 'tracks', &blk )
-  end
-
-  def match_skiers_for_country( name, &blk )
-    match_xxx_for_country( name, 'skiers', &blk )
-  end
-
   def match_players_for_country( name, &blk )
     match_xxx_for_country( name, 'players', &blk )
   end

data/lib/sportdb/models/game.rb

@@ -20,6 +20,10 @@ class Game < ActiveRecord::Base
   before_save :calc_winner
 
 
+  def team1_name()  team1.name; end
+  def team2_name()  team2.name; end
+
+
   def toto12x() toto1x2; end # alias for toto12x - todo/fix: use ruby alias helper
   def toto1x2
     ## note: will return string e.g. 1-X-2 (winner will return int e.g. 1-0-2)
@@ -120,6 +124,7 @@ class Game < ActiveRecord::Base
 
   # game over?
   def over?()     play_at <= Time.now;  end
+
   ## fix/todo: already added by ar magic ??? remove code
   def knockout?() knockout == true;  end
   def complete?() score1.present? && score2.present?;  end

data/lib/sportdb/models/team.rb

@@ -52,6 +52,9 @@ class Team < ActiveRecord::Base
   belongs_to :city,    class_name: 'WorldDb::Model::City',    foreign_key: 'city_id'
 
 
+  ## fix/todo: change title to name; title2 to name2 etc.
+  def name() title; end
+
 
   def self.create_or_update_from_values( new_attributes, values )
 

data/lib/sportdb/reader.rb

@@ -21,14 +21,6 @@ class Reader
 
   def load_setup( name )
     path = "#{include_path}/#{name}.txt"
-    
-    ## depcrecated - for now check if "new" format exsits
-    ##  - if not fall back to old format
-    unless File.exists?( path )
-      puts "  deprecated manifest/setup format [SportDb.Reader]; use new plain text format"
-      ## try old yml format
-      path = "#{include_path}/#{name}.yml"
-    end
 
     logger.info "parsing data '#{name}' (#{path})..."
 
@@ -40,77 +32,6 @@ class Reader
   end # method load_setup
 
 
-  def is_club_fixture?( name )
-    ## guess (heuristic) if it's a national team event (e.g. world cup, copa america, etc.)
-    ##  or club event (e.g. bundesliga, club world cup, etc.)
-
-    if name =~ /club-world-cup!?\//      # NB: must go before -cup (special case)
-      true
-    elsif name =~ /copa-america!?\// ||  # NB: copa-america/ or copa-america!/
-          name =~ /-cup!?\//             # NB: -cup/ or -cup!/
-      false
-    else
-      true
-    end
-  end
-
-  def fix_fix_load_racing_fix_fix
-=begin
-    if name  =~ /^circuits/  # e.g. circuits.txt in formula1.db
-      reader = TrackReader.new( include_path )
-      reader.read( name )
-    elsif match_tracks_for_country( name ) do |country_key|  # name =~ /^([a-z]{2})\/tracks/
-            # auto-add country code (from folder structure) for country-specific tracks
-            #  e.g. at/tracks  or at-austria/tracks
-            country = Country.find_by_key!( country_key )
-            reader = TrackReader.new( include_path )
-            reader.read( name, country_id: country.id )
-          end
-    elsif name  =~ /^tracks/  # e.g. tracks.txt in ski.db
-      reader = TrackReader.new( include_path )
-      reader.read( name )
-    elsif name =~ /^drivers/ # e.g. drivers.txt in formula1.db
-      reader = PersonDb::PersonReader.new( include_path )
-      reader.read( name )
-    elsif match_skiers_for_country( name ) do |country_key|  # name =~ /^([a-z]{2})\/skiers/
-            # auto-add country code (from folder structure) for country-specific skiers (persons)
-            #  e.g. at/skiers  or at-austria/skiers.men
-            country = Country.find_by_key!( country_key )
-            reader = PersonDb::PersonReader.new( include_path )
-            reader.read( name, country_id: country.id )
-          end
-    elsif name =~ /^skiers/ # e.g. skiers.men.txt in ski.db
-      reader = PersonDb::PersonReader.new( include_path )
-      reader.read( name )
-    elsif name =~ /\/races/  # e.g. 2013/races.txt in formula1.db
-      ## fix/bug:  NOT working for now; sorry
-      #   need to read event first and pass along to read (event_id: event.id) etc.
-      reader = RaceReader.new( include_path )
-      reader.read( name )
-    elsif name =~ /^teams/   # e.g. teams.txt in formula1.db   ### fix: check if used for football ? - add clubs
-      reader = TeamReader.new( include_path )
-      reader.read( name )
-##  fix!!! - find a better unique pattern  to generic???
-##
-##    fix: use two routes/tracks/modes:
-##
-##    races w/ records etc   and  teams/matches etc.   split into two to make code easier to read/extend!!!
-##
-    elsif name =~ /\/([0-9]{2})-/
-      race_pos = $1.to_i
-      # NB: assume @event is set from previous load 
-      race = Race.find_by_event_id_and_pos( @event.id, race_pos )
-      reader = RecordReader.new( include_path )
-      reader.read( name, race_id: race.id ) # e.g. 2013/04-gp-monaco.txt in formula1.db
-
-    elsif name =~ /\/squads/ || name =~ /\/rosters/  # e.g. 2013/squads.txt in formula1.db
-      reader = RaceTeamReader.new( include_path )
-      reader.read( name )
-
-=end
-  end
-
-
   def load( name )   # convenience helper for all-in-one reader
 
     logger.debug "enter load( name=>>#{name}<<, include_path=>>#{include_path}<<)"
@@ -164,13 +85,13 @@ class Reader
           end
     elsif name =~ /(?:^|\/)leagues/   # NB: ^leagues or also possible world!/leagues  - NB: make sure goes after leagues_for_country!!
       reader = LeagueReader.new( include_path )
-      reader.read( name, club: is_club_fixture?( name ) )
+      reader.read( name )
     elsif match_teams_for_country( name ) do |country_key|   # name =~ /^([a-z]{2})\/teams/
             # auto-add country code (from folder structure) for country-specific teams
-            #  e.g. at/teams at/teams.2 de/teams etc.                
+            #  e.g. at/teams at/teams.2 de/teams etc.
             country = Country.find_by_key!( country_key )
             reader = TeamReader.new( include_path )
-            reader.read( name, club: true, country_id: country.id )  ## fix: club flag - do NOT set - why? why not?
+            reader.read( name, country_id: country.id )
           end
     elsif match_clubs_for_country( name ) do |country_key|   # name =~ /^([a-z]{2})\/clubs/
             # auto-add country code (from folder structure) for country-specific clubs
@@ -180,11 +101,13 @@ class Reader
             reader.read( name, club: true, country_id: country.id )  ## note: always sets club flag to true
           end
     elsif name =~ /(?:^|\/)teams/   ## fix: check if teams rule above (e.g. /^teams/ )conflicts/matches first ???
+      ### fix: use new NationalTeamReader ??? why? why not?
       reader = TeamReader.new( include_path )
-      reader.read( name, club: is_club_fixture?( name ) )  ## fix: cleanup - use is_club_fixture? still needed w/ new clubs in name?
+      reader.read( name )  ## note: always sets club flag to true / national to true
     elsif name =~ /(?:^|\/)clubs/
+      ### fix: use new ClubReader ??? why? why not?
       reader = TeamReader.new( include_path )
-      reader.read( name, club: true )   ## note: always sets club flag to true
+      reader.read( name, club: true )   ## note: always sets club flag to true / national to false
     elsif name =~ /\/(\d{4}|\d{4}[_\-]\d{2})(--[^\/]+)?\// ||
           name =~ /\/(\d{4}|\d{4}[_\-]\d{2})$/