--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -5,22 +5,27 @@ class BrowseController < ApplicationController
   LOGS_PER_PAGE = 30
   
   def index
-    @git = Git.bare(@repository.full_repository_path)
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
     @commits = @git.log(LOGS_PER_PAGE)
-    @tags_per_sha = returning({}) do |hash|
-      @git.tags.each do |tag| 
-        hash[tag.sha] ||= []
-        hash[tag.sha] << tag.name 
-      end
-    end
-    # TODO: Patch rails to keep track of what it responds to so we can DRY this up
-    @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
-    respond_to do |format|
-      format.html
-      format.atom
-    end
   end
   
+  # def index
+  #   @git = Git.bare(@repository.full_repository_path)
+  #   @commits = @git.log(LOGS_PER_PAGE)
+  #   @tags_per_sha = returning({}) do |hash|
+  #     @git.tags.each do |tag| 
+  #       hash[tag.sha] ||= []
+  #       hash[tag.sha] << tag.name 
+  #     end
+  #   end
+  #   # TODO: Patch rails to keep track of what it responds to so we can DRY this up
+  #   @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
+  #   respond_to do |format|
+  #     format.html
+  #     format.atom
+  #   end
+  # end
+  
   def tree
     @git = Git.bare(@repository.full_repository_path)   
     @tree = @git.gtree(params[:sha])

--- /dev/null
+++ b/lib/gitorious/gitto.rb
@@ -0,0 +1,58 @@
+module Gitorious        
+    # The point of this class is primary to prevent dangerous/malicious arguments 
+    # to be passed down to the underlying Git library, since it shells out to 
+    # the git binary. 
+    class Gitto      
+      def initialize(repository_path)
+        @repository_path = repository_path
+        @git = Git.bare(@repository_path)
+      end
+      attr_reader :repository_path, :git
+      
+      def log(num, skip=nil)
+        @git.log(num, skip)
+      end
+      
+      def tree(sha)
+        check_sha(sha)
+        @git.gtree(sha)
+      end
+      
+      def commit(sha)
+        check_sha(sha)
+        @git.gcommit(sha)
+      end
+      
+      def diff(old_sha, new_sha)
+        check_sha(old_sha)
+        check_sha(new_sha)
+        @git.diff(old_sha, new_sha)
+      end
+      
+      def blob(sha)
+        check_sha(sha)
+        @git.gblob(sha)
+      end
+      
+      def branches
+        @git.branches
+      end  
+      
+      def tags
+        @git.tags
+      end    
+      
+      def remotes
+        @git.remotes
+      end
+      
+      def check_sha(objectish)
+        if /^[a-z0-9~\{\}\^\.]*$/i !~ objectish.to_s
+          raise BadShaError
+        end
+      end
+      
+      class BadShaError < StandardError; end # :nodoc:
+    end
+    
+end
\ No newline at end of file

--- a/lib/gitorious/gitto/gitto.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-module Gitorious
-  module Gitto
-    
-    class BadShaError < StandardError; end # :nodoc:
-    
-    # The point of this class is primary to prevent dangerous/malicious arguments 
-    # to be passed down to the underlying Git library, since it shells out to 
-    # the git binary. 
-    class Gitto
-      def initialize(repository_path)
-        @repository_path = repository_path
-        @git = Git.bare(@repository_path)
-      end
-      attr_reader :repository_path, :git
-      
-      def log(num, skip=nil)
-        @git.log(num, skip)
-      end
-      
-      def tree(sha)
-        check_sha(sha)
-        @git.gtree(sha)
-      end
-      
-      def commit(sha)
-        check_sha(sha)
-        @git.gcommit(sha)
-      end
-      
-      def diff(old_sha, new_sha)
-        check_sha(old_sha)
-        check_sha(new_sha)
-        @git.diff(old_sha, new_sha)
-      end
-      
-      def blob(sha)
-        check_sha(sha)
-        @git.gblob(sha)
-      end
-      
-      def branches
-        @git.branches
-      end  
-      
-      def tags
-        @git.tags
-      end    
-      
-      def remotes
-        @git.remotes
-      end
-      
-      def check_sha(objectish)
-        if /^[a-z0-9~\{\}\^\.]*$/i !~ objectish.to_s
-          raise BadShaError
-        end
-      end
-      
-    end
-    
-  end
-end
\ No newline at end of file

--- a/spec/controllers/browse_controller_spec.rb
+++ b/spec/controllers/browse_controller_spec.rb
@@ -1,10 +1,46 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe BrowseController do
+  before(:each) do
+    login_as :johan
+    @project = projects(:johans)
+    @repository = @project.repositories.first
+    
+    Project.should_receive(:find_by_slug!).with(@project.slug) \
+      .and_return(@project)
+    @project.repositories.should_receive(:find_by_name!) \
+      .with(@repository.name).and_return(@repository)
+    @repository.stub!(:has_commits?).and_return(true)
+    
+    @git_mock = mock("Git mock", :null_object => true)
+    Gitorious::Gitto.should_receive(:new) \
+      .with(@repository.full_repository_path) \
+      .and_return(@git_mock)
+  end
+  
+  describe "index" do
 
-  #Delete this example and add some real ones
-  it "should use BrowseController" do
-    controller.should be_an_instance_of(BrowseController)
+    def do_get
+      get :index, :project_id => @project.slug, :repository_id => @repository.name
+    end
+    
+    it "GETs successfully" do
+      do_get
+      flash[:notice].should == nil
+      response.should be_success
+    end
+    
+    it "fetches the specified log entries" do
+      @git_mock.should_receive(:log).with(BrowseController::LOGS_PER_PAGE).and_return(commits=mock("logentrues"))
+      do_get
+      assigns[:commits].should == commits
+    end    
+    
+    it "assigns the tags for easy lookup" do
+      @git_mock.should_receive(:log).with(BrowseController::LOGS_PER_PAGE).and_return(commits=mock("logentrues"))
+      do_get
+      assigns[:tags_per_sha].should == {:write => "me"}
+    end
   end
 
 end

--- a/spec/lib/gitorious/gitto/gitto_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe Gitorious::Gitto::Gitto do
-  Gitto = Gitorious::Gitto::Gitto
-  
-  before(:each) do
-    @path = "/home/repositories/foo"
-    @git_mock = mock("Git mock")
-    Git.should_receive(:bare).with(@path).and_return(@git_mock)
-    @gitto = Gitto.new(@path)
-  end
-  
-  def some_sha(char = "a")
-    char * 40
-  end
-  
-  it "should return Git#log(10)" do
-    @git_mock.should_receive(:log).with(10, nil).and_return([])
-    @gitto.log(10)
-  end
-  
-  it "returns Git#log(10,20)" do
-    @git_mock.should_receive(:log).with(10, 20).and_return([])
-    @gitto.log(10, 20)
-  end
-  
-  it "returns Git#gtre" do
-    @git_mock.should_receive(:gtree).with(some_sha).and_return(mock("tree"))
-    @gitto.should_receive(:check_sha).with(some_sha)
-    @gitto.tree(some_sha)
-  end
-  
-  it "return Git#gcommit" do
-    @git_mock.should_receive(:gcommit).with(some_sha).and_return(mock("commit"))
-    @gitto.should_receive(:check_sha).with(some_sha)
-    @gitto.commit(some_sha)
-  end
-  
-  it "return Git#diff" do
-    @git_mock.should_receive(:diff).with(some_sha("a"), some_sha("b")).and_return(mock("diff"))
-    @gitto.should_receive(:check_sha).with(some_sha("a"))
-    @gitto.should_receive(:check_sha).with(some_sha("b"))
-    @gitto.diff(some_sha("a"), some_sha("b"))
-  end
-  
-  it "return Git#gblob" do
-    @git_mock.should_receive(:gblob).with(some_sha).and_return(mock("blob"))
-    @gitto.should_receive(:check_sha).with(some_sha)
-    @gitto.blob(some_sha)
-  end
-  
-  it "return Git#gblob" do
-    @git_mock.should_receive(:gblob).with(some_sha).and_return(mock("blob"))
-    @gitto.should_receive(:check_sha).with(some_sha)
-    @gitto.blob(some_sha)
-  end
-  
-  it "returns Git#tags" do
-    @git_mock.should_receive(:tags).and_return([])
-    @gitto.tags
-  end
-  
-  it "returns Git#branches" do
-    @git_mock.should_receive(:branches).and_return([])
-    @gitto.branches
-  end
-  
-  it "returns Git#remotes" do
-    @git_mock.should_receive(:remotes).and_return([])
-    @gitto.remotes
-  end
-  
-  describe "objectish validation" do
-    it "accepts good objectish" do
-      proc{ 
-        @gitto.check_sha(some_sha) 
-      }.should_not raise_error(Gitorious::Gitto::BadShaError)
-      proc{ 
-        @gitto.check_sha( ("a"*20) + ("2"*20) ) 
-      }.should_not raise_error(Gitorious::Gitto::BadShaError)
-      proc{ 
-        @gitto.check_sha("HEAD") 
-      }.should_not raise_error(Gitorious::Gitto::BadShaError)
-      proc{ 
-        @gitto.check_sha("HEAD~1") 
-      }.should_not raise_error(Gitorious::Gitto::BadShaError)
-      proc{ 
-        @gitto.check_sha("HEAD^{1}") # valid chars at least
-      }.should_not raise_error(Gitorious::Gitto::BadShaError)
-      proc{ 
-        @gitto.check_sha("v0.1^{tree}") 
-      }.should_not raise_error(Gitorious::Gitto::BadShaError)
-    end
-    
-    it "raises on bad objectish" do
-      proc{ 
-        @gitto.check_sha("asd;rm -rf") 
-      }.should raise_error(Gitorious::Gitto::BadShaError)
-      proc{ 
-        @gitto.check_sha("asd;cat /etc/foo") 
-      }.should raise_error(Gitorious::Gitto::BadShaError)
-      
-      proc{ 
-        @gitto.check_sha("%3B++%2Ffoo") 
-      }.should raise_error(Gitorious::Gitto::BadShaError)
-    end
-  end
-  
-end
\ No newline at end of file

