Enabled ranking search within country. Also some design change.

Author: Hidetchi

app/controllers/api/players_controller.rb

@@ -116,14 +116,23 @@ def detail
     @player = Player.find(:all, :conditions => ['login = ?',params[:name]])
 
     respond_to do |format|
-      format.xml  { render :xml => @player }
+      format.xml  { render :xml => @player.to_xml(:only => [
+        :avatar_image_url, :country_id, :created_at, :draws34, :exp34, :login,
+        :losses, :losses34, :max_rate, :name, :pr, :rate, :streak, :streak_best,
+        :updated_at, :wins, :wins34]) }
     end
   end
 
   def ranking
-    conditions = 'players.updated_at >= ? and (players.wins + players.losses) >= ? and players.show_ranking = ?'
-    @api_players = Player.find(:all,
-                       :conditions => [conditions, DateTime.now - 90 , 30, true])
+    if (params[:country_id] == "*")
+      conditions = 'players.updated_at >= ? and (players.wins + players.losses) >= ? and players.show_ranking = ?'
+      @api_players = Player.find(:all,
+                         :conditions => [conditions, DateTime.now - 90 , 30, true])
+    else
+      conditions = 'players.updated_at >= ? and (players.wins + players.losses) >= ? and players.show_ranking = ? and players.country_id = ?'
+      @api_players = Player.find(:all,
+                         :conditions => [conditions, DateTime.now - 90 , 30, true, params[:country_id]])
+    end
     case params[:item]
     when "rate"
       @api_players = @api_players.sort_by { |v| - ( v.wins + v.losses ) }
@@ -153,9 +162,15 @@ def ranking
   end
 
   def ranking34
-    conditions = 'players.updated_at >= ? and players.exp34 >= ? and players.show_ranking = ?'
-    @api_players = Player.find(:all,
-                       :conditions => [conditions, DateTime.now - 90 , 20, true])
+    if (params[:country_id] == "*")
+      conditions = 'players.updated_at >= ? and players.exp34 >= ? and players.show_ranking = ?'
+      @api_players = Player.find(:all,
+                         :conditions => [conditions, DateTime.now - 90 , 20, true])
+    else
+      conditions = 'players.updated_at >= ? and players.exp34 >= ? and players.show_ranking = ? and players.country_id = ?'
+      @api_players = Player.find(:all,
+                         :conditions => [conditions, DateTime.now - 90 , 20, true, params[:country_id]])
+    end
     case params[:item]
     when "exp"
       @api_players = @api_players.sort_by { |v| - v.wins34 }

app/views/api/players/ranking.xml.builder

@@ -5,13 +5,11 @@ xml.ranking(:item => params[:item]) do
       xml.login(p.login)
       xml.name(p.name)
       xml.country_id(p.country_id)
-      xml.rate(p.rate)
+      xml.rate(p.rate.to_i)
       xml.wins(p.wins)
       xml.losses(p.losses)
       xml.streak(p.streak)
       xml.streak_best(p.streak_best)
-      xml.created_at(p.created_at)
-      xml.updated_at(p.updated_at)
     end
     i += 1
     break if i >= 100

app/views/api/players/search.xml.builder

@@ -1,14 +1,18 @@
 xml.players do
   for p in @api_players
     xml.player do
-      xml.id(p.id)
       xml.login(p.login)
+      xml.name(p.name)
       xml.country_id(p.country_id)
-      xml.rate(p.rate)
+      xml.rate(p.rate.to_i)
       xml.wins(p.wins)
       xml.losses(p.losses)
       xml.streak(p.streak)
       xml.streak_best(p.streak_best)
+      xml.exp34(p.exp34)
+      xml.wins34(p.wins34)
+      xml.losses34(p.losses34)
+      xml.draws34(p.draws34)
       xml.created_at(p.created_at)
       xml.updated_at(p.updated_at)
     end

app/views/players/show.html.erb

@@ -4,11 +4,11 @@
 <div class="container">
 <table width=100% border="1" cellspacing="0" cellpadding="5" align="center">
 <tr>
-<td><b>81Dojo <%= Player.human_attribute_name("login") %></b><td><%= @player.name %>
+<td><b>81Dojo <%= Player.human_attribute_name("login") %></b><td align="center"><%= @player.name %>
 <tr>
-<td><b><%= Player.human_attribute_name("country") %></b><td><%= @player.country ? @player.country.name : '' %>
+<td><b><%= Player.human_attribute_name("country") %></b><td align="center"><%= @player.country ? @player.country.name : '' %>
 <tr>
-<td><b><%= Player.human_attribute_name("rate") %></b><td><%= @player.rate %>
+<td><b><%= Player.human_attribute_name("rate") %></b><td align="center"><%= sprintf("%.2f",@player.rate) %>
 </table>
 </div>
 <div style="font-size:24px"><%= link_to 'Edit',edit_player_path(@player) %></div>

app/views/sessions/new.html.erb

@@ -3,12 +3,12 @@
 <div style="color:green"><%= flash[:notice] %></div>
 <div style="color:red"><%= flash[:error] %></div>
 <% form_tag session_path do -%>
-<p><%= label_tag 'login' %><br />
-ハンドルネーム<br />
+<p><b><%= label_tag 'login' %></b><br />
+<font size="-1">(ハンドルネーム)</font><br />
 <%= text_field_tag 'login', @login %></p>
 
-<p><%= label_tag 'password' %><br/>
-パスワード<br />
+<p><b><%= label_tag 'password' %></b><br/>
+<font size="-1">(パスワード)</font><br />
 <%= password_field_tag 'password', nil %></p>
 
 <!-- Uncomment this if you want this functionality

config/routes.rb

@@ -8,8 +8,8 @@
 
   map.namespace :api do |api|
     api.connect '/players/search/:name', :controller => 'players', :action => 'search'
-    api.connect '/players/ranking/:item', :controller => 'players', :action => 'ranking'
-    api.connect '/players/ranking34/:item', :controller => 'players', :action => 'ranking34'
+    api.connect '/players/ranking/:country_id/:item', :controller => 'players', :action => 'ranking'
+    api.connect '/players/ranking34/:country_id/:item', :controller => 'players', :action => 'ranking34'
     api.connect '/players/detail/:name', :controller => 'players', :action => 'detail'
     api.connect '/kifus/search/:player_name/:opponent_name/:begin_date/:end_date', :controller => 'kifus', :action => 'search'
     api.connect '/rate_change_histories/search/:name', :controller => 'rate_change_histories', :action => 'search'