From 14d0ef8f37b68c0911edfb197581bb7e818b1e50 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 4 Jan 2013 22:13:32 +0200
Subject: [PATCH] Show images preview in notes. Show line additions/deletions
 for commit

---
 app/models/commit.rb                 |  2 +-
 app/uploaders/attachment_uploader.rb | 42 ++--------------------------
 app/views/commit/show.html.haml      | 12 ++++++--
 app/views/notes/_note.html.haml      |  2 ++
 4 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 32d942a9..a1d89600 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -11,7 +11,7 @@ class Commit
   attr_accessor :commit, :head, :refs
 
   delegate  :message, :authored_date, :committed_date, :parents, :sha,
-            :date, :committer, :author, :diffs, :tree, :id,
+            :date, :committer, :author, :diffs, :tree, :id, :stats,
             :to_patch, to: :commit
 
   class << self
diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb
index bb7dc0da..391731d9 100644
--- a/app/uploaders/attachment_uploader.rb
+++ b/app/uploaders/attachment_uploader.rb
@@ -1,49 +1,13 @@
 # encoding: utf-8
 
 class AttachmentUploader < CarrierWave::Uploader::Base
-
-  # Include RMagick or ImageScience support:
-  # include CarrierWave::RMagick
-  # include CarrierWave::MiniMagick
-  # include CarrierWave::ImageScience
-
-  # Choose what kind of storage to use for this uploader:
   storage :file
-  # storage :fog
 
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process scale: [200, 300]
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
-
-  # Create different versions of your uploaded files:
-  # version :thumb do
-  #   process scale: [50, 50]
-  # end
-
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  # def extension_white_list
-  #   %w(jpg jpeg gif png)
-  # end
-
-  # Override the filename of the uploaded files:
-  # Avoid using model.id or version_name here, see uploader/store.rb for details.
-  # def filename
-  #   "something.jpg" if original_filename
-  # end
-
+  def image?
+    %w(png jpg jpeg).include?(file.extension)
+  end
 end
diff --git a/app/views/commit/show.html.haml b/app/views/commit/show.html.haml
index 432d55b1..1a227a5c 100644
--- a/app/views/commit/show.html.haml
+++ b/app/views/commit/show.html.haml
@@ -1,9 +1,15 @@
 = render "commits/commit_box"
+
+%p.right
+  This commit has
+  %span.cgreen #{@commit.stats.additions} additions
+  and
+  %span.cred #{@commit.stats.deletions} deletions
+
 = render "commits/diffs", diffs: @commit.diffs
 = render "notes/notes_with_form", tid: @commit.id, tt: "commit"
 = render "notes/per_line_form"
 
-
 :javascript
   $(function(){
     PerLineNotes.init();
@@ -19,7 +25,7 @@
           , h = event.currentTarget.naturalHeight;
         $('.image.diff_added .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px');
       }, this));
-      
+
     });
-    
+
   });
diff --git a/app/views/notes/_note.html.haml b/app/views/notes/_note.html.haml
index 70baa212..8591e7bd 100644
--- a/app/views/notes/_note.html.haml
+++ b/app/views/notes/_note.html.haml
@@ -34,6 +34,8 @@
     = preserve do
       = markdown(note.note)
     - if note.attachment.url
+      - if note.attachment.image?
+        = image_tag note.attachment.url, class: 'thumbnail span4'
       .right
         %div.file
           = link_to note.attachment_identifier, note.attachment.url, target: "_blank"