sportdb 1.9.5 → 1.9.6

data/lib/sportdb/service/public/style.css.scss

@@ -1,37 +0,0 @@
-
-$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-body
-{
-  font-family: $base-font-family;
-}
-
-
-a {
-  color: black;
-  text-decoration: none;
-
-  &:hover {
-   color: black;
-   background-color: aqua;
-   text-decoration: underline;
-  }
-
-  &:visited { color: black; }
-}
-
-
-/////////////////////////
-// version / powered_by
-
-.version
-{
-   text-align: center;
-   margin-top: 10px;
-   color: grey;
-   
-   a, span {
-     font-size: 12px;
-     color: grey
-   }
-}

data/lib/sportdb/service/server.rb

@@ -1,184 +0,0 @@
-
-module SportDb
-
-
-class Server < Sinatra::Base
-
-  def self.banner
-    "sportdb-service/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] on Sinatra/#{Sinatra::VERSION} (#{ENV['RACK_ENV']})"
-  end
-
-  ######
-  # allow cross site json requests (e.g. url posting on rubyflow - avoid crash!!)
-  #  see
-  #   http://www.sinatrarb.com/intro.html#Configuring attack protection
-  #  todo: only switch off jsoncrfl ???  do NOT disable all
-  
-  disable :protection
-
-  PUBLIC_FOLDER = "#{SportDb.root}/lib/sportdb/service/public"
-  VIEWS_FOLDER  = "#{SportDb.root}/lib/sportdb/service/views"
-
-  puts "[boot] setting sportdb api public folder to: #{PUBLIC_FOLDER}"
-  puts "[boot] setting sportdb api views folder to: #{VIEWS_FOLDER}" 
-
-  set :public_folder, PUBLIC_FOLDER   # set up the static dir (with images/js/css inside)   
-  set :views,         VIEWS_FOLDER    # set up the views dir
-
-  set :static, true   # set up static file routing
-
-  #####################
-  # Models
-
-  include Models
-
-  ##################
-  # Helpers
-  
-
-  def path_prefix
-    request.env['SCRIPT_NAME']
-  end
-
-##############################################
-# Controllers / Routing / Request Handlers
-
-
-get '/' do
-  erb :index
-end
-
-get '/d*' do
-  erb :debug
-end
-
-get '/rounds/:q' do |q|
-  
-  #################
-  # todo/check:
-  #   what to do for special case with postponed games/matches??
-  #    if match postponed round end_at date also gets moved back!
-  #     use a different end_at date for original end_at e.g add a new field? why? why not?
-  #  -- if round out of original scope mark as postponed (e.g. spielrunde 5 - nachtrag!)
-
-  rounds = []
-
-  if q =~ /(\d{1,2})\.(\d{1,2})\.(\d{4})/
-    t = Time.new( $3.to_i, $2.to_i, $1.to_i )
-  elsif q =~ /(\d{4})\.(\d{1,2})\.(\d{1,2})/
-    t = Time.new( $1.to_i, $2.to_i, $3.to_i )
-  else
-    t = Time.now   # no match - assume today's/current date
-  end
-
-  t_00_00 = t.beginning_of_day
-  t_23_59 = t.end_of_day
-
-  ## NB: sqlite stores time too
-  #   use 00_00 and 23_59 to make sure queries work with hours too
-
-  current_rounds = Round.where( 'start_at <= ? and end_at >= ?', t_23_59, t_00_00 )
-  current_rounds.each do |r|
-    rounds << { pos: r.pos,
-                title: r.title,
-                start_at: r.start_at.strftime('%Y/%m/%d'),
-                end_at:   r.end_at.strftime('%Y/%m/%d'),
-                event: { key:  r.event.key,
-                         title: r.event.full_title }}
-  end
-
-  data = { rounds: rounds }
-  
-  json_or_jsonp( data )
-end
-
-
-get '/event/:key/teams' do |key|
-  # NB: change en.2012_13 to en.2012/13
-  event = Event.find_by_key!( key.tr('_', '/') )
-
-  teams = []
-  event.teams.each do |t|
-    teams << { key: t.key, title: t.title, code: t.code }
-  end
-
-  data = { event: { key: event.key, title: event.full_title }, teams: teams }
-
-  json_or_jsonp( data )
-end
-
-
-get '/event/:key/rounds' do |key|
-  # NB: change en.2012_13 to en.2012/13
-  event = Event.find_by_key!( key.tr('_', '/') )
-
-  rounds = []
-  event.rounds.each do |r|
-    rounds << { pos: r.pos, title: r.title,
-                start_at: r.start_at.strftime('%Y/%m/%d'),
-                end_at:   r.end_at.strftime('%Y/%m/%d') }
-  end
-
-  data = { event: { key: event.key, title: event.full_title }, rounds: rounds }
-
-  json_or_jsonp( data )
-end
-
-
-get '/event/:key/round/:pos' do |key,pos|
-  # NB: change en.2012_13 to en.2012/13
-  event = Event.find_by_key!( key.tr('_', '/') )
-
-  if pos =~ /\d+/
-    round = Round.find_by_event_id_and_pos!( event.id, pos )
-  else  # assume last from today's date (use last/today/etc. - must be non-numeric key)
-    t_23_59 = Time.now.end_of_day
-    round = Round.where( event_id: event.id ).where( 'start_at <= ?', t_23_59 ).order( 'pos' ).last
-    if round.nil?   # assume all rounds in the future; display first upcoming one
-      round = Round.where( event_id: event.id ).order('pos').first
-    end
-  end
-
-  games = []
-  round.games.each do |g|
-    games << { team1_key: g.team1.key, team1_title: g.team1.title, team1_code: g.team1.code,
-               team2_key: g.team2.key, team2_title: g.team2.title, team2_code: g.team2.code,
-               play_at: g.play_at.strftime('%Y/%m/%d'),
-               score1:   g.score1,   score2:   g.score2,
-               score1ot: g.score1ot, score2ot: g.score2ot,
-               score1p:  g.score1p,  score2p:  g.score2p
-             }
-  end
-
-  data = { event: { key: event.key, title: event.full_title },
-           round: { pos: round.pos, title: round.title,
-                    start_at: round.start_at.strftime('%Y/%m/%d'),
-                    end_at:   round.end_at.strftime('%Y/%m/%d')
-                  },
-           games: games }
-
-  json_or_jsonp( data )
-end
-
-
-### helper for json or jsonp response (depending on callback para)
-
-private
-def json_or_jsonp( data )
-  callback = params.delete('callback')
-  response = ''
-
-  if callback
-    content_type :js
-    response = "#{callback}(#{data.to_json})"
-  else
-    content_type :json
-    response = data.to_json
-  end
-  
-  response
-end
-
-end # class Server
-
-end #  module SportDb

