Gitlab::Git::Tree & Blob added

Dmitriy Zaporozhets
1 parent 0c5795a4
Showing 9 changed files with 65 additions and 26 deletions Show diff stats
app/controllers/refs_controller.rb
app/helpers/tree_helper.rb
app/models/merge_request.rb
app/models/tree.rb
app/views/commits/_diffs.html.haml
app/views/tree/_tree.html.haml
lib/extracts_path.rb
lib/gitlab/git/blob.rb
lib/gitlab/git/tree.rb
@@ -30,7 +30,7 @@ class RefsController &lt; ProjectResourceController
   end
   def logs_tree
-    contents = @tree.contents
+    contents = @tree.entries
     @logs = contents.map do |content|
       file = params[:path] ? File.join(params[:path], content.name) : content.name
       last_commit = @repo.commits(@commit.id, file, 1).last
@@ -3,9 +3,9 @@ module TreeHelper
   # their corresponding partials
   #
   # contents - A Grit::Tree object for the current tree
-  def render_tree(contents)
+  def render_tree(tree)
     # Render Folders before Files/Submodules
-    folders, files = contents.partition { |v| v.kind_of?(Grit::Tree) }
+    folders, files = tree.trees, tree.blobs
     tree = ""
@@ -91,5 +91,4 @@ module TreeHelper
     file = File.join(tree.path, "..")
     tree_join(tree.ref, file)
   end
-
 end
@@ -152,7 +152,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def commits
-    load_commits(st_commits) || []
+    load_commits(st_commits || [])
   end
   def probably_merged?
 class Tree
-  attr_accessor :path, :tree, :ref
+  attr_accessor :raw
   def initialize(repository, sha, ref = nil, path = nil)
     @raw = Gitlab::Git::Tree.new(repository, sha, ref, path)
   end
-  def invalid?
-    @raw.nil?
-  end
-
   def method_missing(m, *args, &block)
     @raw.send(m, *args, &block)
   end
@@ -16,8 +16,8 @@
   - unless @suppress_diff
     - diffs.each_with_index do |diff, i|
       - next if diff.diff.empty?
-      - file = Tree.new(@repository, @commit.id, @ref, diff.new_path)
-      - file = Tree.new(@repository, @commit.parent_id, @ref, diff.old_path) unless file
+      - file = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, diff.new_path)
+      - file = Gitlab::Git::Blob.new(@repository, @commit.parent_id, @ref, diff.old_path) unless file.exists?
       - next unless file
       .file{id: "diff-#{i}"}
         .header
@@ -25,7 +25,7 @@
             %span= diff.old_path
             - if @commit.parent_ids.present?
-              = link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
+              = link_to project_tree_path(@project, tree_join(@commit.parent_id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
                 View file @
                 %span.commit-short-id= @commit.short_id(6)
           - else
@@ -43,7 +43,7 @@
           - if file.text?
             = render "commits/text_file", diff: diff, index: i
           - elsif file.image?
-            - old_file = Tree.new(@repository, @commit.parent_id, @ref, diff.old_path) if @commit.parent_id
+            - old_file = Gitlab::Git::Blob.new(@repository, @commit.parent_id, @ref, diff.old_path) if @commit.parent_id
             = render "commits/image", diff: diff, old_file: old_file, file: file, index: i
           - else
             %p.nothing_here_message No preview for this file type
@@ -32,7 +32,7 @@
           %td
           %td
-      = render_tree(tree.contents)
+      = render_tree(tree)
     - if tree.readme
       = render "tree/readme", readme: tree.readme
@@ -104,7 +104,7 @@ module ExtractsPath
     @tree = Tree.new(@project.repository, @commit.id, @ref, @path)
-    raise InvalidPathError if @tree.invalid?
+    raise InvalidPathError unless @tree.exists?
   rescue RuntimeError, NoMethodError, InvalidPathError
     not_found!
   end
@@ -0,0 +1,30 @@
+module Gitlab
+  module Git
+    class Blob
+      include Linguist::BlobHelper
+
+      attr_accessor :raw_blob
+
+      delegate :name, to: :raw_blob
+
+      def initialize(repository, sha, ref, path)
+        @repository, @sha, @ref = repository, sha, ref
+
+        @commit = @repository.commit(sha)
+        @raw_blob = @repository.tree(@commit, path)
+      end
+
+      def data
+        if raw_blob
+          raw_blob.data
+        else
+          nil
+        end
+      end
+
+      def exists?
+        @raw_blob
+      end
+    end
+  end
+end
 module Gitlab
   module Git
     class Tree
-      include Linguist::BlobHelper
-
-      attr_accessor :repository, :sha, :path, :ref, :raw_tree
+      attr_accessor :repository, :sha, :path, :ref, :raw_tree, :id
       def initialize(repository, sha, ref = nil, path = nil)
-        @repository, @sha, @ref = repository, sha, ref
+        @repository, @sha, @ref, @path = repository, sha, ref, path
+
+        @path = nil if @path.blank?
         # Load tree from repository
-        @commit = @repository.commit(sha)
-        @raw_tree = @repository.tree(@commit, path)
+        @commit = @repository.commit(@sha)
+        @raw_tree = @repository.tree(@commit, @path)
+      end
+
+      def exists?
+        raw_tree
       end
       def empty?
         data.blank?
       end
-      def data
-        raw_tree.data
+      def trees
+        entries.select { |t| t.is_a?(Grit::Tree) }
+      end
+
+      def blobs
+        entries.select { |t| t.is_a?(Grit::Blob) }
       end
       def is_blob?
-        tree.is_a?(Grit::Blob)
+        raw_tree.is_a?(Grit::Blob)
       end
       def up_dir?
@@ -30,7 +38,13 @@ module Gitlab
       end
       def readme
-        @readme ||= contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+        @readme ||= entries.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+      end
+
+      protected
+
+      def entries
+        raw_tree.contents
       end
     end
   end
	@@ -30,7 +30,7 @@ class RefsController < ProjectResourceController		@@ -30,7 +30,7 @@ class RefsController < ProjectResourceController
30	end	30	end
31		31
32	def logs_tree	32	def logs_tree
33	- contents = @tree.contents	33	+ contents = @tree.entries
34	@logs = contents.map do \|content\|	34	@logs = contents.map do \|content\|
35	file = params[:path] ? File.join(params[:path], content.name) : content.name	35	file = params[:path] ? File.join(params[:path], content.name) : content.name
36	last_commit = @repo.commits(@commit.id, file, 1).last	36	last_commit = @repo.commits(@commit.id, file, 1).last
	@@ -152,7 +152,7 @@ class MergeRequest < ActiveRecord::Base		@@ -152,7 +152,7 @@ class MergeRequest < ActiveRecord::Base
152	end	152	end
153		153
154	def commits	154	def commits
155	- load_commits(st_commits) \|\| []	155	+ load_commits(st_commits \|\| [])
156	end	156	end
157		157
158	def probably_merged?	158	def probably_merged?
	@@ -32,7 +32,7 @@		@@ -32,7 +32,7 @@
32	%td	32	%td
33	%td	33	%td
34		34
35	- = render_tree(tree.contents)	35	+ = render_tree(tree)
36		36
37	- if tree.readme	37	- if tree.readme
38	= render "tree/readme", readme: tree.readme	38	= render "tree/readme", readme: tree.readme
	@@ -104,7 +104,7 @@ module ExtractsPath		@@ -104,7 +104,7 @@ module ExtractsPath
104		104
105	@tree = Tree.new(@project.repository, @commit.id, @ref, @path)	105	@tree = Tree.new(@project.repository, @commit.id, @ref, @path)
106		106
107	- raise InvalidPathError if @tree.invalid?	107	+ raise InvalidPathError unless @tree.exists?
108	rescue RuntimeError, NoMethodError, InvalidPathError	108	rescue RuntimeError, NoMethodError, InvalidPathError
109	not_found!	109	not_found!
110	end	110	end
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+module Gitlab
	2	+ module Git
	3	+ class Blob
	4	+ include Linguist::BlobHelper
	5	+
	6	+ attr_accessor :raw_blob
	7	+
	8	+ delegate :name, to: :raw_blob
	9	+
	10	+ def initialize(repository, sha, ref, path)
	11	+ @repository, @sha, @ref = repository, sha, ref
	12	+
	13	+ @commit = @repository.commit(sha)
	14	+ @raw_blob = @repository.tree(@commit, path)
	15	+ end
	16	+
	17	+ def data
	18	+ if raw_blob
	19	+ raw_blob.data
	20	+ else
	21	+ nil
	22	+ end
	23	+ end
	24	+
	25	+ def exists?
	26	+ @raw_blob
	27	+ end
	28	+ end
	29	+ end
	30	+end