libdolt 0.6.0 → 0.6.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.6.0)
+    libdolt (0.6.2)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.1.2)
       eventmachine (~> 1.0)
@@ -10,6 +10,7 @@ PATH
       makeup (~> 0)
       mime-types (~> 1.19)
       tzinfo (~> 0.3)
+      when (~> 0)
 
 GEM
   remote: http://rubygems.org/
@@ -18,7 +19,7 @@ GEM
       eventmachine
     em_pessimistic (0.1.2)
       eventmachine (~> 1.0)
-    em_rugged (0.1.3)
+    em_rugged (0.1.5)
       eventmachine (~> 1.0)
       rugged (= 0.17.0.b6)
     eventmachine (1.0.0)
@@ -39,9 +40,10 @@ GEM
     redcarpet (2.1.1)
     rugged (0.17.0.b6)
     tilt (1.3.3)
-    tiltout (1.0.0)
+    tiltout (1.1.0)
       tilt (~> 1.3)
     tzinfo (0.3.33)
+    when (0.1.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS

data/lib/libdolt.rb

@@ -19,6 +19,7 @@
 
 require "libdolt/version"
 require "libdolt/disk_repo_resolver"
+require "libdolt/gitorious_repo_resolver"
 require "libdolt/repo_actions"
 require "libdolt/view"
 

data/lib/libdolt/git/repository.rb

@@ -17,37 +17,45 @@
 #++
 require "em_rugged/repository"
 require "em_pessimistic/deferrable_child_process"
-require "em/deferrable"
 require "libdolt/git/blame"
 require "libdolt/git/commit"
 require "libdolt/git/submodule"
 require "libdolt/git/tree"
-require "libdolt/async/when"
+require "when"
 
 module Dolt
   module Git
     class Repository < EMRugged::Repository
       def submodules(ref)
-        d = EventMachine::DefaultDeferrable.new
+        d = When.defer
         gm = rev_parse("#{ref}:.gitmodules")
         gm.callback do |config|
-          d.succeed(Dolt::Git::Submodule.parse_config(config.content))
+          d.resolve(Dolt::Git::Submodule.parse_config(config.content))
         end
         # Fails if .gitmodules cannot be found, which means no submodules
-        gm.errback { |err| d.succeed([]) }
+        gm.errback { |err| d.resolve([]) }
         d
       end
 
+      def tree_entry(ref, path)
+        When.defer do |d|
+          rp = rev_parse("#{ref}:#{path}")
+          rp.callback { |object| annotate_tree(d, ref, path, object) }
+          rp.errback { |err| d.reject(err) }
+        end
+      end
+
       def tree(ref, path)
-        d = EventMachine::DefaultDeferrable.new
-        rp = rev_parse("#{ref}:#{path}")
-        rp.callback do |tree|
-          break d.fail(StandardError.new("Not a tree")) unless tree.is_a?(Rugged::Tree)
-          break d.succeed(tree) if !tree.find { |e| e[:type].nil? }
-          annotate_submodules(ref, path, d, tree)
+        When.defer do |d|
+          rp = rev_parse("#{ref}:#{path}")
+          rp.callback do |object|
+            if !object.is_a?(Rugged::Tree)
+              next d.reject(StandardError.new("Not a tree"))
+            end
+            annotate_tree(d, ref, path, object)
+          end
+          rp.errback { |err| d.reject(err) }
         end
-        rp.errback { |err| d.fail(err) }
-        d
       end
 
       def blame(ref, path)
@@ -61,18 +69,18 @@ module Dolt
       end
 
       def tree_history(ref, path, limit = 1)
-        d = EventMachine::DefaultDeferrable.new
+        d = When.defer
         rp = rev_parse("#{ref}:#{path}")
-        rp.errback { |err| d.fail(err) }
+        rp.errback { |err| d.reject(err) }
         rp.callback do |tree|
           if tree.class != Rugged::Tree
             message = "#{ref}:#{path} is not a tree (#{tree.class.to_s})"
-            break d.fail(Exception.new(message))
+            break d.reject(Exception.new(message))
           end
 
           building = build_history(path || "./", ref, tree, limit)
-          building.callback { |history| d.succeed(history) }
-          building.errback { |err| d.fail(err) }
+          building.callback { |history| d.resolve(history) }
+          building.errback { |err| d.reject(err) }
         end
         d
       end
@@ -85,19 +93,27 @@ module Dolt
       end
 
       def build_history(path, ref, entries, limit)
-        d = EventMachine::DefaultDeferrable.new
+        d = When.defer
         resolve = lambda { |p| path == "" ? p : File.join(path, p) }
         progress = When.all(entries.map do |e|
                               entry_history(ref, resolve.call(e[:name]), limit)
                             end)
-        progress.errback { |e| d.fail(e) }
+        progress.errback { |e| d.reject(e) }
         progress.callback do |history|
-          d.succeed(entries.map { |e| e.merge({ :history => history.shift }) })
+          d.resolve(entries.map { |e| e.merge({ :history => history.shift }) })
         end
         d
       end
 
-      def annotate_submodules(ref, path, deferrable, tree)
+      def annotate_tree(d, ref, path, object)
+        if object.class.to_s.match(/Blob/) || !object.find { |e| e[:type].nil? }
+          return d.resolve(object)
+        end
+
+        annotate_submodules(d, ref, path, object)
+      end
+
+      def annotate_submodules(deferrable, ref, path, tree)
         submodules(ref).callback do |submodules|
           entries = tree.entries.map do |entry|
             if entry[:type].nil?
@@ -111,21 +127,21 @@ module Dolt
             entry
           end
 
-          deferrable.succeed(Dolt::Git::Tree.new(tree.oid, entries))
+          deferrable.resolve(Dolt::Git::Tree.new(tree.oid, entries))
         end
       end
 
       def deferred_method(cmd, &block)
-        d = EventMachine::DefaultDeferrable.new
+        d = When.defer
         cmd = git(cmd)
         p = EMPessimistic::DeferrableChildProcess.open(cmd)
 
         p.callback do |output, status|
-          d.succeed(block.call(output, status))
+          d.resolve(block.call(output, status))
         end
 
         p.errback do |stderr, status|
-          d.fail(stderr)
+          d.reject(stderr)
         end
 
         d

data/lib/libdolt/gitorious_repo_resolver.rb

@@ -0,0 +1,29 @@
+# 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
+  class GitoriousRepoResolver
+    def initialize(repository)
+      @repository = repository
+    end
+
+    def resolve(repo)
+      Dolt::Git::Repository.new(@repository.full_repository_path)
+    end
+  end
+end

data/lib/libdolt/repo_actions.rb

@@ -36,6 +36,16 @@ module Dolt
       repo_action(repo, ref, path, :tree, :tree, ref, path, &block)
     end
 
+    def tree_entry(repo, ref, path, &block)
+      repository = repo_resolver.resolve(repo)
+      d = repository.tree_entry(ref, path)
+      d.callback do |result|
+        key = result.class.to_s.match(/Blob/) ? :blob : :tree
+        block.call(nil, tpl_data(repo, ref, path, { key => result, :type => key }))
+      end
+      d.errback { |err| block.call(err, nil) }
+    end
+
     def blame(repo, ref, path, &block)
       repo_action(repo, ref, path, :blame, :blame, ref, path, &block)
     end

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/lib/libdolt/view/blob.rb

@@ -51,26 +51,6 @@ The content you're attempting to browse appears to be binary.
         multiline(entityfy(content))
       end
 
-      def blob_url(repository, ref, path)
-        repo_url(repository, "/blob/#{ref}:#{path}")
-      end
-
-      def blame_url(repository, ref, path)
-        repo_url(repository, "/blame/#{ref}:#{path}")
-      end
-
-      def history_url(repository, ref, path)
-        repo_url(repository, "/history/#{ref}:#{path}")
-      end
-
-      def raw_url(repository, ref, path)
-        repo_url(repository, "/raw/#{ref}:#{path}")
-      end
-
-      def tree_history_url(repository, ref, path)
-        repo_url(repository, "/tree_history/#{ref}:#{path}")
-      end
-
       def format_whitespace(text)
         text
       end

data/lib/libdolt/view/breadcrumb.rb

@@ -23,10 +23,10 @@ module Dolt
         dirs = path.split("/")
         filename = dirs.pop
         dir_html = accumulate_dirs(dirs, repository, ref)
-        url = repo_url(repository, "/tree/#{ref}")
+        url = tree_url(repository, 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
@@ -38,7 +38,7 @@ module Dolt
         divider = "<span class=\"divider\">/</span>"
         dir_html = dirs.inject("") do |html, dir|
           accumulated << dir
-          url = repo_url(repository, "/tree/#{ref}:#{accumulated.join('/')}")
+          url = tree_url(repository, ref, accumulated.join('/'))
           "#{html}<li><a href=\"#{url}\">#{dir}#{divider}</a></li>"
         end
       end

data/lib/libdolt/view/object.rb

@@ -19,16 +19,6 @@
 module Dolt
   module View
     module Object
-      def object_url(repository, ref, path, object)
-        return object[:url] if object[:type] == :submodule
-        url = "/#{object[:type]}/#{ref}:#{object_path(path, object)}"
-        repo_url(repository, url)
-      end
-
-      def object_path(root, object)
-        File.join(root, object[:name]).sub(/^\//, "")
-      end
-
       def object_icon_class(entry)
         case entry[:type]
         when :blob

data/lib/libdolt/view/tree.rb

@@ -19,8 +19,13 @@
 module Dolt
   module View
     module Tree
-      def tree_url(repository, ref, path)
-        repo_url(repository, "/tree/#{ref}:#{path}")
+      def object_path(root, object)
+        File.join(root, object[:name]).sub(/^\//, "")
+      end
+
+      def object_url(repository, ref, path, object)
+        return object[:url] if object[:type] == :submodule
+        send(:"#{object[:type]}_url", repository, ref, object_path(path, object))
       end
 
       def tree_entries(tree)

data/lib/libdolt/view/urls.rb

@@ -0,0 +1,47 @@
+# 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 Urls
+      def tree_url(repository, ref, path = "")
+        repo_url(repository, "/tree/#{ref}:#{path}")
+      end
+
+      def blob_url(repository, ref, path)
+        repo_url(repository, "/blob/#{ref}:#{path}")
+      end
+
+      def blame_url(repository, ref, path)
+        repo_url(repository, "/blame/#{ref}:#{path}")
+      end
+
+      def history_url(repository, ref, path)
+        repo_url(repository, "/history/#{ref}:#{path}")
+      end
+
+      def raw_url(repository, ref, path)
+        repo_url(repository, "/raw/#{ref}:#{path}")
+      end
+
+      def tree_history_url(repository, ref, path)
+        repo_url(repository, "/tree_history/#{ref}:#{path}")
+      end
+    end
+  end
+end

data/libdolt.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "libdolt"
 
   s.add_dependency "eventmachine", "~>1.0"
+  s.add_dependency "when", "~>0"
   s.add_dependency "em_pessimistic", "~>0.1"
   s.add_dependency "em_rugged", "~> 0.1.2"
   s.add_dependency "tzinfo", "~> 0.3"

data/test/libdolt/git/repository_test.rb

@@ -64,6 +64,31 @@ describe Dolt::Git::Repository do
     end
   end
 
+  describe "#tree_entry" do
+    it "includes submodule data for trees" do
+      @repository.tree_entry("3dc532f", "vendor").callback do |tree|
+        assert_equal({
+          :type => :submodule,
+          :filemode => 57344,
+          :name => "ui",
+          :oid => "d167e3e1c17a27e4cf459dd380670801b0659659",
+          :url => "git://gitorious.org/gitorious/ui3.git"
+        }, tree.entries.first)
+        done!
+      end
+      wait!
+    end
+
+    it "yields blob" do
+      @repository.tree_entry("3dc532f", "Gemfile").callback do |blob|
+        assert blob.is_a?(Rugged::Blob)
+        assert_equal "source \"http://rubygems.org\"\n\ngemspec\n", blob.content
+        done!
+      end
+      wait!
+    end
+  end
+
   describe "#blame" do
     it "returns deferrable" do
       deferrable = @repository.blame("master", "Gemfile")

data/test/libdolt/repo_actions_test.rb

@@ -17,13 +17,14 @@
 #++
 require "test_helper"
 require "libdolt/repo_actions"
-require "libdolt/async/when"
+require "when"
 require "ostruct"
 
 class Repository
   attr_reader :name
   def initialize(name); @name = name; end
   def tree(ref, path); stub; end
+  def tree_entry(ref, path); stub; end
   def rev_parse(rev); stub; end
   def blame(ref, path); stub; end
   def log(ref, path, limit); stub; end
@@ -36,7 +37,7 @@ class Repository
 
   private
   def stub
-    @deferred = When::Deferred.new
+    @deferred = When.defer
     @deferred.promise
   end
 end
@@ -52,6 +53,8 @@ class Resolver
   end
 end
 
+class FakeBlob; end
+
 describe Dolt::RepoActions do
   before do
     @resolver = Resolver.new
@@ -108,6 +111,41 @@ describe Dolt::RepoActions do
     end
   end
 
+  describe "#tree_entry" do
+    it "yields tree, repo and ref to block" do
+      data = nil
+      @actions.tree_entry("gitorious", "babd120", "") { |err, d| data = d }
+      repo = @resolver.resolved.last
+      repo.resolve_promise "Tree"
+
+      expected = {
+        :tree => "Tree",
+        :repository => "gitorious",
+        :ref =>  "babd120",
+        :path => "",
+        :type => :tree
+      }
+      assert_equal expected, data
+    end
+
+    it "yields tree, repo and ref to block" do
+      data = nil
+      @actions.tree_entry("gitorious", "babd120", "Gemfile") { |err, d| data = d }
+      repo = @resolver.resolved.last
+      blob = FakeBlob.new
+      repo.resolve_promise(blob)
+
+      expected = {
+        :blob => blob,
+        :repository => "gitorious",
+        :ref =>  "babd120",
+        :path => "Gemfile",
+        :type => :blob
+      }
+      assert_equal expected, data
+    end
+  end
+
   describe "#blame" do
     it "resolves repository" do
       @actions.blame("gitorious", "master", "app")

data/test/libdolt/templates/blob_test.rb

@@ -98,6 +98,7 @@ describe "blob template" do
       @helpers = [Dolt::View::SingleRepository,
                   Dolt::View::Breadcrumb,
                   Dolt::View::Blob,
+                  Dolt::View::Urls,
                   Dolt::View::SmartBlobRenderer]
     end
 

data/test/libdolt/view/binary_blob_embedder_test.rb

@@ -21,7 +21,7 @@ require "libdolt/view/blob"
 require "libdolt/view/binary_blob_embedder"
 
 describe Dolt::View::BinaryBlobEmbedder do
-  include Dolt::View::Blob
+  include Dolt::View::Urls
   include Dolt::View::BinaryBlobEmbedder
   include Dolt::View::SingleRepository
 

data/test/libdolt/view/blob_test.rb

@@ -17,49 +17,13 @@
 #++
 require "test_helper"
 require "libdolt/view/single_repository"
-require "libdolt/view/multi_repository"
 require "libdolt/view/blob"
+require "libdolt/view/urls"
 
 describe Dolt::View::Blob do
   include Dolt::View::Blob
-
-  describe "single repo mode" do
-    include Dolt::View::SingleRepository
-
-    it "returns blame url" do
-      url = blame_url("myrepo", "master", "some/path")
-      assert_equal "/blame/master:some/path", url
-    end
-
-    it "returns history url" do
-      url = history_url("myrepo", "master", "some/path")
-      assert_equal "/history/master:some/path", url
-    end
-
-    it "returns raw url" do
-      url = raw_url("myrepo", "master", "some/path")
-      assert_equal "/raw/master:some/path", url
-    end
-  end
-
-  describe "multi repo mode" do
-    include Dolt::View::MultiRepository
-
-    it "returns blame url" do
-      url = blame_url("myrepo", "master", "some/path")
-      assert_equal "/myrepo/blame/master:some/path", url
-    end
-
-    it "returns history url" do
-      url = history_url("myrepo", "master", "some/path")
-      assert_equal "/myrepo/history/master:some/path", url
-    end
-
-    it "returns raw url" do
-      url = raw_url("myrepo", "master", "some/path")
-      assert_equal "/myrepo/raw/master:some/path", url
-    end
-  end
+  include Dolt::View::Urls
+  include Dolt::View::SingleRepository
 
   describe "#multiline" do
     it "adds line number markup to code" do
@@ -89,8 +53,6 @@ describe Dolt::View::Blob do
   end
 
   describe "#format_binary_blob" do
-    include Dolt::View::SingleRepository
-
     it "renders link to binary blob" do
       content = "GIF89aK\000 \000\367\000\000\266\270\274\335\336\337\214"
       html = format_binary_blob("some/file.gif", content, "gitorious", "master")
@@ -100,8 +62,6 @@ describe Dolt::View::Blob do
   end
 
   describe "#format_blob" do
-    include Dolt::View::SingleRepository
-
     it "renders link to binary blob" do
       content = "GIF89aK\000 \000\367\000\000\266\270\274\335\336\337\214"
       html = format_blob("file.gif", content, "gitorious", "master")

data/test/libdolt/view/breadcrumb_test.rb

@@ -21,6 +21,7 @@ require "libdolt/view/breadcrumb"
 describe Dolt::View::Breadcrumb do
   include Dolt::Html
   include Dolt::View::SingleRepository
+  include Dolt::View::Urls
   include Dolt::View::Breadcrumb
 
   it "renders li element for root" do

data/test/libdolt/view/object_test.rb

@@ -23,44 +23,6 @@ require "libdolt/view/object"
 describe Dolt::View::Object do
   include Dolt::View::Object
 
-  describe "single repo mode" do
-    include Dolt::View::SingleRepository
-
-    it "returns blob url" do
-      object = { :type => "blob", :name => "Gemfile" }
-      url = object_url("myrepo", "master", "", object)
-      assert_equal "/blob/master:Gemfile", url
-    end
-
-    it "returns tree url" do
-      object = { :type => "tree", :name => "models" }
-      url = object_url("myrepo", "master", "app", object)
-      assert_equal "/tree/master:app/models", url
-    end
-
-    it "returns blob url in directory" do
-      object = { :type => "blob", :name => "Gemfile" }
-      url = object_url("myrepo", "master", "lib/mything", object)
-      assert_equal "/blob/master:lib/mything/Gemfile", url
-    end
-  end
-
-  describe "multi repo mode" do
-    include Dolt::View::MultiRepository
-
-    it "returns blob url" do
-      object = { :type => "blob", :name => "Gemfile" }
-      url = object_url("myrepo", "master", "", object)
-      assert_equal "/myrepo/blob/master:Gemfile", url
-    end
-
-    it "returns blob url in directory" do
-      object = { :type => "blob", :name => "Gemfile" }
-      url = object_url("myrepo", "master", "lib/mything", object)
-      assert_equal "/myrepo/blob/master:lib/mything/Gemfile", url
-    end
-  end
-
   describe "#object_icon_class" do
     it "returns blob icon type" do
       assert_equal "icon-file", object_icon_class({ :type => :blob })
@@ -74,10 +36,4 @@ describe Dolt::View::Object do
       assert_equal "icon-hdd", object_icon_class({ :type => :submodule })
     end
   end
-
-  it "links submodule object to submodule" do
-    url = "git://gitorious.org/gitorious/ui3.git"
-    object = { :type => :submodule, :url => url }
-    assert_equal url, object_url("gitorious", "master", "vendor", object)
-  end
 end

data/test/libdolt/view/tree_test.rb

@@ -17,17 +17,21 @@
 #++
 require "test_helper"
 require "libdolt/view/single_repository"
+require "libdolt/view/multi_repository"
 require "libdolt/view/object"
 require "libdolt/view/tree"
+require "libdolt/view/urls"
 require "ostruct"
 
 describe Dolt::View::Tree do
   include Dolt::Html
-  include Dolt::View::SingleRepository
   include Dolt::View::Object
   include Dolt::View::Tree
+  include Dolt::View::Urls
 
   describe "#tree_entries" do
+    include Dolt::View::SingleRepository
+
     before do
       async = { :name => "async", :type => :tree }
       disk_repo_resolver = { :type => :blob, :name => "disk_repo_resolver.rb" }
@@ -132,6 +136,8 @@ describe Dolt::View::Tree do
   end
 
   describe "#tree_context" do
+    include Dolt::View::SingleRepository
+
     def context(path, maxdepth = nil)
       tree_context("gitorious", "master", accumulate_path(partition_path(path, maxdepth)))
     end
@@ -193,4 +199,48 @@ describe Dolt::View::Tree do
       assert_equal "<a href=\"/tree/master:src/phorkie/Database\">/ Database</a>", links[3]
     end
   end
+
+  describe "single repo mode" do
+    include Dolt::View::SingleRepository
+
+    it "returns blob url" do
+      object = { :type => "blob", :name => "Gemfile" }
+      url = object_url("myrepo", "master", "", object)
+      assert_equal "/blob/master:Gemfile", url
+    end
+
+    it "returns tree url" do
+      object = { :type => "tree", :name => "models" }
+      url = object_url("myrepo", "master", "app", object)
+      assert_equal "/tree/master:app/models", url
+    end
+
+    it "returns blob url in directory" do
+      object = { :type => "blob", :name => "Gemfile" }
+      url = object_url("myrepo", "master", "lib/mything", object)
+      assert_equal "/blob/master:lib/mything/Gemfile", url
+    end
+  end
+
+  describe "multi repo mode" do
+    include Dolt::View::MultiRepository
+
+    it "returns blob url" do
+      object = { :type => "blob", :name => "Gemfile" }
+      url = object_url("myrepo", "master", "", object)
+      assert_equal "/myrepo/blob/master:Gemfile", url
+    end
+
+    it "returns blob url in directory" do
+      object = { :type => "blob", :name => "Gemfile" }
+      url = object_url("myrepo", "master", "lib/mything", object)
+      assert_equal "/myrepo/blob/master:lib/mything/Gemfile", url
+    end
+  end
+
+  it "links submodule object to submodule" do
+    url = "git://gitorious.org/gitorious/ui3.git"
+    object = { :type => :submodule, :url => url }
+    assert_equal url, object_url("gitorious", "master", "vendor", object)
+  end
 end

data/test/libdolt/view/urls_test.rb

@@ -0,0 +1,63 @@
+# 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 "libdolt/view/single_repository"
+require "libdolt/view/multi_repository"
+require "libdolt/view/urls"
+
+describe Dolt::View::Urls do
+  include Dolt::View::Urls
+
+  describe "single repo mode" do
+    include Dolt::View::SingleRepository
+
+    it "returns blame url" do
+      url = blame_url("myrepo", "master", "some/path")
+      assert_equal "/blame/master:some/path", url
+    end
+
+    it "returns history url" do
+      url = history_url("myrepo", "master", "some/path")
+      assert_equal "/history/master:some/path", url
+    end
+
+    it "returns raw url" do
+      url = raw_url("myrepo", "master", "some/path")
+      assert_equal "/raw/master:some/path", url
+    end
+  end
+
+  describe "multi repo mode" do
+    include Dolt::View::MultiRepository
+
+    it "returns blame url" do
+      url = blame_url("myrepo", "master", "some/path")
+      assert_equal "/myrepo/blame/master:some/path", url
+    end
+
+    it "returns history url" do
+      url = history_url("myrepo", "master", "some/path")
+      assert_equal "/myrepo/history/master:some/path", url
+    end
+
+    it "returns raw url" do
+      url = raw_url("myrepo", "master", "some/path")
+      assert_equal "/myrepo/raw/master:some/path", url
+    end
+  end
+end

data/test/test_helper.rb

@@ -36,6 +36,7 @@ module Dolt
       root = File.join(File.dirname(__FILE__), "..", "views")
       renderer = Tiltout.new(root, options)
       renderer.helper(helpers || [Dolt::View::MultiRepository,
+                                  Dolt::View::Urls,
                                   Dolt::View::Object,
                                   Dolt::View::Blob,
                                   Dolt::View::Tree,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libdolt
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-05 00:00:00 +02:00
+date: 2012-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,9 +34,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: em_pessimistic
+  name: when
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: em_pessimistic
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +61,11 @@ dependencies:
         - 1
         version: "0.1"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: em_rugged
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +77,11 @@ dependencies:
         - 2
         version: 0.1.2
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,11 +92,11 @@ dependencies:
         - 3
         version: "0.3"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: makeup
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,11 +106,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: htmlentities
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,11 +121,11 @@ dependencies:
         - 3
         version: "4.3"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,11 +136,11 @@ dependencies:
         - 7
         version: "1.7"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -137,11 +151,11 @@ dependencies:
         - 19
         version: "1.19"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -152,11 +166,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: em-minitest-spec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -167,11 +181,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -182,11 +196,11 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: redcarpet
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,11 +210,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: tiltout
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -210,7 +224,7 @@ dependencies:
         - 1
         version: "1"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 description: Dolt API for serving git trees and syntax highlighted blobs
 email: 
 - christian@gitorious.org
@@ -226,13 +240,13 @@ files:
 - Rakefile
 - Readme.md
 - lib/libdolt.rb
-- lib/libdolt/async/when.rb
 - lib/libdolt/disk_repo_resolver.rb
 - lib/libdolt/git/blame.rb
 - lib/libdolt/git/commit.rb
 - lib/libdolt/git/repository.rb
 - lib/libdolt/git/submodule.rb
 - lib/libdolt/git/tree.rb
+- lib/libdolt/gitorious_repo_resolver.rb
 - lib/libdolt/repo_actions.rb
 - lib/libdolt/version.rb
 - lib/libdolt/view.rb
@@ -250,8 +264,8 @@ files:
 - lib/libdolt/view/syntax_highlight.rb
 - lib/libdolt/view/tab_width.rb
 - lib/libdolt/view/tree.rb
+- lib/libdolt/view/urls.rb
 - libdolt.gemspec
-- test/libdolt/async/when_test.rb
 - test/libdolt/git/blame_test.rb
 - test/libdolt/git/commit_test.rb
 - test/libdolt/git/repository_test.rb
@@ -277,6 +291,7 @@ files:
 - test/libdolt/view/syntax_highlight_test.rb
 - test/libdolt/view/tab_width_test.rb
 - test/libdolt/view/tree_test.rb
+- test/libdolt/view/urls_test.rb
 - test/test_helper.rb
 - views/500.erb
 - views/blame.erb

data/lib/libdolt/async/when.rb

@@ -1,128 +0,0 @@
-require "eventmachine"
-
-module When
-  class Promise
-    def initialize(deferred = EM::DefaultDeferrable.new)
-      @deferred = deferred
-    end
-
-    def callback(&block)
-      @deferred.callback(&block)
-      self
-    end
-
-    def errback(&block)
-      @deferred.errback(&block)
-      self
-    end
-  end
-
-  class Resolver
-    def initialize(deferred = EM::DefaultDeferrable.new)
-      @deferred = deferred
-      @resolved = false
-    end
-
-    def resolve(*args)
-      mark_resolved
-      @deferred.succeed(*args)
-    end
-
-    def reject(*args)
-      mark_resolved
-      @deferred.fail(*args)
-    end
-
-    def resolved?
-      @resolved
-    end
-
-    private
-    def mark_resolved
-      raise StandardError.new("Already resolved") if @resolved
-      @resolved = true
-    end
-  end
-
-  class Deferred
-    attr_reader :resolver, :promise
-
-    def initialize
-      deferred = EM::DefaultDeferrable.new
-      @resolver = Resolver.new(deferred)
-      @promise = Promise.new(deferred)
-    end
-
-    def resolve(*args)
-      @resolver.resolve(*args)
-    end
-
-    def reject(*args)
-      @resolver.reject(*args)
-    end
-
-    def callback(&block)
-      @promise.callback(&block)
-    end
-
-    def errback(&block)
-      @promise.errback(&block)
-    end
-
-    def resolved?
-      @resolver.resolved?
-    end
-
-    def self.resolved(value)
-      d = self.new
-      d.resolve(value)
-      d
-    end
-
-    def self.rejected(value)
-      d = self.new
-      d.reject(value)
-      d
-    end
-  end
-
-  def self.deferred(val)
-    return val if val.respond_to?(:callback) && val.respond_to?(:errback)
-    Deferred.resolved(val).promise
-  end
-
-  def self.all(promises)
-    raise(ArgumentError, "expected enumerable promises") if !promises.is_a?(Enumerable)
-    resolved = 0
-    results = []
-    d = Deferred.new
-
-    attempt_resolution = lambda do |err, res|
-      break if d.resolved?
-      if err.nil?
-        d.resolve(res) if promises.length == resolved
-      else
-        d.reject(err)
-      end
-    end
-
-    wait_for_all(promises) do |err, result, index|
-      resolved += 1
-      results[index] = result
-      attempt_resolution.call(err, results)
-    end
-
-    attempt_resolution.call(nil, results) if promises.length == 0
-    d.promise
-  end
-
-  private
-  def self.wait_for_all(promises, &block)
-    promises.each_with_index do |p, i|
-      p.callback do |result|
-        block.call(nil, result, i)
-      end
-      p.errback { |e| block.call(e, nil, i) }
-    end
-  end
-end

data/test/libdolt/async/when_test.rb

@@ -1,112 +0,0 @@
-# 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 "libdolt/async/when"
-
-describe When do
-  include EM::MiniTest::Spec
-
-  describe ".all" do
-    it "returns deferrable" do
-      d = When.all([When.deferred(42)])
-      assert d.respond_to?(:callback)
-      assert d.respond_to?(:errback)
-    end
-
-    it "resolves immediately if no promises" do
-      d = When.all([])
-      d.callback do |results|
-        assert_equal [], results
-        done!
-      end
-      wait!
-    end
-
-    it "resolves when single deferrable resolves" do
-      deferred = When::Deferred.new
-      d = When.all([deferred.promise])
-      resolved = false
-      d.callback { |results| resolved = true }
-
-      assert !resolved
-      deferred.resolve(42)
-      assert resolved
-    end
-
-    it "resolves when all deferrables are resolved" do
-      deferreds = [When::Deferred.new, When::Deferred.new, When::Deferred.new]
-      d = When.all(deferreds.map(&:promise))
-      resolved = false
-      d.callback { |results| resolved = true }
-
-      assert !resolved
-      deferreds[0].resolve(42)
-      assert !resolved
-      deferreds[1].resolve(13)
-      assert !resolved
-      deferreds[2].resolve(3)
-      assert resolved
-    end
-
-    it "rejects when single deferrable rejects" do
-      deferred = When::Deferred.new
-      d = When.all([deferred.promise])
-      rejected = false
-      d.errback { |results| rejected = true }
-
-      assert !rejected
-      deferred.reject(StandardError.new)
-      assert rejected
-    end
-
-    it "rejects on first rejection" do
-      deferreds = [When::Deferred.new, When::Deferred.new, When::Deferred.new]
-      d = When.all(deferreds.map(&:promise))
-      rejected = false
-      d.errback { |results| rejected = true }
-
-      deferreds[0].resolve(42)
-      deferreds[2].reject(StandardError.new)
-      deferreds[1].resolve(13)
-
-      assert rejected
-    end
-
-    it "proxies resolution vaule in array" do
-      deferred = When::Deferred.new
-      d = When.all([deferred.promise])
-      results = nil
-      d.callback { |res| results = res }
-
-      deferred.resolve(42)
-      assert_equal [42], results
-    end
-
-    it "orders results like input" do
-      deferred1 = When::Deferred.new
-      deferred2 = When::Deferred.new
-      d = When.all([deferred1.promise, deferred2.promise])
-      results = nil
-      d.callback { |res| results = res }
-
-      deferred2.resolve(42)
-      deferred1.resolve(13)
-      assert_equal [13, 42], results
-    end
-  end
-end