Merge branch 'refs/heads/snippets_expiration' into dev

Conflicts:
	db/schema.rb

app/views/projects/_top_menu.html.haml

@@ -23,7 +23,7 @@
     = 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
+        %span{ :class => "top_menu_count" }= @project.snippets.non_expired.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

app/views/snippets/_form.html.haml

@@ -12,6 +12,9 @@
       %tr
         %td= f.label :file_name
         %td= f.text_field :file_name, :placeholder => "example.rb"
+      %tr
+        %td= f.label "Lifetime"
+        %td= f.select :expires_at, lifetime_select_options
       %tr
         %td{:colspan => 2}
           = f.label :content, "Code"

app/views/snippets/_snippet.html.haml

@@ -1,11 +1,12 @@
-%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}"
+- unless snippet.expired?
+  %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}"

app/views/snippets/index.html.haml

@@ -8,7 +8,7 @@
       %th Title
       %th File name
       %th
-    = render @snippets
+    = render @snippets.fresh
 :javascript
   $('.delete-snippet').live('ajax:success', function() {
     $(this).closest('tr').fadeOut(); });

app/views/snippets/show.html.haml

@@ -1,22 +1,26 @@
-%h2
-  = "Snippet ##{@snippet.id} - #{@snippet.title}"
+- if !@snippet.expired?
+  %h2
+    = "Snippet ##{@snippet.id} - #{@snippet.title}"
 
-.view_file
-  .view_file_header
-    %strong
-      = @snippet.file_name
-      %br/
-  .view_file_content
-    :erb
-      <%= raw @snippet.colorize %>
+  .view_file
+    .view_file_header
+      %strong
+        = @snippet.file_name
+        %br/
+    .view_file_content
+      :erb
+        <%= raw @snippet.colorize %>
 
-- 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}"
-.clear
-%br
-.snippet_notes= render "notes/notes"
+  - 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}"
+  .clear
+  %br
+  .snippet_notes= render "notes/notes"
 
-.clear
+  .clear
 
+- else
+  %h2
+    Sorry, this snippet is no longer exists