From 453e809646d55cedc33317e33b1987a8ed3b8f21 Mon Sep 17 00:00:00 2001
From: magnolia-fan <magnolia_fan@me.com>
Date: Sun, 27 Nov 2011 13:56:10 +0400
Subject: [PATCH] More stable, I hope...

---
 app/assets/javascripts/ajax.coffee        | 27 ++++++++++++++++-------
 app/assets/javascripts/beathaven.coffee   |  6 ++++-
 app/assets/javascripts/page.coffee        | 17 ++++++++++++++
 app/assets/javascripts/session.coffee     |  2 ++
 app/assets/javascripts/vkontakte.coffee   | 11 +++++----
 app/controllers/application_controller.rb |  8 ++++---
 app/controllers/page_controller.rb        | 16 ++++++++------
 app/views/page/_stat.en.html.haml         | 19 ----------------
 app/views/page/_stat.html.haml            | 19 ++++++++++++++++
 app/views/page/_stat.ru.html.haml         | 19 ----------------
 config/locales/en.yml                     | 12 ++++++++++
 config/locales/ru.yml                     | 12 ++++++++++
 12 files changed, 107 insertions(+), 61 deletions(-)
 delete mode 100644 app/views/page/_stat.en.html.haml
 create mode 100644 app/views/page/_stat.html.haml
 delete mode 100644 app/views/page/_stat.ru.html.haml

diff --git a/app/assets/javascripts/ajax.coffee b/app/assets/javascripts/ajax.coffee
index 434fedf..a22b72f 100644
--- a/app/assets/javascripts/ajax.coffee
+++ b/app/assets/javascripts/ajax.coffee
@@ -3,6 +3,14 @@ class window.Ajax
   referer: false
   previous_page: null
   
+  showSpinner: ->
+    $('#artist-load-spinner').show()
+    false
+  
+  hideSpinner: ->
+    $('#artist-load-spinner').hide()
+    false
+  
   load404Page: ->
     $.get '/404.html', (data) ->
       $('.data-container .inner').html data
@@ -43,19 +51,22 @@ class window.Ajax
   detectPage: () ->
     return false if @previous_page == _ajax.getAnchor()
     @previous_page = _ajax.getAnchor()
+    path = _ajax.getAnchor()
+    if path == "/"
+      path = "/greetings/"
     
-    log "Ajax controller is detecting page ..."
+    log "Ajax controller is detecting page for #{path} ..."
     
-    if m = _ajax.getAnchor().match /\/artist\/(.+)\//
+    if m = path.match /\/artist\/(.+)\//
       _search.loadArtistData m[1]
-    else if _ajax.getAnchor().match /\/settings\//
+    else if path.match /\/settings\//
       _settings.loadSettingsPage()
-    else if _ajax.getAnchor().match /\/about\//
-      _ajax.loadAboutPage()
-    else if _ajax.getAnchor().match /\/stat\//
-      _ajax.loadStatPage()
     else
-      _ajax.loadIndexPage();
+      this.showSpinner()
+      _session.query path, {}, (response) ->
+        _page.render response
+        _ajax.hideSpinner()
+        false
     false
 
 $(window).bind 'hashchange', ->
diff --git a/app/assets/javascripts/beathaven.coffee b/app/assets/javascripts/beathaven.coffee
index a44cefa..a02610b 100644
--- a/app/assets/javascripts/beathaven.coffee
+++ b/app/assets/javascripts/beathaven.coffee
@@ -15,6 +15,9 @@ jQuery ->
     l.href = 'http://beathaven.org/'+ l.hash
   
   window.log = (str) ->
+    _beathaven.logs.push
+      timestamp: Date()
+      info: str
     console.log(str) if console?
 
   $.ajaxSetup
@@ -28,9 +31,10 @@ class window.BeatHaven
   
   last_height: false
   lang: 'ru'
+  logs: []
   
   init: ->
