dolt 0.4.3 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dolt (0.4.3)
+    dolt (0.5.0)
       async_sinatra (~> 1.0)
       builder (~> 3.1)
       em_pessimistic (~> 0.1)

data/bin/dolt

@@ -66,6 +66,14 @@ view.helper(Dolt::View::BinaryBlobEmbedder)
 # Render supported formats as markup, syntax highlight the rest
 view.helper(Dolt::View::SmartBlobRenderer)
 
+module MaxDepth
+  def maxdepth
+    3
+  end
+end
+
+view.helper(MaxDepth)
+
 Sinatra::Base.set(:public_folder, File.join(base, "vendor/ui"))
 server = create_app(ARGV[0], view)
 Thin::Server.start("0.0.0.0", 3000, server)

data/lib/dolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/lib/dolt/view/breadcrumb.rb

@@ -26,7 +26,7 @@ module Dolt
         url = repo_url(repository, "/tree/#{ref}")
         <<-HTML
           <ul class="breadcrumb">
-            <li><a href="#{url}:"><i class="icon icon-file"></i></a></li>
+            <li><a href="#{url}:"><i class="icon icon-file"></i> /</a></li>
             #{dir_html}<li class="active">#{filename}</li>
           </ul>
         HTML

data/lib/dolt/view/syntax_highlight.rb

@@ -45,6 +45,8 @@ module Dolt
 
       def self.lexer(suffix, code = nil)
         return @@lexer_aliases[suffix] if @@lexer_aliases[suffix]
+        lexer = Pygments::Lexer.find_by_extname(".#{suffix}")
+        return lexer.aliases.first || lexer.name if lexer
         shebang_language(shebang(code)) || suffix
       end
 
@@ -79,12 +81,10 @@ module Dolt
   end
 end
 
-Dolt::View::SyntaxHighlight.add_lexer_alias("yml", "yaml")
+Dolt::View::SyntaxHighlight.add_lexer_alias("txt", "text")
 Dolt::View::SyntaxHighlight.add_lexer_alias("ru", "rb")
 Dolt::View::SyntaxHighlight.add_lexer_alias("Rakefile", "rb")
 Dolt::View::SyntaxHighlight.add_lexer_alias("Gemfile", "rb")
 Dolt::View::SyntaxHighlight.add_lexer_alias("Gemfile.lock", "yaml")
-Dolt::View::SyntaxHighlight.add_lexer_alias("gemspec", "rb")
-Dolt::View::SyntaxHighlight.add_lexer_alias("htm", "html")
 
 Dolt::View::SyntaxHighlight.add_lexer_shebang(/\bruby\b/, "rb")

data/lib/dolt/view/tree.rb

@@ -28,8 +28,7 @@ module Dolt
           sort(tree.entries.select { |e| e[:type] == :blob })
       end
 
-      def tree_context(repo, ref, path, maxdepth = nil)
-        levels = accumulate_path(partition_path(path, maxdepth))
+      def tree_context(repo, ref, levels)
         return "" if levels.length == 1 && levels[0].length == 1
         total = 4 + levels.length
         colspan = total
@@ -56,7 +55,7 @@ module Dolt
            file = path == "" ? "/" : File.basename(path)
            url = object_url(repo, ref, dir, { :type => :tree, :name => file })
            html = "<a href=\"#{url}\">#{extra} #{file}</a>"
-           extra = ""
+           extra = extra == "" || extra == "/" ? "/" : ""
            html
         end).join(" ")
       end
@@ -67,7 +66,8 @@ module Dolt
         return result if path == ""
         parts = path.split("/")
         maxdepth ||= parts.length
-        (parts.length - maxdepth + 1).times { result[0] << parts.shift }
+        fill_first = [parts.length, [1, parts.length - maxdepth + 1].max].min
+        fill_first.times { result[0] << parts.shift }
         result << [parts.shift] while parts.length > 0
         result
       end
@@ -83,12 +83,12 @@ module Dolt
         end
       end
 
-      def tree_table_padding_width(path)
-        path.split("/").length
+      def tree_table_padding_width(partitioned)
+        partitioned.length == 1 ? partitioned[0].length - 1 : partitioned.length
       end
 
-      def tree_table_padding_td(path)
-        "<td></td>" * tree_table_padding_width(path)
+      def tree_table_padding_td(partitioned)
+        "<td></td>" * tree_table_padding_width(partitioned)
       end
 
       private

data/test/dolt/git/repository_test.rb

@@ -50,12 +50,12 @@ describe Dolt::Git::Repository do
 
   describe "#tree" do
     it "includes submodule data for trees" do
-      @repository.tree("master", "vendor").callback do |tree|
+      @repository.tree("3dc532f", "vendor").callback do |tree|
         assert_equal({
           :type => :submodule,
           :filemode => 57344,
           :name => "ui",
-          :oid => "2b05baa5a2e626cb1a4c4b30299c1db5490979b7",
+          :oid => "d167e3e1c17a27e4cf459dd380670801b0659659",
           :url => "git://gitorious.org/gitorious/ui3.git"
         }, tree.entries.first)
         done!

data/test/dolt/templates/tree_test.rb

@@ -49,4 +49,17 @@ describe "tree template" do
     assert_match /<table class="table table-striped gts-tree-explorer"/, markup
     assert_match /data-gts-tree-history="/, markup
   end
+
+  it "renders context for non-empty tree" do
+    tree = Tree.new([
+      { :type => :tree, :name => "lib" },
+      { :type => :submodule, :name => "ui", :url => "git://git.git" },
+      { :type => :blob, :name => "file.txt" }
+    ])
+
+    markup = render("app/models", tree)
+
+    assert_match /icon-folder-open/, markup
+    assert_match /tree\/master:app"/, markup
+  end
 end

data/test/dolt/view/syntax_highlight_test.rb

@@ -56,7 +56,7 @@ describe Dolt::View::Blob do
     end
 
     it "skips highlighting if lexer is missing" do
-      html = highlight("file.txt", "Yeah yeah yeah")
+      html = highlight("file.trololol", "Yeah yeah yeah")
 
       assert_equal "Yeah yeah yeah", html
     end

data/test/dolt/view/tree_test.rb

@@ -120,6 +120,11 @@ describe Dolt::View::Tree do
       parts = partition_path("lib/dolt/very/deep", 3)
       assert_equal [["", "lib", "dolt"], ["very"], ["deep"]], parts
     end
+
+    it "partitions short path with maxdepth" do
+      parts = partition_path("lib", 3)
+      assert_equal [["", "lib"]], parts
+    end
   end
 
   describe "#accumulate_path" do
@@ -130,8 +135,8 @@ describe Dolt::View::Tree do
   end
 
   describe "#tree_context" do
-    def context(path)
-      tree_context("gitorious", "master", path)
+    def context(path, maxdepth = nil)
+      tree_context("gitorious", "master", accumulate_path(partition_path(path, maxdepth)))
     end
 
     it "renders root as empty string" do
@@ -173,5 +178,22 @@ describe Dolt::View::Tree do
       tr = select(context("lib/dolt"), "tr")[1]
       assert_equal 2, select(tr, "td").length
     end
+
+    it "renders condensed first entry with slashes" do
+      links = select(context("src/phorkie/Database/Adapter", 3), "a")
+
+      assert_equal "<a href=\"/tree/master:\"><i class=\"icon icon-folder-open\"></i> /</a>", links.first
+      assert_equal "<a href=\"/tree/master:src\"> src</a>", links[1]
+      assert_equal "<a href=\"/tree/master:src/phorkie\">/ phorkie</a>", links[2]
+    end
+
+    it "renders long condensed first entry with slashes" do
+      links = select(context("src/phorkie/Database/Adapter/Elasticsearch", 3), "a")
+
+      assert_equal "<a href=\"/tree/master:\"><i class=\"icon icon-folder-open\"></i> /</a>", links.first
+      assert_equal "<a href=\"/tree/master:src\"> src</a>", links[1]
+      assert_equal "<a href=\"/tree/master:src/phorkie\">/ phorkie</a>", links[2]
+      assert_equal "<a href=\"/tree/master:src/phorkie/Database\">/ Database</a>", links[3]
+    end
   end
 end

data/views/tree.erb

@@ -17,21 +17,24 @@
   #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #++
 %>
-<% @title = "#{path == '' ? './' : path} in #{ref}" %>
+<%
+@title = "#{path == '' ? './' : path} in #{ref}"
+levels = accumulate_path(partition_path(path, respond_to?(:maxdepth) ? maxdepth : nil))
+%>
 <div id="gts-ref-selector-ph"></div>
 <table class="table table-striped gts-tree-explorer" data-gts-tree-history="<%= tree_history_url(repository, ref, path) %>">
   <thead>
     <tr>
-      <th colspan="<%= tree_table_padding_width("/#{path}") %>">File</th>
+      <th colspan="<%= tree_table_padding_width(levels) + 1 %>">File</th>
       <th class="gts-col-changed">Changed</th>
       <th class="gts-col-commit" colspan="2">Last commit</th>
     </tr>
   </thead>
   <tbody>
-    <%= tree_context(repository, ref, path) %>
+    <%= tree_context(repository, ref, levels) %>
     <% tree_entries(tree).each do |object| %>
       <tr>
-        <%= tree_table_padding_td(path) %>
+        <%= tree_table_padding_td(levels) %>
         <td class="gts-name">
           <a href="<%= object_url(repository, ref, path, object) %>">
             <i class="icon <%= object_icon_class(object) %>"></i>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dolt
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Christian Johansen