data/lib/sportdb/service/views/_debug.erb

@@ -1,17 +0,0 @@
-
-<h3>Debug</h3>
-
-<pre>
-  request.scheme          <%= request.scheme %>
-  request.script_name     <%= request.script_name %>
-  request.path_info       <%= request.path_info %>
-  request.port            <%= request.port %>
-  request.request_method  <%= request.request_method %>
-  request.query_string    <%= request.query_string %>
-  request.host            <%= request.host %>
-  request.referrer        <%= request.referrer %>
-  request.user_agent      <%= request.user_agent %>
-  request.url             <%= request.url %>
-  request.path            <%= request.path %>
-  request.ip              <%= request.ip %>
-</pre>

data/lib/sportdb/service/views/_version.erb

@@ -1,7 +0,0 @@
-<div class='version'>
-  <a href="http://groups.google.com/group/opensport">Questions? Comments?</a> |
-  <a href="https://github.com/geraldb/world.db.ruby">world.db/<%= WorldDb::VERSION %></a>,
-  <a href="https://github.com/geraldb/sport.db.ruby">sport.db/<%= SportDb::VERSION %></a> - 
-  <span>Ruby/<%= "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}/#{RUBY_PLATFORM})" %> on</span>
-  <span>Sinatra/<%= Sinatra::VERSION %> (<%= ENV['RACK_ENV'] %>)</span>
-</div>

data/lib/sportdb/service/views/debug.erb

@@ -1,2 +0,0 @@
-
-<%= erb :'_debug' %>

data/lib/sportdb/service/views/index.erb

@@ -1,6 +0,0 @@
-<h1>sport.db HTTP JSON(P) API</h1>
-
-
-<% if params[:debug].present? %>
-  <%= erb :'_debug' %>
-<% end %>

