--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .DS_Store
 coverage/*
 public/cache/*
+public/images/graphs/*
 config/database.yml
 config/gitorious.yml
 config/ultrasphinx/development.conf

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -86,44 +86,17 @@ module ApplicationHelper
     flash.map { |type, content| content_tag(:div, content_tag(:p, content), :class => "flash_message #{type}")}
   end
   
-  def commit_graph_tag(repository, sha = "master", width = 650, height = 110)
-    labels, commits = repository.commit_graph_data(sha)
-    return if commits.blank?
-    
-    label_names = []
-    labels.each_with_index do |week, index|
-      if (index % 5) == 0
-        label_names << "Week #{week}"
-      end
+  def commit_graph_tag(repository, ref = "master")
+    filename = "#{repository.project.slug}_#{repository.name}_#{h(ref)}_commit_count.png"
+    if File.exist?(File.join(Gitorious::Graphs::Builder.graph_dir, filename))
+      image_tag("graphs/#{filename}")
     end
-    label_names << "Week #{labels.last}"
-    
-    # "<pre>#{labels.inspect}\n#{commits.inspect}</pre>" + 
-    Gchart.line({
-      :title => "Commits by week (24 week period)",
-      :data => [0] + commits, 
-      :width => width, 
-      :height => height, 
-      :format => "img_tag", 
-      :axis_with_labels => ["y", "x"], 
-      :axis_labels => ["|#{commits.max}", label_names.join("|")],
-      :bar_colors => "9cce2e",
-      :custom => "chm=B,E4E9D4,0,0,0",
-      :max_value => "auto"
-    })
   end
   
-  def commit_graph_by_author_tag(repos, sha = "master", width = 350, height = 150)    
-    labels, data = repos.commit_graph_data_by_author
-    
-    Gchart.pie({
-      :title => "Commits by author",
-      :data => data, 
-      :labels => labels, 
-      :width => width, 
-      :height => height, 
-      :bar_colors => "9cce2e",
-      :format => "img_tag" 
-    })
+  def commit_graph_by_author_tag(repository, ref = "master")    
+    filename = "#{repository.project.slug}_#{repository.name}_#{h(ref)}_commit_count_by_author.png"
+    if File.exist?(File.join(Gitorious::Graphs::Builder.graph_dir, filename))
+      image_tag("graphs/#{filename}")
+    end
   end
 end

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -206,7 +206,11 @@ class Repository < ActiveRecord::Base
       data << others_v.last
     end
     
-    [labels, data]
+    #[labels, data]
+    labels.inject({}) do |hash, label| 
+      hash[label] = data[labels.index(label)] 
+      hash
+    end
   end
     
   protected

--- a/app/views/logs/show.html.erb
+++ b/app/views/logs/show.html.erb
@@ -14,7 +14,7 @@
 
 <% if @commits.current_page == 1 -%>
   <div class="commits_by_author_graph">
-    <%= commit_graph_by_author_tag(@repository) %>
+    <%= commit_graph_by_author_tag(@repository, params[:id]) %>
   </div>
 <% end -%>
 <h2>Commits in "<%=h params[:id] -%>"</h2>

--- /dev/null
+++ b/lib/gitorious/graphs/builder.rb
@@ -0,0 +1,38 @@
+require "gruff"
+
+Gruff::Base::TITLE_MARGIN = 2.0
+
+module Gitorious
+  module Graphs    
+    class Builder      
+      def self.generate_all_for(repository)
+        CommitsBuilder.generate_for(repository)
+        CommitsByAuthorBuilder.generate_for(repository)
+      end
+      
+      def self.graph_dir
+        File.join(RAILS_ROOT, "public/images/graphs/")
+      end
+
+      def self.default_theme
+        {
+          :colors => [
+              '#acd64f',
+              '#bcde71',
+              '#cce692',
+              '#dceeb4',
+              '#ecf6d6',
+            ],
+          :marker_color => '#aea9a9', # Grey
+          :font_color => 'black',
+          :background_colors => 'white'
+        }
+      end
+      
+      def write
+        dest = File.join(self.class.graph_dir, construct_filename)
+        @graph.write(dest)
+      end
+    end
+  end
+end

--- /dev/null
+++ b/lib/gitorious/graphs/commits_builder.rb
@@ -0,0 +1,54 @@
+module Gitorious
+  module Graphs
+    
+    class CommitsBuilder < Gitorious::Graphs::Builder
+      def self.generate_for(repository)
+        if repository.has_commits?
+          builder = new(repository, repository.head_candidate.name)
+          builder.build
+          builder.write
+        end
+      end
+      
+      def initialize(repository, branch)
+        @repository = repository
+        @branch = branch
+        @graph = Gruff::Area.new("650x150")
+        @graph.title = "Commits by week (24 week period)" 
+        #@graph.x_axis_label = 'Commits by week (24 week period)'
+        #@graph.y_axis_label = "Commits"
+        @graph.theme = self.class.default_theme
+        @graph.hide_legend = true
+        @graph.title_font_size = 12.5
+        @graph.marker_font_size = 12
+        @graph.top_margin = 1
+        @graph.bottom_margin = 1
+      end
+      
+      def build
+        week_numbers, commits_by_week = @repository.commit_graph_data(@branch)
+        
+        @graph.y_axis_increment = commits_by_week.max# / 3
+        @graph.data("Commits", commits_by_week)
+        @graph.labels = build_labels(week_numbers)
+      end
+      
+      def construct_filename
+        "#{@repository.project.slug}_#{@repository.name}_#{@branch}_commit_count.png"
+      end
+      
+      private
+        def build_labels(week_numbers)
+          label_names = {}
+          week_numbers.each_with_index do |week, index|
+            if (index % 5) == 0
+              label_names[index] = "Week #{week}"
+            end
+          end
+          label_names[week_numbers.index(week_numbers.last)] = "Week #{week_numbers.last}" 
+          label_names
+        end
+    end
+    
+  end
+end

--- /dev/null
+++ b/lib/gitorious/graphs/commits_by_author_builder.rb
@@ -0,0 +1,40 @@
+module Gitorious
+  module Graphs
+    
+    class CommitsByAuthorBuilder < Gitorious::Graphs::Builder
+      def self.generate_for(repository)
+        if repository.has_commits?
+          repository.git.heads.each do |head|
+            builder = new(repository, head.name)
+            builder.build
+            builder.write
+          end
+        end
+      end
+      
+      def initialize(repository, branch)
+        @repository = repository
+        @branch = branch
+        @graph = Gruff::Mini::Pie.new(250)
+        @graph.theme_pastel
+        @graph.marker_font_size = 32
+        @graph.legend_font_size = 32
+        @graph.top_margin = 1
+        @graph.bottom_margin = 1
+      end
+      
+      def build
+        commits_by_author = @repository.commit_graph_data_by_author(@branch)
+        
+        commits_by_author.each do |author, count|
+          @graph.data(author, count)
+        end
+      end
+      
+      def construct_filename
+        "#{@repository.project.slug}_#{@repository.name}_#{@branch}_commit_count_by_author.png"
+      end
+    end  
+    
+  end
+end

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -438,7 +438,7 @@ table.repository_list tr.clone td.name {
 
 .commit_list .commit_item {
   clear:left;
-  margin-bottom: 10px;
+  margin-bottom: 15px;
 }
 
 .commit_message, .commit_message p {
@@ -447,6 +447,10 @@ table.repository_list tr.clone td.name {
   font: 95%/105%  "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;  
 }
 
+.commit_list .commit_item .commit_message {
+  margin-left: 40px;
+}
+
 small.commit_message {
   margin: 0;
   font: 85%/95%  "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;  
@@ -470,6 +474,10 @@ small.commit_message {
   margin-right: 5px;
 }
 
+.commit_list .commit_item .gravatar {
+  margin-top: 5px;
+}
+
 ul.project_list li {
   padding-bottom: 1em;
   margin-bottom: 1em;

--- /dev/null
+++ b/script/graph_generator
@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= "production"
+require File.dirname(__FILE__) + "/../config/environment"
+
+log = Logger.new(File.join(RAILS_ROOT, "log", "graph_generator.log"))
+log.formatter = Logger::Formatter.new
+log.level = Logger::INFO
+log.formatter.datetime_format = "%Y-%m-%d %H:%M:%S"
+
+Repository.find(:all).each_with_index do |repository, index|
+	begin
+		Gitorious::Graphs::Builder.generate_all_for(repository)
+		if index % 5 == 0
+			# GC every five cycles
+			GC.start
+		end
+		sleep(0.1)
+	rescue => e
+		log.fatal "Error generating graphs for repo##{repository.id}"
+    exception_backtrace_string = "#{e.class.name} #{e.message}\n#{e.backtrace.join("\n  ")}"
+    log.fatal exception_backtrace_string
+    $stderr.puts exception_backtrace_string
+#    exit(1)		
+	end
+end

--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -44,21 +44,16 @@ describe ApplicationHelper do
   end
   
     
-  it "should generate a commit graph url" do
-    repos = repositories(:johans)
-    repos.should_receive(:commit_graph_data).and_return([[1,2,3], [4,5,6]])
-    
-    url = commit_graph_tag(repos)    
-    url.should match(/\<img/)
-    url.include?("google.com").should == true
+  it "should generate a blank commit graph url if the graph isn't there" do
+    File.should_receive(:exist?).and_return(false)
+    url = commit_graph_tag(repositories(:johans))    
+    url.should == nil
   end
   
-  it "should generate a url for commit graph by author" do
-    repos = repositories(:johans)
-    repos.should_receive(:commit_graph_data_by_author).and_return([[1,2,3], [4,5,6]])
+  it "should generate a blank url for commit graph by author if the graph isn't there" do
+    File.should_receive(:exist?).and_return(false)
     
-    url = commit_graph_by_author_tag(repos)
-    url.should match(/\<img/)
-    url.include?("google.com").should == true
+    url = commit_graph_by_author_tag(repositories(:johans))
+    url.should == nil
   end
 end

--- /dev/null
+++ b/vendor/plugins/gruff/History.txt
@@ -0,0 +1,98 @@
+== 0.3.2
+
+* Include init.rb for use as a Rails plugin.
+
+
+== 0.3.1
+
+* Fixed missing bullet graph bug (experimental, will be in a future release).
+
+== 0.3.0
+
+* Fixed bug where pie graphs weren't drawing their label correctly.
+
+== 0.2.9
+
+* Patch to make SideBar accurate instead of stacked [Marik]
+* Will be extracting net, pie, stacked, and side-stacked to separate gem
+  in next release.
+
+== 0.2.8
+
+* New accumulator bar graph (experimental)
+* Better mini graphs
+* Bug fixes
+
+== 0.2.7
+
+* Regenerated Manifest.txt
+* Added scene sample to package
+* Added mini side_bar (EXPERIMENTAL)
+* Added @zero_degree option to Gruff::Pie so first slice can start somewhere other than 3 o'clock
+* Increased size of numbers in Gruff::Mini::Pie
+* Added legend_box_size accessor
+
+== 0.2.6
+
+* Fixed missing side_bar.rb in Manifest.txt
+
+== 0.2.5
+
+* New mini graph types (Experimental)
+* Marker lines can be different color than text labels
+* Theme definition cleanup
+
+== 0.2.4
+
+* Added option to hide line numbers
+* Fixed code that was causing warnings
+
+== 0.2.3
+
+* Cleaned up measurements so the graph expands to fill the available space
+* Added x-axis and y-axis label options
+
+== 0.1.2
+
+* minimum_value and maximum_value can be set after data() to manually scale the graph
+* Fixed infinite loop bug when values are all equal
+* Added experimental net and spider graphs
+* Added non-linear scene graph for a simple interface to complex layered graphs
+* Initial refactoring of tests
+* A host of other bug fixes
+
+== 0.0.8
+
+* NEW Sidestacked Bar Graphs. [Alun Eyre]
+* baseline_value larger than data will now show correctly. [Mike Perham]
+* hide_dots and hide_lines are now options for line graphs.
+
+== 0.0.6
+
+* Fixed hang when no data is passed.
+
+== 0.0.4
+
+* Added bar graphs
+* Added area graphs
+* Added pie graphs
+* Added render_image_background for using images as background on a theme
+* Fixed small size legend centering issue
+* Added initial line marker rounding to significant digits (Christian Winkler)
+* Line graphs line width is scaled with number of points being drawn (Christian Winkler)
+
+== 0.0.3
+
+* Added option to draw line graphs without the lines (points only), thanks to Eric Hodel
+* Removed font-minimum check so graphs look better at 300px width
+
+== 0.0.2
+
+* Fixed to_blob (thanks to Carlos Villela)
+* Added bar graphs (initial functionality...will be enhanced)
+* Removed rendered test output from gem
+
+== 0.0.1
+
+* Initial release.
+* Line graphs only. Other graph styles coming soon.

--- /dev/null
+++ b/vendor/plugins/gruff/MIT-LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2005 Geoffrey Grosenbach boss@topfunky.com
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

--- /dev/null
+++ b/vendor/plugins/gruff/Manifest.txt
@@ -0,0 +1,76 @@
+History.txt
+MIT-LICENSE
+Manifest.txt
+README.txt
+Rakefile
+assets/bubble.png
+assets/city_scene/background/0000.png
+assets/city_scene/background/0600.png
+assets/city_scene/background/2000.png
+assets/city_scene/clouds/cloudy.png
+assets/city_scene/clouds/partly_cloudy.png
+assets/city_scene/clouds/stormy.png
+assets/city_scene/grass/default.png
+assets/city_scene/haze/true.png
+assets/city_scene/number_sample/1.png
+assets/city_scene/number_sample/2.png
+assets/city_scene/number_sample/default.png
+assets/city_scene/sky/0000.png
+assets/city_scene/sky/0200.png
+assets/city_scene/sky/0400.png
+assets/city_scene/sky/0600.png
+assets/city_scene/sky/0800.png
+assets/city_scene/sky/1000.png
+assets/city_scene/sky/1200.png
+assets/city_scene/sky/1400.png
+assets/city_scene/sky/1500.png
+assets/city_scene/sky/1700.png
+assets/city_scene/sky/2000.png
+assets/pc306715.jpg
+assets/plastik/blue.png
+assets/plastik/green.png
+assets/plastik/red.png
+init.rb
+lib/gruff.rb
+lib/gruff/accumulator_bar.rb
+lib/gruff/area.rb
+lib/gruff/bar.rb
+lib/gruff/bar_conversion.rb
+lib/gruff/base.rb
+lib/gruff/deprecated.rb
+lib/gruff/line.rb
+lib/gruff/mini/bar.rb
+lib/gruff/mini/legend.rb
+lib/gruff/mini/pie.rb
+lib/gruff/mini/side_bar.rb
+lib/gruff/net.rb
+lib/gruff/photo_bar.rb
+lib/gruff/pie.rb
+lib/gruff/scene.rb
+lib/gruff/side_bar.rb
+lib/gruff/side_stacked_bar.rb
+lib/gruff/spider.rb
+lib/gruff/stacked_area.rb
+lib/gruff/stacked_bar.rb
+lib/gruff/stacked_mixin.rb
+rails_generators/gruff/gruff_generator.rb
+rails_generators/gruff/templates/controller.rb
+rails_generators/gruff/templates/functional_test.rb
+test/gruff_test_case.rb
+test/test_accumulator_bar.rb
+test/test_area.rb
+test/test_bar.rb
+test/test_base.rb
+test/test_legend.rb
+test/test_line.rb
+test/test_mini_bar.rb
+test/test_mini_pie.rb
+test/test_mini_side_bar.rb
+test/test_net.rb
+test/test_photo.rb
+test/test_pie.rb
+test/test_scene.rb
+test/test_side_bar.rb
+test/test_sidestacked_bar.rb
+test/test_spider.rb
+test/test_stacked_bar.rb