dolt 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dolt (0.2.0)
+    dolt (0.2.1)
       async_sinatra (~> 1.0)
       builder (~> 3.1)
       em_pessimistic (~> 0.1)
@@ -9,6 +9,7 @@ PATH
       eventmachine (~> 1.0)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
+      json (~> 1.7)
       pygments.rb (~> 0.2)
       sinatra (~> 1.3)
       thin (~> 1.4)
@@ -28,13 +29,14 @@ GEM
       eventmachine
     em_pessimistic (0.1.2)
       eventmachine (~> 1.0)
-    em_rugged (0.1.2)
+    em_rugged (0.1.3)
       eventmachine (~> 1.0)
       rugged (= 0.17.0.b6)
     eventmachine (1.0.0)
     ffi (1.0.11)
     github-markup (0.7.4)
     htmlentities (4.3.1)
+    json (1.7.5)
     metaclass (0.0.1)
     minitest (2.12.1)
     mocha (0.12.4)

data/bin/dolt

@@ -51,6 +51,8 @@ view.helper(Dolt::View::Breadcrumb)
 view.helper(Dolt::View::Tree)
 view.helper(Dolt::View::Commit)
 view.helper(Dolt::View::Gravatar)
+Dolt::View::TabWidth.tab_width = 4
+view.helper(Dolt::View::TabWidth)
 
 # Configure blob rendering module
 

data/dolt.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "tzinfo", "~> 0.3"
   s.add_dependency "github-markup", "~> 0.7"
   s.add_dependency "htmlentities", "~> 4.3"
+  s.add_dependency "json", "~> 1.7"
 
   s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "em-minitest-spec", "~> 1.1"

data/lib/dolt/repo_actions.rb

@@ -39,6 +39,20 @@ module Dolt
       repo_action(repo, ref, path, :commits, :log, ref, path, count, &block)
     end
 
+    def refs(repo, &block)
+      repository = repo_resolver.resolve(repo)
+      d = repository.refs
+      d.callback do |refs|
+        names = refs.map(&:name)
+        block.call(nil, {
+                     :repository => repo,
+                     :tags => stripped_ref_names(names, :tags),
+                     :heads => stripped_ref_names(names, :heads)
+                   })
+      end
+      d.errback { |err| block.call(err, nil) }
+    end
+
     def repositories
       repo_resolver.all
     end
@@ -62,5 +76,11 @@ module Dolt
         :ref => ref
       }.merge(locals)
     end
+
+    def stripped_ref_names(names, type)
+      names.select { |n| n =~ /#{type}/ }.map do |n|
+        n.sub(/^refs\/#{type}\//, "")
+      end
+    end
   end
 end

data/lib/dolt/sinatra/actions.rb

@@ -77,6 +77,14 @@ module Dolt
           body(renderer.render(:commits, data))
         end
       end
+
+      def refs(repo)
+        actions.refs(repo) do |err, data|
+          return error(err) if !err.nil?
+          response["Content-Type"] = "application/json"
+          body(renderer.render(:refs, data, :layout => nil))
+        end
+      end
     end
   end
 end

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -68,6 +68,10 @@ module Dolt
         force_ref(params[:splat], "blame", "master")
       end
 
+      aget "/*/refs" do
+        refs(params[:splat].first)
+      end
+
       private
       def force_ref(args, action, ref)
         redirect(args.shift + "/#{action}/#{ref}:" + args.join)

data/lib/dolt/sinatra/single_repo_browser.rb

@@ -82,6 +82,10 @@ module Dolt
         force_ref(params[:splat], "blame", "master")
       end
 
+      aget "/refs" do
+        refs(repo)
+      end
+
       private
       def force_ref(args, action, ref)
         redirect("/#{action}/#{ref}:" + args.join)

data/lib/dolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/dolt/view/blob.rb

@@ -20,9 +20,13 @@ require "htmlentities"
 module Dolt
   module View
     module Blob
-      def format_blob(path, content)
+      def entityfy(content)
         @coder ||= HTMLEntities.new
-        multiline(@coder.encode(content))
+        @coder.encode(content)
+      end
+
+      def format_blob(path, content)
+        multiline(entityfy(content))
       end
 
       def blob_url(repository, ref, path)
@@ -41,6 +45,10 @@ module Dolt
         repo_url(repository, "/raw/#{ref}:#{path}")
       end
 
+      def format_whitespace(text)
+        text
+      end
+
       def multiline(blob, options = {})
         class_names = options[:class_names] || []
         class_names << "prettyprint" << "linenums"
@@ -48,7 +56,10 @@ module Dolt
         num = 0
         lines = blob.split("\n").inject("") do |html, line|
           num += 1
-          line = line.gsub(/\t/, "    ")
+          # Empty elements causes annoying rendering artefacts
+          # Forcing one space on each line affects copy-paste negatively
+          # TODO: Don't force one space, find CSS fix
+          line = format_whitespace(line).sub(/^$/, " ")
           "#{html}<li class=\"L#{num}\"><span class=\"line\">#{line}</span></li>"
         end
 

data/lib/dolt/view/syntax_highlight.rb

@@ -24,7 +24,7 @@ module Dolt
         options = { :lexer => lexer(path, code) }.merge(opt)
         Pygments.highlight(code, highlight_options(options))
       rescue RubyPython::PythonError
-        code
+        respond_to?(:entityfy) ? entityfy(code) : code
       end
 
       def highlight_multiline(path, code, options = {})
@@ -78,6 +78,7 @@ module Dolt
 end
 
 Dolt::View::SyntaxHighlight.add_lexer_alias("yml", "yaml")
+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")

data/lib/dolt/view/tab_width.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 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/>.
+#++
+
+module Dolt
+  module View
+    module TabWidth
+      def self.tab_width; @@tab_width; end
+      def self.tab_width=(tab_width); @@tab_width = tab_width; end
+
+      def format_whitespace(text)
+        text.gsub(/\t/, " " * TabWidth.tab_width)
+      end
+    end
+  end
+end

data/test/dolt/repo_actions_test.rb

@@ -18,29 +18,25 @@
 require "test_helper"
 require "dolt/repo_actions"
 require "dolt/async/when"
+require "ostruct"
 
 class Repository
   attr_reader :name
   def initialize(name); @name = name; end
+  def rev_parse(rev); stub; end
+  def blame(ref, path); stub; end
+  def log(ref, path, limit); stub; end
+  def refs; stub; end
 
-  def rev_parse(rev)
-    @deferred = When::Deferred.new
-    @deferred.promise
-  end
-
-  def blame(ref, path)
-    @deferred = When::Deferred.new
-    @deferred.promise
+  def resolve_promise(blob)
+    @deferred.resolve(blob)
   end
 
-  def log(ref, path, limit)
+  private
+  def stub
     @deferred = When::Deferred.new
     @deferred.promise
   end
-
-  def resolve_promise(blob)
-    @deferred.resolve(blob)
-  end
 end
 
 class Resolver
@@ -161,4 +157,30 @@ describe Dolt::RepoActions do
       assert_equal expected, data
     end
   end
+
+  describe "#refs" do
+    before do
+      @refs = ["refs/stash",
+               "refs/tags/v0.2.1",
+               "refs/tags/v0.2.0",
+               "refs/remotes/origin/master",
+               "refs/heads/libgit2",
+               "refs/heads/master"].map { |n| OpenStruct.new(:name => n) }
+    end
+
+    it "yields repositories, tags and heads" do
+      data = nil
+      @actions.refs("gitorious") { |err, d| data = d }
+
+      repo = @resolver.resolved.last
+      repo.resolve_promise(@refs)
+
+      expected = {
+        :repository => "gitorious",
+        :heads => ["libgit2", "master"],
+        :tags => ["v0.2.1", "v0.2.0"]
+      }
+      assert_equal expected, data
+    end
+  end
 end

data/test/dolt/sinatra/actions_test.rb

@@ -99,6 +99,10 @@ class Actions
     respond(:history, repo, ref, path, &block)
   end
 
+  def refs(repo, &block)
+    respond(:refs, repo, nil, nil, &block)
+  end
+
   def respond(type, repo, ref, path, &block)
     @repo = repo
     @ref = ref
@@ -210,7 +214,7 @@ describe Dolt::Sinatra::Actions do
       assert_equal "app/models/repository.rb", actions.path
     end
 
-    it "renders the blame template as text" do
+    it "renders the blame template as html" do
       app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Text"))
       app.blame("gitorious", "master", "app/models/repository.rb")
 
@@ -230,7 +234,7 @@ describe Dolt::Sinatra::Actions do
       assert_equal "app/models/repository.rb", actions.path
     end
 
-    it "renders the commits template as text" do
+    it "renders the commits template as html" do
       app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("Text"))
       app.history("gitorious", "master", "app/models/repository.rb", 10)
 
@@ -238,4 +242,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "commits:Text", app.body
     end
   end
+
+  describe "#refs" do
+    it "renders the refs template as json" do
+      app = DummySinatraApp.new(Actions.new(BlobStub.new), Renderer.new("JSON"))
+      app.refs("gitorious")
+
+      assert_equal "application/json", app.response["Content-Type"]
+      assert_equal "refs:JSON", app.body
+    end
+  end
 end

data/test/dolt/templates/refs_test.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 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/>.
+#++
+require "test_helper"
+require "dolt/template_renderer"
+require "dolt/view"
+require "json"
+
+describe "refs template" do
+  include Dolt::ViewTest
+
+  before do
+    @repo = "the-dolt"
+    @template_root = File.join(File.dirname(__FILE__), "..", "..", "..", "views")
+    @renderer = prepare_renderer(@template_root)
+  end
+
+  it "renders JSON" do
+    data = { "heads" => ["libgit2", "master"], "tags" => ["v2.1.0"] }
+    html = @renderer.render(:refs, data)
+
+    assert_equal data, JSON.parse(html)
+  end
+end

data/test/dolt/view/smart_blob_renderer_test.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 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/>.
+#++
+require "test_helper"
+require "dolt/view/smart_blob_renderer"
+
+describe Dolt::View::SmartBlobRenderer do
+  include Dolt::View::Blob
+  include Dolt::View::SmartBlobRenderer
+
+  describe "#format_blob" do
+    it "highlights a Ruby file" do
+      html = format_blob("file.rb", "class File\n  attr_reader :path\nend")
+
+      assert_match "<span class=\"k\">class</span>", html
+      assert_match "<span class=\"nc\">File</span>", html
+    end
+
+    it "wraps markup in .gts-markup" do
+      html = render_markup("file.md", "# Hey")
+      assert_match "<div class=\"gts-markup\">", html
+    end
+  end
+end

data/test/dolt/view/tab_width_test.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 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/>.
+#++
+require "test_helper"
+require "dolt/view/tab_width"
+
+describe Dolt::View::TabWidth do
+  include Dolt::View::Blob
+  include Dolt::View::TabWidth
+
+  describe "#format_whitespace" do
+    it "limits width of whitespace" do
+      Dolt::View::TabWidth.tab_width = 4
+      html = format_whitespace("class File\n\tattr_reader :path\nend")
+
+      assert_match(/    attr_reader/, html)
+    end
+
+    it "uses wide tabs in formatted blobs" do
+      Dolt::View::TabWidth.tab_width = 12
+      html = format_blob("file.rb", "class File\n\tattr_reader :path\nend")
+
+      assert_match(/            attr_reader/, html)
+    end
+  end
+end