RefugeRestrooms · cllns · Nov 21, 2015 · Nov 21, 2015 · Nov 21, 2015 · Nov 21, 2015
diff --git a/app/assets/stylesheets/partials/_posts.scss b/app/assets/stylesheets/partials/_posts.scss
@@ -92,4 +92,9 @@
   .confirmation-text {
     text-align: center;
   }
+
+  .delete-button input {
+    background-color: red;
+    margin: 0.5em;
+  }
 }
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
@@ -1,4 +1,9 @@
 class PostsController < ApplicationController
+  before_action :assign_post_by_validation_and_id, only: [:edit,
+                                                          :update,
+                                                          :destroy,
+                                                          :confirm]
+
   def index
     if check_for_search_params
       @posts = post_search
@@ -23,20 +28,13 @@ def create
   end
 
   def edit
-    redirect_to(validation_error_url) && return unless check_validation
-
-    @post = Post.find(params[:id])
   end
 
   def show
     @post = Post.active.find(params[:id])
   end
 
   def update
-    redirect_to(validation_error_url) && return unless check_validation
-
-    @post = Post.find_by_validation(params[:validation])
-
     if @post.update_attributes(post_params)
       redirect_to @post
     else
@@ -45,40 +43,28 @@ def update
   end
 
   def destroy
-    redirect_to(validation_error_url) && return unless check_validation
+    @post.toggle_show(false)
 
-    post = Post.find_by_validation(params[:validation])
-    redirect_to(validation_error_url) && return if post.nil?
-
-    post.toggle_show(false)
-
-    ConfirmationMailer.deleted_email(post).deliver_now
+    ConfirmationMailer.deleted_email(@post).deliver_now
 
     flash[:notice] = "Post successfully deleted"
   end
 
   def confirm
-    redirect_to(validation_error_url) && return unless check_validation
-
-    @post = Post.find_by_validation(params[:validation])
-    redirect_to(validation_error_url) && return if @post.nil?
-
     @post.toggle_show(true)
     ConfirmationMailer.posted_email(@post).deliver_now
   end
 
-  # Get wrapper/confirmation for destroy
-  def delete
-    redirect_to(validation_error_url) && return unless check_validation && params.key?(:id)
-  end
-
   def validation_error
   end
 
   private
 
-  def check_validation
-    params.key?(:validation) && params[:validation].match(/^.{32}$/)
+  def assign_post_by_validation_and_id
+    @post = Post.where(id: find_post_params[:id],
+                       validation: find_post_params[:validation]).first
+
+    redirect_to(validation_error_url) && return if @post.nil?
   end
 
   def post_params
@@ -99,6 +85,10 @@ def post_params
       )
   end
 
+  def find_post_params
+    params.permit(:id, :validation)
+  end
+
   def check_for_search_params
     [:type, :location, :query].any? { |k| params.key?(k) }
   end

diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb
@@ -1,14 +1,10 @@
 module PostsHelper
-  def delete_post_link(post)
-    link_to_url(posts_delete_url(post, validation: post.validation, id: post.id))
-  end
-
   def edit_post_link(post)
     link_to_url(edit_post_url(post, validation: post.validation))
   end
 
   def confirm_post_link(post)
-    link_to_url(posts_confirm_url(post, validation: post.validation, id: post.id))
+    link_to_url(confirm_post_url(post, post.validation))
   end
 
   def post_link(post)

diff --git a/app/views/confirmation_mailer/posted_email.html.erb b/app/views/confirmation_mailer/posted_email.html.erb
@@ -6,8 +6,7 @@
   <body>
     <p>Your post is confirmed!</p>
     <p>To view your post, visit: <%= post_link(@post) %></p>
-    <p>To edit your post, visit: <%= edit_post_link(@post) %></p>
-    <p>To delete your post, visit: <%= delete_post_link(@post) %></p>
+    <p>To edit (or delete) your post, visit: <%= edit_post_link(@post) %></p>
     <p>Your post will expire in two weeks, on <%= @post.expiration.strftime("%B %d, %Y") %>. </p>
     <p>Thanks for posting on <%= app_name %>!</p>
   </body>

diff --git a/app/views/posts/_form.html.erb b/app/views/posts/_form.html.erb
@@ -1,5 +1,7 @@
-<% url = post_path(:id => params[:id], validation: params[:validation]) if params[:validation] %>
-<%= form_for(@post, url: url) do |f| %>
+<%= form_for(@post) do |f| %>
+  <%= hidden_field_tag :validation, @post.validation %>
+  <%= hidden_field_tag :id, @post.id %>
+
   <%= render "posts/form_error", :target => @post %>
 
   <div class="button-group">

diff --git a/app/views/posts/delete.html.erb b/app/views/posts/delete.html.erb
@@ -1,4 +0,0 @@
-<p class="confirmation-text">
-Are you sure you want to delete your post?
-</p>
-<%= button_to 'Delete', post_path(id: params[:id], validation: params[:validation]), method: :delete %>

diff --git a/app/views/posts/edit.html.erb b/app/views/posts/edit.html.erb
@@ -2,4 +2,17 @@
   Editing Post
 </h1>
 
+<div class="delete-button">
+  <%=
+    button_to(
+      "Delete this post",
+      post_path(id: @post.id, validation: @post.validation),
+      method: :delete,
+      data: {
+        confirm: "Are you sure you want to delete this post?"
+      }
+    )
+  %>
+</div>
+
 <%= render "form" %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -3,13 +3,21 @@
   ActiveAdmin.routes(self)
   root "posts#index"
 
-  get "posts/delete", to: "posts#delete"
-  get "posts/confirm", to: "posts#confirm"
+  # Can we remove these in favor of using the flash, and redirecting?
   get "posts/success", to: "posts#success"
-  resources :posts
-
   get "validation_error", to: "posts#validation_error"
 
+  resources :posts, except: [:edit] do
+    member do
+      constraints validation: /.{32}/ do
+        get    "edit/:validation",    to: "posts#edit",    as: :edit
+        get    "confirm/:validation", to: "posts#confirm", as: :confirm
+      end
+
+      get "confirm/:validation", to: "posts#validation_error" # if ^^^^ fails
+    end
+  end
+
   get "about", controller: "about"
 
   get "contact", to: "contacts#new"

diff --git a/spec/controllers/post_spec.rb b/spec/controllers/post_spec.rb
@@ -94,7 +94,7 @@
   describe "GET #confirm" do
     it "activates a post" do
       post = create(:post)
-      get :confirm, validation: post.validation
+      get :confirm, id: post.id, validation: post.validation
 
       expect(Post.active).to match_array([post])
     end
@@ -105,14 +105,7 @@
         id: 1,
         validation: "0f21473d03145662d38ce4ea1ebac790"
       )
-      get :confirm, validation: "0f21473d03145662d38ce4ea1ebac791"
-
-      expect(response).to redirect_to validation_error_url
-    end
-
-    it "redirects to error page without validation" do
-      create(:post)
-      get :confirm
+      get :confirm, id: 1, validation: "0f21473d03145662d38ce4ea1ebac791"
 
       expect(response).to redirect_to validation_error_url
     end

diff --git a/spec/features/post_spec.rb b/spec/features/post_spec.rb
@@ -114,17 +114,17 @@
   it "confirms a post from given link" do
     post = create(:post)
 
-    visit posts_confirm_url(id: post.id, validation: post.validation)
+    visit confirm_post_url(post.id, post.validation)
 
     expect(page).to have_content("confirmed")
   end
 end
 
 describe "the post deletion process" do
-  it "deletes a post from given link" do
+  it "deletes a post from edit link" do
     post = create(:post)
 
-    visit posts_delete_url(id: post.id, validation: post.validation)
+    visit edit_post_url(post.id, validation: post.validation)
     click_button "Delete"
 
     expect(page).to have_content("successfully")