app/controllers/statistics_controller.rb app/helpers/statistics_helper.rb app/views/statistics/index.html.erb test/functional/statistics_controller_test.rb @@ -1,3 +1,11 @@ class Media < ActiveRecord::Base belongs_to :post + + def big_thumbnail_url + if self.thumbnail_url =~ /flickr\.com/ + self.thumbnail_url.gsub(/_s\.jpg/, '.jpg') + else + self.embed_url + end + end end \ No newline at end of file app/models/media.rb @@ -1,3 +1,4 @@ + class Stream < ActiveRecord::Base has_many :posts, :conditions => 'is_deleted IS FALSE', :order => 'published_at DESC' has_many :articles, @@ -38,4 +39,105 @@ class Stream < ActiveRecord::Base def self.current self.find_or_create_by_id(1) end + + def activity_overview_graph + require 'google_chart' + # Main Activity Chart + GoogleChart::BarChart.new('900x300', "Daily Activity", :vertical, false) do |bc| + data = {} + services = [] + self.posts.find(:all, + :select => 'COUNT(posts.id) AS num_posts, service_id, published_at', + :conditions => ['posts.published_at > ?', 2.weeks.ago], + :group => "service_id,DATE_FORMAT(posts.published_at, '%Y-%m-%d')").each do |post| + xlabel = post.published_at.strftime("%b-%d") + data[xlabel] = {} unless data[xlabel] + data[xlabel][post.service_id.to_i] = post.num_posts.to_i + services << post.service_id.to_i unless services.include?(post.service_id.to_i) + end + xlabels = [] + data_by_service = {} + all_values = [] + data.each do |day,posts_by_service| + xlabels << day + total_today = 0 + services.each do |service_id| + data_by_service[service_id] ||= [] + data_by_service[service_id] << (posts_by_service[service_id] || 0) + total_today += posts_by_service[service_id].to_i + end + all_values << total_today + end + color_i = 0 + services.each do |service_id| + bc.data(Service.find(service_id).identifier, data_by_service[service_id], graph_colors[(color_i % 4)]) + color_i += 1 + end + ylabels = [] + 0.upto(all_values.max) { |i| ylabels << i } + #1.upto(10) { |i| ylabels << i } + bc.axis(:y, :labels => ylabels) + bc.axis(:x, :labels => xlabels) + bc.width_spacing_options(:bar_width => 50) + bc.stacked = true + return bc + end + end + + def used_services_graph + require 'google_chart' + # Services Diagram + services = {} + self.posts.find(:all, + :select => 'COUNT(posts.id) AS num_posts,service_id', + :conditions => ['posts.published_at > ?', 2.weeks.ago], + :group => 'service_id').each do |post| + services[post.service_id.to_i] = post.num_posts.to_i + end + GoogleChart::PieChart.new('320x200', "Services used", false) do |pc| + color_i = 0 + services.each do |service_id,num_posts| + pc.data(Service.find(service_id).identifier, num_posts, graph_colors[(color_i % 4)]) + color_i += 1 + end + return pc + end + end + + def common_activity_hours_graph_url + require 'google_chart' + hourly_activity = {} + time_zone = nil + self.posts.find(:all, + :select => 'COUNT(posts.id) AS num_posts,published_at', + :conditions => ['posts.published_at > ?', 2.weeks.ago], + :group => "DATE_FORMAT(posts.published_at, '%H')").each do |post| + hourly_activity[post.published_at.strftime("%H").to_i] = post.num_posts.to_i + end + puts hourly_activity.inspect + xlabels = (0..23).collect { |h| "#{h+1}:00" } + hourly_activity = (0..23).collect { |h| hourly_activity[h] || 0 } + hourly_activity = hourly_activity.collect { |p| ((p/hourly_activity.max.to_f)*100).ceil } + "http://chart.apis.google.com/chart?cht=r&chs=200x200&chd=t:#{hourly_activity.join(',')}0&chco=#{graph_colors.first}&chls=2.0,4.0,0.0&chxt=x&chxl=0:|#{(0..23).collect { |i| i.to_s }.join('|')}&chxr=0,0.0,23.0&chm=B,#{graph_colors.last},0,1.0,4.0&chtt=Hourly+Activity+#{time_zone}" + end + + def activity_summary_sparkline_url + data = [] + self.posts.find(:all, + :select => 'COUNT(posts.id) AS num_posts, published_at', + :conditions => ['posts.published_at > ?', 2.weeks.ago], + :group => "DATE_FORMAT(posts.published_at, '%Y-%m-%d')").each do |post| + data << post.num_posts.to_i + end + peak = data.max + data = data.collect { |p| ((p/peak.to_f)*100).ceil } + "http://chart.apis.google.com/chart?chs=200x80&chd=t:#{data.join(',')}&cht=ls" + end + + protected + + def graph_colors + ['2a2a2a', '666666', '999999', 'cccccc'] + end + end app/models/stream.rb @@ -3,6 +3,6 @@ <% if @post %> <%= image_tag(media.embed_url.gsub(/_m\.jpg$/, '.jpg')) %> <% elsif local_assigns[:context] == 'media' %> - <%= link_to(image_tag(media.embed_url), read_url(:id => post)) %> + <%= link_to(image_tag(media.big_thumbnail_url), read_url(:id => post)) %> <% end %> <% end %> \ No newline at end of file app/views/posts/_photo.html.erb @@ -72,6 +72,12 @@ </div> <% end %> + <div class="stats"> + <h3>Activity Stats</h3> + <%= link_to(image_tag(@stream.activity_summary_sparkline_url), statistics_url) %> + <%= link_to('more', statistics_url, :class => 'more') %> + </div> + <%= will_paginate(@posts) if @posts.respond_to?(:total_pages) %> </div> app/views/posts/index.html.erb @@ -4,15 +4,17 @@ <%= distance_of_time_in_words_to_now(@post.published_at) %> ago </abbr> <div class="share"> - <%= link_to('Tweet this', "http://twitter.com/home/?status=" + CGI.escape("Check out: #{File.join(@stream.blog_url.to_s, File.join(request.request_uri.to_s))}"), :class => 'tweet_this') %> - <script type="text/javascript"> - digg_url = '<%= File.join(@stream.blog_url.to_s, File.join(request.request_uri.to_s)) %>'; - digg_skin = 'compact'; - digg_window = 'new'; - </script> - <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script> - <% unless @stream.addthis_username.blank? %> - <a href="http://www.addthis.com/bookmark.php" onclick="window.open('http://www.addthis.com/bookmark.php?wt=nw&pub=<%= @stream.addthis_username %>&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title), 'addthis', 'scrollbars=yes,menubar=no,width=620,height=520,resizable=yes,toolbar=no,location=no,status=no,screenX=200,screenY=100,left=200,top=100'); return false;" title="Bookmark and Share" target="_blank"><img src="http://s9.addthis.com/button1-addthis.gif" width="125" height="16" border="0" alt="Bookmark and Share" /></a> + <% if @post.type == 'article' %> + <%= link_to('Tweet this', "http://twitter.com/home/?status=" + CGI.escape("Check out: #{File.join(@stream.blog_url.to_s, File.join(request.request_uri.to_s))}"), :class => 'tweet_this') %> + <script type="text/javascript"> + digg_url = '<%= File.join(@stream.blog_url.to_s, File.join(request.request_uri.to_s)) %>'; + digg_skin = 'compact'; + digg_window = 'new'; + </script> + <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script> + <% unless @stream.addthis_username.blank? %> + <a href="http://www.addthis.com/bookmark.php" onclick="window.open('http://www.addthis.com/bookmark.php?wt=nw&pub=<%= @stream.addthis_username %>&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title), 'addthis', 'scrollbars=yes,menubar=no,width=620,height=520,resizable=yes,toolbar=no,location=no,status=no,screenX=200,screenY=100,left=200,top=100'); return false;" title="Bookmark and Share" target="_blank"><img src="http://s9.addthis.com/button1-addthis.gif" width="125" height="16" border="0" alt="Bookmark and Share" /></a> + <% end %> <% end %> </div> app/views/posts/show.html.erb @@ -39,6 +39,7 @@ ActionController::Routing::Routes.draw do |map| #map.connect '/', :controller => 'posts', :method => :index #map.connect '/archive', :controller => 'posts', :method => :archive + map.resources :statistics map.resources :services map.resources :assets config/routes.rb @@ -245,7 +245,8 @@ div.articles a.feedburner { .trips h3, .tagcloud h3, -.profiles h3 { +.profiles h3, +.stats h3 { margin-bottom: 0.8em; } @@ -257,7 +258,8 @@ div.articles a.feedburner { } .trips, -.profiles { +.profiles, +.stats { float: left; width: 300px; padding: 1em; @@ -288,6 +290,11 @@ div.articles a.feedburner { /* Stream */ +.stream_and_context a.more { + display: block; + font-size: 12px; +} + .stream_and_context { width: 920px; margin: 2em auto; @@ -485,3 +492,19 @@ a.more { height: 20px; } +/* Statistics */ + +div.statistics { + width: 920px; + margin: 2em auto; +} + +.statistics div.services.summary { + margin: 2em 2em 0 0; + float: left; +} + +.statistics div.hourly.activity { + margin-top: 2em; +} + public/stylesheets/application.css bb097ce69f05c3a6645aee19f86f49ed46bc6e91 Dominiek ter Heide info@dominiek.com http://github.com/dominiek/kakuteru/commit/bb54a366708da358a69dd988d70432736af655fc bb54a366708da358a69dd988d70432736af655fc 2008-10-25T08:28:01-07:00 2008-10-25T08:28:01-07:00 Added (public) activity statistics to Kakuteru f2cfa8d274de94ab6ce358529f2a908b8741da4c Dominiek ter Heide info@dominiek.com