dolt 0.11.0 → 0.12.0

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    dolt (0.11.0)
-      async_sinatra (~> 1.0)
+    dolt (0.12.0)
       json (~> 1.5)
-      libdolt (~> 0.15)
+      libdolt (~> 0.17)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.4)
@@ -12,59 +11,47 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    async_sinatra (1.0.0)
-      rack (>= 1.4.1)
-      sinatra (>= 1.3.2)
     daemons (1.1.9)
-    em-minitest-spec (1.1.1)
-      eventmachine
-    em_pessimistic (0.1.2)
-      eventmachine (~> 1.0)
-    em_rugged (0.3.0)
-      eventmachine (~> 1.0)
-      rugged (= 0.17.0.b6)
-    eventmachine (1.0.0)
+    eventmachine (1.0.3)
     github-markup (0.7.5)
     htmlentities (4.3.1)
-    json (1.7.6)
-    libdolt (0.15.0)
-      em_pessimistic (~> 0.1)
-      em_rugged (~> 0.3)
-      eventmachine (~> 1.0)
+    json (1.8.0)
+    libdolt (0.17.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.2)
       mime-types (~> 1.19)
+      rugged (= 0.17.0.b6)
       tzinfo (~> 0.3)
-      when (~> 0)
     makeup (0.3.0)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
       pygments.rb (~> 0.2)
-    mime-types (1.19)
+    mime-types (1.23)
     minitest (2.12.1)
     posix-spawn (0.3.6)
-    pygments.rb (0.3.7)
+    pygments.rb (0.5.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.4.3)
-    rack-protection (1.3.2)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
-    rake (0.9.2.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.9.6)
     rugged (0.17.0.b6)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    thin (1.5.0)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.3.3)
+    tilt (1.4.1)
     tiltout (1.4.0)
       tilt (~> 1.3)
-    tzinfo (0.3.35)
-    when (0.1.0)
+    tzinfo (0.3.37)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -72,6 +59,6 @@ PLATFORMS
 
 DEPENDENCIES
   dolt!
-  em-minitest-spec (~> 1.1)
   minitest (~> 2.0)
+  rack-test (~> 0.6)
   rake (~> 0.9)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.11.0"
+  s.version     = "0.12.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"
@@ -20,16 +20,15 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "dolt"
 
-  s.add_dependency "libdolt", "~>0.15"
+  s.add_dependency "libdolt", "~>0.17"
   s.add_dependency "thin", "~>1.4"
   s.add_dependency "sinatra", "~>1.0"
-  s.add_dependency "async_sinatra", "~>1.0"
   s.add_dependency "tiltout", "~>1.4"
   s.add_dependency "json", "~>1.5"
 
   s.add_development_dependency "minitest", "~> 2.0"
-  s.add_development_dependency "em-minitest-spec", "~> 1.1"
   s.add_development_dependency "rake", "~> 0.9"
+  s.add_development_dependency "rack-test", "~> 0.6"
 
   s.files         = GemSpecHelper.files(".") + GemSpecHelper.files("vendor/ui")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")

data/lib/dolt/sinatra/actions.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #--
-#   Copyright (C) 2012 Gitorious AS
+#   Copyright (C) 2012-2013 Gitorious AS
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as published by
@@ -21,8 +21,6 @@ require "time"
 module Dolt
   module Sinatra
     module Actions
-      # Built-in redirect seems to not work with Sinatra::Async, it throws
-      # an error.
       def redirect(url)
         response.status = 302
         response["Location"] = url
@@ -30,8 +28,9 @@ module Dolt
       end
 
       def error(error, repo, ref)
+        template = error.class.to_s == "Rugged::IndexerError" ? :"404" : :"500"
         add_headers(response)
