@@ -5,7 +5,8 @@ class LinksController < ApplicationController end def create - website_url = params.include?(:website_url) ? params[:website_url] : params[:link][:website_url] + website_url = params[:link][:website_url] if params.include?(:link) + @link = Link.find_or_create_by_website_url( website_url ) @link.ip_address = request.remote_ip if @link.new_record? @@ -25,7 +26,7 @@ class LinksController < ApplicationController @link.add_visit(request) redirect_to @link.website_url, { :status => 301 } else - redirect_to :action => 'invalid' + redirect_to :action => :invalid end end end app/controllers/links_controller.rb @@ -27,6 +27,11 @@ describe LinksController do post :create, :link => valid_attributes.except(:website_url) assigns(:link).should have_at_least(1).errors_on(:website_url) end + + it "should not save a new link wihout a website url" do + post :create + assigns(:link).should have_at_least(1).errors_on(:website_url) + end it "should save a new link with valid attributes" do lambda do spec/controllers/links_controller_spec.rb 0586e1381d0b09760c15260a5f2ffbedf05ae31c Michael Hale mikehale@gmail.com http://github.com/kohlhofer/rubyurl/commit/e470c9fa7b262df409851ce71dafb101721aa438 e470c9fa7b262df409851ce71dafb101721aa438 2008-09-01T18:00:36-07:00 2008-09-01T18:00:36-07:00 handle case where params[:link] is nil 4347e614bf6ac2faaf5c8fb600221a3c2389bd58 Michael Hale mikehale@gmail.com