Rescue from duplicate key errors in AspectMembershipsController

app/controllers/aspect_memberships_controller.rb

@@ -76,4 +76,8 @@ class AspectMembershipsController < ApplicationController
     render :text => response_hash.to_json
   end
 
+  rescue_from ActiveRecord::RecordNotUnique do
+    render :text => "Duplicate record rejected.", :status => 400
+  end
+
 end

spec/controllers/aspect_memberships_controller_spec.rb

@@ -62,6 +62,13 @@ describe AspectMembershipsController do
       flash[:error].should_not be_empty
     end
 
+    it 'does not 500 on a duplicate key error' do
+      params = {:format => 'js', :person_id => @person.id, :aspect_id => @aspect0.id}
+      post :create, params
+      post :create, params
+      response.status.should == 400
+    end
+
     context 'json' do
       it 'returns a list of aspect ids for the person' do
         post :create,