-    log "Initiatin BeatHaven ..."
+    log "Initiating BeatHaven ..."
     
     window._vkontakte = new Vkontakte(2335068)
     window._vkontakte.init()
diff --git a/app/assets/javascripts/page.coffee b/app/assets/javascripts/page.coffee
index 235fadc..f7aab4d 100644
--- a/app/assets/javascripts/page.coffee
+++ b/app/assets/javascripts/page.coffee
@@ -1,5 +1,22 @@
 class window.Page
   
+  @data: {}
+  @html: ""
+  @status: ""
+  
+  render: (params) ->
+    @data = params.data
+    @html = params.html
+    @title = params.title
+    @status = params.status
+    
+    log "Rendering page titled \"#{@title}\" of type \"#{params.renderer}\" ..."
+    $('#content').html(@html)
+    
+    # yaCounter7596904.hit _ajax.getAnchor(), @title, _ajax.referer
+    _ajax.setTitle @title
+    false
+  
   print: (html) ->
     $('#content').html(html)
     false
diff --git a/app/assets/javascripts/session.coffee b/app/assets/javascripts/session.coffee
index ec347ad..715774e 100644
--- a/app/assets/javascripts/session.coffee
+++ b/app/assets/javascripts/session.coffee
@@ -12,7 +12,9 @@ class window.Session
     @vk_params = _params
   
   setUser: (user) ->
+    log "Setting user ..."
     @user = user
+    log "Hello, #{if user.name? then user.name else "%username%"}!"
     false
     
   getUser: ->
diff --git a/app/assets/javascripts/vkontakte.coffee b/app/assets/javascripts/vkontakte.coffee
index 83c35bd..7637387 100644
--- a/app/assets/javascripts/vkontakte.coffee
+++ b/app/assets/javascripts/vkontakte.coffee
@@ -8,11 +8,10 @@ class window.Vkontakte
     @api_id
   
   init: ->
-    log "Initiatin Vkontakte API ..."
+    log "Initiating Vkontakte API ..."
     window.vkAsyncInit = ->
       VK.init apiId: _vkontakte.getApiId()
-      VK.Auth.getLoginStatus (response) ->
-        _vkontakte.authInfo(response)
+      _vkontakte.auth()
 
     setTimeout ->
       $('#vk_api_transport').append($('<script async="async" type="text/javascript" src="http://vkontakte.ru/js/api/openapi.js">'))
@@ -50,10 +49,13 @@ class window.Vkontakte
         $('.fullscreen').hide();
       
       if response.session.expire?
+        expire_in = response.session.expire * 1000 - new Date().getTime()
+        log "Session will expire in #{Math.round(expire_in / 1000)} seconds"
         setTimeout ->
+          log "Session expired"
           _vkontakte.auth()
           false
-        , response.session.expire * 1000 - new Date().getTime() + 1000
+        , expire_in + 1000
     else
       _session = new Session({})
       _session.setUser {}
@@ -63,6 +65,7 @@ class window.Vkontakte
       $('.fullscreen').hide();
   
   auth: ->
+    log "Requesting new Vkontakte session ..."
     VK.Auth.getLoginStatus (response) ->
       _vkontakte.authInfo(response)
       false
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1698837..c44da9f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -10,11 +10,13 @@ class ApplicationController < ActionController::Base
   end
   
   def compile_page params
-    @data = params[:data]
+    @data = params[:data] unless params[:data].nil?
     render json: {
-      status: (params[:status] unless params[:status].nil?),
+      renderer: "unified",
       data: @data,
-      html: render_compact_partial(params[:partial])
+      html: render_compact_partial(params[:partial]),
+      title: params[:title],
+      status: (params[:status] unless params[:status].nil?)
     }, include: (params[:include] unless params[:include].nil?)
   end
   
diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb
index 93713b3..1e98dbe 100644
--- a/app/controllers/page_controller.rb
+++ b/app/controllers/page_controller.rb
@@ -4,18 +4,20 @@ class PageController < ApplicationController
   end
   
   def greetings
-    render partial: 'greetings'
+    compile_page(partial: "page/greetings", title: t("title.greetings"))
   end
   
   def about
-    render partial: 'about'
+    compile_page(partial: "page/about", title: t("title.about"))
   end
   
   def stat
-    @artists = Artist.count
-    @albums = Album.count
-    @tracks = Track.count
-    @users = User.count
-    render partial: 'stat'
+    data = {
+      artists: Artist.count,
+      albums: Album.count,
+      tracks: Track.count,
+      users: User.count
+    }
+    compile_page(data: data, partial: "page/stat", title: t("title.stat"))
   end
 end
diff --git a/app/views/page/_stat.en.html.haml b/app/views/page/_stat.en.html.haml
deleted file mode 100644
index ae511bf..0000000
--- a/app/views/page/_stat.en.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-%h2 BeatHaven statistics
-
-%table.zebra-striped.stats
-  %tr
-    %td
-      %strong Artists
-    %td= @artists
-  %tr
-    %td
-      %strong Albums
-    %td= @albums
-  %tr
-    %td
-      %strong Tracks
-    %td= @tracks
-  %tr
-    %td
-      %strong Users
-    %td= @users
diff --git a/app/views/page/_stat.html.haml b/app/views/page/_stat.html.haml
new file mode 100644
index 0000000..6d24256
--- /dev/null
+++ b/app/views/page/_stat.html.haml
@@ -0,0 +1,19 @@
+%h2= t('stat.title')
+
+%table.zebra-striped.stats
+  %tr
+    %td
+      %strong= t('stat.artists')
+    %td= @data[:artists]
+  %tr
+    %td
+      %strong= t('stat.albums')
+    %td= @data[:albums]
+  %tr
+    %td
+      %strong= t('stat.tracks')
+    %td= @data[:tracks]
+  %tr
+    %td
+      %strong= t('stat.users')
+    %td= @data[:users]
diff --git a/app/views/page/_stat.ru.html.haml b/app/views/page/_stat.ru.html.haml
deleted file mode 100644
index 24eda4f..0000000
--- a/app/views/page/_stat.ru.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-%h2 Статистика BeatHaven
-
-%table.zebra-striped.stats
-  %tr
-    %td
-      %strong Исполнителей
-    %td= @artists
-  %tr
-    %td
-      %strong Альбомов
-    %td= @albums
-  %tr
-    %td
-      %strong Треков
-    %td= @tracks
-  %tr
-    %td
-      %strong Пользователей
-    %td= @users
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9e4d97c..3040fcc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -12,11 +12,23 @@ en:
     settings: "Settings"
     your_ad_here: "Your ad couldn't<br/>be here"
   
+  title:
+    greetings: Greetings
+    about: About
+    stat: Stats
+  
   search:
     fail: "Something very bad happened while we tried out to load some info about this artist. How about some other one?"
     loading: "Artist info is loading for the first time now. Usually it takes less than a minute, please wait a bit."
     typo: "Misspelled?"
   
+  stat:
+    title: BeatHaven stats
+    artists: Artists
+    albums: Albums
+    tracks: Tracks
+    users: Users
+  
   settings:
     title: "Settings"
     tab:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2ae52cb..169c389 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -12,11 +12,23 @@ ru:
     settings: "Настройки"
     your_ad_here: "Здесь не могла бы<br/>быть Ваша реклама"
   
+  title:
+    greetings: Привет
+    about: О проекте
+    stat: Статистика
+  
   search:
     fail: "Что-то ужасное произошло пока мы собирали информацию об этом исполнителе. Может пока поищем другого?"
     loading: "Прямо сейчас мы собираем всю возможною информацию об этом исполнителе в первый раз. Обычно это занимает меньше минуты."
     typo: "Опечатались?"
   
+  stat:
+    title: Статистика BeatHaven
+    artists: Исполнителей
+    albums: Альбомов
+    tracks: Треков
+    users: Пользователей
+  
   settings:
     title: "Настройки"
     tab: