Merge branch 'feature/merge_request_serialize'

Dmitriy Zaporozhets
2 parents 7af16bbb dfeef6c2
Showing 40 changed files with 388 additions and 201 deletions Show diff stats
app/controllers/blame_controller.rb
app/controllers/blob_controller.rb
app/controllers/raw_controller.rb
app/controllers/refs_controller.rb
app/helpers/tree_helper.rb
app/models/merge_request.rb
app/models/tree.rb
app/services/git_push_service.rb
app/views/blame/show.html.haml
app/views/blob/_actions.html.haml
app/views/blob/_blob.html.haml
app/views/blob/_download.html.haml
app/views/blob/_image.html.haml
app/views/blob/_text.html.haml
app/views/blob/show.html.haml
app/views/blob/show.js.haml
app/views/commits/_diffs.html.haml
app/views/graph/show.json.erb
app/views/tree/_blob.html.haml
app/views/tree/_blob_actions.html.haml
@@ -8,6 +8,7 @@ class BlameController &lt; ProjectResourceController
   before_filter :require_non_empty_project
   def show
+    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
     @blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
   end
 end
@@ -8,15 +8,6 @@ class BlobController &lt; ProjectResourceController
   before_filter :require_non_empty_project
   def show
-    if @tree.is_blob?
-      send_data(
-        @tree.data,
-        type: @tree.mime_type,
-        disposition: 'inline',
-        filename: @tree.name
-      )
-    else
-      not_found!
-    end
+    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
   end
 end
@@ -0,0 +1,25 @@
+# Controller for viewing a file's raw
+class RawController < ProjectResourceController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
+
+    if @blob.exists?
+      send_data(
+        @blob.data,
+        type: @blob.mime_type,
+        disposition: 'inline',
+        filename: @blob.name
+      )
+    else
+      not_found!
+    end
+  end
+end
+
@@ -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
@@ -48,7 +48,7 @@ class RefsController &lt; ProjectResourceController
     @repo = project.repository
     @commit = @repo.commit(@ref)
-    @tree = Tree.new(@commit.tree, @ref, params[:path])
+    @tree = Tree.new(@repo, @commit.id, @ref, params[:path])
     @hex_path = Digest::SHA1.hexdigest(params[:path] || "")
     if params[:path]
@@ -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 = ""
@@ -18,7 +18,7 @@ module TreeHelper
                render partial: 'tree/submodule_item', object: f
              else
                # Object is a Blob
-               render partial: 'tree/tree_item', object: f, locals: {type: 'file'}
+               render partial: 'tree/blob_item', object: f, locals: {type: 'file'}
              end
       tree += html if html.present?
@@ -91,5 +91,4 @@ module TreeHelper
     file = File.join(tree.path, "..")
     tree_join(tree.ref, file)
   end
-
 end
@@ -152,17 +152,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def commits
-    if st_commits.present?
-      # check if merge request commits are valid
-      if st_commits.first.respond_to?(:short_id)
-        st_commits
-      else
-        # if commits are invalid - simply reload it from repo
-        reloaded_commits
-      end
-    else
-      []
-    end
+    load_commits(st_commits || [])
   end
   def probably_merged?
@@ -172,13 +162,7 @@ class MergeRequest &lt; ActiveRecord::Base
   def reloaded_commits
     if opened? && unmerged_commits.any?
-      # we need to reset st_commits field first
-      # in order to prevent internal rails comparison
-      self.st_commits = []
-      save
-
-      # Then we can safely write unmerged commits
-      self.st_commits = unmerged_commits
+      self.st_commits = dump_commits(unmerged_commits)
       save
     end
     commits
@@ -228,4 +212,14 @@ class MergeRequest &lt; ActiveRecord::Base
   def last_commit_short_sha
     @last_commit_short_sha ||= last_commit.sha[0..10]
   end
+
+  private
+
+  def dump_commits(commits)
+    commits.map(&:to_hash)
+  end
+
+  def load_commits(array)
+    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash)) }
+  end
 end
 class Tree
-  include Linguist::BlobHelper
+  attr_accessor :raw
-  attr_accessor :path, :tree, :ref
-
-  delegate  :contents, :basename, :name, :data, :mime_type,
-            :mode, :size, :text?, :colorize, to: :tree
-
-  def initialize(raw_tree, ref = nil, path = nil)
-    @ref, @path = ref, path
-    @tree = if path.present?
-              raw_tree / path
-            else
-              raw_tree
-            end
-  end
-
-  def is_blob?
-    tree.is_a?(Grit::Blob)
+  def initialize(repository, sha, ref = nil, path = nil)
+    @raw = Gitlab::Git::Tree.new(repository, sha, ref, path)
   end
-  def invalid?
-    tree.nil?
+  def method_missing(m, *args, &block)
+    @raw.send(m, *args, &block)
   end
-  def empty?
-    data.blank?
-  end
-
-  def up_dir?
-    path.present?
-  end
+  def respond_to?(method)
+    return true if @raw.respond_to?(method)
-  def readme
-    @readme ||= contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+    super
   end
 end
@@ -104,7 +104,7 @@ class GitPushService
       data[:commits] << {
         id: commit.id,
         message: commit.safe_message,
-        timestamp: commit.date.xmlschema,
+        timestamp: commit.committed_date.xmlschema,
         url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{commit.id}",
         author: {
           name: commit.author_name,
@@ -15,9 +15,9 @@
     .file_title
       %i.icon-file
       %span.file_name
-        = @tree.name
-        %small= number_to_human_size @tree.size
-      %span.options= render "tree/blob_actions"
+        = @blob.name
+        %small= number_to_human_size @blob.size
+      %span.options= render "blob/actions"
     .file_content.blame
       %table
         - current_line = 1
@@ -0,0 +1,12 @@
+.btn-group.tree-btn-group
+  -# only show edit link for text files
+  - if @blob.text?
+    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
+  = link_to "raw", project_raw_path(@project, @id), class: "btn btn-tiny", target: "_blank"
+  -# only show normal/blame view links for text files
+  - if @blob.text?
+    - if current_page? project_blame_path(@project, @id)
+      = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
+    - else
+      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny"
+  = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
@@ -0,0 +1,27 @@
+%ul.breadcrumb
+  %li
+    %i.icon-angle-right
+    = link_to project_tree_path(@project, @ref) do
+      = @project.path
+  - tree_breadcrumbs(@tree, 6) do |title, path|
+    \/
+    %li
+      - if path
+        = link_to truncate(title, length: 40), project_tree_path(@project, path)
+      - else
+        = link_to title, '#'
+
+%div#tree-content-holder.tree-content-holder
+  .file_holder
+    .file_title
+      %i.icon-file
+      %span.file_name
+        = blob.name
+        %small= number_to_human_size blob.size
+      %span.options= render "actions"
+    - if blob.text?
+      = render "text", blob: blob
+    - elsif blob.image?
+      = render "image", blob: blob
+    - else
+      = render "download", blob: blob
@@ -0,0 +1,8 @@
+.file_content.blob_file
+  %center
+    = link_to project_blob_path(@project, @id) do
+      %div.padded
+        %h4
+          %i.icon-download-alt
+          %br
+          Download (#{number_to_human_size blob.size})
@@ -0,0 +1,2 @@
+.file_content.image_file
+  %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
@@ -0,0 +1,14 @@
+- if gitlab_markdown?(blob.name)
+  .file_content.wiki
+    = preserve do
+      = markdown(blob.data)
+- elsif markup?(blob.name)
+  .file_content.wiki
+    = raw GitHub::Markup.render(blob.name, blob.data)
+- else
+  .file_content.code
+    - unless blob.empty?
+      %div{class: user_color_scheme_class}
+        = raw blob.colorize(formatter: :gitlab)
+    - else
+      %p.nothing_here_message Empty file
@@ -0,0 +1,4 @@
+%div.tree-ref-holder
+  = render 'shared/ref_switcher', destination: 'tree', path: @path
+%div#tree-holder.tree-holder
+  = render 'blob', blob: @blob
@@ -0,0 +1,10 @@
+:plain
+  // Load Files list
+  $("#tree-holder").html("#{escape_javascript(render(partial: "blob", locals: {blob: @blob}))}");
+  $("#tree-content-holder").show("slide", { direction: "right" }, 400);
+  $('.project-refs-form #path').val("#{@path}");
+
+  //  Load last commit log for each file in tree
+  $('#tree-slider').waitForImages(function() {
+    ajaxGet('#{@logs_path}');
+  });
@@ -16,16 +16,16 @@
   - unless @suppress_diff
     - diffs.each_with_index do |diff, i|
       - next if diff.diff.empty?
-      - file = (@commit.tree / diff.new_path)
-      - file = (@commit.prev_commit.tree / 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
           - if diff.deleted_file
             %span= diff.old_path
-            - if @commit.prev_commit
-              = link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
+            - if @commit.parent_ids.present?
+              = 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 = (@commit.prev_commit.tree / diff.old_path) if !@commit.prev_commit.nil?
+            - 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
@@ -7,9 +7,9 @@
       {
         parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
         author: {
-          name: c.author.name,
-          email: c.author.email,
-          icon: gravatar_icon(c.author.email, 20)
+          name: c.author_name,
+          email: c.author_email,
+          icon: gravatar_icon(c.author_email, 20)
         },
         time: c.time,
         space: c.spaces.first,
@@ -1,13 +0,0 @@
-.file_holder
-  .file_title
-    %i.icon-file
-    %span.file_name
-      = blob.name
-      %small= number_to_human_size blob.size
-    %span.options= render "tree/blob_actions"
-  - if blob.text?
-    = render "tree/blob/text", blob: blob
-  - elsif blob.image?
-    = render "tree/blob/image", blob: blob
-  - else
-    = render "tree/blob/download", blob: blob
@@ -1,12 +0,0 @@
-.btn-group.tree-btn-group
-  -# only show edit link for text files
-  - if @tree.text?
-    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
-  = link_to "raw", project_blob_path(@project, @id), class: "btn btn-tiny", target: "_blank"
-  -# only show normal/blame view links for text files
-  - if @tree.text?
-    - if current_page? project_blame_path(@project, @id)
-      = link_to "normal view", project_tree_path(@project, @id), class: "btn btn-tiny"
-    - else
-      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny"
-  = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
@@ -0,0 +1,9 @@
+%tr{ class: "tree-item #{tree_hex_class(blob_item)}" }
+  %td.tree-item-file-name
+    = tree_icon(type)
+    %strong= link_to truncate(blob_item.name, length: 40), project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name))
+  %td.tree_time_ago.cgray
+    %span.log_loading.hide
+      Loading commit data...
+      = image_tag "ajax_loader_tree.gif", width: 14
+  %td.tree_commit{ colspan: 2 }
@@ -12,36 +12,32 @@
         = link_to title, '#'
 %div#tree-content-holder.tree-content-holder
-  - if tree.is_blob?
-    = render "tree/blob", blob: tree
-  - else
-    %table#tree-slider{class: "table_#{@hex_path} tree-table" }
-      %thead
-        %tr
-          %th Name
-          %th Last Update
-          %th Last Commit
-          %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
+  %table#tree-slider{class: "table_#{@hex_path} tree-table" }
+    %thead
+      %tr
+        %th Name
+        %th Last Update
+        %th Last Commit
+        %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
-      - if tree.up_dir?
-        %tr.tree-item
-          %td.tree-item-file-name
-            = image_tag "file_empty.png", size: '16x16'
-            = link_to "..", project_tree_path(@project, up_dir_path(tree))
-          %td
-          %td
-          %td
+    - if tree.up_dir?
+      %tr.tree-item
+        %td.tree-item-file-name
+          = image_tag "file_empty.png", size: '16x16'
+          = link_to "..", project_tree_path(@project, up_dir_path(tree))
+        %td
+        %td
+        %td
-      = render_tree(tree.contents)
+    = render_tree(tree)
-    - if tree.readme
-      = render "tree/readme", readme: tree.readme
+  - if tree.readme
+    = render "tree/readme", readme: tree.readme
 %div.tree_progress
-- unless tree.is_blob?
-  :javascript
-    // Load last commit log for each file in tree
-    $(window).load(function(){
-      ajaxGet('#{@logs_path}');
-    });
+:javascript
+  // Load last commit log for each file in tree
+  $(window).load(function(){
+    ajaxGet('#{@logs_path}');
+  });
@@ -1,8 +0,0 @@
-.file_content.blob_file
-  %center
-    = link_to project_blob_path(@project, @id) do
-      %div.padded
-        %h4
-          %i.icon-download-alt
-          %br
-          Download (#{number_to_human_size blob.size})
@@ -1,2 +0,0 @@
-.file_content.image_file
-  %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
@@ -1,14 +0,0 @@
-- if gitlab_markdown?(blob.name)
-  .file_content.wiki
-    = preserve do
-      = markdown(blob.data)
-- elsif markup?(blob.name)
-  .file_content.wiki
-    = raw GitHub::Markup.render(blob.name, blob.data)
-- else
-  .file_content.code
-    - unless blob.empty?
-      %div{class: user_color_scheme_class}
-        = raw blob.colorize(formatter: :gitlab)
-    - else
-      %p.nothing_here_message Empty file
@@ -23,7 +23,7 @@ class PostReceive
     user = if identifier.blank?
              # Local push from gitlab
-             email = project.repository.commit(newrev).author.email rescue nil
+             email = project.repository.commit(newrev).author_email rescue nil
              User.find_by_email(email) if email
            elsif identifier =~ /\Auser-\d+\Z/
@@ -170,6 +170,7 @@ Gitlab::Application.routes.draw do
     end
     resources :blob,    only: [:show], constraints: {id: /.+/}
+    resources :raw,    only: [:show], constraints: {id: /.+/}
     resources :tree,    only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
     resources :edit_tree,    only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
     resources :commit,  only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
@@ -205,7 +205,7 @@ module SharedPaths
   end
   Given 'I visit blob file from repo' do
-    visit project_tree_path(@project, File.join(ValidCommit::ID, ValidCommit::BLOB_FILE_PATH))
+    visit project_blob_path(@project, File.join(ValidCommit::ID, ValidCommit::BLOB_FILE_PATH))
   end
   Given 'I visit project source page for "8470d70"' do
@@ -493,14 +493,16 @@ module Gitlab
         ref = params[:sha]
-        commit = user_project.repository.commit ref
+        repo = user_project.repository
+
+        commit = repo.commit(ref)
         not_found! "Commit" unless commit
-        tree = Tree.new commit.tree, ref, params[:filepath]
-        not_found! "File" unless tree.try(:tree)
+        blob = Gitlab::Git::Blob.new(repo, commit.id, ref, params[:filepath])
+        not_found! "File" unless blob.exists?
-        content_type tree.mime_type
-        present tree.data
+        content_type blob.mime_type
+        present blob.data
       end
       # Get a specific project's keys
@@ -102,9 +102,9 @@ module ExtractsPath
     # because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
     @commit = @project.repository.commits(@ref, @path, 1, 0).first
-    @tree = Tree.new(@commit.tree, @ref, @path)
+    @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,42 @@
+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
+
+      def empty?
+        data.blank?
+      end
+
+      def mode
+        raw_blob.mode
+      end
+
+      def size
+        raw_blob.size
+      end
+    end
+  end
+end
@@ -4,13 +4,19 @@
 module Gitlab
   module Git
     class Commit
-      attr_accessor :raw_commit, :head, :refs
+      attr_accessor :raw_commit, :head, :refs,
+        :id, :authored_date, :committed_date, :message,
+        :author_name, :author_email, :parent_ids,
+        :committer_name, :committer_email
-      delegate  :message, :authored_date, :committed_date, :parents, :sha,
-        :date, :committer, :author, :diffs, :tree, :id, :stats, :to_patch,
+      delegate :parents, :diffs, :tree, :stats, :to_patch,
         to: :raw_commit
       class << self
+        def serialize_keys
+          %w(id authored_date committed_date author_name author_email committer_name committer_email message parent_ids)
+        end
+
         def find_or_first(repo, commit_id = nil, root_ref)
           commit = if commit_id
                      repo.commit(commit_id)
@@ -73,10 +79,19 @@ module Gitlab
       def initialize(raw_commit, head = nil)
         raise "Nil as raw commit passed" unless raw_commit
-        @raw_commit = raw_commit
+        if raw_commit.is_a?(Hash)
+          init_from_hash(raw_commit)
+        else
+          init_from_grit(raw_commit)
+        end
+
         @head = head
       end
+      def sha
+        id
+      end
+
       def short_id(length = 10)
         id.to_s[0..length]
       end
@@ -89,37 +104,13 @@ module Gitlab
         committed_date
       end
-      def author_email
-        author.email
-      end
-
-      def author_name
-        author.name
-      end
-
       # Was this commit committed by a different person than the original author?
       def different_committer?
         author_name != committer_name || author_email != committer_email
       end
-      def committer_name
-        committer.name
-      end
-
-      def committer_email
-        committer.email
-      end
-
-      def prev_commit
-        @prev_commit ||= if parents.present?
-                           Commit.new(parents.first)
-                         else
-                           nil
-                         end
-      end
-
-      def prev_commit_id
-        prev_commit.try :id
+      def parent_id
+        parent_ids.first
       end
       # Shows the diff between the commit's parent and the commit.
@@ -148,6 +139,43 @@ module Gitlab
       def no_commit_message
         "--no commit message"
       end
+
+      def to_hash
+        hash = {}
+
+        keys = Commit.serialize_keys
+
+        keys.each do |key|
+          hash[key] = send(key)
+        end
+
+        hash
+      end
+
+      def date
+        committed_date
+      end
+
+      private
+
+      def init_from_grit(grit)
+        @raw_commit = grit
+        @id = grit.id
+        @message = grit.message
+        @authored_date = grit.authored_date
+        @committed_date = grit.committed_date
+        @author_name = grit.author.name
+        @author_email = grit.author.email
+        @committer_name = grit.committer.name
+        @committer_email = grit.committer.email
+        @parent_ids = grit.parents.map(&:id)
+      end
+
+      def init_from_hash(hash)
+        Commit.serialize_keys.each do |key|
+          send(:"#{key}=", hash[key])
+        end
+      end
     end
   end
 end
@@ -20,10 +20,8 @@ module Gitlab
           return
         end
-        @commit = Commit.new(first)
-
+        @commit = first
         @commits = repository.commits_between(last.id, first.id)
-        @commits = @commits.map { |c| Commit.new(c) }
         @diffs = if @commits.size > 100
                    []
@@ -0,0 +1,52 @@
+module Gitlab
+  module Git
+    class Tree
+      attr_accessor :repository, :sha, :path, :ref, :raw_tree, :id
+
+      def initialize(repository, sha, ref = nil, path = nil)
+        @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)
+      end
+
+      def exists?
+        raw_tree
+      end
+
+      def empty?
+        data.blank?
+      end
+
+      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?
+        raw_tree.is_a?(Grit::Blob)
+      end
+
+      def up_dir?
+        path.present?
+      end
+
+      def readme
+        @readme ||= entries.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+      end
+
+      protected
+
+      def entries
+        raw_tree.contents
+      end
+    end
+  end
+end
+
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe BlobController do
+  let(:project) { create(:project_with_code) }
+  let(:user)    { create(:user) }
+
+  before do
+    sign_in(user)
+
+    project.team << [user, :master]
+
+    project.stub(:branches).and_return(['master', 'foo/bar/baz'])
+    project.stub(:tags).and_return(['v1.0.0', 'v2.0.0'])
+    controller.instance_variable_set(:@project, project)
+  end
+
+  describe "GET show" do
+    render_views
+
+    before { get :show, project_id: project.code, id: id }
+
+    context "valid branch, valid file" do
+      let(:id) { 'master/README.md' }
+      it { should respond_with(:success) }
+    end
+
+    context "valid branch, invalid file" do
+      let(:id) { 'master/invalid-path.rb' }
+      it { should respond_with(:not_found) }
+    end
+
+    context "invalid branch, valid file" do
+      let(:id) { 'invalid-branch/README.md' }
+      it { should respond_with(:not_found) }
+    end
+  end
+end
@@ -26,17 +26,17 @@ describe TreeController do
     end
     context "valid branch, valid path" do
-      let(:id) { 'master/README.md' }
+      let(:id) { 'master/app/' }
       it { should respond_with(:success) }
     end
     context "valid branch, invalid path" do
-      let(:id) { 'master/invalid-path.rb' }
+      let(:id) { 'master/invalid-path/' }
       it { should respond_with(:not_found) }
     end
     context "invalid branch, valid path" do
-      let(:id) { 'invalid-branch/README.md' }
+      let(:id) { 'invalid-branch/app/' }
       it { should respond_with(:not_found) }
     end
   end
@@ -86,9 +86,11 @@ FactoryGirl.define do
       target_branch "master" # pretend bcf03b5d~3
       source_branch "stable" # pretend bcf03b5d
       st_commits do
-        [Commit.new(project.repository.commit('bcf03b5d')),
-         Commit.new(project.repository.commit('bcf03b5d~1')),
-         Commit.new(project.repository.commit('bcf03b5d~2'))]
+        [
+          project.repository.commit('bcf03b5d').to_hash,
+          project.repository.commit('bcf03b5d~1').to_hash,
+          project.repository.commit('bcf03b5d~2').to_hash
+        ]
       end
       st_diffs do
         project.repo.diff("bcf03b5d~3", "bcf03b5d")
@@ -20,6 +20,8 @@ describe Gitlab::Git::Commit do
         author: @author,
         committer: @committer,
         committed_date: Date.yesterday,
+        authored_date: Date.yesterday,
+        parents: [],
         message: 'Refactoring specs'
       )
@@ -38,10 +38,10 @@ describe Commit do
     it { should respond_to(:message) }
     it { should respond_to(:authored_date) }
     it { should respond_to(:committed_date) }
+    it { should respond_to(:committer_email) }
+    it { should respond_to(:author_email) }
     it { should respond_to(:parents) }
     it { should respond_to(:date) }
-    it { should respond_to(:committer) }
-    it { should respond_to(:author) }
     it { should respond_to(:diffs) }
     it { should respond_to(:tree) }
     it { should respond_to(:id) }
@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_valid_commit do
     actual != nil
     actual.id == ValidCommit::ID
     actual.message == ValidCommit::MESSAGE
-    actual.author.name == ValidCommit::AUTHOR_FULL_NAME
+    actual.author_name == ValidCommit::AUTHOR_FULL_NAME
   end
 end
	@@ -8,6 +8,7 @@ class BlameController < ProjectResourceController		@@ -8,6 +8,7 @@ class BlameController < ProjectResourceController
8	before_filter :require_non_empty_project	8	before_filter :require_non_empty_project
9		9
10	def show	10	def show
		11	+ @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
11	@blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)	12	@blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
12	end	13	end
13	end	14	end
	@@ -8,15 +8,6 @@ class BlobController < ProjectResourceController		@@ -8,15 +8,6 @@ class BlobController < ProjectResourceController
8	before_filter :require_non_empty_project	8	before_filter :require_non_empty_project
9		9
10	def show	10	def show
11	- if @tree.is_blob?
12	- send_data(
13	- @tree.data,
14	- type: @tree.mime_type,
15	- disposition: 'inline',
16	- filename: @tree.name
17	- )
18	- else
19	- not_found!
20	- end	11	+ @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
21	end	12	end
22	end	13	end
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+# Controller for viewing a file's raw
	2	+class RawController < ProjectResourceController
	3	+ include ExtractsPath
	4	+
	5	+ # Authorize
	6	+ before_filter :authorize_read_project!
	7	+ before_filter :authorize_code_access!
	8	+ before_filter :require_non_empty_project
	9	+
	10	+ def show
	11	+ @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
	12	+
	13	+ if @blob.exists?
	14	+ send_data(
	15	+ @blob.data,
	16	+ type: @blob.mime_type,
	17	+ disposition: 'inline',
	18	+ filename: @blob.name
	19	+ )
	20	+ else
	21	+ not_found!
	22	+ end
	23	+ end
	24	+end
	25	+
	@@ -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
	@@ -48,7 +48,7 @@ class RefsController < ProjectResourceController		@@ -48,7 +48,7 @@ class RefsController < ProjectResourceController
48		48
49	@repo = project.repository	49	@repo = project.repository
50	@commit = @repo.commit(@ref)	50	@commit = @repo.commit(@ref)
51	- @tree = Tree.new(@commit.tree, @ref, params[:path])	51	+ @tree = Tree.new(@repo, @commit.id, @ref, params[:path])
52	@hex_path = Digest::SHA1.hexdigest(params[:path] \|\| "")	52	@hex_path = Digest::SHA1.hexdigest(params[:path] \|\| "")
53		53
54	if params[:path]	54	if params[:path]
1	class Tree	1	class Tree
2	- include Linguist::BlobHelper	2	+ attr_accessor :raw
3		3
4	- attr_accessor :path, :tree, :ref
5	-
6	- delegate :contents, :basename, :name, :data, :mime_type,
7	- :mode, :size, :text?, :colorize, to: :tree
8	-
9	- def initialize(raw_tree, ref = nil, path = nil)
10	- @ref, @path = ref, path
11	- @tree = if path.present?
12	- raw_tree / path
13	- else
14	- raw_tree
15	- end
16	- end
17	-
18	- def is_blob?
19	- tree.is_a?(Grit::Blob)	4	+ def initialize(repository, sha, ref = nil, path = nil)
		5	+ @raw = Gitlab::Git::Tree.new(repository, sha, ref, path)
20	end	6	end
21		7
22	- def invalid?
23	- tree.nil?	8	+ def method_missing(m, *args, &block)
		9	+ @raw.send(m, *args, &block)
24	end	10	end
25		11
26	- def empty?
27	- data.blank?
28	- end
29	-
30	- def up_dir?
31	- path.present?
32	- end	12	+ def respond_to?(method)
		13	+ return true if @raw.respond_to?(method)
33		14
34	- def readme
35	- @readme \|\|= contents.find { \|c\| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }	15	+ super
36	end	16	end
37	end	17	end
	@@ -104,7 +104,7 @@ class GitPushService		@@ -104,7 +104,7 @@ class GitPushService
104	data[:commits] << {	104	data[:commits] << {
105	id: commit.id,	105	id: commit.id,
106	message: commit.safe_message,	106	message: commit.safe_message,
107	- timestamp: commit.date.xmlschema,	107	+ timestamp: commit.committed_date.xmlschema,
108	url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{commit.id}",	108	url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{commit.id}",
109	author: {	109	author: {
110	name: commit.author_name,	110	name: commit.author_name,
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+.btn-group.tree-btn-group
	2	+ -# only show edit link for text files
	3	+ - if @blob.text?
	4	+ = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
	5	+ = link_to "raw", project_raw_path(@project, @id), class: "btn btn-tiny", target: "_blank"
	6	+ -# only show normal/blame view links for text files
	7	+ - if @blob.text?
	8	+ - if current_page? project_blame_path(@project, @id)
	9	+ = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
	10	+ - else
	11	+ = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny"
	12	+ = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+%ul.breadcrumb
	2	+ %li
	3	+ %i.icon-angle-right
	4	+ = link_to project_tree_path(@project, @ref) do
	5	+ = @project.path
	6	+ - tree_breadcrumbs(@tree, 6) do \|title, path\|
	7	+ \/
	8	+ %li
	9	+ - if path
	10	+ = link_to truncate(title, length: 40), project_tree_path(@project, path)
	11	+ - else
	12	+ = link_to title, '#'
	13	+
	14	+%div#tree-content-holder.tree-content-holder
	15	+ .file_holder
	16	+ .file_title
	17	+ %i.icon-file
	18	+ %span.file_name
	19	+ = blob.name
	20	+ %small= number_to_human_size blob.size
	21	+ %span.options= render "actions"
	22	+ - if blob.text?
	23	+ = render "text", blob: blob
	24	+ - elsif blob.image?
	25	+ = render "image", blob: blob
	26	+ - else
	27	+ = render "download", blob: blob
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+.file_content.blob_file
	2	+ %center
	3	+ = link_to project_blob_path(@project, @id) do
	4	+ %div.padded
	5	+ %h4
	6	+ %i.icon-download-alt
	7	+ %br
	8	+ Download (#{number_to_human_size blob.size})
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+.file_content.image_file
	2	+ %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}