dolt 0.24.0 → 0.25.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dolt (0.24.0)
+    dolt (0.25.0)
       json (~> 1.5)
       libdolt (~> 0.23)
       sinatra (~> 1.0)
@@ -20,7 +20,7 @@ GEM
     github-markup (0.7.5)
     htmlentities (4.3.1)
     json (1.8.0)
-    libdolt (0.23.0)
+    libdolt (0.24.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.2)

data/dolt.gemspec

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

data/lib/dolt/sinatra/actions.rb

@@ -28,9 +28,12 @@ module Dolt
         body ""
       end
 
-      def render_error(error, repo, ref)
+      def render_error(error, repo, ref, data = {})
         if error.class.to_s == "Rugged::ReferenceError" && ref == "HEAD"
-          return body(renderer.render("empty", { :repository => repo, :ref => ref }))
+          return body(renderer.render("empty", {
+                :repository => repo,
+                :ref => ref
+              }.merge(data)))
         end
         template = error.class.to_s == "Rugged::IndexerError" ? :"404" : :"500"
         add_headers(response)
@@ -38,7 +41,7 @@ module Dolt
                                :error => error,
                                :repository_slug => repo,
                                :ref => ref
-                             }))
+                             }.merge(data)))
       rescue Exception => err
         err_backtrace = err.backtrace.map { |s| "<li>#{s}</li>" }
         error_backtrace = error.backtrace.map { |s| "<li>#{s}</li>" }
@@ -49,6 +52,13 @@ module Dolt
           Dolt encountered an exception, and additionally
           triggered another exception trying to render the error.
         </p>
+        <p>Tried to render the #{template} template with the following data:</p>
+        <dl>
+          <dt>Repository</dt>
+          <dd>#{repo}</dd>
+          <dt>Ref</dt>
+          <dd>#{ref}</dd>
+        </dl>
         <h2>Error: #{err.class} #{err.message}</h2>
         <ul>#{err_backtrace.join()}</ul>
         <h2>Original error: #{error.class} #{error.message}</h2>

metadata

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