From 64597de28c9dde03a2dbbc9e12099368b6dc326b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Mon, 17 Oct 2011 00:07:10 +0300
Subject: snippets are ready

---
 app/assets/javascripts/snippets.js        |  9 +++++
 app/assets/stylesheets/highlight.css.scss |  6 +--
 app/assets/stylesheets/projects.css.scss  |  3 ++
 app/assets/stylesheets/snippets.css.scss  |  3 ++
 app/controllers/notes_controller.rb       |  2 +
 app/controllers/snippets_controller.rb    | 63 +++++++++++++++++++++++++++++++
 app/helpers/application_helper.rb         |  2 +-
 app/helpers/snippets_helper.rb            |  2 +
 app/models/ability.rb                     |  3 ++
 app/models/project.rb                     |  1 +
 app/models/snippet.rb                     | 31 +++++++++++++++
 app/views/projects/_form.html.haml        |  4 +-
 app/views/projects/_top_menu.html.haml    |  5 +++
 app/views/snippets/_form.html.haml        | 22 +++++++++++
 app/views/snippets/_snippet.html.haml     | 11 ++++++
 app/views/snippets/edit.html.haml         |  1 +
 app/views/snippets/index.html.haml        | 14 +++++++
 app/views/snippets/new.html.haml          |  1 +
 app/views/snippets/show.html.haml         | 22 +++++++++++
 19 files changed, 198 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/snippets.js
 create mode 100644 app/assets/stylesheets/snippets.css.scss
 create mode 100644 app/controllers/snippets_controller.rb
 create mode 100644 app/helpers/snippets_helper.rb
 create mode 100644 app/models/snippet.rb
 create mode 100644 app/views/snippets/_form.html.haml
 create mode 100644 app/views/snippets/_snippet.html.haml
 create mode 100644 app/views/snippets/edit.html.haml
 create mode 100644 app/views/snippets/index.html.haml
 create mode 100644 app/views/snippets/new.html.haml
 create mode 100644 app/views/snippets/show.html.haml

(limited to 'app')

diff --git a/app/assets/javascripts/snippets.js b/app/assets/javascripts/snippets.js
new file mode 100644
index 00000000000..11e18eb779e
--- /dev/null
+++ b/app/assets/javascripts/snippets.js
@@ -0,0 +1,9 @@
+$(document).ready(function(){
+  $("#snippets-table .snippet").live('click', function(e){
+    if(e.target.nodeName != "A" && e.target.nodeName != "INPUT") {
+      location.href = $(this).attr("url");
+      e.stopPropagation();
+      return false;
+    }
+  });
+});
diff --git a/app/assets/stylesheets/highlight.css.scss b/app/assets/stylesheets/highlight.css.scss
index 05cb98e73cb..31f9369a45f 100644
--- a/app/assets/stylesheets/highlight.css.scss
+++ b/app/assets/stylesheets/highlight.css.scss
@@ -22,8 +22,8 @@ td.linenos{
 
 .highlight{
   background:none;
-  padding:10px 0px 0px 0;
-  margin-left:10px;
+  padding:10px 0px 0px 10px;
+  margin-left:0px;
 }
 .highlight pre{
 }
@@ -43,7 +43,7 @@ td.linenos {
 }
 
 td.code .highlight { 
-  overflow-x: scroll;
+  overflow: auto;
 }
 table.highlighttable pre{
   padding:0;
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index bc15d8e2c12..2ea79dcc2c2 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -310,6 +310,7 @@ input.ssh_project_url {
 }
 
 #projects-list .project,
+#snippets-table .snippet,
 #issues-table .issue{ 
   cursor:pointer;
 
@@ -360,6 +361,8 @@ input.ssh_project_url {
 .user_new,
 .edit_user,
 .new_project,
+.new_snippet,
+.edit_snippet,
 .edit_project { 
   input[type='text'],
   input[type='email'],
diff --git a/app/assets/stylesheets/snippets.css.scss b/app/assets/stylesheets/snippets.css.scss
new file mode 100644
index 00000000000..1b680d87bd3
--- /dev/null
+++ b/app/assets/stylesheets/snippets.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Snippets controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index d0a40eb18e4..1703c00d5e5 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -41,6 +41,8 @@ class NotesController < ApplicationController
         Notify.note_commit_email(u, @note).deliver
       when "Issue" then
         Notify.note_issue_email(u, @note).deliver
+      when "Snippet"
+        true
       else
         Notify.note_wall_email(u, @note).deliver
       end
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
new file mode 100644
index 00000000000..5a6ffa4f913
--- /dev/null
+++ b/app/controllers/snippets_controller.rb
@@ -0,0 +1,63 @@
+class SnippetsController < ApplicationController
+  before_filter :authenticate_user!
+  before_filter :project 
+
+  # Authorize
+  before_filter :add_project_abilities
+  before_filter :authorize_read_snippet!
+  before_filter :authorize_write_snippet!, :only => [:new, :create, :close, :edit, :update, :sort] 
+
+  respond_to :html
+
+  def index
+    @snippets = @project.snippets
+  end
+
+  def new 
+    @snippet = @project.snippets.new
+  end
+
+  def create
+    @snippet = @project.snippets.new(params[:snippet])
+    @snippet.author = current_user
+    @snippet.save
+
+    if @snippet.valid?
+      redirect_to [@project, @snippet]
+    else
+      respond_with(@snippet)
+    end
+  end
+
+  def edit
+    @snippet = @project.snippets.find(params[:id])
+  end
+
+  def update
+    @snippet = @project.snippets.find(params[:id])
+    @snippet.update_attributes(params[:snippet])
+
+    if @snippet.valid?
+      redirect_to [@project, @snippet]
+    else
+      respond_with(@snippet)
+    end
+  end
+
+  def show
+    @snippet = @project.snippets.find(params[:id])
+    @notes = @snippet.notes
+    @note = @project.notes.new(:noteable => @snippet)
+  end
+
+  def destroy
+    @snippet = @project.snippets.find(params[:id])
+    authorize_admin_snippet! unless @snippet.author == current_user
+
+    @snippet.destroy
+
+    respond_to do |format|
+      format.js { render :nothing => true }  
+    end
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 89a906f0472..c389fd4a904 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -53,7 +53,7 @@ module ApplicationHelper
     [projects, default_nav, project_nav].flatten.to_json
   end
 
-  def handle_file_type(file_name, mime_type)
+  def handle_file_type(file_name, mime_type = nil)
     if file_name =~ /(\.rb|\.ru|\.rake|Rakefile|\.gemspec|\.rbx|Gemfile)$/
       :ruby
     elsif file_name =~ /\.py$/
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb
new file mode 100644
index 00000000000..236b6c8c23a
--- /dev/null
+++ b/app/helpers/snippets_helper.rb
@@ -0,0 +1,2 @@
+module SnippetsHelper
+end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 0a2c45f1289..9a5970b5838 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -12,6 +12,7 @@ class Ability
     rules << [
       :read_project,
       :read_issue,
+      :read_snippet,
       :read_team_member,
       :read_note 
     ] if project.readers.include?(user)
@@ -19,12 +20,14 @@ class Ability
     rules << [
       :write_project,
       :write_issue,
+      :write_snippet,
       :write_note 
     ] if project.writers.include?(user)
 
     rules << [
       :admin_project,
       :admin_issue,
+      :admin_snippet,
       :admin_team_member,
       :admin_note 
     ] if project.admins.include?(user)
diff --git a/app/models/project.rb b/app/models/project.rb
index 3c07976d24e..3366b87816a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -7,6 +7,7 @@ class Project < ActiveRecord::Base
   has_many :users_projects, :dependent => :destroy
   has_many :users, :through => :users_projects
   has_many :notes, :dependent => :destroy
+  has_many :snippets, :dependent => :destroy
 
   validates :name,
             :uniqueness => true,
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
new file mode 100644
index 00000000000..d51afc39994
--- /dev/null
+++ b/app/models/snippet.rb
@@ -0,0 +1,31 @@
+class Snippet < ActiveRecord::Base
+  belongs_to :project
+  belongs_to :author, :class_name => "User"
+  has_many :notes, :as => :noteable
+
+  attr_protected :author, :author_id, :project, :project_id
+
+  validates_presence_of :project_id
+  validates_presence_of :author_id
+
+  validates :title,
+            :presence => true,
+            :length   => { :within => 0..255 }
+  
+  validates :file_name,
+            :presence => true,
+            :length   => { :within => 0..255 }
+
+  validates :content,
+            :presence => true,
+            :length   => { :within => 0..10000 }
+
+
+  def self.content_types
+    [ 
+      ".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",
+      ".haml", ".html", ".sass", ".scss", ".xml", ".php", ".erb",
+      ".js", ".sh", ".coffee", ".yml", ".md"
+    ]
+  end
+end
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index baa1f14fe06..9dbe57d223f 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -1,8 +1,6 @@
 = form_for(@project, :remote => true) do |f|
   %div.form_content
-    - if @project.new_record?
-      %h1 New Project
-    - else
+    - unless @project.new_record?
       %h1 Edit Project
     - if @project.errors.any?
       #error_explanation
diff --git a/app/views/projects/_top_menu.html.haml b/app/views/projects/_top_menu.html.haml
index b81ba6bb4d6..fe4b72da681 100644
--- a/app/views/projects/_top_menu.html.haml
+++ b/app/views/projects/_top_menu.html.haml
@@ -18,6 +18,11 @@
       Wall
       - if @project.common_notes.count > 0
         %span{ :class => "top_menu_count" }= @project.common_notes.count
+  %span
+    = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
+      Snippets
+      - if @project.snippets.count > 0
+        %span{ :class => "top_menu_count" }= @project.snippets.count
 
   - if @commit
     %span= link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
new file mode 100644
index 00000000000..571e2b063c1
--- /dev/null
+++ b/app/views/snippets/_form.html.haml
@@ -0,0 +1,22 @@
+%div
+  = form_for [@project, @snippet] do |f|
+    -if @snippet.errors.any?
+      %ul
+        - @snippet.errors.full_messages.each do |msg|
+          %li= msg
+
+    %table.round-borders
+      %tr
+        %td= f.label :title
+        %td= f.text_field :title, :placeholder => "Example Snippet"
+      %tr
+        %td= f.label :file_name
+        %td= f.text_field :file_name, :placeholder => "example.rb"
+      %tr
+        %td{:colspan => 2}
+          = f.label :content, "Code"
+          %br
+          = f.text_area :content, :style => "height:240px;width:932px;"
+    
+    .actions.prepend-top
+      = f.submit 'Save', :class => "lbutton vm"
diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml
new file mode 100644
index 00000000000..483ff42cbb6
--- /dev/null
+++ b/app/views/snippets/_snippet.html.haml
@@ -0,0 +1,11 @@
+%tr{ :id => dom_id(snippet), :class => "snippet", :url => project_snippet_path(@project, snippet) }
+  %td
+    = image_tag gravatar_icon(snippet.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
+    = truncate snippet.author.name, :lenght => 20
+  %td= html_escape snippet.title
+  %td= html_escape snippet.file_name
+  %td
+    - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
+      = link_to 'Edit', edit_project_snippet_path(@project, snippet), :class => "lbutton positive"
+    - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
+      = link_to 'Destroy', [@project, snippet], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{snippet.id}"
diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
new file mode 100644
index 00000000000..f81c0b8bc64
--- /dev/null
+++ b/app/views/snippets/edit.html.haml
@@ -0,0 +1 @@
+= render "snippets/form"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
new file mode 100644
index 00000000000..6e5dbde5bb1
--- /dev/null
+++ b/app/views/snippets/index.html.haml
@@ -0,0 +1,14 @@
+%div
+  - if can? current_user, :write_snippet, @project
+    .left= link_to 'New Snippet', new_project_snippet_path(@project), :class => "lbutton vm"
+
+  %table.round-borders#snippets-table
+    %tr
+      %th Author
+      %th Title
+      %th File name
+      %th
+    = render @snippets
+:javascript
+  $('.delete-snippet').live('ajax:success', function() {  
+    $(this).closest('tr').fadeOut(); });  
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
new file mode 100644
index 00000000000..f81c0b8bc64
--- /dev/null
+++ b/app/views/snippets/new.html.haml
@@ -0,0 +1 @@
+= render "snippets/form"
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
new file mode 100644
index 00000000000..d29e0f8c7ab
--- /dev/null
+++ b/app/views/snippets/show.html.haml
@@ -0,0 +1,22 @@
+%h2
+  = "Snippet ##{@snippet.id} - #{@snippet.title}"
+
+.view_file
+  .view_file_header
+    %strong
+      = @snippet.file_name
+      %br/
+  .view_file_content
+    - ft = handle_file_type(@snippet.file_name)
+    :erb
+      <%= raw Albino.colorize(@snippet.content, ft, :html, 'utf-8', "linenos=True") %>
+
+- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
+  = link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
+- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
+  = link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{@snippet.id}"
+%br
+.snippet_notes= render "notes/notes"
+
+.clear
+
-- 
cgit v1.2.3