dolt 0.10.0 → 0.11.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dolt (0.9.0)
+    dolt (0.11.0)
       async_sinatra (~> 1.0)
       json (~> 1.5)
-      libdolt (~> 0.12)
+      libdolt (~> 0.15)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.4)
@@ -24,10 +24,10 @@ GEM
       eventmachine (~> 1.0)
       rugged (= 0.17.0.b6)
     eventmachine (1.0.0)
-    github-markup (0.7.4)
+    github-markup (0.7.5)
     htmlentities (4.3.1)
-    json (1.7.5)
-    libdolt (0.12.0)
+    json (1.7.6)
+    libdolt (0.15.0)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.3)
       eventmachine (~> 1.0)
@@ -41,17 +41,14 @@ GEM
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
       pygments.rb (~> 0.2)
-    metaclass (0.0.1)
     mime-types (1.19)
     minitest (2.12.1)
-    mocha (0.12.7)
-      metaclass (~> 0.0.1)
     posix-spawn (0.3.6)
-    pygments.rb (0.3.2)
+    pygments.rb (0.3.7)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    rack (1.4.3)
+    rack-protection (1.3.2)
       rack
     rake (0.9.2.2)
     rugged (0.17.0.b6)
@@ -77,5 +74,4 @@ DEPENDENCIES
   dolt!
   em-minitest-spec (~> 1.1)
   minitest (~> 2.0)
-  mocha
   rake (~> 0.9)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.10.0"
+  s.version     = "0.11.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "dolt"
 
-  s.add_dependency "libdolt", "~>0.14"
+  s.add_dependency "libdolt", "~>0.15"
   s.add_dependency "thin", "~>1.4"
   s.add_dependency "sinatra", "~>1.0"
   s.add_dependency "async_sinatra", "~>1.0"

data/lib/dolt/sinatra/actions.rb

@@ -54,6 +54,10 @@ module Dolt
       end
 
       def raw(repo, ref, path)
+        if oid = lookup_ref_oid(repo, ref)
+          redirect(raw_url(repo, oid, path)) and return
+        end
+
         blob(repo, ref, path, {
                :template => :raw,
                :content_type => "text/plain",
@@ -62,7 +66,11 @@ module Dolt
       end
 
       def blob(repo, ref, path, options = { :template => :blob })
-        actions.blob(repo, ref, path) do |err, data|
+        if oid = lookup_ref_oid(repo, ref)
+          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/
@@ -73,7 +81,11 @@ module Dolt
       end
 
       def tree(repo, ref, path)
-        actions.tree(repo, ref, path) do |err, data|
+        if oid = lookup_ref_oid(repo, ref)
+          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]
@@ -87,7 +99,11 @@ module Dolt
       end
 
       def tree_entry(repo, ref, path)
-        actions.tree_entry(repo, ref, path) do |err, data|
+        if oid = lookup_ref_oid(repo, ref)
+          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)
@@ -99,7 +115,11 @@ module Dolt
       end
 
       def blame(repo, ref, path)
-        actions.blame(repo, ref, path) do |err, data|
+        if oid = lookup_ref_oid(repo, ref)
+          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))
@@ -107,7 +127,11 @@ module Dolt
       end
 
       def history(repo, ref, path, count)
-        actions.history(repo, ref, path, count) do |err, data|
+        if oid = lookup_ref_oid(repo, ref)
+          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))
@@ -123,7 +147,11 @@ module Dolt
       end
 
       def tree_history(repo, ref, path, count = 1)
-        actions.tree_history(repo, ref, path, count) do |err, data|
+        if oid = lookup_ref_oid(repo, ref)
+          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)
@@ -137,7 +165,22 @@ module Dolt
         end
       end
 
+      def resolve_repository(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
+
+      def u(str)
+        # Temporarily swap the + out with a magic byte, so
+        # filenames/branches with +'s won't get unescaped to a space
+        CGI.unescape(str.gsub("+", "\001")).gsub("\001", '+')
+      end
+
       def add_headers(response, headers = {})
         default_ct = "text/html; charset=utf-8"
         response["Content-Type"] = headers[:content_type] || default_ct

data/test/dolt/sinatra/actions_test.rb

@@ -48,6 +48,30 @@ class DummySinatraApp
   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
@@ -119,6 +143,10 @@ class Actions
     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
@@ -151,11 +179,30 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      actions = Actions.new(BlobStub.new)
+      app = DummySinatraApp.new(actions, 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.blob("gitorious", "master", "lib/gitorious.rb")
+
+      location = app.response["Location"]
+      refute_equal 302, app.response.status
+    end
+
+    it "redirects ref to oid if configured so" do
+      app = RedirectingDummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app.blob("gitorious", "master", "lib/gitorious.rb")
+
+      location = app.response["Location"]
+      assert_equal 302, app.response.status
+      assert_equal "/gitorious/blob/#{'a' * 40}:lib/gitorious.rb", location
+      assert_equal "", app.body
+    end
   end
 
   describe "#tree" do
@@ -208,6 +255,21 @@ describe Dolt::Sinatra::Actions do
       assert_equal "max-age=315360000, public", app.response["Cache-Control"]
       refute_nil app.response["Expires"]
     end
+
+    it "unescapes ref" do
+      actions = Actions.new(TreeStub.new)
+      app = DummySinatraApp.new(actions, 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.tree("gitorious", "master", "lib")
+
+      assert_equal "/gitorious/tree/#{'a' * 40}:lib", app.response["Location"]
+    end
   end
 
   describe "#tree_entry" do
@@ -226,6 +288,21 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blob:Blob", app.body
     end
+
+    it "unescapes ref" do
+      actions = Actions.new(TreeStub.new)
+      app = DummySinatraApp.new(actions, 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.tree_entry("gitorious", "master", "lib")
+
+      assert_equal "/gitorious/source/#{'a' * 40}:lib", app.response["Location"]
+    end
   end
 
   describe "#raw" do
@@ -256,6 +333,21 @@ describe Dolt::Sinatra::Actions do
       assert_equal "/gitorious/tree/master:app/models", location
       assert_equal "", app.body
     end
+
+    it "unescapes ref" do
+      actions = Actions.new(BlobStub.new)
+      app = DummySinatraApp.new(actions, 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.raw("gitorious", "master", "lib/gitorious.rb")
+
+      assert_equal "/gitorious/raw/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
+    end
   end
 
   describe "#blame" do
@@ -276,6 +368,21 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blame:Text", app.body
     end
+
+    it "unescapes ref" do
+      actions = Actions.new(BlobStub.new)
+      app = DummySinatraApp.new(actions, 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.blame("gitorious", "master", "lib/gitorious.rb")
+
+      assert_equal "/gitorious/blame/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
+    end
   end
 
   describe "#history" do
@@ -296,6 +403,21 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "commits:Text", app.body
     end
+
+    it "unescapes ref" do
+      actions = Actions.new(BlobStub.new)
+      app = DummySinatraApp.new(actions, 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.history("gitorious", "master", "lib/gitorious.rb", 10)
+
+      assert_equal "/gitorious/history/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
+    end
   end
 
   describe "#refs" do
@@ -310,11 +432,26 @@ describe Dolt::Sinatra::Actions do
 
   describe "#tree_history" do
     it "renders the tree_history template as json" do
-      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("JSON"))
+      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("JSON"))
       app.tree_history("gitorious", "master", "", 1)
 
       assert_equal "application/json", app.response["Content-Type"]
       assert_equal "tree_history:JSON", app.body
     end
+
+    it "unescapes ref" do
+      actions = Actions.new(TreeStub.new)
+      app = DummySinatraApp.new(actions, 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.tree_history("gitorious", "master", "lib", 10)
+
+      assert_equal "/gitorious/tree_history/#{'a' * 40}:lib", app.response["Location"]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement