app/views/pages/_timeline.html.erb server @@ -12,7 +12,8 @@ class PagesController < ApplicationController def index @pages = Page.paginate :page => params[:page], :order => 'total_pageviews DESC' - + @page = Page.first(:order => 'total_pageviews desc') + respond_to do |format| format.html # index.html.erb format.xml { render :xml => @pages } @@ -24,25 +25,6 @@ class PagesController < ApplicationController def show @page = Page.find(params[:id]) - # @data = { - # 1.day.ago => { :foo=>123, :bar=>100 }, - # 2.day.ago => { :foo=>345, :bar=>200 }, - # 3.day.ago => { :foo=>445, :bar=>120 }, - # 4.day.ago => { :foo=>425, :bar=>140 }, - # 5.day.ago => { :foo=>515, :bar=>107 } - # } - - rawdates = JSON.parse(@page.daily_timeline.dates) - pageviews = JSON.parse(@page.daily_timeline.pageviews) - - # TODO: move this out to the model - - @data ={} - rawdates.each_with_index do |date, index| - @data[DateTime.strptime( date.to_s, "%Y%m%d")] = {:page_views => pageviews[index]} - end - - respond_to do |format| format.html # show.html.erb format.xml { render :xml => @page } app/controllers/pages_controller.rb @@ -1,7 +1,6 @@ class Page < ActiveRecord::Base has_one :daily_timeline named_scope :title_like, lambda { |query| { :conditions => ['title like ?', "#{query}%"], :order => '`total_pageviews` DESC', :limit => 20 } } - def normed_daily_pageviews @pageviews = JSON.parse(self.daily_timeline.pageviews) @@ -17,7 +16,7 @@ class Page < ActiveRecord::Base return sorted_pageviews end - def chart + def sparkline # todo: move the data fetching out to the model # prepare some nice charts here # dataset = GC4R::API::GoogleChartDataset.new :data => (1..30).map{ rand(100) }, :color => '0000FF' @@ -30,4 +29,15 @@ class Page < ActiveRecord::Base return @chart end + def timeline + rawdates = JSON.parse(self.daily_timeline.dates) + pageviews = JSON.parse(self.daily_timeline.pageviews) + + @data ={} + rawdates.each_with_index do |date, index| + @data[DateTime.strptime( date.to_s, "%Y%m%d")] = {:page_views => pageviews[index]} + end + return @data + end + end app/models/page.rb @@ -11,7 +11,7 @@ </head> <body> -<%= render :partial=>"pages/search_pane" %> +Search Articles: <%= render :partial=>"pages/search_pane" %> <p style="color: green"><%= flash[:notice] %></p> app/views/layouts/pages.html.erb @@ -1,4 +1,9 @@ -<h1>Top Wikipedia Articles (Last 30 Days)</h1> +<h2> Top Article this month:</h2> +<div id = "timeline_chart"> + <%= render :partial => "timeline" %> +</div> + +<h2>Top Wikipedia Articles (Last 30 Days)</h2> <table> <tr> @@ -12,7 +17,7 @@ <tr> <td><%= index +1 %></td> <td><%= number_with_delimiter(page.total_pageviews, ',') %></td> - <td><%= link_to page.title, page %><BR><%= image_tag page.chart.to_url %> </td> + <td><%= link_to page.title, page %><BR><%= image_tag page.sparkline.to_url %> </td> <td><%= link_to 'http://en.wikipedia.org/wiki/' + page.url, 'http://en.wikipedia.org/wiki/' + page.url %></td> </tr> <% end %> app/views/pages/index.html.erb @@ -1,7 +1,8 @@ -<%= inline_annotated_timeline @data, 600, 400, 'div_id_to_create' %> - +<div id = "timeline_chart"> + <%= render :partial => "timeline" %> +</div> <p> <b>Url:</b> <%=h @page.url %> app/views/pages/show.html.erb @@ -1,6 +1,6 @@ ActionController::Routing::Routes.draw do |map| + map.root :controller => "pages" map.resources :daily_timelines - map.resources :pages # The priority is based upon order of creation: first created -> highest priority. config/routes.rb 8d8ebc803662a8ba1b7661e6c1e0b20c6f941f39 Pete Skomoroch pete@datawrangling.com http://github.com/datawrangling/trendingtopics/commit/c3c7f9229e012474a58b92c0d3744327bed0cb1d c3c7f9229e012474a58b92c0d3744327bed0cb1d

2009-06-02T20:56:55-07:00

cleanup d4cc1b135132d2d14fc5391122bd6f88f7ef7650 Pete Skomoroch pete@datawrangling.com