data/lib/sportdb/service/views/layout.erb

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset='UTF-8'>  
-  <title>sport.db.api // sport.db HTTP JSON(P) API // sport.db Web Service</title>
-  <link href="<%= url('/style.css') %>" rel='stylesheet'>
-</head>
-<body>
-
-<%= yield %>
-
-<%= erb :'_version' %>
-
-</body>
-</html>

data/lib/sportdb/updater.rb

@@ -1,152 +0,0 @@
-
-module SportDb
-
-  class Updater
-
-    include LogUtils::Logging
-
-    ######
-    # NB: make models available in sportdb module by default with namespace
-    #  e.g. lets you use Team instead of Model::Team
-    include Models
-
-
-    def map_event_to_dlurl( event )
-
-      league_key = event.league.key
-      season_key = event.season.key
-
-      repo_path, folder_path = map_key_to_repo_n_folder_path( league_key )
-      
-      return nil if repo_path.nil?   # no match/mapping found; cancel download
-
-      season_path = season_key.gsub( '/', '_')  # convert 2013/14 to 2013_14
-
-      #####
-      # quick hack!!!!
-      # - find something better e.g. more generic/easy to configure etc.
-      if league_key == 'world'   # world cup repo mappings include host country e.g. 2014--brazil etc.
-        season_path = '2006--germany'       if season_path == '2006'
-        season_path = '2010--south-africa'  if season_path == '2010'
-        season_path = '2014--brazil'        if season_path == '2014'
-      end
-
-      ###
-      # e.g. https://raw.github.com/openfootball/at-austria/master/2013_14
-
-      dlurl = "https://raw.github.com/openfootball/#{repo_path}/master"
-      dlurl << "/#{folder_path}" if folder_path.present?
-      dlurl << "/#{season_path}"
-      dlurl
-    end
-
-
-    def map_key_to_repo_n_folder_path( key )
-
-      ### allow * for regex match w/ .+
-      map = [
-        [ 'at',         'at-austria'  ],
-        [ 'at.*',       'at-austria'  ],
-        [ 'de',         'de-deutschland' ],
-        [ 'de.*',       'de-deutschland'  ],
-        [ 'en',         'en-england' ],
-        [ 'es',         'es-espana' ],
-        [ 'it',         'it-italy' ],
-        [ 'be',         'europe', 'be-belgium' ], # NB: europe/be-belgium
-        [ 'ro',         'europe', 'ro-romania' ],
-        [ 'cl',         'europe-champions-league' ],
-        [ 'el',         'europe-champions-league' ],
-        [ 'br',         'br-brazil' ],
-        [ 'mx',         'mx-mexico' ],  # todo: add mx.* for clausura etc ??
-        [ 'euro',       'euro-cup'  ],
-        [ 'world',      'world-cup' ],
-        [ 'world.*',    'world-cup' ]]
-
-      map.each do |entry|
-         pattern = entry[0]
-         path    = [ entry[1], entry[2] ]  # repo n folder path
-         
-         if pattern.index( '*' ).nil?  # match just plain string (no wildcard *)
-           return path if key == pattern
-         else
-           # assume regex match
-           regex = pattern.gsub( '.', '\.' ).gsub( '*', '.+' )
-           return path if key =~ /#{regex}/
-         end
-      end
-      nil  # return nil; no match found
-    end
-
-    def update_event( event )
-      logger.info "update event >>#{event.title}<< (#{event.league.key}+#{event.season.key})"
-
-      dlbase = map_event_to_dlurl( event )
-      if dlbase.nil?
-        logger.warn "  [Updater] skip download; no download source mapping found for >#{event.key}<"
-        return  # cancel download; no mapping found
-      end
-
-      puts "  using dlbase >>#{dlbase}<<"
-
-      if event.sources.nil?
-        logger.warn "  [Updater] skip download; no download event source configured/found for >#{event.key}<"
-        return
-      end
-
-      sources = event.sources.gsub(' ','').split(',')   # NB: remove all blanks (leading,trailing,inside)
-
-
-      text_ary = []   # array of fixtures (text)
-
-      ## collect all fixtures (text)
-      sources.each_with_index do |source,i|
-        dlurl = "#{dlbase}/#{source}.txt"
-        logger.info "   downloading source (#{i+1}/#{sources.length}) >>#{dlurl}<< ..."     # todo/check: use size for ary or length - does it matter?
-
-        # download fixtures into string
-        text = Fetcher.read( dlurl )
-
-        logger.debug "text.encoding.name (before): #{text.encoding.name}"
-        
-        ###
-        # NB: Net::HTTP will NOT set encoding UTF-8 etc.
-        #  will mostly be ASCII
-        #  - try to change encoding to UTF-8 ourselves
-
-        #####
-        # NB:  ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
-
-        ## NB:
-        #  for now "hardcoded" to utf8 - what else can we do?
-        #  - note: force_encoding will NOT change the chars only change the assumed encoding w/o translation
-        text = text.force_encoding( Encoding::UTF_8 )
-        logger.debug "text.encoding.name (after): #{text.encoding.name}"
-
-        text_ary << text
-      end
-
-      ## note: need to pass in all fixtures at once (e.g as array) for @last_pos calc etc to work
-      ##         if multipe "files"/strings are used
-      unless text_ary.empty?
-        puts "   importing/reading source..."
-        # passing dummy include_path (not needed for reading from string)
-        # fix: use/add proper api for reading from string e.g. read and read_file ?? etc.
-        reader= GameReader.new( '/tmp' )
-        ### fix: allow to pass in event (to avoid lookup)
-        reader.read_fixtures_from_string( event.key, text_ary )
-      end
-    end
-
-
-    def run
-      # for now update all events (fixtures only) - not *.yml
-
-      Event.all.each do |event|
-        update_event( event )
-      end
-
-    end
-    
-  end # class Updater
-  
-end # module SportDb

data/lib/sportdb/utils_record.rb

@@ -1,91 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-
-  def find_record_comment!( line )
-    # assume everything left after the last record marker,that is, ] is a record comment
-
-    regex = /]([^\]]+?)$/   # NB: use non-greedy +?
-
-    if line =~ regex
-      value = $1.strip
-      return nil if value.blank?   # skip whitespaces only
-
-      logger.debug "   comment: >#{value}<"
-
-      line.sub!( value, '[REC.COMMENT] ' )
-      return value
-    else
-      return nil
-    end
-  end
-
-
-  def find_record_timeline!( line )
-
-    #  +1 lap or +n laps
-    regex_laps = /\s+\+\d{1,2}\s(lap|laps)\b/
-
-    #  2:17:15.123
-    regex_time = /\b\d{1,2}:\d{2}:\d{2}\.\d{1,3}\b/
-
-    #  +40.1 secs
-    regex_secs = /\s+\+\d{1,3}\.\d{1,3}\s(secs)\b/   # NB: before \+ - boundry (\b) will not work 
-
-    # NB: $& contains the complete matched text
-
-    if line =~ regex_laps
-      value = $&.strip
-      logger.debug "   timeline.laps: >#{value}<"
-
-      line.sub!( value, '[REC.TIMELINE.LAPS] ' ) # NB: add trailing space
-      return value
-    elsif line =~ regex_time
-      value = $&.strip
-      logger.debug "   timeline.time: >#{value}<"
-
-      line.sub!( value, '[REC.TIMELINE.TIME] ' ) # NB: add trailing space
-      return value
-    elsif line =~ regex_secs
-      value = $&.strip
-      logger.debug "   timeline.secs: >#{value}<"
-
-      line.sub!( value, '[REC.TIMELINE.SECS] ' ) # NB: add trailing space
-      return value
-    else
-      return nil
-    end
-  end
-
-  def find_record_laps!( line )
-    # e.g.  first free-standing number w/ one or two digits e.g. 7 or 28 etc.
-    regex = /\b(\d{1,2})\b/
-    if line =~ regex
-      logger.debug "   laps: >#{$1}<"
-      
-      line.sub!( regex, '[REC.LAPS] ' ) # NB: add trailing space
-      return $1.to_i
-    else
-      return nil
-    end
-  end
-
-  def find_record_leading_state!( line )
-    # e.g.  1|2|3|etc or Ret  - must start line 
-    regex = /^[ \t]*(\d{1,3}|Ret)[ \t]+/
-    if line =~ regex
-      value = $1.dup
-      logger.debug "   state: >#{value}<"
-
-      line.sub!( regex, '[REC.STATE] ' ) # NB: add trailing space
-      return value
-    else
-      return nil
-    end
-  end
-
-
-  end # module FixtureHelpers
-end # module SportDb