-        body(renderer.render(:"500", {
+        body(renderer.render(template, {
                                :error => error,
                                :repository_slug => repo,
                                :ref => ref
@@ -70,14 +69,14 @@ module Dolt
           redirect(blob_url(repo, oid, path)) and return
         end
 
-        actions.blob(repo, u(ref), path) do |err, data|
-          next error(err, repo, ref) if !err.nil?
-          blob = data[:blob]
-          next redirect(tree_url(repo, ref, path)) if blob.class.to_s !~ /\bBlob/
-          add_headers(response, options.merge(:ref => ref))
-          tpl_options = options[:template_options] || {}
-          body(renderer.render(options[:template], data, tpl_options))
-        end
+        data = actions.blob(repo, u(ref), path)
+        blob = data[:blob]
+        return redirect(tree_url(repo, ref, path)) if blob.class.to_s !~ /\bBlob/
+        add_headers(response, options.merge(:ref => ref))
+        tpl_options = options[:template_options] || {}
+        body(renderer.render(options[:template], data, tpl_options))
+      rescue Exception => err
+        error(err, repo, ref)
       end
 
       def tree(repo, ref, path)
@@ -85,17 +84,13 @@ module Dolt
           redirect(tree_url(repo, oid, path)) and return
         end
 
-        actions.tree(repo, u(ref), path) do |err, data|
-          begin
-            next error(err, repo, ref) if !err.nil?
-            tree = data[:tree]
-            next redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
-            add_headers(response, :ref => ref)
-            body(renderer.render(:tree, data))
-          rescue Exception => err
-            error(err, repo, ref)
-          end
-        end
+        data = actions.tree(repo, u(ref), path)
+        tree = data[:tree]
+        return redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
+        add_headers(response, :ref => ref)
+        body(renderer.render(:tree, data))
+      rescue Exception => err
+        error(err, repo, ref)
       end
 
       def tree_entry(repo, ref, path)
@@ -103,15 +98,11 @@ module Dolt
           redirect(tree_entry_url(repo, oid, path)) and return
         end
 
-        actions.tree_entry(repo, u(ref), path) do |err, data|
-          begin
-            next error(err, repo, ref) if !err.nil?
-            add_headers(response, :ref => ref)
-            body(renderer.render(data.key?(:tree) ? :tree : :blob, data))
-          rescue Exception => err
-            error(err, repo, ref)
-          end
-        end
+        data = actions.tree_entry(repo, u(ref), path)
+        add_headers(response, :ref => ref)
+        body(renderer.render(data.key?(:tree) ? :tree : :blob, data))
+      rescue Exception => err
+        error(err, repo, ref)
       end
 
       def blame(repo, ref, path)
@@ -119,11 +110,11 @@ module Dolt
           redirect(blame_url(repo, oid, path)) and return
         end
 
-        actions.blame(repo, u(ref), path) do |err, data|
-          next error(err, repo, ref) if !err.nil?
-          add_headers(response, :ref => ref)
-          body(renderer.render(:blame, data))
-        end
+        data = actions.blame(repo, u(ref), path)
+        add_headers(response, :ref => ref)
+        body(renderer.render(:blame, data))
+      rescue Exception => err
+        error(err, repo, ref)
       end
 
       def history(repo, ref, path, count)
@@ -131,19 +122,19 @@ module Dolt
           redirect(history_url(repo, oid, path)) and return
         end
 
-        actions.history(repo, u(ref), path, count) do |err, data|
-          next error(err, repo, ref) if !err.nil?
-          add_headers(response, :ref => ref)
-          body(renderer.render(:commits, data))
-        end
+        data = actions.history(repo, u(ref), path, count)
+        add_headers(response, :ref => ref)
+        body(renderer.render(:commits, data))
+      rescue Exception => err
+        error(err, repo, ref)
       end
 
       def refs(repo)
-        actions.refs(repo) do |err, data|
-          next error(err, repo, ref) if !err.nil?
-          add_headers(response, :content_type => "application/json")
-          body(renderer.render(:refs, data, :layout => nil))
-        end
+        data = actions.refs(repo)
+        add_headers(response, :content_type => "application/json")
+        body(renderer.render(:refs, data, :layout => nil))
+      rescue Exception => err
+        error(err, repo, nil)
       end
 
       def tree_history(repo, ref, path, count = 1)
@@ -151,18 +142,11 @@ module Dolt
           redirect(tree_history_url(repo, oid, path)) and return
         end
 
-        actions.tree_history(repo, u(ref), path, count) do |err, data|
-          begin
-            if !err.nil?
-              error(err, repo, ref)
-            else
-              add_headers(response, :content_type => "application/json", :ref => ref)
-              body(renderer.render(:tree_history, data, :layout => nil))
-            end
-          rescue Exception => err
-            error(err, repo, ref)
-          end
-        end
+        data = actions.tree_history(repo, u(ref), path, count)
+        add_headers(response, :content_type => "application/json", :ref => ref)
+        body(renderer.render(:tree_history, data, :layout => nil))
+      rescue Exception => err
+        error(err, repo, ref)
       end
 
       def resolve_repository(repo)

data/lib/dolt/sinatra/base.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #--
-#   Copyright (C) 2012 Gitorious AS
+#   Copyright (C) 2012-2013 Gitorious AS
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as published by
@@ -16,7 +16,6 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require "sinatra/base"
-require "sinatra/async"
 require "dolt/sinatra/actions"
 
 module Dolt
@@ -24,7 +23,6 @@ module Dolt
     class Base < ::Sinatra::Base
       attr_reader :actions, :renderer
       include Dolt::Sinatra::Actions
-      register ::Sinatra::Async
 
       def initialize(actions, renderer)
         @actions = actions

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -27,61 +27,61 @@ module Dolt
       include Dolt::View::Blob
       include Dolt::View::Tree
 
-      aget "/" do
+      get "/" do
         response["Content-Type"] = "text/html"
         body(renderer.render(:index, { :repositories => actions.repositories }))
       end
 
-      aget "/*/tree/*:*" do
+      get "/*/tree/*:*" do
         repo, ref, path = params[:splat]
         tree(repo, ref, path)
       end
 
-      aget "/*/tree/*" do
+      get "/*/tree/*" do
         force_ref(params[:splat], "tree", "master")
       end
 
-      aget "/*/blob/*:*" do
+      get "/*/blob/*:*" do
         repo, ref, path = params[:splat]
         blob(repo, ref, path)
       end
 
-      aget "/*/blob/*" do
+      get "/*/blob/*" do
         force_ref(params[:splat], "blob", "master")
       end
 
-      aget "/*/raw/*:*" do
+      get "/*/raw/*:*" do
         repo, ref, path = params[:splat]
         raw(repo, ref, path)
       end
 
-      aget "/*/raw/*" do
+      get "/*/raw/*" do
         force_ref(params[:splat], "raw", "master")
       end
 
-      aget "/*/blame/*:*" do
+      get "/*/blame/*:*" do
         repo, ref, path = params[:splat]
         blame(repo, ref, path)
       end
 
-      aget "/*/blame/*" do
+      get "/*/blame/*" do
         force_ref(params[:splat], "blame", "master")
       end
 
-      aget "/*/history/*:*" do
+      get "/*/history/*:*" do
         repo, ref, path = params[:splat]
         history(repo, ref, path, (params[:commit_count] || 20).to_i)
       end
 
-      aget "/*/history/*" do
+      get "/*/history/*" do
         force_ref(params[:splat], "history", "master")
       end
 
-      aget "/*/refs" do
+      get "/*/refs" do
         refs(params[:splat].first)
       end
 
-      aget "/*/tree_history/*:*" do
+      get "/*/tree_history/*:*" do
         repo, ref, path = params[:splat]
         tree_history(repo, ref, path)
       end

data/lib/dolt/sinatra/single_repo_browser.rb

@@ -33,60 +33,60 @@ module Dolt
         super(actions, renderer)
       end
 
-      aget "/" do
+      get "/" do
         redirect("/tree/master:")
       end
 
-      aget "/tree/*:*" do
+      get "/tree/*:*" do
         ref, path = params[:splat]
         tree(repo, ref, path)
       end
 
-      aget "/tree/*" do
+      get "/tree/*" do
         force_ref(params[:splat], "tree", "master")
       end
 
-      aget "/blob/*:*" do
+      get "/blob/*:*" do
         ref, path = params[:splat]
         blob(repo, ref, path)
       end
 
-      aget "/blob/*" do
+      get "/blob/*" do
         force_ref(params[:splat], "blob", "master")
       end
 
-      aget "/raw/*:*" do
+      get "/raw/*:*" do
         ref, path = params[:splat]
         raw(repo, ref, path)
       end
 
-      aget "/raw/*" do
+      get "/raw/*" do
         force_ref(params[:splat], "raw", "master")
       end
 
-      aget "/blame/*:*" do
+      get "/blame/*:*" do
         ref, path = params[:splat]
         blame(repo, ref, path)
       end
 
-      aget "/blame/*" do
+      get "/blame/*" do
         force_ref(params[:splat], "blame", "master")
       end
 
-      aget "/history/*:*" do
+      get "/history/*:*" do
         ref, path = params[:splat]
         history(repo, ref, path, (params[:commit_count] || 20).to_i)
       end
 
-      aget "/history/*" do
+      get "/history/*" do
         force_ref(params[:splat], "blame", "master")
       end
 
-      aget "/refs" do
+      get "/refs" do
         refs(repo)
       end
 
-      aget "/tree_history/*:*" do
+      get "/tree_history/*:*" do
         ref, path = params[:splat]
         tree_history(repo, ref, path)
       end

data/test/dolt/sinatra/actions_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #--
-#   Copyright (C) 2012 Gitorious AS
+#   Copyright (C) 2012-2013 Gitorious AS
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as published by
@@ -18,142 +18,11 @@
 require "test_helper"
 require "dolt/sinatra/actions"
 
-class DummySinatraApp
-  include Dolt::Sinatra::Actions
-  attr_reader :actions, :renderer
-
-  def initialize(actions, renderer)
-    @actions = actions
-    @renderer = renderer
-  end
-
-  def body(str = nil)
-    @body = str if !str.nil?
-    @body
-  end
-
-  def response
-    if !@response
-      @response = {}
-      def @response.status; @status; end
-      def @response.status=(status); @status = status; end
-    end
-    @response
-  end
-
-  def tree_url(repo, ref, path)
-    "/#{repo}/tree/#{ref}:#{path}"
-  end
-
-  def blob_url(repo, ref, path)
-    "/#{repo}/blob/#{ref}:#{path}"
-  end
-
-  def tree_entry_url(repo, ref, path)
-    "/#{repo}/source/#{ref}:#{path}"
-  end
-
-  def blame_url(repo, ref, path)
-    "/#{repo}/blame/#{ref}:#{path}"
-  end
-
-  def history_url(repo, ref, path)
-    "/#{repo}/history/#{ref}:#{path}"
-  end
-
-  def tree_history_url(repo, ref, path)
-    "/#{repo}/tree_history/#{ref}:#{path}"
-  end
-
-  def raw_url(repo, ref, path)
-    "/#{repo}/raw/#{ref}:#{path}"
-  end
-end
-
-class RedirectingDummySinatraApp < DummySinatraApp
-  def redirect_refs?; true; end
-end
-
-class Renderer
-  def initialize(body = ""); @body = body; end
-
-  def render(action, data, options = {})
-    @action = action
-    @data = data
-    "#{action}:#@body"
-  end
-end
-
-class BlobStub
-  def is_a?(type)
-    type == Rugged::Blob
-  end
-end
-
-class TreeStub
-  def is_a?(type)
-    type == Rugged::Tree
-  end
-end
-
-class Actions
-  attr_reader :repo, :ref, :path
-
-  def initialize(response)
-    @response = response
-  end
-
-  def blob(repo, ref, path, &block)
-    respond(:blob, repo, ref, path, &block)
-  end
-
-  def tree(repo, ref, path, &block)
-    respond(:tree, repo, ref, path, &block)
-  end
-
-  def tree_entry(repo, ref, path, &block)
-    respond(:tree_entry, repo, ref, path, &block)
-  end
-
-  def raw(repo, ref, path, &block)
-    respond(:raw, repo, ref, path, &block)
-  end
-
-  def blame(repo, ref, path, &block)
-    respond(:blame, repo, ref, path, &block)
-  end
-
-  def history(repo, ref, path, limit, &block)
-    respond(:history, repo, ref, path, &block)
-  end
-
-  def refs(repo, &block)
-    respond(:refs, repo, nil, nil, &block)
-  end
-
-  def tree_history(repo, ref, path, count, &block)
-    respond(:tree_history, repo, ref, path, &block)
-  end
-
-  def respond(type, repo, ref, path, &block)
-    @repo = repo
-    @ref = ref
-    @path = path
-    data = { :ref => ref, :repository => repo }
-    data[type != :tree_entry ? type : (@response.class.to_s =~ /Tree/ ? :tree : :blob)] = @response
-    block.call(nil, data)
-  end
-
-  def rev_parse_oid(repo, ref)
-    "a" * 40
-  end
-end
-
 describe Dolt::Sinatra::Actions do
   describe "#blob" do
     it "delegates to actions" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new)
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new)
       app.blob("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "gitorious", actions.repo
@@ -162,7 +31,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "renders the blob template as html" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.blob("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
@@ -170,7 +39,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "redirects tree views to tree action" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.blob("gitorious", "master", "app/models")
 
       assert_equal 302, app.response.status
@@ -179,15 +48,15 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new("Blob"))
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
       app.blob("gitorious", "issue-%23221", "app/my documents")
 
       assert_equal "issue-#221", actions.ref
     end
 
     it "does not redirect ref to oid by default" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.blob("gitorious", "master", "lib/gitorious.rb")
 
       location = app.response["Location"]
@@ -195,7 +64,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "redirects ref to oid if configured so" do
-      app = RedirectingDummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.blob("gitorious", "master", "lib/gitorious.rb")
 
       location = app.response["Location"]
@@ -207,8 +76,8 @@ describe Dolt::Sinatra::Actions do
 
   describe "#tree" do
     it "delegates to actions" do
-      actions = Actions.new(TreeStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new)
+      actions = Test::Actions.new(Stub::Tree.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new)
       app.tree("gitorious", "master", "app/models")
 
       assert_equal "gitorious", actions.repo
@@ -217,7 +86,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "renders the tree template as html" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "master", "app/models")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
@@ -225,7 +94,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "redirects blob views to blob action" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "master", "app/models/repository.rb")
 
       location = app.response["Location"]
@@ -235,21 +104,21 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "sets X-UA-Compatible header" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "master", "app/models")
 
       assert_equal "IE=edge", app.response["X-UA-Compatible"]
     end
 
     it "does not set cache-control header for head ref" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "master", "app/models")
 
       assert !app.response.key?("Cache-Control")
     end
 
     it "sets cache headers for full oid ref" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "a" * 40, "app/models")
 
       assert_equal "max-age=315360000, public", app.response["Cache-Control"]
@@ -257,15 +126,15 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Actions.new(TreeStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new("Tree"))
+      actions = Test::Actions.new(Stub::Tree.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new("Tree"))
       app.tree("gitorious", "issue-%23221", "app")
 
       assert_equal "issue-#221", actions.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = RedirectingDummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "master", "lib")
 
       assert_equal "/gitorious/tree/#{'a' * 40}:lib", app.response["Location"]
@@ -274,7 +143,7 @@ describe Dolt::Sinatra::Actions do
 
   describe "#tree_entry" do
     it "renders trees with the tree template as html" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree_entry("gitorious", "master", "app/models")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
@@ -282,7 +151,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "renders trees with the tree template as html" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.tree_entry("gitorious", "master", "app/models")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
@@ -290,15 +159,15 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Actions.new(TreeStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new("Tree"))
+      actions = Test::Actions.new(Stub::Tree.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new("Tree"))
       app.tree_entry("gitorious", "issue-%23221", "app")
 
       assert_equal "issue-#221", actions.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = RedirectingDummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree_entry("gitorious", "master", "lib")
 
       assert_equal "/gitorious/source/#{'a' * 40}:lib", app.response["Location"]
@@ -307,8 +176,8 @@ describe Dolt::Sinatra::Actions do
 
   describe "#raw" do
     it "delegates to actions" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new)
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new)
       app.raw("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "gitorious", actions.repo
@@ -317,7 +186,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "renders the raw template as text" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Text"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Text"))
       app.raw("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "text/plain", app.response["Content-Type"]
@@ -325,7 +194,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "redirects tree views to tree action" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.raw("gitorious", "master", "app/models")
 
       location = app.response["Location"]
@@ -335,15 +204,15 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new("Blob"))
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
       app.raw("gitorious", "issue-%23221", "app/models/repository.rb")
 
       assert_equal "issue-#221", actions.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = RedirectingDummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.raw("gitorious", "master", "lib/gitorious.rb")
 
       assert_equal "/gitorious/raw/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
@@ -352,8 +221,8 @@ describe Dolt::Sinatra::Actions do
 
   describe "#blame" do
     it "delegates to actions" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new)
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new)
       app.blame("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "gitorious", actions.repo
@@ -362,7 +231,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "renders the blame template as html" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Text"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Text"))
       app.blame("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
@@ -370,15 +239,15 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new("Blob"))
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
       app.blame("gitorious", "issue-%23221", "app/models/repository.rb")
 
       assert_equal "issue-#221", actions.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = RedirectingDummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.blame("gitorious", "master", "lib/gitorious.rb")
 
       assert_equal "/gitorious/blame/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
@@ -387,8 +256,8 @@ describe Dolt::Sinatra::Actions do
 
   describe "#history" do
     it "delegates to actions" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new)
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new)
       app.history("gitorious", "master", "app/models/repository.rb", 10)
 
       assert_equal "gitorious", actions.repo
@@ -397,7 +266,7 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "renders the commits template as html" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Text"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Text"))
       app.history("gitorious", "master", "app/models/repository.rb", 10)
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
@@ -405,15 +274,15 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Actions.new(BlobStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new("Blob"))
+      actions = Test::Actions.new(Stub::Blob.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
       app.history("gitorious", "issue-%23221", "lib/gitorious.rb", 10)
 
       assert_equal "issue-#221", actions.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = RedirectingDummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.history("gitorious", "master", "lib/gitorious.rb", 10)
 
       assert_equal "/gitorious/history/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
@@ -422,7 +291,7 @@ describe Dolt::Sinatra::Actions do
 
   describe "#refs" do
     it "renders the refs template as json" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("JSON"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("JSON"))
       app.refs("gitorious")
 
       assert_equal "application/json", app.response["Content-Type"]
@@ -432,7 +301,7 @@ describe Dolt::Sinatra::Actions do
 
   describe "#tree_history" do
     it "renders the tree_history template as json" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("JSON"))
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("JSON"))
       app.tree_history("gitorious", "master", "", 1)
 
       assert_equal "application/json", app.response["Content-Type"]
@@ -440,15 +309,15 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Actions.new(TreeStub.new)
-      app = DummySinatraApp.new(actions, Renderer.new("Tree"))
+      actions = Test::Actions.new(Stub::Tree.new)
+      app = Test::SinatraApp.new(actions, Test::Renderer.new("Tree"))
       app.tree_history("gitorious", "issue-%23221", "app/models")
 
       assert_equal "issue-#221", actions.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = RedirectingDummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
+      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree_history("gitorious", "master", "lib", 10)
 
       assert_equal "/gitorious/tree_history/#{'a' * 40}:lib", app.response["Location"]

data/test/dolt/sinatra/multi_repo_browser_test.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2013 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require "test_helper"
+require "rack/test"
+require "pathname"
+require "tiltout"
+require "libdolt"
+require "dolt/sinatra/multi_repo_browser"
+
+ENV["RACK_ENV"] = "test"
+
+describe Dolt::Sinatra::MultiRepoBrowser do
+  include Rack::Test::Methods
+
+  def app
+    actions = Test::Actions.new(Stub::Blob.new)
+    def actions.repositories; []; end
+    view = Tiltout.new(Dolt.template_dir)
+    Dolt::Sinatra::MultiRepoBrowser.new(actions, view)
+  end
+
+  it "serves the index" do
+    get "/"
+    assert_equal 200, last_response.status
+  end
+end

data/test/dolt/sinatra/single_repo_browser_test.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2013 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require "test_helper"
+require "rack/test"
+require "pathname"
+require "tiltout"
+require "libdolt"
+require "dolt/sinatra/single_repo_browser"
+
+ENV["RACK_ENV"] = "test"
+
+describe Dolt::Sinatra::SingleRepoBrowser do
+  include Rack::Test::Methods
+
+  def app
+    dir = Pathname("../../../").realpath.to_s
+    actions = Test::Actions.new(Stub::Blob.new)
+    view = Tiltout.new(Dolt.template_dir)
+    Dolt::Sinatra::SingleRepoBrowser.new(dir, actions, view)
+  end
+
+  it "serves the index" do
+    get "/"
+
+    assert_equal 302, last_response.status
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #--
-#   Copyright (C) 2012 Gitorious AS
+#   Copyright (C) 2012-2013 Gitorious AS
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as published by
@@ -17,9 +17,8 @@
 #++
 require "bundler/setup"
 require "minitest/autorun"
-require "em/minitest/spec"
-require "eventmachine"
 require "libdolt/view"
+require "dolt/sinatra/actions"
 require "tiltout"
 
 Bundler.require(:default, :test)
@@ -36,15 +35,150 @@ module Dolt
       root = File.join(File.dirname(__FILE__), "..", "views")
       renderer = Tiltout.new(root, options)
       renderer.helper(helpers || [Dolt::View::MultiRepository,
-                                  Dolt::View::Object,
-                                  Dolt::View::Blob,
-                                  Dolt::View::Tree,
-                                  Dolt::View::Blame,
-                                  Dolt::View::SyntaxHighlight,
-                                  Dolt::View::Commit,
-                                  Dolt::View::Gravatar,
-                                  Dolt::View::Breadcrumb])
+          Dolt::View::Object,
+          Dolt::View::Blob,
+          Dolt::View::Tree,
+          Dolt::View::Blame,
+          Dolt::View::SyntaxHighlight,
+          Dolt::View::Commit,
+          Dolt::View::Gravatar,
+          Dolt::View::Breadcrumb])
       renderer
     end
   end
 end
