Merge branch 'master' of github.com:diaspora/diaspora

README.md

@@ -1,6 +1,8 @@
 ## Commit Guidlines
 You are welcome to contribute, add and extend Diaspora however you see fit.  We will do our best to incorporate everything that meets our guidelines.
 
+We need you to fill out a [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) before we can accept your patches.  The agreement gives Diaspora joint ownership of the patch so the copyright isn't scattered.  You can find it [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). 
+
 All commits must be tested, and after each commit, all tests should be green before a pull request is sent.  Please write your tests in Rspec or Test-Unit.
 
 GEMS:  We would like to keep external dependencies unduplicated.  We're using Nokogiri, and Mongomapper, and EM::HttpRequest as much as possible.  We have a few gems in the project we'd rather not use, but if you can, use dependencies we already have.

app/controllers/albums_controller.rb

@@ -46,7 +46,7 @@ class AlbumsController < ApplicationController
   end
 
   def update
-    @album = Album.find_params_by_id params[:id]
+    @album = Album.find_by_id params[:id]
     if @album.update_attributes params[:album]
       flash[:notice] = "Album #{@album.name} successfully edited."
       respond_with @album

spec/controllers/albums_controller_spec.rb

@@ -0,0 +1,23 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+require File.dirname(__FILE__) + '/../spec_helper'
+include ApplicationHelper
+describe AlbumsController do
+ render_views
+  before do
+    @user = Factory.create(:user)
+    @user.aspect(:name => "lame-os")
+    @album = Factory.create(:album)
+    sign_in :user, @user
+  end
+
+  it "should update the name of an album" do
+    sign_in :user, @user
+    put :update, :id => @album._id, :album => { :name => "new_name"}
+    @album.reload.name.should eql("new_name")
+  end
+
+end

spec/factories.rb

@@ -22,6 +22,11 @@ Factory.define :person do |p|
   p.serialized_key OpenSSL::PKey::RSA.generate(1024).public_key.export
 end
 
+Factory.define :album do |p|
+  p.name "my first album"
+  p.person { |a| Factory.create(:person) }
+end
+
 Factory.define :person_with_private_key, :parent => :person do |p|
   p.serialized_key OpenSSL::PKey::RSA.generate(1024).export
 end