sportdb 1.8.27 → 1.8.28

data/Manifest.txt

@@ -70,31 +70,10 @@ lib/sportdb/readers/team.rb
 lib/sportdb/readers/track.rb
 lib/sportdb/schema.rb
 lib/sportdb/service.rb
-lib/sportdb/service/public/football/js/football/api.js
-lib/sportdb/service/public/football/js/football/plugin.js
-lib/sportdb/service/public/football/js/football/widget.js
-lib/sportdb/service/public/football/js/libs/jquery-2.0.2.min.js
-lib/sportdb/service/public/football/js/libs/require-2.1.6.js
-lib/sportdb/service/public/football/js/libs/underscore-1.4.4.min.js
-lib/sportdb/service/public/football/js/text.js
-lib/sportdb/service/public/football/js/utils.js
-lib/sportdb/service/public/football/matchday-jquery.html
-lib/sportdb/service/public/football/matchday-template.html
-lib/sportdb/service/public/football/matchday.html
-lib/sportdb/service/public/football/templates/event.html
-lib/sportdb/service/public/football/templates/games.html
-lib/sportdb/service/public/football/templates/rounds-long.html
-lib/sportdb/service/public/football/templates/rounds-short.html
-lib/sportdb/service/public/football/templates/rounds-today.html
 lib/sportdb/service/public/style.css
 lib/sportdb/service/public/style.css.scss
 lib/sportdb/service/server.rb
-lib/sportdb/service/version.rb
 lib/sportdb/service/views/_debug.erb
-lib/sportdb/service/views/_football_head.erb
-lib/sportdb/service/views/_football_live.erb
-lib/sportdb/service/views/_football_today.erb
-lib/sportdb/service/views/_usage.erb
 lib/sportdb/service/views/_version.erb
 lib/sportdb/service/views/debug.erb
 lib/sportdb/service/views/index.erb

data/lib/sportdb/calc.rb

@@ -12,17 +12,41 @@ module StandingsHelper
 
   ## todo:
   ##  add team_id to struct - why? why not?  - saves a db lookup?
-  ##  add appearances (event) count  or similar - add to struct or use an extension?
-  ##    == use recs for number of (stats) records?
-  Stats = Struct.new(
-            :pos,
-            :played,
-            :won,
-            :lost,
-            :drawn,
-            :goals_for,
-            :goals_against,
-            :pts )
+  class Stats
+     attr_accessor :pos, :played, :won, :lost, :drawn,
+                   :goals_for, :goals_against, :pts,
+                   :recs
+
+     def initialize
+       @pos           = nil    # use 0? why? why not?
+       @played        = 0
+       @won           = 0
+       @lost          = 0
+       @drawn         = 0
+       @goals_for     = 0
+       @goals_against = 0
+       @pts           = 0
+       @recs          = 0
+       # note: appearances (event) count  or similar
+       #   is recs counter (number of (stats) records)
+     end
+
+     def add( rec )
+       ### fix: add plus + operator too!
+       
+       # note: will NOT update/add pos (ranking)
+       self.played        += rec.played
+       self.won           += rec.won
+       self.lost          += rec.lost
+       self.drawn         += rec.drawn
+       self.goals_for     += rec.goals_for
+       self.goals_against += rec.goals_against
+       self.pts           += rec.pts
+       self.recs          += rec.recs
+
+       self # return self stats rec
+     end # method add
+  end  # class Stats
 
 
   def self.calc( games, opts={} )
@@ -36,6 +60,7 @@ module StandingsHelper
   end
 
 
+
   def self.calc_for_events( events, opts={} )
 
     ## todo:
@@ -48,21 +73,59 @@ module StandingsHelper
       recs = calc_stats( event.games )
 
       recs.each do |team_key, rec|
-        alltime_rec = alltime_recs[ team_key ] || Stats.new( 0, 0, 0, 0, 0, 0, 0, 0 )
+        alltime_rec = alltime_recs[ team_key ] || Stats.new
 
         ## add stats values
-        alltime_rec.played        += rec.played
-        alltime_rec.won           += rec.won
-        alltime_rec.lost          += rec.lost
-        alltime_rec.drawn         += rec.drawn
-        alltime_rec.goals_for     += rec.goals_for
-        alltime_rec.goals_against += rec.goals_against
-        alltime_rec.pts           += rec.pts
-        
+        alltime_rec.add( rec )
+
         alltime_recs[ team_key ] = alltime_rec 
       end
     end
 