+
+module Stub
+  class Blob
+    def is_a?(type)
+      type == Rugged::Blob
+    end
+  end
+
+  class Tree
+    def is_a?(type)
+      type == Rugged::Tree
+    end
+  end
+end
+
+module Test
+  class SinatraApp
+    include Dolt::Sinatra::Actions
+    attr_reader :actions, :renderer
+
+    def initialize(actions, renderer)
+      @actions = actions
+      @renderer = renderer
+    end
+
+    def body(str = nil)
+      @body = str if !str.nil?
+      @body
+    end
+
+    def response
+      if !@response
+        @response = {}
+        def @response.status; @status; end
+        def @response.status=(status); @status = status; end
+      end
+      @response
+    end
+
+    def tree_url(repo, ref, path)
+      "/#{repo}/tree/#{ref}:#{path}"
+    end
+
+    def blob_url(repo, ref, path)
+      "/#{repo}/blob/#{ref}:#{path}"
+    end
+
+    def tree_entry_url(repo, ref, path)
+      "/#{repo}/source/#{ref}:#{path}"
+    end
+
+    def blame_url(repo, ref, path)
+      "/#{repo}/blame/#{ref}:#{path}"
+    end
+
+    def history_url(repo, ref, path)
+      "/#{repo}/history/#{ref}:#{path}"
+    end
+
+    def tree_history_url(repo, ref, path)
+      "/#{repo}/tree_history/#{ref}:#{path}"
+    end
+
+    def raw_url(repo, ref, path)
+      "/#{repo}/raw/#{ref}:#{path}"
+    end
+  end
+
+  class RedirectingSinatraApp < SinatraApp
+    def redirect_refs?; true; end
+  end
+
+  class Renderer
+    def initialize(body = ""); @body = body; end
+
+    def render(action, data, options = {})
+      @action = action
+      @data = data
+      "#{action}:#@body"
+    end
+  end
+
+  class Actions
+    attr_reader :repo, :ref, :path
+
+    def initialize(response)
+      @response = response
+    end
+
+    def blob(repo, ref, path)
+      respond(:blob, repo, ref, path)
+    end
+
+    def tree(repo, ref, path)
+      respond(:tree, repo, ref, path)
+    end
+
+    def tree_entry(repo, ref, path)
+      respond(:tree_entry, repo, ref, path)
+    end
+
+    def raw(repo, ref, path)
+      respond(:raw, repo, ref, path)
+    end
+
+    def blame(repo, ref, path)
+      respond(:blame, repo, ref, path)
+    end
+
+    def history(repo, ref, path, limit)
+      respond(:history, repo, ref, path)
+    end
+
+    def refs(repo)
+      respond(:refs, repo)
+    end
+
+    def tree_history(repo, ref, path, count)
+      respond(:tree_history, repo, ref, path)
+    end
+
+    def respond(type, repo, ref = nil, path = nil)
+      @repo = repo
+      @ref = ref
+      @path = path
+      data = { :ref => ref, :repository => repo }
+      data[type != :tree_entry ? type : (@response.class.to_s =~ /Tree/ ? :tree : :blob)] = @response
+      data
+    end
+
+    def rev_parse_oid(repo, ref)
+      "a" * 40
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: async_sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tiltout
   requirement: !ruby/object:Gem::Requirement
@@ -124,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: em-minitest-spec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,15 +122,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
 description: Dolt serves git trees and syntax highlighted blobs
 email:
 - christian@gitorious.org
@@ -175,6 +159,8 @@ files:
 - ./lib/dolt/sinatra/multi_repo_browser.rb
 - ./lib/dolt/sinatra/single_repo_browser.rb
 - ./test/dolt/sinatra/actions_test.rb
+- ./test/dolt/sinatra/multi_repo_browser_test.rb
+- ./test/dolt/sinatra/single_repo_browser_test.rb
 - ./test/test_helper.rb
 - vendor/ui/.gitignore
 - vendor/ui/.gitmodules