[82152] branches/gsoc11-statistics/stats-server

Mon Aug 8 19:50:47 PDT 2011

Revision: 82152
          http://trac.macports.org/changeset/82152
Author:   derek at macports.org
Date:     2011-08-08 19:50:45 -0700 (Mon, 08 Aug 2011)
Log Message:
-----------
Use gvis library for Google Charts visualizations

Gemfile
 - Fetch gvis from github

helpers/application_helper.rb
 - include GoogleVisualization

layouts/application.html.erb
 - added gvis include and render calls to <head> tag

Modified Paths:
--------------
    branches/gsoc11-statistics/stats-server/Gemfile
    branches/gsoc11-statistics/stats-server/Gemfile.lock
    branches/gsoc11-statistics/stats-server/app/helpers/application_helper.rb
    branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb

Modified: branches/gsoc11-statistics/stats-server/Gemfile
===================================================================

--- branches/gsoc11-statistics/stats-server/Gemfile	2011-08-08 22:27:50 UTC (rev 82151)
+++ branches/gsoc11-statistics/stats-server/Gemfile	2011-08-09 02:50:45 UTC (rev 82152)
@@ -7,8 +7,8 @@
 gem "rake", "0.8.7"
 gem 'sqlite3'
 gem 'json'
-gem 'googlecharts'
 gem 'will_paginate', '>= 3.0.pre2'
+gem 'gvis', :git => 'git://github.com/jeremyolliver/gvis.git'
 
 # Use unicorn as the web server
 # gem 'unicorn'

Modified: branches/gsoc11-statistics/stats-server/Gemfile.lock
===================================================================
--- branches/gsoc11-statistics/stats-server/Gemfile.lock	2011-08-08 22:27:50 UTC (rev 82151)
+++ branches/gsoc11-statistics/stats-server/Gemfile.lock	2011-08-09 02:50:45 UTC (rev 82152)
@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/jeremyolliver/gvis.git
+  revision: 018819a0e0a974eafc38f2c87d214d37f4fb27ab
+  specs:
+    gvis (2.0.3)
+      json
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -32,7 +39,6 @@
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    googlecharts (1.6.7)
     i18n (0.5.0)
     json (1.5.3)
     mail (2.2.19)
@@ -74,7 +80,7 @@
   ruby
 
 DEPENDENCIES
-  googlecharts
+  gvis!
   json
   rails (= 3.0.9)
   rake (= 0.8.7)

Modified: branches/gsoc11-statistics/stats-server/app/helpers/application_helper.rb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/helpers/application_helper.rb	2011-08-08 22:27:50 UTC (rev 82151)
+++ branches/gsoc11-statistics/stats-server/app/helpers/application_helper.rb	2011-08-09 02:50:45 UTC (rev 82152)
@@ -1,2 +1,3 @@
 module ApplicationHelper
+  include GoogleVisualization
 end

Modified: branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb	2011-08-08 22:27:50 UTC (rev 82151)
+++ branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb	2011-08-09 02:50:45 UTC (rev 82152)
@@ -5,6 +5,8 @@
   <%= stylesheet_link_tag :all %>
   <%= javascript_include_tag :defaults %>
   <%= csrf_meta_tag %>
+  <%= include_visualization_api %>
+  <%= render_visualizations %>
 </head>
 <body>
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110808/e9f0b79e/attachment.html>
