@@ -24,9 +24,9 @@ class EpisodesController < ApplicationController def show if admin? - @episode = Episode.find(params[:id]) + @episode = Episode.find_by_position!(params[:id].to_i) else - @episode = Episode.published.find(params[:id]) + @episode = Episode.published.find_by_position!(params[:id].to_i) end if params[:id] != @episode.to_param headers["Status"] = "301 Moved Permanently" app/controllers/episodes_controller.rb @@ -67,7 +67,7 @@ class Episode < ActiveRecord::Base end def to_param - [id, permalink].join('-') + [position, permalink].join('-') end def last_published? app/models/episode.rb @@ -48,8 +48,8 @@ describe EpisodesController, "as guest" do response.should render_template(:show) end - it "show action should redirect to full episode URL when only id" do - get :show, :id => Episode.first.id + it "show action should redirect to full episode URL when only position" do + get :show, :id => Episode.first.position response.should redirect_to(episode_url(Episode.first)) end spec/controllers/episodes_controller_spec.rb @@ -44,9 +44,9 @@ describe Episode do episode.permalink.should == 'hello-world-2-1' end - it "should include id and permalink in to_param" do + it "should include position and permalink in to_param" do episode = Factory(:episode, :name => 'Foo Bar') - episode.to_param.should == "#{episode.id}-#{episode.permalink}" + episode.to_param.should == "#{episode.position}-foo-bar" end it "should translate single digit seconds into duration with minutes" do spec/models/episode_spec.rb 3146f0dc8b821aec7fad0f5ca7a7245227412a85 Ryan Bates ryan@railscasts.com http://github.com/ryanb/railscasts/commit/c9d6386feb15f9fea9129047d540a8de7b8063f4 c9d6386feb15f9fea9129047d540a8de7b8063f4 2009-04-16T13:54:32-07:00 2009-04-16T13:54:32-07:00 using position in episode URL instead of id 32b60a86f01a7e13b6a71cb45156021998a397b0 Ryan Bates ryan@railscasts.com