Update protip to use / as separator for url slug

ddyy · ddyy · commit 29219c2523a8 · 2014-10-24T16:46:37.000+08:00
diff --git a/app/controllers/protips_controller.rb b/app/controllers/protips_controller.rb
@@ -135,7 +135,7 @@ def show
                   end
 
     return redirect_to protip_missing_destination, notice: "The pro tip you were looking for no longer exists" if @protip.nil?
-    return redirect_to protip_path(@protip.friendly_id, :p => params[:p], :q => params[:q]) if params[:id]!=@protip.friendly_id
+    return redirect_to protip_path(@protip.public_id<<'/'<<@protip.friendly_id, :p => params[:p], :q => params[:q]) if params[:slug]!=@protip.friendly_id
     
     @comments    = @protip.comments
     @reply_to    = show_params[:reply_to]
@@ -404,7 +404,7 @@ def expand_query(query_string)
   end
 
   def lookup_protip
-    @protip = if public_id = params[:id].split('--').first
+    @protip = if public_id = params[:id]
                 Protip.find_by_public_id(public_id.downcase)
               else
                 nil
diff --git a/app/models/protip.rb b/app/models/protip.rb
@@ -956,7 +956,7 @@ def to_html
   end
   
   def slug_format
-    "#{public_id}--#{title}"
+    "#{title}"
   end
   
   protected
diff --git a/config/routes.rb b/config/routes.rb
@@ -289,6 +289,7 @@
 
   resources :protips, :path => '/p' do
     collection do
+      get ':id/:slug' => 'protips#show'
       get 'random'
       get 'search' => 'protips#search', as: :search
       post 'search' => 'protips#search'
diff --git a/spec/controllers/protips_controller_spec.rb b/spec/controllers/protips_controller_spec.rb
@@ -54,15 +54,15 @@ def valid_session
       protip = Protip.create! valid_attributes
       protip.save
       get :show, {id: protip.to_param}, valid_session
-      expect(response).to redirect_to protip_path(protip.slug)
+      expect(response).to redirect_to protip_path(protip)
     end
   end
   
   describe "GET show using slug" do
     it "assigns the requested protip as @protip" do
       protip = Protip.create! valid_attributes
       protip.save
-      get :show, {id: protip.friendly_id}, valid_session
+      get :show, {id: protip.public_id, slug: protip.friendly_id}, valid_session
       expect(assigns(:protip)).to eq(protip)
     end
   end
