libdolt 0.27.0 → 0.28.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.27.0)
+    libdolt (0.28.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.4)
@@ -17,7 +17,7 @@ GEM
     ci_reporter (1.9.0)
       builder (>= 2.1.2)
     escape_utils (0.3.2)
-    github-linguist (2.8.5)
+    github-linguist (2.8.6)
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.3.1)
       mime-types (~> 1.19)

data/Readme.md

@@ -20,21 +20,25 @@ libdolt depends on two system packages to do its job.
 
 ### Systems using apt (Debian/Ubuntu, others)
 
-    # 1) Install Python development files
-    sudo apt-get install -y python-dev libicu-dev
+```sh
+# 1) Install Python development files
+sudo apt-get install -y python-dev libicu-dev
 
-    # 2) Install dolt. This may or may not require the use of sudo, depending on
-    #    how you installed Ruby.
-    gem install libdolt
+# 2) Install dolt. This may or may not require the use of sudo, depending on
+#    how you installed Ruby.
+gem install libdolt
+```
 
 ### Systems using yum (Fedora/CentOS/RedHat, others)
 
-    # 1) Install Python development files
-    sudo yum install -y python-devel libicu-devel
+```sh
+# 1) Install Python development files
+sudo yum install -y python-devel libicu-devel
 
-    # 3) Install dolt. This may or may not require the use of sudo, depending on
-    #    how you installed Ruby.
-    gem install dolt
+# 2) Install dolt. This may or may not require the use of sudo, depending on
+#    how you installed Ruby.
+gem install dolt
+```
 
 ## API
 

data/lib/libdolt/controller_actions.rb

@@ -33,17 +33,29 @@ module Dolt
     end
 
     def render_error(error, repo, ref, data = {})
-      $stderr.puts(error.message)
+      $stderr.puts("#{error.class.to_s}: #{error.message}")
       $stderr.puts(error.backtrace)
 
       if error.class.to_s == "Rugged::ReferenceError" && ref == "HEAD"
-        return [200, headers, [renderer.render("empty", {
+        template = "empty"
+        return [200, headers, [renderer.render(template, {
                 :repository => repo,
                 :ref => ref
               }.merge(data))]]
       end
 
-      [response, headers, [renderer.render(response.to_s.to_sym, {
+      if error.class.to_s == "Rugged::ReferenceError"
+        template = "non_existent"
+        return [404, headers, [renderer.render(template, {
+                :repository => repo,
+                :ref => ref,
+                :error => error
+              }.merge(data))]]
+      end
+
+      response = error.class.to_s == "Rugged::IndexerError" ? 404 : 500
+      template = response.to_s.to_sym
+      [response, headers, [renderer.render(template, {
               :error => error,
               :repository_slug => repo,
               :ref => ref

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.27.0"
+  VERSION = "0.28.0"
 end

data/lib/libdolt/view/blame.rb

@@ -42,7 +42,7 @@ module Dolt
 
         <<-HTML
           <td class="#{class_name}">
-            <span class="gts-commit-oid" data-gts-commit-oid="#{annotation[:oid]}">#{annotation[:oid][0..6]}</span>
+            <span class="gts-commit-oid" data-gts-commit-oid="#{annotation[:oid]}" title="#{annotation[:summary]}">#{annotation[:oid][0..6]}</span>
             #{annotation[:committer][:time].strftime("%Y-%m-%d")}
             #{annotation[:committer][:name]}
           </td>

data/test/libdolt/view/blame_test.rb

@@ -107,6 +107,12 @@ describe Dolt::View::Blame do
 
       assert_match /2012-01-01/, html
     end
+
+    it "includes the commit summary" do
+      html = blame_annotation_cell({ :committer => @committer, :oid => @oid, :summary => "Doing it" })
+
+      assert_match "Doing it", html
+    end
   end
 
   describe "#blame_code_cell" do

data/views/non_existent.erb

@@ -0,0 +1,25 @@
+<%#
+# encoding: utf-8
+#--
+#   Copyright (C) 2013 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+%>
+<div class="container gts-body">
+  <h1><%= @title = "No such ref '#{ref}'" %></h1>
+  <p>
+    <%= error.message %>
+  </p>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -287,6 +287,7 @@ files:
 - views/empty.erb
 - views/index.erb
 - views/layout.erb
+- views/non_existent.erb
 - views/raw.erb
 - views/refs.erb
 - views/tree.erb