libdolt 0.25.0 → 0.26.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    libdolt (0.25.0)
+    libdolt (0.26.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
-      makeup (~> 0.2)
+      makeup (~> 0.4)
       mime-types (~> 1.19)
       rugged (= 0.18.0.gh.de28323)
       tzinfo (~> 0.3)
@@ -13,15 +13,23 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.2.2)
+    charlock_holmes (0.6.9.4)
     ci_reporter (1.9.0)
       builder (>= 2.1.2)
+    escape_utils (0.3.2)
+    github-linguist (2.8.5)
+      charlock_holmes (~> 0.6.6)
+      escape_utils (~> 0.3.1)
+      mime-types (~> 1.19)
+      pygments.rb (~> 0.4.2)
     github-markup (0.7.5)
     htmlentities (4.3.1)
     json (1.8.0)
-    makeup (0.3.0)
+    makeup (0.4.0)
+      github-linguist (~> 2.8)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
-      pygments.rb (~> 0.2)
+      pygments.rb (~> 0.4)
     metaclass (0.0.1)
     mime-types (1.23)
     minitest (2.12.1)
@@ -29,7 +37,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.7.7)
     posix-spawn (0.3.6)
-    pygments.rb (0.5.1)
+    pygments.rb (0.4.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rake (0.9.6)

data/lib/libdolt/repository_lookup.rb

@@ -30,7 +30,8 @@ module Dolt
     def blob(repo, ref, path)
       repository = resolve_repository(repo)
       tpl_data(repository, ref, path, {
-          :blob => repository.rev_parse("#{ref}:#{path}")
+          :blob => repository.rev_parse("#{ref}:#{path}"),
+          :filemode => filemode(repository, ref, path)
         })
     end
 
@@ -47,13 +48,15 @@ module Dolt
       key = result.class.to_s.match(/Blob/) ? :blob : :tree
       hash = tpl_data(repository, ref, path, { key => result, :type => key })
       hash[:readme] = readme(repo, ref, path) if key == :tree
+      hash[:filemode] = filemode(repository, ref, path) if key == :blob
       hash
     end
 
     def blame(repo, ref, path)
       repository = resolve_repository(repo)
       tpl_data(repository, ref, path, {
-          :blame => repository.blame(ref, path)
+          :blame => repository.blame(ref, path),
+          :filemode => filemode(repository, ref, path)
         })
     end
 
@@ -120,6 +123,13 @@ module Dolt
       blob = repository.blob(ref, blob_path)
       {:blob => blob, :path => blob_path}
     end
+
+    def filemode(repo, ref, path)
+      file = File.basename(path)
+      refspec = "#{ref}:#{File.dirname(path).sub(/^\.$/, '')}"
+      entry = repo.rev_parse(refspec).find { |e| e[:name] == file }
+      entry.nil? ? nil : entry[:filemode].to_s(8)
+    end
   end
 
   class ResolvedRepository

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.25.0"
+  VERSION = "0.26.0"
 end

data/lib/libdolt/view/smart_blob_renderer.rb

@@ -25,7 +25,14 @@ module Dolt
       include Dolt::View::SyntaxHighlight
 
       def format_text_blob(path, content, repo = nil, ref = nil, options = {})
-        return render_markup(path, content) if supported_markup_format?(path)
+        begin
+          return render_markup(path, content) if supported_markup_format?(path)
+        rescue StandardError => err
+          $stderr.puts("Failed rendering markup in #{path}, render syntax highlighted insted")
+          $stderr.puts("Original error was: #{err.name}")
+          $stderr.puts(err.backtrace)
+        end
+
         highlight_multiline(path, content, options)
       end
     end

data/libdolt.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rugged", "0.18.0.gh.de28323"
   s.add_dependency "tzinfo", "~> 0.3"
-  s.add_dependency "makeup", "~>0.2"
+  s.add_dependency "makeup", "~>0.4"
   s.add_dependency "htmlentities", "~> 4.3"
   s.add_dependency "json", "~> 1.7"
   s.add_dependency "mime-types", "~> 1.19"

data/test/libdolt/repository_lookup_test.rb

@@ -48,11 +48,12 @@ describe Dolt::RepositoryLookup do
   end
 
   describe "#blob" do
-    it "returns path, blob, repo, ref and base_tree_url" do
+    it "returns path, blob, repo, ref, filemode and base_tree_url" do
       data = @lookup.blob("gitorious", "fc5f5fb50b435e18", "lib/foo.rb")
       assert_equal "gitorious", data[:repository_slug]
       assert_equal "fc5f5fb50b435e18", data[:ref]
       assert Rugged::Blob === data[:blob]
+      assert_equal "100644", data[:filemode]
     end
   end
 
@@ -83,12 +84,13 @@ describe Dolt::RepositoryLookup do
       assert_equal :tree, data[:type]
     end
 
-    it "returns blob, repo and ref" do
+    it "returns blob, filemode, repo and ref" do
       data = @lookup.tree_entry("gitorious", "fc5f5fb50b435e18", "lib/foo.rb")
 
       assert_equal "lib/foo.rb", data[:path]
       assert_equal "fc5f5fb50b435e18", data[:ref]
       assert_equal :blob, data[:type]
+      assert_equal "100644", data[:filemode]
     end
   end
 
@@ -98,12 +100,13 @@ describe Dolt::RepositoryLookup do
       assert_equal 1, @resolver.resolved.size
     end
 
-    it "returns blame, repo and ref" do
+    it "returns blame, filemode, repo and ref" do
       data = @lookup.blame("gitorious", "fc5f5fb50b435e18", "lib")
       assert Dolt::Git::Blame === data[:blame]
       assert_equal "gitorious", data[:repository_slug]
       assert_equal "fc5f5fb50b435e18", data[:ref]
       assert_equal "lib", data[:path]
+      assert_equal "40000", data[:filemode]
     end
   end
 

data/test/libdolt/view/syntax_highlight_test.rb

@@ -48,14 +48,6 @@ describe Dolt::View::Blob do
       assert_match "Hey<span class=\"nt\">&lt;/h1&gt;</span>", html
     end
 
-    it "highlights file with custom suffix" do
-      Makeup::SyntaxHighlighter.add_lexer_alias("derp", "rb")
-      html = highlight("file.derp", "class File")
-
-      assert_match "<span class=\"k\">class</span>", html
-      assert_match "<span class=\"nc\">File</span>", html
-    end
-
     it "skips highlighting if lexer is missing" do
       html = highlight("file.trololol", "Yeah yeah yeah")
 

data/views/tree.erb

@@ -50,11 +50,18 @@
     </tbody>
   </table>
   <% if readme %>
-  <div class="gts-readme" id="readme">
-    <div class="gts-page-header">
-      <h4><%= readme[:path] %></h4>
+    <div class="gts-readme" id="readme">
+      <div class="gts-page-header">
+        <h4><%= readme[:path] %></h4>
+      </div>
+      <% begin %>
+        <%= format_blob(readme[:path], readme[:blob].text(nil, defined?(Encoding) ? Encoding.default_external : nil), repository_slug, ref) %>
+      <% rescue StandardError => err %>
+        <p>
+          <em>Failed to render <%= readme[:path] %></em>
+          <!-- <%= err.message %> -->
+        </p>
+      <% end %>
     </div>
-    <%= format_blob(readme[:path], readme[:blob].text(nil, defined?(Encoding) ? Encoding.default_external : nil), repository_slug, ref) %>
-  </div>
   <% end %>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement