libdolt 0.31.0 → 0.32.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.31.0)
+    libdolt (0.32.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.4)

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.31.0"
+  VERSION = "0.32.0"
 end

data/lib/libdolt/view/submodule_url.rb

@@ -0,0 +1,140 @@
+# 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/>.
+#++
+
+module Dolt
+  module View
+    module SubmoduleUrl
+      def self.for(submodule)
+        url = submodule[:url]
+        commit = submodule[:oid]
+
+        parsers.map { |p| p.browse_url(url, commit) }.compact.first
+      end
+
+      def self.parsers
+        @parsers ||= [GitoriousOrg.new, GitHub.new, BitBucket.new, GenericParser.new]
+      end
+
+      def self.parsers=(value)
+        @parsers = value
+      end
+
+      module Parser
+        def browse_url(url, commit)
+          mountpoints.each do |mountpoint|
+            path = parse_mountpoint(mountpoint, url)
+            return generate_url(*path, commit) if path
+          end
+          return nil
+        end
+
+        private
+
+        def parse_mountpoint(mountpoint, url)
+          base_url = mountpoint.base_url
+          return nil unless url.include?(base_url)
+          parts = url.gsub(base_url, '').gsub(/\.git$/, '').split("/")
+          return parts[-2..-1]
+        end
+      end
+
+      class HttpMountPoint
+        attr_reader :host, :protocol
+
+        def initialize(host, protocol = 'http')
+          @host = host
+          @protocol = protocol
+        end
+
+        def base_url
+          "#{protocol}://#{host}/"
+        end
+      end
+
+      class GitMountPoint
+        attr_reader :host
+
+        def initialize(host)
+          @host = host
+        end
+
+        def base_url
+          "git://#{host}/"
+        end
+      end
+
+      class GitSshMountPoint
+        attr_reader :user, :host
+
+        def initialize(user, host)
+          @user = user
+          @host = host
+        end
+
+        def base_url
+          "#{user}@#{host}:"
+        end
+      end
+
+      class BitBucket
+        include Parser
+
+        def mountpoints
+          [HttpMountPoint.new("bitbucket.org", "https"), GitSshMountPoint.new("git", "bitbucket.org")]
+        end
+
+        def generate_url(project, repository, commit)
+          "https://bitbucket.org/#{project}/#{repository}/src/#{commit}"
+        end
+      end
+
+      class GitHub
+        include Parser
+
+        def mountpoints
+          [GitMountPoint.new("github.com"), HttpMountPoint.new("github.com", "https"), GitSshMountPoint.new("git", "github.com")]
+        end
+
+        def generate_url(project, repository, commit)
+          "https://github.com/#{project}/#{repository}/tree/#{commit}"
+        end
+      end
+
+      class GitoriousOrg
+        include Parser
+
+        def mountpoints
+          [GitMountPoint.new("gitorious.org"),
+           HttpMountPoint.new("git.gitorious.org", "http"),
+           HttpMountPoint.new("git.gitorious.org", "https"),
+           GitSshMountPoint.new("git", "gitorious.org")]
+        end
+
+        def generate_url(project, repository, commit)
+          "https://gitorious.org/#{project}/#{repository}/source/#{commit}"
+        end
+      end
+
+      class GenericParser
+        def browse_url(url, commit)
+          url
+        end
+      end
+    end
+  end
+end

data/lib/libdolt/view/tree.rb

@@ -20,11 +20,11 @@ module Dolt
   module View
     module Tree
       def object_path(root, object)
+        return object if object[:type] == :submodule
         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
 

data/lib/libdolt/view/urls.rb

@@ -19,6 +19,10 @@
 module Dolt
   module View
     module Urls
+      def submodule_url(repository, ref, object)
+        SubmoduleUrl.for(object)
+      end
+
       def tree_url(repository, ref, path = "")
         repo_url(repository, "/tree/#{ref}:#{path}")
       end

data/test/libdolt/view/submodule_url_test.rb

@@ -0,0 +1,102 @@
+# 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/>.
+#++
+
+module Dolt
+  module View
+    class SubmoduleUrlTest < MiniTest::Spec
+      describe SubmoduleUrl do
+        it "recognizes urls from gitorious.org" do
+          submodule = { :url => "http://git.gitorious.org/bar/baz.git", :oid => "sha123" }
+
+          assert_equal "https://gitorious.org/bar/baz/source/sha123", SubmoduleUrl.for(submodule)
+        end
+
+        it "recognizes urls from bitbucket.org" do
+          submodule = { :url => "https://bitbucket.org/bar/baz.git", :oid => "sha123" }
+
+          assert_equal "https://bitbucket.org/bar/baz/src/sha123", SubmoduleUrl.for(submodule)
+        end
+
+        it "recognizes urls from github.com" do
+          submodule = { :url => "git://github.com/bar/baz.git", :oid => "sha123" }
+
+          assert_equal "https://github.com/bar/baz/tree/sha123", SubmoduleUrl.for(submodule)
+        end
+
+        it "returns other urls unchanged" do
+          submodule = { :url => "git://foobar.com/bar/baz.git", :oid => "sha123" }
+
+          assert_equal "git://foobar.com/bar/baz.git", SubmoduleUrl.for(submodule)
+        end
+      end
+
+      describe SubmoduleUrl::GitoriousOrg do
+        let(:parser) { SubmoduleUrl::GitoriousOrg.new }
+        let(:expected_url) { "https://gitorious.org/foo/bar/source/sha123" }
+
+        describe "ssh urls" do
+          it "returns nil for other users" do
+            assert_nil parser.browse_url("foo@gitorious.org:foo/bar.git", "sha123")
+          end
+
+          it "returns nil for other domains" do
+            assert_nil parser.browse_url("git@github.com:foo/bar.git", "sha123")
+          end
+
+          it "returns repository url for matching protocol and domain" do
+            assert_equal expected_url, parser.browse_url("git@gitorious.org:foo/bar.git", "sha123")
+          end
+        end
+
+        describe "https urls" do
+          it "returns nil for other domains" do
+            assert_nil parser.browse_url("http://git.github.com/foo/bar.git", "sha123")
+          end
+
+          it "returns repository url for matching protocol and domain" do
+            assert_equal expected_url, parser.browse_url("http://git.gitorious.org/foo/bar.git", "sha123")
+          end
+        end
+
+        describe "git urls" do
+          it "returns nil for other domains" do
+            assert_nil parser.browse_url("git://github.com/foo/bar.git", "sha123")
+          end
+
+          it "returns repository url for matching protocol and domain" do
+            assert_equal expected_url, parser.browse_url("git://gitorious.org/foo/bar.git", "sha123")
+          end
+        end
+
+        describe "legacy urls" do
+          it "returns repository url for legacy git url" do
+            assert_equal expected_url, parser.browse_url("git://gitorious.org/~baz/foo/bar.git", "sha123")
+          end
+
+          it "returns repository url for legacy http url" do
+            assert_equal expected_url, parser.browse_url("http://git.gitorious.org/~baz/foo/bar.git", "sha123")
+          end
+
+          it "returns repository url for legacy ssh url" do
+            assert_equal expected_url, parser.browse_url("git@gitorious.org:+baz/foo/bar.git", "sha123")
+          end
+        end
+      end
+    end
+  end
+end

data/test/libdolt/view/tree_test.rb

@@ -238,9 +238,41 @@ describe Dolt::View::Tree do
     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)
+  describe "submodule url" do
+    def generated_url(url)
+      object = { :type => :submodule, :url => url, :oid => "sha123" }
+      object_url("gitorious", "master", "vendor", object)
+    end
+
+    it "links submodules with unknown hosting to original url" do
+      url = "git://example.com/gitorious/ui3.git"
+      assert_equal url, generated_url(url)
+    end
+
+    it "links submodules hosted on github.com to the correct commit on github.com" do
+      correct_url = "https://github.com/gitorious/ui3/tree/sha123"
+
+      assert_equal correct_url, generated_url("git@github.com:gitorious/ui3.git")
+      assert_equal correct_url, generated_url("git://github.com/gitorious/ui3.git")
+      assert_equal correct_url, generated_url("https://github.com/gitorious/ui3.git")
+    end
+
+    it "links submodules hosted on gitorious.org to the correct commit on gitorious.org" do
+      correct_url = "https://gitorious.org/gitorious/ui3/source/sha123"
+
+      assert_equal correct_url, generated_url("git@gitorious.org:gitorious/ui3.git")
+      assert_equal correct_url, generated_url("git://gitorious.org/gitorious/ui3.git")
+      assert_equal correct_url, generated_url("http://git.gitorious.org/gitorious/ui3.git")
+      assert_equal correct_url, generated_url("https://git.gitorious.org/gitorious/ui3.git")
+      assert_equal correct_url, generated_url("http://git.gitorious.org/~foo/gitorious/ui3.git")
+      assert_equal correct_url, generated_url("http://git.gitorious.org/+bar/gitorious/ui3.git")
+    end
+
+    it "links submodules hosted on bitbucket.org to the correct commit on bitbucket.org" do
+      correct_url = "https://bitbucket.org/gitorious/ui3/src/sha123"
+
+      assert_equal correct_url, generated_url("git@bitbucket.org:gitorious/ui3.git")
+      assert_equal correct_url, generated_url("https://bitbucket.org/gitorious/ui3.git")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -225,6 +225,7 @@ files:
 - lib/libdolt/view/object.rb
 - lib/libdolt/view/single_repository.rb
 - lib/libdolt/view/smart_blob_renderer.rb
+- lib/libdolt/view/submodule_url.rb
 - lib/libdolt/view/syntax_highlight.rb
 - lib/libdolt/view/tab_width.rb
 - lib/libdolt/view/tree.rb
@@ -299,6 +300,7 @@ files:
 - test/libdolt/view/object_test.rb
 - test/libdolt/view/single_repository_test.rb
 - test/libdolt/view/smart_blob_renderer_test.rb
+- test/libdolt/view/submodule_url_test.rb
 - test/libdolt/view/syntax_highlight_test.rb
 - test/libdolt/view/tab_width_test.rb
 - test/libdolt/view/tree_test.rb