+
+    ### fix:
+    # - make merge team into a helper method (for reuse)
+
+    ## check for merging teams
+    # e.g. all time world cup
+    #   Germany incl. West Germany
+    #   Russia  incl. Soviet Union etc.
+    
+    # todo: change opts para to :includes  instead of :merge ? why? why not??
+
+    merge = opts[:merge]
+    if merge
+      puts "  merging teams (stats records):"
+      pp merge
+
+      merge.each do |k,v|
+        # note: assume key is destition team key and
+        #         value is source team key  e.g.  'GER' => 'FRG'
+        #         or array (for mulitple teamss e.g.  'GER' => ['FRG','GDR']
+        team_key_dest = k.to_s
+
+        if v.kind_of? Array
+          team_keys_src = v
+        else
+          team_keys_src = [v]    # turn single value arg into array w/ single item
+        end
+        team_keys_src = team_keys_src.map { |src| src.to_s }  # turn all to string (might be symbol)
+
+        alltime_rec_dest = alltime_recs[ team_key_dest ] || Stats.new
+
+        team_keys_src.each do |team_key_src|
+          alltime_rec_src  = alltime_recs[ team_key_src]
+
+          if alltime_rec_src  # stats record found?
+            alltime_rec_dest.add( alltime_rec_src )  # add stats values
+            alltime_recs.delete( team_key_src )      # remove old src entry
+          end
+        end
+
+        alltime_recs[ team_key_dest ] = alltime_rec_dest
+      end
+    end
+
     ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
     alltime_recs= update_ranking( alltime_recs )
 
@@ -73,26 +136,33 @@ module StandingsHelper
 
 
   def self.calc_stats( games, opts={} )
-    
+
     ## fix:
     #   passing in e.g. pts for win (3? 2? etc.)
     #    default to 3 for now
-    
+
+    # note:
+    #   returns stats records w/ stats records counter always set to one (recs==1)
+
     recs = {}
 
     games.each_with_index do |g,i|   # note: index(i) starts w/ zero (0)
       puts "  [#{i+1}] #{g.team1.title} - #{g.team2.title}  #{g.score_str}"
       unless g.over?
-        puts "    skipping match - not yet over (play_at date in the future)"
+        puts "    !!!! skipping match - not yet over (play_at date in the future)"
         next
       end
       unless g.complete?
-        puts "    skipping match - scores incomplete"
+        puts "    !!!! skipping match - scores incomplete"
         next
       end
 
-      rec1 = recs[ g.team1.key ] || Stats.new( 0, 0, 0, 0, 0, 0, 0, 0 )
-      rec2 = recs[ g.team2.key ] || Stats.new( 0, 0, 0, 0, 0, 0, 0, 0 )
+      rec1 = recs[ g.team1.key ] || Stats.new
+      rec2 = recs[ g.team2.key ] || Stats.new
+
+      ## set stats records counter to one if new (first) record update 
+      rec1.recs = 1   if rec1.recs == 0
+      rec2.recs = 1   if rec2.recs == 0
 
       rec1.played += 1
       rec2.played += 1

data/lib/sportdb/models/stats/alltime_standing.rb

@@ -11,9 +11,9 @@ class AlltimeStanding < ActiveRecord::Base
   has_many :entries,  class_name: 'SportDb::Model::AlltimeStandingEntry', foreign_key: 'alltime_standing_id', :dependent => :delete_all
 
 
-  def recalc_for_league!( league )
+  def recalc_for_league!( league, opts={} )
 
-    recs = StandingsHelper.calc_for_events( league.events )
+    recs = StandingsHelper.calc_for_events( league.events, opts )
 
     ## - remove (if exit) old entries and add new entries
     entries.delete_all    # note: assoc dependent set to :delete_all (defaults to :nullify)
@@ -21,6 +21,7 @@ class AlltimeStanding < ActiveRecord::Base
     recs.each do |team_key,rec|
      
       team = Team.find_by_key!( team_key )
+      ### note: we also add rec.recs (appearance counter) - not included w/ group or event standings, for example
       entries.create!(
                 team_id: team.id,
                 pos:     rec.pos,
@@ -30,7 +31,8 @@ class AlltimeStanding < ActiveRecord::Base
                 lost:    rec.lost,
                 goals_for: rec.goals_for,
                 goals_against: rec.goals_against,
-                pts:     rec.pts  )
+                pts:     rec.pts,
+                recs:    rec.recs )
     end
   end  # method recalc_for_league!
 

data/lib/sportdb/schema.rb

@@ -366,7 +366,8 @@ create_table :alltime_standing_entries do |t|
   t.integer     :goals_for             # todo: find a short name - gf? why? why not?
   t.integer     :goals_against         # todo: find a shorter name - ga? why? why not?
   t.integer     :pts
-  t.string      :comments
+  t.integer     :recs               # note: specific to alltime - stats records counter (e.g. appearance counter)
+  t.string      :comments  
   t.timestamps
 end
 

data/lib/sportdb/service.rb

@@ -3,7 +3,7 @@
 #
 #  e.g. config.ru:
 #   require './boot'
-#   run SportDb::Service::Server
+#   run SportDb::Server
 
 
 # 3rd party libs/gems
@@ -13,30 +13,18 @@ require 'sinatra/base'
 
 # our own code
 
-require 'sportdb/service/version'
 
+require 'sportdb/service/server'
 
-module SportDb::Service
-
-  def self.banner
-    "sportdb-service #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] on Sinatra/#{Sinatra::VERSION} (#{ENV['RACK_ENV']})"
-  end
-
-### fix: move to SportDb
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
-  end
-
-=begin  
-  def self.config_path
-    ## needed? use default db connection?
-    "#{root}/config"
-  end
-=end
 
+### for legacy old code e.g. SportDb::Service::Server - remove later - do NOT use
+##  remove module Service (obsolete)
+module SportDb
+  module Service
+    Server = SportDb::Server
+  end # module Service
 end #  module SportDb
 
-require 'sportdb/service/server'
 
 # say hello
-puts SportDb::Service.banner
+puts SportDb::Server.banner

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

@@ -11,23 +11,6 @@ a {
   a:visited {
     color: black; }
 
-.params {
-  color: green;
-  font-style: italic;
-  font-weight: bold; }
-
-pre {
-  background-color: #F3F3F3;
-  border-bottom: 1px solid #BBBBBB;
-  border-top: 1px solid #BBBBBB;
-  padding: 4px; }
-
-.football-widget {
-  background-color: lime;
-  border: 1px solid green;
-  padding: 4px; }
-  .football-widget ul {
-    list-style-type: none; }
 
 .version {
   text-align: center;

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

@@ -1,8 +1,6 @@
 
-
 $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 
-
 body
 {
   font-family: $base-font-family;
@@ -23,30 +21,6 @@ a {
 }
 
 
-.params {
-   color: green;
-   font-style: italic;
-   font-weight: bold;
-}
-
-pre {
-  background-color: #F3F3F3;
-  border-bottom: 1px solid #BBBBBB;
-  border-top: 1px solid #BBBBBB;
-  padding: 4px;
-}
-
-
-.football-widget {
-  background-color: lime;
-  border: 1px solid green;
-  padding: 4px;
-  
-  ul {
-   list-style-type: none;
-  }
-}
-
 /////////////////////////
 // version / powered_by
 
@@ -60,4 +34,4 @@ pre {
      font-size: 12px;
      color: grey
    }
-}
+}

data/lib/sportdb/service/server.rb

@@ -1,8 +1,13 @@
 
-module SportDb::Service
+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
@@ -11,8 +16,8 @@ class Server < Sinatra::Base
   
   disable :protection
 
-  PUBLIC_FOLDER = "#{SportDb::Service.root}/lib/sportdb/service/public"
-  VIEWS_FOLDER  = "#{SportDb::Service.root}/lib/sportdb/service/views"
+  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}" 
@@ -25,7 +30,7 @@ class Server < Sinatra::Base
   #####################
   # Models
 
-  include SportDb::Models
+  include Models
 
   ##################
   # Helpers
@@ -176,5 +181,4 @@ end
 
 end # class Server
 
-
-end #  module SportDb::Service
+end #  module SportDb

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

@@ -1,8 +1,7 @@
 <div class='version'>
   <a href="http://groups.google.com/group/opensport">Questions? Comments?</a> |
-  <a href="https://github.com/geraldb/world.db">world.db/<%= WorldDB::VERSION %></a>,
-  <a href="https://github.com/geraldb/sport.db">sport.db/<%= SportDB::VERSION %></a>,
-  <a href="https://github.com/geraldb/sport.db.api">sport.db.api/<%= SportDB::Service::VERSION %></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/index.erb

@@ -1,146 +1,6 @@
 <h1>sport.db HTTP JSON(P) API</h1>
 
-<%= erb :'_football_today' %>
-
-
-<h2>Examples</h2>
-
-<% example_event_keys  = ['world.confed.2013', 'en.2012_13', 'de.2012_13', 'euro.2012', 'world.2010']
-   example_round_pos   = [ 4, 2, 5, 1, 20 ]
-   example_round_label = [ '4th Round (=> Semi-finals)', '2nd Round', '5th Round', '1st Round', '20th Round (=> Final)' ]
- %>
-
-<h3>List all teams for an event (league+season) <code>/event/<span class='params'>:key</span>/teams</code></h3>
-
-<table>
- <% example_event_keys.each do |event_key|
-    event = Event.find_by_key!( event_key.tr('_', '/') )
-  %>
- <tr>
-  <td>
-    <code>
-     <a href='<%= url("/event/#{event_key}/teams") %>'>
-        /event/<span class='params'><%= event_key %></span>/teams
-     </a>
-    </code>
-  </td>
-  <td>
-     <%= event.full_title %>
-  </td>
- </tr>
- <% end %>
-</table>
-
-<h3>List all rounds for an event (league+season) <code>/event/<span class='params'>:key</span>/rounds</code></h3>
-
-<table>
- <% example_event_keys.each do |event_key|
-    event = Event.find_by_key!( event_key.tr('_', '/') )
-  %>
- <tr>
-   <td>
-     <code>
-       <a href='<%= url("/event/#{event_key}/rounds") %>'>
-         /event/<span class='params'><%= event_key %></span>/rounds
-       </a>
-     </code>
-   </td>
-   <td>
-      <%= event.full_title %>
-   </td>
-  </tr>
- <% end %>
-</table>
-
-
-<h3>List all rounds for today or a date <code>/rounds/<span class='params'>today|:YYYY.MM.DD</span></code></h3>
-
-<table>
- <tr>
-   <td>
-     <code>
-       <a href='<%= url("/rounds/today") %>'>
-         /rounds/<span class='params'>today</span>
-       </a>
-     </code>
-   </td>
-   <td>
-      All rounds scheduled for today
-   </td>
-  </tr>
-  <tr>
-   <td>
-     <code>
-       <a href='<%= url("/rounds/2013.6.30") %>'>
-         /rounds/<span class='params'>2013.6.30</span>
-       </a>
-     </code>
-   </td>
-   <td>
-      All rounds scheduled for July 30th, 2013 
-   </td>
-  </tr>
-</table>
-
-
-
-<h3>List all games in a round for an event (league+season) <code>/event/<span class='params'>:key</span>/round/<span class='params'>:pos|today</code></h3>
-
-
-<table>
- <% example_event_keys.each_with_index do |event_key, index|
-    event = Event.find_by_key!( event_key.tr('_', '/') )
-  %>
- <tr>
-   <td>
-     <code>
-       <a href='<%= url("/event/#{event_key}/round/#{example_round_pos[index]}") %>'>
-         /event/<span class='params'><%= event_key %></span>/round/<span class='params'><%= example_round_pos[index] %></span>
-       </a>
-     </code>
-   </td>
-   <td>
-       <%= event.full_title %> - <%= example_round_label[index] %>
-   </td>
-  </tr>
- <% end %>
-
- <tr>
-   <td>
-     <code>
-       <a href='<%= url("/event/de.2013_14/round/today") %>'>
-         /event/<span class='params'>de.2013_14</span>/round/<span class='params'>today</span>
-       </a>
-     </code>
-   </td>
-   <td>
-       Deutsche Bundesliga 2013/14 - all games for today's round (or if no round scheduled for today the last one or if no last one the next upcoming one).
-   </td>
-  </tr>
-</table>
-
-
-
-<%= erb :'_usage' %>
-
-<%= erb :'_football_live' %>
-
-
-<h2>About</h2>
-
-<h3>What's <code>sport.db</code>?</h3>
-
-<p>
-A free open sports database &amp; schema. <a href='https://github.com/geraldb/sport.db'>More &raquo;</a>
-</p>
-
-<h3>What's <code>sport.db.api</code>?</h3>
-
-<p>
-A free open source web service in Ruby w/ Sinatra. <a href='https://github.com/geraldb/sport.db.api'>More  &raquo;</a>
-</p>
-
 
 <% if params[:debug].present? %>
   <%= erb :'_debug' %>
-<% end %>
+<% end %>