Changeset 82155

Timestamp:

08/08/11 20:03:21 (4 years ago)

Author:

derek@…

Message:

• Use gvis rather than manually generating JSON
• Removed JSON helper functions
• Inherit from ChartController
• Use methods in ChartController to manage charts rather than @frequencies hash

File:

• branches/gsoc11-statistics/stats-server/app/controllers/os_statistics_controller.rb (modified) (3 diffs)

branches/gsoc11-statistics/stats-server/app/controllers/os_statistics_controller.rb

@@ -1 @@
-class OsStatisticsController < ApplicationController
+class OsStatisticsController < ChartController
   
-  def hash_to_google_json(hash, columns)
-    json = Hash.new
+  # Populate charts with data
+  def populate(chart_name, chart)
+    # This is the column's label
+    chart.string "Item"
     
-    json['cols'] = columns
-    
-    # Create rows array
-    rows = []
-    hash.each do |key, frequency|
-      row = Hash.new
-      row['c'] = [{'v' => key}, {'v' => frequency}]
-      rows << row
+    # This is the numerical value associated with the label
+    chart.number "Frequency"
+
+    # Add rows of data
+    dataset = chart_dataset chart_name
+    dataset.each do |item, count|
+      chart.add_row([item, count])
     end
-  
-    json['rows'] = rows
-    
-    return json.to_json.to_s
   end
   
-  def to_json(frequencies)
-    first_col = {'id' => 'name', 'label' => 'name', 'type' => 'string'}
-    second_col = {'id' => 'frequency', 'label' => 'Frequency', 'type' => 'number'}
-    
-    cols = [first_col, second_col]
-    
-    json = Hash.new
-    frequencies.each do |name, hash|
-      json[name] = hash_to_google_json(frequencies[name], cols)
-    end
-    
-    return json
-  end
-  
+  # Gather all needed data from the model
   def gather_frequencies(stats)
     macports_version = Hash.new(0)
@@ -42 +26 @@
     xcode_version = Hash.new(0)
     
+    # For each column in OsStatistics count the number of unique entries
     stats.each do |row|
       key = row.macports_version.to_sym  
@@ -65 +50 @@
     end
     
-    frequencies = Hash.new
-    frequencies['macports_version'] = macports_version
-    frequencies['osx_version'] = osx_version
-    frequencies['os_arch'] = os_arch
-    frequencies['os_platform'] = os_platform
-    frequencies['build_arch'] = build_arch
-    frequencies['gcc_version'] = gcc_version
-    frequencies['xcode_version'] = xcode_version
+    populate = method(:populate)
     
-    return frequencies
+    add_chart :macports_version, macports_version, populate
+    add_chart :osx_version, osx_version, populate
+    add_chart :os_arch, os_arch, populate
+    add_chart :os_platform, os_platform, populate
+    add_chart :build_arch, build_arch, populate
+    add_chart :macports_version, macports_version, populate
+    add_chart :gcc_version, gcc_version, populate
+    add_chart :xcode_version, xcode_version, populate
   end
-  
+    
   def index
     @stats = OsStatistic.all
-    
-    frequencies = gather_frequencies @stats
-    @chartjson = to_json frequencies
+    @charts = Hash.new
+    gather_frequencies @stats
     
     respond_to do |format|