dolt 0.9.0 → 0.10.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dolt (0.8.0)
+    dolt (0.9.0)
       async_sinatra (~> 1.0)
       json (~> 1.5)
-      libdolt (~> 0.11)
+      libdolt (~> 0.12)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.4)
@@ -27,7 +27,7 @@ GEM
     github-markup (0.7.4)
     htmlentities (4.3.1)
     json (1.7.5)
-    libdolt (0.11)
+    libdolt (0.12.0)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.3)
       eventmachine (~> 1.0)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.9.0"
+  s.version     = "0.10.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.12"
+  s.add_dependency "libdolt", "~>0.14"
   s.add_dependency "thin", "~>1.4"
   s.add_dependency "sinatra", "~>1.0"
   s.add_dependency "async_sinatra", "~>1.0"
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   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 "mocha"
 
   s.files         = GemSpecHelper.files(".") + GemSpecHelper.files("vendor/ui")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")

data/lib/dolt/sinatra/actions.rb

@@ -16,6 +16,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require "json"
+require "time"
 
 module Dolt
   module Sinatra
@@ -29,7 +30,7 @@ module Dolt
       end
 
       def error(error, repo, ref)
-        response["Content-Type"] = "text/html"
+        add_headers(response)
         body(renderer.render(:"500", {
                                :error => error,
                                :repository_slug => repo,
@@ -60,12 +61,12 @@ module Dolt
              })
       end
 
-      def blob(repo, ref, path, options = { :template => :blob, :content_type => "text/html" })
+      def blob(repo, ref, path, options = { :template => :blob })
         actions.blob(repo, 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/
-          response["Content-Type"] = options[:content_type]
+          add_headers(response, options.merge(:ref => ref))
           tpl_options = options[:template_options] || {}
           body(renderer.render(options[:template], data, tpl_options))
         end
@@ -77,7 +78,7 @@ module Dolt
             next error(err, repo, ref) if !err.nil?
             tree = data[:tree]
             next redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
-            response["Content-Type"] = "text/html"
+            add_headers(response, :ref => ref)
             body(renderer.render(:tree, data))
           rescue Exception => err
             error(err, repo, ref)
@@ -89,7 +90,7 @@ module Dolt
         actions.tree_entry(repo, ref, path) do |err, data|
           begin
             next error(err, repo, ref) if !err.nil?
-            response["Content-Type"] = "text/html"
+            add_headers(response, :ref => ref)
             body(renderer.render(data.key?(:tree) ? :tree : :blob, data))
           rescue Exception => err
             error(err, repo, ref)
@@ -100,7 +101,7 @@ module Dolt
       def blame(repo, ref, path)
         actions.blame(repo, ref, path) do |err, data|
           next error(err, repo, ref) if !err.nil?
-          response["Content-Type"] = "text/html"
+          add_headers(response, :ref => ref)
           body(renderer.render(:blame, data))
         end
       end
@@ -108,7 +109,7 @@ module Dolt
       def history(repo, ref, path, count)
         actions.history(repo, ref, path, count) do |err, data|
           next error(err, repo, ref) if !err.nil?
-          response["Content-Type"] = "text/html"
+          add_headers(response, :ref => ref)
           body(renderer.render(:commits, data))
         end
       end
@@ -116,21 +117,38 @@ module Dolt
       def refs(repo)
         actions.refs(repo) do |err, data|
           next error(err, repo, ref) if !err.nil?
-          response["Content-Type"] = "application/json"
+          add_headers(response, :content_type => "application/json")
           body(renderer.render(:refs, data, :layout => nil))
         end
       end
 
       def tree_history(repo, ref, path, count = 1)
         actions.tree_history(repo, ref, path, count) do |err, data|
-          if !err.nil?
+          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)
-          else
-            response["Content-Type"] = "application/json"
-            body(renderer.render(:tree_history, data, :layout => nil))
           end
         end
       end
+
+      private
+      def add_headers(response, headers = {})
+        default_ct = "text/html; charset=utf-8"
+        response["Content-Type"] = headers[:content_type] || default_ct
+        response["X-UA-Compatible"] = "IE=edge"
+
+        if headers[:ref] && headers[:ref].length == 40
+          response["Cache-Control"] = "max-age=315360000, public"
+          year = 60*60*24*365
+          response["Expires"] = (Time.now + year).httpdate
+        end
+      end
     end
   end
 end

data/test/dolt/sinatra/actions_test.rb

@@ -137,18 +137,25 @@ describe Dolt::Sinatra::Actions do
       app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
       app.blob("gitorious", "master", "app/models/repository.rb")
 
-      assert_equal "text/html", app.response["Content-Type"]
+      assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blob:Blob", app.body
     end
 
     it "redirects tree views to tree action" do
-      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Blob"))
+      app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
       app.blob("gitorious", "master", "app/models")
 
       assert_equal 302, app.response.status
       assert_equal "/gitorious/tree/master:app/models", app.response["Location"]
       assert_equal "", app.body
     end
+
+    it "unescapes ref" do
+      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
+      app.blob("gitorious", "issue-%23221", "app/my documents")
+
+      assert_equal "issue-#221", actions.ref
+    end
   end
 
   describe "#tree" do
@@ -166,7 +173,7 @@ describe Dolt::Sinatra::Actions do
       app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
       app.tree("gitorious", "master", "app/models")
 
-      assert_equal "text/html", app.response["Content-Type"]
+      assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "tree:Tree", app.body
     end
 
@@ -179,6 +186,28 @@ describe Dolt::Sinatra::Actions do
       assert_equal "/gitorious/blob/master:app/models/repository.rb", location
       assert_equal "", app.body
     end
+
+    it "sets X-UA-Compatible header" do
+      app = DummySinatraApp.new(Actions.new(TreeStub.new), 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.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.tree("gitorious", "a" * 40, "app/models")
+
+      assert_equal "max-age=315360000, public", app.response["Cache-Control"]
+      refute_nil app.response["Expires"]
+    end
   end
 
   describe "#tree_entry" do
@@ -186,7 +215,7 @@ describe Dolt::Sinatra::Actions do
       app = DummySinatraApp.new(Actions.new(TreeStub.new), Renderer.new("Tree"))
       app.tree_entry("gitorious", "master", "app/models")
 
-      assert_equal "text/html", app.response["Content-Type"]
+      assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "tree:Tree", app.body
     end
 
@@ -194,7 +223,7 @@ describe Dolt::Sinatra::Actions do
       app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Blob"))
       app.tree_entry("gitorious", "master", "app/models")
 
-      assert_equal "text/html", app.response["Content-Type"]
+      assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blob:Blob", app.body
     end
   end
@@ -244,7 +273,7 @@ describe Dolt::Sinatra::Actions do
       app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Text"))
       app.blame("gitorious", "master", "app/models/repository.rb")
 
-      assert_equal "text/html", app.response["Content-Type"]
+      assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blame:Text", app.body
     end
   end
@@ -264,7 +293,7 @@ describe Dolt::Sinatra::Actions do
       app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Text"))
       app.history("gitorious", "master", "app/models/repository.rb", 10)
 
-      assert_equal "text/html", app.response["Content-Type"]
+      assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "commits:Text", app.body
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -155,22 +155,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Dolt serves git trees and syntax highlighted blobs
 email:
 - christian@gitorious.org