dolt 0.8.0 → 0.9.0

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    dolt (0.7.2)
+    dolt (0.8.0)
       async_sinatra (~> 1.0)
       json (~> 1.5)
-      libdolt (~> 0.10)
+      libdolt (~> 0.11)
       sinatra (~> 1.0)
       thin (~> 1.4)
-      tiltout (~> 1.1)
+      tiltout (~> 1.4)
 
 GEM
   remote: http://rubygems.org/
@@ -27,7 +27,7 @@ GEM
     github-markup (0.7.4)
     htmlentities (4.3.1)
     json (1.7.5)
-    libdolt (0.10.1)
+    libdolt (0.11)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.3)
       eventmachine (~> 1.0)
@@ -37,7 +37,7 @@ GEM
       mime-types (~> 1.19)
       tzinfo (~> 0.3)
       when (~> 0)
-    makeup (0.2.0)
+    makeup (0.3.0)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
       pygments.rb (~> 0.2)
@@ -64,7 +64,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    tiltout (1.2.0)
+    tiltout (1.4.0)
       tilt (~> 1.3)
     tzinfo (0.3.35)
     when (0.1.0)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.8.0"
+  s.version     = "0.9.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.11"
+  s.add_dependency "libdolt", "~>0.12"
   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

@@ -85,6 +85,18 @@ module Dolt
         end
       end
 
+      def tree_entry(repo, ref, path)
+        actions.tree_entry(repo, ref, path) do |err, data|
+          begin
+            next error(err, repo, ref) if !err.nil?
+            response["Content-Type"] = "text/html"
+            body(renderer.render(data.key?(:tree) ? :tree : :blob, data))
+          rescue Exception => err
+            error(err, repo, ref)
+          end
+        end
+      end
+
       def blame(repo, ref, path)
         actions.blame(repo, ref, path) do |err, data|
           next error(err, repo, ref) if !err.nil?

data/test/dolt/sinatra/actions_test.rb

@@ -87,6 +87,10 @@ class Actions
     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
@@ -112,7 +116,7 @@ class Actions
     @ref = ref
     @path = path
     data = { :ref => ref, :repository => repo }
-    data[type] = @response
+    data[type != :tree_entry ? type : (@response.class.to_s =~ /Tree/ ? :tree : :blob)] = @response
     block.call(nil, data)
   end
 end
@@ -177,6 +181,24 @@ describe Dolt::Sinatra::Actions do
     end
   end
 
+  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.tree_entry("gitorious", "master", "app/models")
+
+      assert_equal "text/html", app.response["Content-Type"]
+      assert_equal "tree:Tree", app.body
+    end
+
+    it "renders trees with the tree template as html" 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 "blob:Blob", app.body
+    end
+  end
+
   describe "#raw" do
     it "delegates to actions" do
       actions = Actions.new(BlobStub.new)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement