sportdb-admin 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66d7b2733c697b323947a2de008d14efa899d98
-  data.tar.gz: 6536dd17977c3285c733d9af24bf09ea673e3b63
+  metadata.gz: 107d4c3b52b32eeafa4c5eb8b6ae0a87b569d695
+  data.tar.gz: 58808e627b6b960fefb59d177b292f651f6bc9ef
 SHA512:
-  metadata.gz: 971b1ccc04db6c7207aa249fd8b323043b44bbf1acb85305bb93e894fc9a412cd9137e90404429af288a545d32dcb689af261199a420cd3561f35020c3b5bce6
-  data.tar.gz: a00f111c96acba4b34a9e77e98af6dab19cef72a3322f6e4ab2be721fb59bf69ce78caf53e20f6395f17583a0543057ed2c7d9821817595023726dcd4e3c490f
+  metadata.gz: ca4277156b7ae5114acd97c1a38d868a7eb9bb4e2f04ca9a530faaea1d741f9f2981ba3afd84da3cdd5556cd7a960e94ce821d8334e51c260a77daa48b5ae733
+  data.tar.gz: b67a1cffa010f98a757f0c7bf9a2d5c03deabc90b3c59d2b5224a17def7588373453ea88c6713c9399efb5510bf59877984383c975534a16fb4f7b1ef0c2511b

data/Manifest.txt

@@ -12,7 +12,11 @@ app/controllers/sport_db_admin/regions_controller.rb
 app/controllers/sport_db_admin/rounds_controller.rb
 app/controllers/sport_db_admin/sport_db_admin_controller.rb
 app/controllers/sport_db_admin/teams_controller.rb
+app/helpers/sport_db_admin/api_helper.rb
 app/helpers/sport_db_admin/application_helper.rb
+app/helpers/sport_db_admin/format_helper.rb
+app/helpers/sport_db_admin/image_helper.rb
+app/helpers/sport_db_admin/link_helper.rb
 app/helpers/sport_db_admin/part_helper.rb
 app/helpers/sport_db_admin/routes_helper.rb
 app/views/layouts/sport_db_admin/sport_db_admin.html.erb
@@ -34,6 +38,7 @@ app/views/sport_db_admin/shared/_td_game_score.html.erb
 app/views/sport_db_admin/shared/_td_game_team1.html.erb
 app/views/sport_db_admin/shared/_td_game_team2.html.erb
 app/views/sport_db_admin/shared/_team_world_tree.html.erb
+app/views/sport_db_admin/teams/_teams.html.erb
 app/views/sport_db_admin/teams/index.html.erb
 app/views/sport_db_admin/teams/index_clubs.html.erb
 app/views/sport_db_admin/teams/index_national_teams.html.erb

data/app/helpers/sport_db_admin/api_helper.rb

@@ -0,0 +1,24 @@
+module SportDbAdmin
+module ApiHelper
+
+  def sportdb_api_defined?
+    defined?( SportDb::Service::Server ) == 'constant'
+  end
+
+  def sportdb_api?
+    # shorter alias (remove long version??? why? why not?)
+    sportdb_api_defined?
+  end
+
+
+  ##############################
+  # routes for api
+  
+  def api_path
+    '/api/v1'
+  end
+
+
+end # module ApiHelper
+end # module SportDbAdmin
+

data/app/helpers/sport_db_admin/application_helper.rb

@@ -1,32 +1,14 @@
 module SportDbAdmin
 module ApplicationHelper
 
-  def game_team1_style_class( game )
-    ## fix: move to game model in game.rb
-    buf = ''
-    buf << game.team1_style_class
-    buf << ' game-knockout ' if game.knockout?
-    ### fix: loser - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals)
-    buf << ' game-team-loser '  if game.complete? && (game.score1 < game.score2)
-    buf
-  end
-  
-  def game_team2_style_class( game )
-    ## fix: move to game model in game.rb
-    buf = ''
-    buf << game.team2_style_class
-    buf << ' game-knockout ' if game.knockout?
-    buf << ' game-team-loser '  if game.complete? && (game.score1 > game.score2)
-    buf
-  end
 
   def powered_by
     ## todo/fix: use version from wettpool module
     content_tag :div do
       link_to( 'Questions? Comments?', 'http://groups.google.com/group/opensport' ) + " | " +
-      link_to( "world.db/#{WorldDB::VERSION}", 'https://github.com/geraldb/world.db' )  + ', ' +
-      link_to( "sport.db/#{SportDB::VERSION}", 'https://github.com/geraldb/sport.db' )  + ', ' +
-      link_to( 'sport.db.admin/1', 'https://github.com/geraldb/sport.db.admin' ) + ' - ' + 
+      link_to( "world.db/#{WorldDb::VERSION}", 'https://github.com/geraldb/world.db' )  + ', ' +
+      link_to( "sport.db/#{SportDb::VERSION}", 'https://github.com/geraldb/sport.db' )  + ', ' +
+      link_to( "sport.db.admin/#{SportDbAdmin::VERSION}", 'https://github.com/geraldb/sport.db.admin' ) + ' - ' + 
       content_tag( :span, "Ruby/#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}/#{RUBY_PLATFORM}) on") + ' ' +
       content_tag( :span, "Rails/#{Rails.version} (#{Rails.env})" ) + " | " + 
       link_to( 'Icon Drawer Flags', 'http://www.icondrawer.com' )
@@ -34,17 +16,5 @@ module ApplicationHelper
     end
   end
 
-  ### todo/fix: move to format helper
-  
-  def fmt_date_with_week( date )
-    if date.nil?
-      '-'
-    else
-      ##  e.g. 2012 (Week 22) // Oct/21 Fri
-      date.strftime( "%Y (Week %V) // %b/%d %a" )
-    end
-  end
-  
-
 end # module ApplicationHelper
-end # module SportDbAdmin
+end # module SportDbAdmin

data/app/helpers/sport_db_admin/format_helper.rb

@@ -0,0 +1,17 @@
+module SportDbAdmin
+module FormatHelper
+
+
+  def fmt_date_with_week( date )
+    if date.nil?
+      '-'
+    else
+      ##  e.g. 2012 (Week 22) // Oct/21 Fri
+      date.strftime( "%Y (Week %V) // %b/%d %a" )
+    end
+  end
+
+
+
+end # module FormatHelper
+end # module SportDbAdmin

data/app/helpers/sport_db_admin/image_helper.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+module SportDbAdmin
+module ImageHelper
+
+  def logo_for_team( team )
+    # 1) check if logo exists
+    if Rails.application.assets.find_asset( "logos/24x24/#{team.key}.png" ).present?
+      image_tag( "logos/24x24/#{team.key}.png" )
+    else
+      ''  # return empty string (e.g. nothing)
+    end
+  end
+
+  def flag_for_country( country )
+    image_tag( "flags/24x24/#{country.key}.png" )
+  end
+
+
+end # module ImageHelper
+end # module SportDbAdmin

data/app/helpers/sport_db_admin/link_helper.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+module SportDbAdmin
+module LinkHelper
+
+  def link_to_country( country )
+    link_to( country.title, short_country_path( country ) )
+  end
+
+  def link_to_team( team )
+    link_to( team.title, short_team_path( team ) )
+  end
+
+  def link_to_event( event, opts={} )
+    if (opts[:full].present? ||
+        opts[:full_title].present? ||
+        opts[:fulltitle].present? )
+      # show league title + season title (a.k.a full_title)
+      #  e.g. Primera División 2013/14
+      link_to( event.full_title, short_event_path( event ))
+    elsif opts[:league].present?
+      # show only league (w/o season title)
+      #  e.g. Primera División
+      link_to( event.league.title, short_event_path( event ))
+    else # season: true (default)
+      # show only season (w/o league title)
+      #  e.g. 2013/14 or 2014
+      link_to( event.season.title, short_event_path( event ))
+    end
+  end
+
+
+
+end # module LinkHelper
+end # module SportDbAdmin

data/app/helpers/sport_db_admin/part_helper.rb

@@ -10,36 +10,36 @@ module PartHelper
 
 
   def render_game_date( game, opts={} )
-    render :partial => 'sport_db_admin/shared/td_game_date', :locals => { :game => game }
+    render partial: 'sport_db_admin/shared/td_game_date', locals: { game: game }
   end
 
   def render_game_score( game, opts={} )
-    render :partial => 'sport_db_admin/shared/td_game_score', :locals => { :game => game }
+    render partial: 'sport_db_admin/shared/td_game_score', locals: { game: game }
   end
 
   def render_game_team1( game, opts={} )
-    render :partial => 'sport_db_admin/shared/td_game_team1', :locals => { :game => game }
+    render partial: 'sport_db_admin/shared/td_game_team1', locals: { game: game }
   end
 
   def render_game_team2( game, opts={} )
-    render :partial => 'sport_db_admin/shared/td_game_team2', :locals => { :game => game }
+    render partial: 'sport_db_admin/shared/td_game_team2', locals: { game: game }
   end
 
   def render_game_flags( game, opts={} )
-    render :partial => 'sport_db_admin/shared/td_game_flags', :locals => { :game => game }
+    render partial: 'sport_db_admin/shared/td_game_flags', locals: { game: game }
   end
 
   def render_game_debug( game, opts={} )
-    render :partial => 'sport_db_admin/shared/td_game_debug', :locals => { :game => game }
+    render partial: 'sport_db_admin/shared/td_game_debug', locals: { game: game }
   end
 
   def render_game_round( game, opts={} )
-    render :partial => 'sport_db_admin/shared/td_game_round', :locals => { :game => game }
+    render partial: 'sport_db_admin/shared/td_game_round', locals: { game: game }
   end
 
 
   def render_team_world_tree( team, opts={} )
-    render :partial => 'sport_db_admin/shared/team_world_tree', :locals => { :team => team }
+    render partial: 'sport_db_admin/shared/team_world_tree', locals: { team: team }
   end
 
 

data/app/helpers/sport_db_admin/routes_helper.rb

@@ -4,7 +4,7 @@ module SportDbAdmin
 module RoutesHelper
 
   ##############################
-  ## routes for shortcuts
+  # routes for shortcuts
   
   def short_country_path( country )
     short_country_worker_path( country.key )

data/app/views/layouts/sport_db_admin/sport_db_admin.html.erb

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>sport.db Web Admin</title>
-  <%= stylesheet_link_tag    "sport_db_admin/application", :media => "all" %>
-  <%= javascript_include_tag "sport_db_admin/application" %>
+  <%= stylesheet_link_tag    'sport_db_admin/application', :media => 'all' %>
+  <%= javascript_include_tag 'sport_db_admin/application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
@@ -17,11 +17,15 @@
   <%= link_to 'Rounds', rounds_path() %>  &bull;
   <%= link_to 'Past Games', past_games_path() %> &bull;
   <%= link_to 'Upcoming Games', games_path() %>  &bull;
-  <%= link_to 'About', about_path() %>   .::.
-
-  <!-- fix: use named url_helper for /api -->
-  <%= link_to "Web Service / HTTP JSON API", '/api' %>
+  <%= link_to 'About', about_path() %>
   <!-- todo: add some more links -->
+  
+  <% if sportdb_api_defined? %>
+     .::.
+  
+  <!-- fix/check: does it work for nested routes /e.g. db/api/v1 or /api/v1 ?? -->
+  <%= link_to 'Web Service / HTTP JSON API', api_path() %>
+  <% end %>
  </p>
 
 <div class='content'>

data/app/views/sport_db_admin/countries/index.html.erb

@@ -27,8 +27,8 @@
       <%= country.key %>
     </td>
     <td style='white-space: nowrap;'>
-<%= image_tag "flags/24x24/#{country.key}.png" %>  
-<%= link_to country.title, short_country_path( country ) %>
+<%= flag_for_country( country ) %>  
+<%= link_to_country( country ) %>
     </td>
     <td>
       (<%= country.code %>)

data/app/views/sport_db_admin/countries/show.html.erb

@@ -1,6 +1,6 @@
 
 <h3>
-<%= image_tag "flags/24x24/#{@country.key}.png" %>
+<%= flag_for_country( @country ) %>
 <%= @country.title %> 
 (<%= @country.code %>)
 </h3>
@@ -37,7 +37,8 @@
    <tr>
      <td class='team-key'><%= team.key %></td>
      <td>
-       <%= link_to team.title, short_team_path( team ) %>
+       <%= logo_for_team( team ) %>
+       <%= link_to_team( team ) %>
        <%= " | #{team.synonyms.split('|').join(' | ')}" if team.synonyms.present? %>
      </td>
      <td>
@@ -99,7 +100,8 @@
       <td>
         <% city.teams.each_with_index do |team,index| %>
           <%= '•' if index > 0 %>
-          <%= link_to team.title, short_team_path(team) %>
+          <%= logo_for_team( team ) %>
+          <%= link_to_team( team ) %>
         <% end %><!-- each team -->
       </td>
     </tr>

data/app/views/sport_db_admin/events/index.html.erb

@@ -15,13 +15,13 @@
    <td>
      <% league.events.each_with_index do |event,index| %>
           <%= '•' if index > 0 %>
-          <%= link_to event.season.title, short_event_path(event) %>
+          <%= link_to_event( event ) %>
      <% end %>
    </td>
    <td style='white-space: nowrap;'>
     <% if league.country.present? %>
-       <%= image_tag "flags/24x24/#{league.country.key}.png" %>
-       <%= link_to league.country.title, short_country_path(league.country) %>
+       <%= flag_for_country( league.country) %>
+       <%= link_to_country( league.country ) %>
        (<%= league.country.code %>)
     <% end %>
    </td>

data/app/views/sport_db_admin/events/show.html.erb

@@ -7,22 +7,12 @@
 <table>
  <% @event.teams.each do |team| %>
 
-<% if team.national? %>
  <tr>
  <td>
-     <%= image_tag "flags/32x32/#{team.country.key}.png" %>
-     <%= link_to team.title, short_team_path( team ) %>
+     <%= logo_for_team( team ) %>
+     <%= link_to_team( team ) %>
      <%= "(#{team.code})" if team.code.present? %>
-      >
-     <%= team.country.continent.title if team.country.continent.present? %>
- </td>
- </tr>
-<% else %><!-- club -->
- <tr>
-   <td>
-     <%= link_to team.title, short_team_path( team ) %>
-     <%= "(#{team.code})" if team.code.present? %>
-    </td>
+
     <td>
        <%= team.title2  if team.title2.present? %>
     </td>
@@ -30,10 +20,10 @@
       <%= render_team_world_tree( team ) %>
      </td>
  </tr>
-<% end %>
 <% end %><!-- teams.each -->
 </table>
 
+
 <% if @event.groups.count > 0 %>
 <h4><%= @event.groups.count %> Groups</h4>
 
@@ -55,10 +45,8 @@
   <% group.teams.each do |team| %>
 
    <td>
-    <% if team.national? %>
-      <%= image_tag "flags/32x32/#{team.country.key}.png" %>
-    <% end %>
-    <%= link_to team.title, short_team_path( team ) %>
+    <%= logo_for_team( team ) %>
+    <%= link_to_team( team ) %>
    </td>
   <% end %>
 </tr>

data/app/views/sport_db_admin/games/index.html.erb

@@ -7,14 +7,14 @@
 <h3>Past Games</h3>
 <% end %>
 
-<%= render :partial => 'games',  :locals => { :games  => @games } %>
+<%= render partial: 'games', locals: { :games  => @games } %>
 
 <% if @games.count > 0 %>
 <p>
   <% if @show_upcoming %>
-     <%= link_to 'Mehr Spiele »', games_path(:limit => 100) %>
+     <%= link_to 'Mehr Spiele »', games_path( limit: 100 ) %>
   <% else %>
-     <%= link_to 'Mehr Spiele »', past_games_path(:limit => 100) %>
+     <%= link_to 'Mehr Spiele »', past_games_path( limit: 100 ) %>
   <% end %>
 </p>
 <% else %>

data/app/views/sport_db_admin/pages/about.html.erb

@@ -25,8 +25,8 @@ A free open sports database & schema.
   <tr><td style='text-align: right'><%= Country.count %> </td><td>Countries</td></tr>
   <tr><td style='text-align: right'><%= Region.count %>  </td><td>Regions</td></tr>
   <tr><td style='text-align: right'><%= City.count %>    </td><td>Cities</td></tr>
-  <tr><td style='text-align: right'><%= WorldDB::Models::Tag.count %>    </td><td>Tags</td></tr>
-  <tr><td style='text-align: right'><%= WorldDB::Models::Tagging.count %>    </td><td>Taggings</td></tr>
+  <tr><td style='text-align: right'><%= WorldDb::Models::Tag.count %>    </td><td>Tags</td></tr>
+  <tr><td style='text-align: right'><%= WorldDb::Models::Tagging.count %>    </td><td>Taggings</td></tr>
 
   <!-- todo: add prop count -->
 
@@ -45,7 +45,7 @@ A free open sports database &amp; schema.
               Season.count+
               Team.count+
               LogDb::Models::Log.count + 
-              WorldDB::Models::Tag.count+
-              WorldDB::Models::Tagging.count %></td><td>Total</td></tr>
+              WorldDb::Models::Tag.count+
+              WorldDb::Models::Tagging.count %></td><td>Total</td></tr>
 </table>
 

data/app/views/sport_db_admin/regions/index.html.erb

@@ -9,8 +9,8 @@
       <%= country.key %>
     </td>
     <td style='white-space: nowrap; vertical-align: top;'>
-<%= image_tag "flags/24x24/#{country.key}.png" %>  
-<%= link_to country.title, short_country_path( country ) %>
+<%= flag_for_country( country ) %>
+<%= link_to_country( country ) %>
     </td>
     <td  style='vertical-align: top;'>
       (<%= country.code %>)

data/app/views/sport_db_admin/rounds/index.html.erb

@@ -35,7 +35,7 @@
        <%= round.start_at.strftime( '%b/%d %a') %>
      </td>
      <td>
-       <%= link_to round.event.full_title, short_event_path( round.event ) %>
+       <%= link_to_event( round.event, full_title: true ) %>
      </td>
      <td>
         <%= round.title %>

data/app/views/sport_db_admin/shared/_td_game_round.html.erb

@@ -3,7 +3,7 @@
   -->
 
 <td class='game-round'>
-  (<%= link_to game.round.event.title, short_event_path( game.round.event ) %>
+  (<%= link_to_event( game.round.event, league: true ) %>
    <%= "/ #{game.round.title}" %>
    <%= "/ #{game.group.title}" if game.group.present? %>)
 </td>

data/app/views/sport_db_admin/shared/_td_game_team1.html.erb

@@ -8,14 +8,10 @@
 
 
 <td class='game-team1' style='text-align: right;'>
-  <span class='<%= game_team1_style_class( game ) %>'>
-    <%= link_to game.team1.title, short_team_path( game.team1 ) %>
+  <span class='<%= game.team1_style_class %>'>
+    <%= link_to_team( game.team1 ) %>
   </span>
   <%= "(#{game.team1.title2})" if game.team1.title2.present? %>
   
-  <!-- todo: move code to model ?? -->
-  <% if game.team1.national? %>
-    <%= image_tag "flags/32x32/#{game.team1.country.key}.png" %>
-  <% end %>
-  
-</td>
+  <%= logo_for_team( game.team1 ) %>
+</td>

data/app/views/sport_db_admin/shared/_td_game_team2.html.erb

@@ -8,12 +8,10 @@
 
 <td class='game-team2'>
   <!-- todo: move code to model ?? -->
-  <% if game.team2.national? %>
-    <%= image_tag "flags/32x32/#{game.team2.country.key}.png" %>
-  <% end %>
-  
-  <span class='<%= game_team2_style_class( game ) %>'>
-    <%= link_to game.team2.title, short_team_path( game.team2 ) %>
+  <%= logo_for_team( game.team2 ) %>
+
+  <span class='<%= game.team2_style_class %>'>
+    <%= link_to_team( game.team2 ) %>
   </span>
   <%= "(#{game.team2.title2})" if game.team2.title2.present? %>
 </td>

data/app/views/sport_db_admin/shared/_team_world_tree.html.erb

@@ -1,7 +1,7 @@
 
 <span>
-  <%= image_tag "flags/24x24/#{team.country.key}.png" %>
-  
+  <%= flag_for_country( team.country ) %>
+
   <% if team.city.present? %>
     <%= team.city.title %> >
     <% if team.city.region.present? %>
@@ -9,8 +9,8 @@
     <% end %>
   <% end %>
 
-  
-  <%= link_to team.country.title, short_country_path(team.country) %>
+
+  <%= link_to_country( team.country ) %>
   (<%= team.country.code %>) >
   <%= team.country.continent.title if team.country.continent.present? %>
 </span>

data/app/views/sport_db_admin/teams/_teams.html.erb

@@ -0,0 +1,26 @@
+<table>
+ <% teams.each do |team| %>
+   <tr>
+     <td class='team-key'><%= team.key %></td>
+     <td>
+       <%= logo_for_team( team ) %>
+     </td>
+     <td>
+       <%= link_to team.title, short_team_path( team ) %>
+       <%= " | #{team.synonyms.split('|').join(' | ')}" if team.synonyms.present? %>
+     </td>
+     <td>
+       <%= "(#{team.code})" if team.code.present? %>
+     </td>
+     <td>
+       <%= team.title2  if team.title2.present? %>
+     </td>
+     
+     <td class='team-key'><%= team.country.key %>
+     </td>
+     <td style='white-space: nowrap;'>
+      <%= render_team_world_tree( team ) %>
+     <td>
+   </tr>
+ <% end %><!-- teams.each -->
+</table>

data/app/views/sport_db_admin/teams/index.html.erb

@@ -1,7 +1,6 @@
 
-<h3><%= Team.count %> Teams</h3>
-
-<p>nb: no longer used; split into two views (national teams n clubs)
+<p>
+   note: no longer used; split into two views (national teams n clubs)
    - club view is default
 </p>
 

data/app/views/sport_db_admin/teams/index_clubs.html.erb

@@ -24,26 +24,4 @@
 </p>
 
 
-<table>
- <% @teams.each do |team| %>
-   <tr>
-     <td class='team-key'><%= team.key %></td>
-     <td>
-       <%= link_to team.title, short_team_path( team ) %>
-       <%= " | #{team.synonyms.split('|').join(' | ')}" if team.synonyms.present? %>
-     </td>
-     <td>
-       <%= "(#{team.code})" if team.code.present? %>
-     </td>
-     <td>
-       <%= team.title2  if team.title2.present? %>
-     </td>
-     
-     <td class='team-key'><%= team.country.key %>
-     </td>
-     <td style='white-space: nowrap;'>
-      <%= render_team_world_tree( team ) %>
-     <td>
-   </tr>
- <% end %><!-- teams.each -->
-</table>
+<%= render partial: 'teams', locals: { teams: @teams } %>

data/app/views/sport_db_admin/teams/index_national_teams.html.erb

@@ -16,30 +16,4 @@
 </p>
 
 
-<table>
- <% @teams.each do |team| %>
-   <tr>
-     <td class='team-key'><%= team.key %></td>
-     <td>
-       <%= link_to team.title, short_team_path( team ) %>
-     </td>
-     <td>
-       <%= "(#{team.code})" if team.code.present? %>
-     </td>
-     <td>
-       <%= team.title2 if team.title2.present? %>
-     </td>
-     
-     <td class='team-key'><%= team.country.key %>
-     </td>
-     <td>
-       <%= image_tag "flags/24x24/#{team.country.key}.png" %>
-       <%= link_to team.country.title, short_country_path(team.country) %>
-       (<%= team.country.code %>)
-       >
-       <%= team.country.continent.title if team.country.continent.present? %>
-     <td>
-     
-   </tr>
- <% end %><!-- teams.each -->
-</table>
+<%= render partial: 'teams', locals: { teams: @teams } %>

data/app/views/sport_db_admin/teams/show.html.erb

@@ -6,10 +6,7 @@
 
 <p>
  
-  <% if @team.national? %>
-  <% else %>
-    <%= render_team_world_tree( @team ) %>
-  <% end %>
+   <%= render_team_world_tree( @team ) %>
   
    <%= " | #{@team.title2}" if @team.title2.present? %>
 
@@ -25,7 +22,7 @@
 
 <ul>
   <% @team.events.each do |event| %>
-      <li><%= link_to event.full_title, short_event_path(event) %></li>
+      <li><%= link_to_event( event, full_title: true ) %></li>
   <% end %>
 </ul>
 

data/config/routes.rb

@@ -1,15 +1,15 @@
 
-puts "[boot] routes.rb - before SportDbAdmin::Engine.routes.draw"
+puts '[boot] routes.rb - before SportDbAdmin::Engine.routes.draw'
 
 SportDbAdmin::Engine.routes.draw do
 
-  puts "[boot] routes.rb - enter SportDbAdmin::Engine.routes.draw"
+  puts '[boot] routes.rb - enter SportDbAdmin::Engine.routes.draw'
   
-  match 'about',    :to => 'pages#about'
+  get 'about',    :to => 'pages#about'
 
 
-  match 'clubs',          :to => 'teams#index_clubs', :as => 'clubs'
-  match 'national_teams', :to => 'teams#index_national_teams', :as => 'national_teams'
+  get 'clubs',          :to => 'teams#index_clubs',          :as => 'clubs'
+  get 'national_teams', :to => 'teams#index_national_teams', :as => 'national_teams'
 
   resources :countries
   resources :regions
@@ -45,24 +45,25 @@ SportDbAdmin::Engine.routes.draw do
   # shortcut -- 3+ letters  (w/ digits w/ dots) - assume shortcut for event
   #  
   # NB: for now -> must end with   .2012 or .2012_13 etc.
-  match '/:key', :to => 'events#shortcut', :as => :short_event_worker, :key => /.+\.[0-9_]+/
+  get '/:key', :to => 'events#shortcut', :as => :short_event_worker, :key => /.+\.[0-9_]+/
 
   ####
   # shortcut -- 3+ lower case letters (w/o digits) - assume shortcut for team
   #  nb: do NOT use team keys like az with only two lower case letters; always use at least three minimum
-  match '/:key', :to => 'teams#shortcut', :as => :short_team_worker, :key => /[a-z]{3,}/
+  #  todo: allow numbers in key too
+  get '/:key', :to => 'teams#shortcut', :as => :short_team_worker, :key => /[a-z]{3,}/
 
 
   ####
   # shortcut -- 2 lower case letters - assume shortcut for country
-  match '/:key', :to => 'countries#shortcut', :as => :short_country_worker, :key => /[a-z]{2}/
-  
+  get '/:key', :to => 'countries#shortcut', :as => :short_country_worker, :key => /[a-z]{2}/
+
 
 
   root :to => 'games#index'
   
-   puts "[boot] routes.rb - leave SportDbAdmin::Engine.routes.draw"
+  puts '[boot] routes.rb - leave SportDbAdmin::Engine.routes.draw'
 
 end
 
-puts "[boot] routes.rb - after SportDbAdmin::Engine.routes.draw"
+puts '[boot] routes.rb - after SportDbAdmin::Engine.routes.draw'

data/lib/sportdb/admin/version.rb

@@ -1,4 +1,4 @@
 
 module SportDbAdmin
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -61,7 +61,11 @@ files:
 - app/controllers/sport_db_admin/rounds_controller.rb
 - app/controllers/sport_db_admin/sport_db_admin_controller.rb
 - app/controllers/sport_db_admin/teams_controller.rb
+- app/helpers/sport_db_admin/api_helper.rb
 - app/helpers/sport_db_admin/application_helper.rb
+- app/helpers/sport_db_admin/format_helper.rb
+- app/helpers/sport_db_admin/image_helper.rb
+- app/helpers/sport_db_admin/link_helper.rb
 - app/helpers/sport_db_admin/part_helper.rb
 - app/helpers/sport_db_admin/routes_helper.rb
 - app/views/layouts/sport_db_admin/sport_db_admin.html.erb
@@ -83,6 +87,7 @@ files:
 - app/views/sport_db_admin/shared/_td_game_team1.html.erb
 - app/views/sport_db_admin/shared/_td_game_team2.html.erb
 - app/views/sport_db_admin/shared/_team_world_tree.html.erb
+- app/views/sport_db_admin/teams/_teams.html.erb
 - app/views/sport_db_admin/teams/index.html.erb
 - app/views/sport_db_admin/teams/index_clubs.html.erb
 - app/views/sport_db_admin/teams/index_national_teams.html.erb