dolt 0.20.0 → 0.21.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dolt (0.18.0)
+    dolt (0.21.0)
       json (~> 1.5)
       libdolt (~> 0.21)
       sinatra (~> 1.0)
@@ -16,7 +16,7 @@ GEM
     eventmachine (1.0.3)
     github-markup (0.7.5)
     htmlentities (4.3.1)
-    json (1.8.0)
+    json (1.7.7)
     libdolt (0.22.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
@@ -31,7 +31,7 @@ GEM
     mime-types (1.23)
     minitest (2.12.1)
     posix-spawn (0.3.6)
-    pygments.rb (0.5.0)
+    pygments.rb (0.5.1)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.20.0"
+  s.version     = "0.21.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"

data/lib/dolt/sinatra/actions.rb

@@ -22,8 +22,8 @@ require "cgi"
 module Dolt
   module Sinatra
     module Actions
-      def redirect(url)
-        response.status = 302
+      def redirect(url, status = 302)
+        response.status = status
         response["Location"] = url
         body ""
       end
@@ -55,7 +55,7 @@ module Dolt
 
       def raw(repo, ref, path, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
-          redirect(raw_url(repo, oid, path)) and return
+          redirect(raw_url(repo, oid, path), 307) and return
         end
 
         blob(repo, ref, path, custom_data, {
@@ -67,7 +67,7 @@ module Dolt
 
       def blob(repo, ref, path, custom_data = {}, options = { :template => :blob })
         if oid = lookup_ref_oid(repo, ref)
-          redirect(blob_url(repo, oid, path)) and return
+          redirect(blob_url(repo, oid, path), 307) and return
         end
 
         data = (custom_data || {}).merge(actions.blob(repo, u(ref), path))
@@ -76,13 +76,11 @@ module Dolt
         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, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
-          redirect(tree_url(repo, oid, path)) and return
+          redirect(tree_url(repo, oid, path), 307) and return
         end
 
         data = (custom_data || {}).merge(actions.tree(repo, u(ref), path))
@@ -90,64 +88,52 @@ module Dolt
         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, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
-          redirect(tree_entry_url(repo, oid, path)) and return
+          redirect(tree_entry_url(repo, oid, path), 307) and return
         end
 
         data = (custom_data || {}).merge(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, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
-          redirect(blame_url(repo, oid, path)) and return
+          redirect(blame_url(repo, oid, path), 307) and return
         end
 
         data = (custom_data || {}).merge(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, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
-          redirect(history_url(repo, oid, path)) and return
+          redirect(history_url(repo, oid, path), 307) and return
         end
 
         data = (custom_data || {}).merge(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, custom_data = {})
         data = (custom_data || {}).merge(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, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
-          redirect(tree_history_url(repo, oid, path)) and return
+          redirect(tree_history_url(repo, oid, path), 307) and return
         end
 
         data = (custom_data || {}).merge(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)
@@ -155,12 +141,12 @@ module Dolt
         @cache[repo] ||= actions.resolve_repository(repo)
       end
 
-      private
       def lookup_ref_oid(repo, ref)
         return if !respond_to?(:redirect_refs?) || !redirect_refs? || ref.length == 40
         actions.rev_parse_oid(repo, ref)
       end
 
+      private
       def u(str)
         # Temporarily swap the + out with a magic byte, so
         # filenames/branches with +'s won't get unescaped to a space

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -39,8 +39,12 @@ module Dolt
       end
 
       get "/*/tree/*:*" do
-        repo, ref, path = params[:splat]
-        tree(repo, ref, path)
+        begin
+          repo, ref, path = params[:splat]
+          tree(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/*/tree/*" do
@@ -48,8 +52,12 @@ module Dolt
       end
 
       get "/*/blob/*:*" do
-        repo, ref, path = params[:splat]
-        blob(repo, ref, path)
+        begin
+          repo, ref, path = params[:splat]
+          blob(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/*/blob/*" do
@@ -57,8 +65,12 @@ module Dolt
       end
 
       get "/*/raw/*:*" do
-        repo, ref, path = params[:splat]
-        raw(repo, ref, path)
+        begin
+          repo, ref, path = params[:splat]
+          raw(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/*/raw/*" do
@@ -66,8 +78,12 @@ module Dolt
       end
 
       get "/*/blame/*:*" do
-        repo, ref, path = params[:splat]
-        blame(repo, ref, path)
+        begin
+          repo, ref, path = params[:splat]
+          blame(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/*/blame/*" do
@@ -75,8 +91,12 @@ module Dolt
       end
 
       get "/*/history/*:*" do
-        repo, ref, path = params[:splat]
-        history(repo, ref, path, (params[:commit_count] || 20).to_i)
+        begin
+          repo, ref, path = params[:splat]
+          history(repo, ref, path, (params[:commit_count] || 20).to_i)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/*/history/*" do
@@ -84,12 +104,20 @@ module Dolt
       end
 
       get "/*/refs" do
-        refs(params[:splat].first)
+        begin
+          refs(params[:splat].first)
+        rescue Exception => err
+          error(err, repo, nil)
+        end
       end
 
       get "/*/tree_history/*:*" do
-        repo, ref, path = params[:splat]
-        tree_history(repo, ref, path)
+        begin
+          repo, ref, path = params[:splat]
+          tree_history(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       private

data/lib/dolt/sinatra/single_repo_browser.rb

@@ -40,8 +40,12 @@ module Dolt
       end
 
       get "/tree/*:*" do
-        ref, path = params[:splat]
-        tree(repo, ref, path)
+        begin
+          ref, path = params[:splat]
+          tree(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/tree/*" do
@@ -49,8 +53,12 @@ module Dolt
       end
 
       get "/blob/*:*" do
-        ref, path = params[:splat]
-        blob(repo, ref, path)
+        begin
+          ref, path = params[:splat]
+          blob(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/blob/*" do
@@ -58,8 +66,12 @@ module Dolt
       end
 
       get "/raw/*:*" do
-        ref, path = params[:splat]
-        raw(repo, ref, path)
+        begin
+          ref, path = params[:splat]
+          raw(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/raw/*" do
@@ -67,8 +79,12 @@ module Dolt
       end
 
       get "/blame/*:*" do
-        ref, path = params[:splat]
-        blame(repo, ref, path)
+        begin
+          ref, path = params[:splat]
+          blame(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/blame/*" do
@@ -76,8 +92,12 @@ module Dolt
       end
 
       get "/history/*:*" do
-        ref, path = params[:splat]
-        history(repo, ref, path, (params[:commit_count] || 20).to_i)
+        begin
+          ref, path = params[:splat]
+          history(repo, ref, path, (params[:commit_count] || 20).to_i)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/history/*" do
@@ -85,12 +105,20 @@ module Dolt
       end
 
       get "/refs" do
-        refs(repo)
+        begin
+          refs(repo)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       get "/tree_history/*:*" do
-        ref, path = params[:splat]
-        tree_history(repo, ref, path)
+        begin
+          ref, path = params[:splat]
+          tree_history(repo, ref, path)
+        rescue Exception => err
+          error(err, repo, ref)
+        end
       end
 
       private

data/test/dolt/sinatra/actions_test.rb

@@ -69,6 +69,7 @@ describe Dolt::Sinatra::Actions do
 
       location = app.response["Location"]
       refute_equal 302, app.response.status
+      refute_equal 307, app.response.status
     end
 
     it "redirects ref to oid if configured so" do
@@ -76,7 +77,7 @@ describe Dolt::Sinatra::Actions do
       app.blob("gitorious", "master", "lib/gitorious.rb")
 
       location = app.response["Location"]
-      assert_equal 302, app.response.status
+      assert_equal 307, app.response.status
       assert_equal "/gitorious/blob/#{'a' * 40}:lib/gitorious.rb", location
       assert_equal "", app.body
     end
@@ -153,6 +154,7 @@ describe Dolt::Sinatra::Actions do
       app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "master", "lib")
 
+      assert_equal 307, app.response.status
       assert_equal "/gitorious/tree/#{'a' * 40}:lib", app.response["Location"]
     end
   end
@@ -194,6 +196,7 @@ describe Dolt::Sinatra::Actions do
       app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree_entry("gitorious", "master", "lib")
 
+      assert_equal 307, app.response.status
       assert_equal "/gitorious/source/#{'a' * 40}:lib", app.response["Location"]
     end
   end
@@ -247,6 +250,7 @@ describe Dolt::Sinatra::Actions do
       app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.raw("gitorious", "master", "lib/gitorious.rb")
 
+      assert_equal 307, app.response.status
       assert_equal "/gitorious/raw/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
     end
   end
@@ -290,6 +294,7 @@ describe Dolt::Sinatra::Actions do
       app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.blame("gitorious", "master", "lib/gitorious.rb")
 
+      assert_equal 307, app.response.status
       assert_equal "/gitorious/blame/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
     end
   end
@@ -333,6 +338,7 @@ describe Dolt::Sinatra::Actions do
       app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.history("gitorious", "master", "lib/gitorious.rb", 10)
 
+      assert_equal 307, app.response.status
       assert_equal "/gitorious/history/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
     end
   end
@@ -384,6 +390,7 @@ describe Dolt::Sinatra::Actions do
       app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.tree_history("gitorious", "master", "lib", 10)
 
+      assert_equal 307, app.response.status
       assert_equal "/gitorious/tree_history/#{'a' * 40}:lib", app.response["Location"]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt