summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/helpers/snippets_helper.rb9
-rw-r--r--app/models/snippet.rb8
-rw-r--r--app/views/projects/_top_menu.html.haml2
-rw-r--r--app/views/snippets/_form.html.haml3
-rw-r--r--app/views/snippets/_snippet.html.haml23
-rw-r--r--app/views/snippets/index.html.haml2
-rw-r--r--app/views/snippets/show.html.haml40
-rw-r--r--db/migrate/20111027051828_add_expires_at_to_snippets.rb5
-rw-r--r--db/schema.rb1
-rw-r--r--spec/models/snippet_spec.rb1
-rw-r--r--spec/requests/snippets_spec.rb8
11 files changed, 71 insertions, 31 deletions
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb
index 236b6c8c23a..6a91d616722 100644
--- a/app/helpers/snippets_helper.rb
+++ b/app/helpers/snippets_helper.rb
@@ -1,2 +1,11 @@
module SnippetsHelper
+ def lifetime_select_options
+ options = [
+ ['forever', nil],
+ ['1 day', "#{Date.current + 1.day}"],
+ ['1 week', "#{Date.current + 1.week}"],
+ ['1 month', "#{Date.current + 1.month}"]
+ ]
+ options_for_select(options)
+ end
end
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 0f488a8c94a..5c61cf1c543 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -22,6 +22,9 @@ class Snippet < ActiveRecord::Base
:presence => true,
:length => { :within => 0..10000 }
+ scope :fresh, order("created_at DESC")
+ scope :non_expired, where(["expires_at IS NULL OR expires_at > ?", Time.current])
+
def self.content_types
[
".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",
@@ -33,6 +36,10 @@ class Snippet < ActiveRecord::Base
def colorize
system_colorize(content, file_name)
end
+
+ def expired?
+ expires_at && expires_at < Time.current
+ end
end
# == Schema Information
#
@@ -46,5 +53,6 @@ end
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
+# expires_at :datetime
#
diff --git a/app/views/projects/_top_menu.html.haml b/app/views/projects/_top_menu.html.haml
index 59f2533ea7f..0b8751c93cc 100644
--- a/app/views/projects/_top_menu.html.haml
+++ b/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
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 7a34ae8e03f..5cd0f74a0be 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -13,6 +13,9 @@
%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"
%br
diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml
index 483ff42cbb6..ddfba6bf80f 100644
--- a/app/views/snippets/_snippet.html.haml
+++ b/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}"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index fe5e617044b..3f2610004bf 100644
--- a/app/views/snippets/index.html.haml
+++ b/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(); });
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 899950b7c36..757cdb11e03 100644
--- a/app/views/snippets/show.html.haml
+++ b/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
diff --git a/db/migrate/20111027051828_add_expires_at_to_snippets.rb b/db/migrate/20111027051828_add_expires_at_to_snippets.rb
new file mode 100644
index 00000000000..0d94b33376b
--- /dev/null
+++ b/db/migrate/20111027051828_add_expires_at_to_snippets.rb
@@ -0,0 +1,5 @@
+class AddExpiresAtToSnippets < ActiveRecord::Migration
+ def change
+ add_column :snippets, :expires_at, :datetime
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9c99e5328e5..1ac90a9b400 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -65,6 +65,7 @@ ActiveRecord::Schema.define(:version => 20111027142641) do
t.datetime "created_at"
t.datetime "updated_at"
t.string "file_name"
+ t.datetime "expires_at"
end
create_table "users", :force => true do |t|
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index 9dab72ca7dc..037287a9928 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -26,5 +26,6 @@ end
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
+# expires_at :datetime
#
diff --git a/spec/requests/snippets_spec.rb b/spec/requests/snippets_spec.rb
index d4811958db3..ee4f90e6028 100644
--- a/spec/requests/snippets_spec.rb
+++ b/spec/requests/snippets_spec.rb
@@ -23,6 +23,14 @@ describe "Snippets" do
it { should have_content(@snippet.project.name) }
it { should have_content(@snippet.author.name) }
+ it "doesn't show expired snippets" do
+ @snippet.update_attribute(:expires_at, 1.day.ago.to_time)
+ visit project_snippet_path(project, @snippet)
+ page.should have_content("Sorry, this snippet is no longer exists")
+ page.should_not have_content(@snippet.title)
+ page.should_not have_content(@snippet.content)
+ end
+
describe "Destroy" do
before do
# admin access to remove snippet
View Lorry Controller Status