Add seeds and improve ui. Remove snippet expires_at

Dmitriy Zaporozhets
1 parent 02e39563
Showing 6 changed files with 61 additions and 28 deletions Show diff stats
app/views/snippets/_form.html.haml
app/views/snippets/_snippet.html.haml
app/views/snippets/_snippets.html.haml
app/views/snippets/show.html.haml
db/fixtures/development/12_snippets.rb
features/steps/snippets/snippets.rb
@@ -16,9 +16,6 @@
       = f.label "Private?"
       .input= f.check_box :private, {class: ''}
     .clearfix
-      = f.label "Lifetime"
-      .input= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
-    .clearfix
       .file-editor
         = f.label :file_name, "File"
         .input
@@ -30,7 +27,11 @@
               = f.hidden_field :content, class: 'snippet-file-content'
     .form-actions
-      = f.submit 'Save', class: "btn-save btn"
+      - if @snippet.new_record?
+        = f.submit 'Create snippet', class: "btn-create btn"
+      - else
+        = f.submit 'Save', class: "btn-save btn"
+
       = link_to "Cancel", snippets_path(@project), class: " btn"
       - unless @snippet.new_record?
         .pull-right= link_to 'Destroy', snippet_path(@snippet), confirm: 'Removed snippet cannot be restored! Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
 %li
-  .snippet-title
-    - if snippet.private?
-      = private_icon
-    - else
-      = public_icon
+  %h4.snippet-title
     = link_to reliable_snippet_path(snippet) do
-      %h5.inline
-        = truncate(snippet.title, length: 60)
-    %span.cgray
+      = truncate(snippet.title, length: 60)
+      - if snippet.private?
+        %span.label.label-success
+          %i.icon-lock
+          private
+    %span.cgray.monospace.tiny.pull-right
       = snippet.file_name
   %small.pull-right.cgray
@@ -15,16 +14,11 @@
       = link_to snippet.project.name_with_namespace, project_path(snippet.project)
       %span
         \|
-    Expires:
-    - if snippet.expires_at
-      = snippet.expires_at.to_date.to_s(:short)
-    - else
-      Never
-  .snippet-info.prepend-left-20
+  .snippet-info
     = "##{snippet.id}"
-    %span.light
+    %span
       by
       = image_tag gravatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
       = snippet.author_name
-
+      %span.light #{time_ago_in_words(snippet.created_at)} ago
@@ -4,4 +4,4 @@
     %li
       %h3.nothing_here_message Nothing here.
-= paginate @snippets
+= paginate @snippets, theme: 'gitlab'
 %h3.page-title
+  = @snippet.title
+
   - if @snippet.private?
-    %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"}
-  - else
-    %i{:class => "icon-globe cblue has_bottom_tooltip", "data-original-title" => "Public snippet"}
+    %span.label.label-success
+      %i.icon-lock
+      private
-  = @snippet.title
+  .pull-right
+    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+      Add new snippet
-  %small.pull-right
+
+.append-bottom-20
+  .pull-right
     = "##{@snippet.id}"
     %span.light
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
+
+  .back-link
+    - if @snippet.author == current_user
+      = link_to user_snippets_path(current_user) do
+        &larr; my snippets
+    - else
+      = link_to snippets_path do
+        &larr; discover snippets
+
 %div= render 'blob'
@@ -0,0 +1,24 @@
+ActiveRecord::Base.observers.disable :all
+
+Gitlab::Seeder.quiet do
+  contents = [
+    `curl https://gist.github.com/randx/4275756/raw/da2f262920c96d1a970d48bf2e99147954b1f4bd/glus1204.sh`,
+    `curl https://gist.github.com/randx/3754594/raw/11026a295e6ef3a151c635707a3e1e8e15fc4725/gitlab_setup.sh `,
+    `curl https://gist.github.com/randx/3065552/raw/29fbd09f4605a5ea22a5a9095e35fd1938dea4d6/gistfile1.sh`,
+  ]
+
+  (1..50).each  do |i|
+    user = User.all.sample
+
+    PersonalSnippet.seed(:id, [{
+      id: i,
+      author_id: user.id,
+      title: Faker::Lorem.sentence(6),
+      file_name:  Faker::Internet.domain_word + '.sh',
+      private: [true, false].sample,
+      content: contents.sample,
+    }])
+    print('.')
+  end
+end
+
@@ -24,12 +24,11 @@ class SnippetsFeature &lt; Spinach::FeatureSteps
   And 'I submit new snippet "Personal snippet three"' do
     fill_in "personal_snippet_title", :with => "Personal snippet three"
-    select "forever", :from => "personal_snippet_expires_at"
     fill_in "personal_snippet_file_name", :with => "my_snippet.rb"
     within('.file-editor') do
       find(:xpath, "//input[@id='personal_snippet_content']").set 'Content of snippet three'
     end
-    click_button "Save"
+    click_button "Create snippet"
   end
   Then 'I should see snippet "Personal snippet three"' do
	@@ -4,4 +4,4 @@		@@ -4,4 +4,4 @@
4	%li	4	%li
5	%h3.nothing_here_message Nothing here.	5	%h3.nothing_here_message Nothing here.
6		6
7	-= paginate @snippets	7	+= paginate @snippets, theme: 'gitlab'
1	%h3.page-title	1	%h3.page-title
		2	+ = @snippet.title
		3	+
2	- if @snippet.private?	4	- if @snippet.private?
3	- %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"}
4	- - else
5	- %i{:class => "icon-globe cblue has_bottom_tooltip", "data-original-title" => "Public snippet"}	5	+ %span.label.label-success
		6	+ %i.icon-lock
		7	+ private
6		8
7	- = @snippet.title	9	+ .pull-right
		10	+ = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
		11	+ Add new snippet
8		12
9	- %small.pull-right	13	+
		14	+.append-bottom-20
		15	+ .pull-right
10	= "##{@snippet.id}"	16	= "##{@snippet.id}"
11	%span.light	17	%span.light
12	by	18	by
13	= image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"	19	= image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
14	= @snippet.author_name	20	= @snippet.author_name
		21	+
		22	+ .back-link
		23	+ - if @snippet.author == current_user
		24	+ = link_to user_snippets_path(current_user) do
		25	+ ← my snippets
		26	+ - else
		27	+ = link_to snippets_path do
		28	+ ← discover snippets
		29	+
15	%div= render 'blob'	30	%div= render 'blob'
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+ActiveRecord::Base.observers.disable :all
	2	+
	3	+Gitlab::Seeder.quiet do
	4	+ contents = [
	5	+ `curl https://gist.github.com/randx/4275756/raw/da2f262920c96d1a970d48bf2e99147954b1f4bd/glus1204.sh`,
	6	+ `curl https://gist.github.com/randx/3754594/raw/11026a295e6ef3a151c635707a3e1e8e15fc4725/gitlab_setup.sh `,
	7	+ `curl https://gist.github.com/randx/3065552/raw/29fbd09f4605a5ea22a5a9095e35fd1938dea4d6/gistfile1.sh`,
	8	+ ]
	9	+
	10	+ (1..50).each do \|i\|
	11	+ user = User.all.sample
	12	+
	13	+ PersonalSnippet.seed(:id, [{
	14	+ id: i,
	15	+ author_id: user.id,
	16	+ title: Faker::Lorem.sentence(6),
	17	+ file_name: Faker::Internet.domain_word + '.sh',
	18	+ private: [true, false].sample,
	19	+ content: contents.sample,
	20	+ }])
	21	+ print('.')
	22	+ end
	23	+end
	24	+