--- /dev/null
+++ b/spec/lib/gitorious/gitto_spec.rb
@@ -0,0 +1,108 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Gitorious::Gitto do
+  
+  before(:each) do
+    @path = "/home/repositories/foo"
+    @git_mock = mock("Git mock")
+    Git.should_receive(:bare).with(@path).and_return(@git_mock)
+    @gitto = Gitorious::Gitto.new(@path)
+  end
+  
+  def some_sha(char = "a")
+    char * 40
+  end
+  
+  it "should return Git#log(10)" do
+    @git_mock.should_receive(:log).with(10, nil).and_return([])
+    @gitto.log(10)
+  end
+  
+  it "returns Git#log(10,20)" do
+    @git_mock.should_receive(:log).with(10, 20).and_return([])
+    @gitto.log(10, 20)
+  end
+  
+  it "returns Git#gtre" do
+    @git_mock.should_receive(:gtree).with(some_sha).and_return(mock("tree"))
+    @gitto.should_receive(:check_sha).with(some_sha)
+    @gitto.tree(some_sha)
+  end
+  
+  it "return Git#gcommit" do
+    @git_mock.should_receive(:gcommit).with(some_sha).and_return(mock("commit"))
+    @gitto.should_receive(:check_sha).with(some_sha)
+    @gitto.commit(some_sha)
+  end
+  
+  it "return Git#diff" do
+    @git_mock.should_receive(:diff).with(some_sha("a"), some_sha("b")).and_return(mock("diff"))
+    @gitto.should_receive(:check_sha).with(some_sha("a"))
+    @gitto.should_receive(:check_sha).with(some_sha("b"))
+    @gitto.diff(some_sha("a"), some_sha("b"))
+  end
+  
+  it "return Git#gblob" do
+    @git_mock.should_receive(:gblob).with(some_sha).and_return(mock("blob"))
+    @gitto.should_receive(:check_sha).with(some_sha)
+    @gitto.blob(some_sha)
+  end
+  
+  it "return Git#gblob" do
+    @git_mock.should_receive(:gblob).with(some_sha).and_return(mock("blob"))
+    @gitto.should_receive(:check_sha).with(some_sha)
+    @gitto.blob(some_sha)
+  end
+  
+  it "returns Git#tags" do
+    @git_mock.should_receive(:tags).and_return([])
+    @gitto.tags
+  end
+  
+  it "returns Git#branches" do
+    @git_mock.should_receive(:branches).and_return([])
+    @gitto.branches
+  end
+  
+  it "returns Git#remotes" do
+    @git_mock.should_receive(:remotes).and_return([])
+    @gitto.remotes
+  end
+  
+  describe "objectish validation" do
+    it "accepts good objectish" do
+      proc{ 
+        @gitto.check_sha(some_sha) 
+      }.should_not raise_error(Gitorious::Gitto::BadShaError)
+      proc{ 
+        @gitto.check_sha( ("a"*20) + ("2"*20) ) 
+      }.should_not raise_error(Gitorious::Gitto::BadShaError)
+      proc{ 
+        @gitto.check_sha("HEAD") 
+      }.should_not raise_error(Gitorious::Gitto::BadShaError)
+      proc{ 
+        @gitto.check_sha("HEAD~1") 
+      }.should_not raise_error(Gitorious::Gitto::BadShaError)
+      proc{ 
+        @gitto.check_sha("HEAD^{1}") # valid chars at least
+      }.should_not raise_error(Gitorious::Gitto::BadShaError)
+      proc{ 
+        @gitto.check_sha("v0.1^{tree}") 
+      }.should_not raise_error(Gitorious::Gitto::BadShaError)
+    end
+    
+    it "raises on bad objectish" do
+      proc{ 
+        @gitto.check_sha("asd;rm -rf") 
+      }.should raise_error(Gitorious::Gitto::BadShaError)
+      proc{ 
+        @gitto.check_sha("asd;cat /etc/foo") 
+      }.should raise_error(Gitorious::Gitto::BadShaError)
+      
+      proc{ 
+        @gitto.check_sha("%3B++%2Ffoo") 
+      }.should raise_error(Gitorious::Gitto::BadShaError)
+    end
+  end
+  
+end
\ No newline at end of file