removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)

app/controllers/aspects_controller.rb

@@ -18,7 +18,7 @@ class AspectsController < ApplicationController
   end
 
   def create
-    @aspect = current_user.aspect(params[:aspect])
+    @aspect = current_user.aspects.create(params[:aspect])
     if @aspect.valid?
       flash[:notice] = I18n.t('aspects.create.success')
       respond_with @aspect

app/models/user.rb

@@ -85,13 +85,6 @@ class User
   end
 
   ######### Aspects ######################
-  def aspect(opts = {})
-    aspect = Aspect.new(opts)
-    aspect.user = self
-    aspect.save
-    aspect
-  end
-
   def drop_aspect(aspect)
     if aspect.people.size == 0
       aspect.destroy
@@ -417,8 +410,8 @@ class User
   end
 
   def seed_aspects
-    aspect(:name => "Family")
-    aspect(:name => "Work")
+    self.aspects.create(:name => "Family")
+    self.aspects.create(:name => "Work")
   end
 
   def diaspora_handle

db/seeds/backer.rb

@@ -32,7 +32,7 @@ def create
   user.save
   user.person.save!
 
-  user.aspect(:name => "Presidents")
+  user.aspects.create(:name => "Presidents")
 end
 
 def set_app_config username

db/seeds/dev.rb

@@ -46,8 +46,8 @@ user2.save
 user2.person.save!
 user2.seed_aspects
 # friending users
-aspect = user.aspect(:name => "other dudes") 
-aspect2 = user2.aspect(:name => "presidents")
+aspect = user.aspects.create(:name => "other dudes") 
+aspect2 = user2.aspects.create(:name => "presidents")
 
 friend_users(user, aspect, user2, aspect2)
-user.aspect(:name => "Presidents")
+user.aspects.create(:name => "Presidents")

spec/controllers/albums_controller_spec.rb

@@ -8,7 +8,7 @@ describe AlbumsController do
  render_views
   before do
     @user = make_user
-    @aspect = @user.aspect(:name => "lame-os")
+    @aspect = @user.aspects.create(:name => "lame-os")
     @album = @user.post :album, :to => @aspect.id, :name => 'things on fire'
     sign_in :user, @user
   end

spec/controllers/aspects_controller_spec.rb

@@ -9,10 +9,10 @@ describe AspectsController do
 
   before do
     @user    = make_user
-    @aspect  = @user.aspect(:name => "lame-os")
-    @aspect1 = @user.aspect(:name => "another aspect")
+    @aspect  = @user.aspects.create(:name => "lame-os")
+    @aspect1 = @user.aspects.create(:name => "another aspect")
     @user2   = make_user
-    @aspect2 = @user2.aspect(:name => "party people")
+    @aspect2 = @user2.aspects.create(:name => "party people")
     friend_users(@user,@aspect, @user2, @aspect2)
     @contact = @user.contact_for(@user2.person)
     sign_in :user, @user
@@ -63,7 +63,7 @@ describe AspectsController do
 
   describe "#update" do
     before do
-      @aspect = @user.aspect(:name => "Bruisers")
+      @aspect = @user.aspects.create(:name => "Bruisers")
     end
     it "doesn't overwrite random attributes" do
       new_user = Factory.create :user

spec/controllers/people_controller_spec.rb

@@ -8,7 +8,7 @@ describe PeopleController do
   render_views
 
   let(:user) { Factory(:user) }
-  let!(:aspect) { user.aspect(:name => "lame-os") }
+  let!(:aspect) { user.aspects.create(:name => "lame-os") }
 
   before do
     sign_in :user, user

spec/controllers/photos_controller_spec.rb

@@ -8,7 +8,7 @@ describe PhotosController do
   render_views
   before do
     @user = make_user
-    @aspect = @user.aspect(:name => "lame-os")
+    @aspect = @user.aspects.create(:name => "lame-os")
     @album = @user.post :album, :to => @aspect.id, :name => 'things on fire'
     @fixture_filename = 'button.png'
     @fixture_name = File.join(File.dirname(__FILE__), '..', 'fixtures', @fixture_filename)

spec/controllers/publics_controller_spec.rb

@@ -9,9 +9,9 @@ describe PublicsController do
   render_views
   let!(:user) { make_user }
   let!(:user2) { make_user }
-  let!(:aspect1) { user.aspect(:name => "foo") }
-  let!(:aspect2) { user2.aspect(:name => "far") }
-  let!(:aspect2) { user2.aspect(:name => 'disciples') }
+  let!(:aspect1) { user.aspects.create(:name => "foo") }
+  let!(:aspect2) { user2.aspects.create(:name => "far") }
+  let!(:aspect2) { user2.aspects.create(:name => 'disciples') }
   let!(:req) { user2.send_friend_request_to(user.person, aspect2) }
   let!(:xml) { user2.salmon(req).xml_for(user.person) }
   let(:person){Factory(:person)}

spec/controllers/requests_controller_spec.rb

@@ -10,7 +10,7 @@ describe RequestsController do
     @user = make_user
 
     sign_in :user, @user
-    @user.aspect(:name => "lame-os")
+    @user.aspects.create(:name => "lame-os")
   end
 
   it "should not error out when requesting to be friends with yourself" do

spec/controllers/services_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe ServicesController do
   render_views
   let(:user) { make_user }
-  let!(:aspect) { user.aspect(:name => "lame-os") }
+  let!(:aspect) { user.aspects.create(:name => "lame-os") }
 
   let!(:service1) {a = Factory(:service); user.services << a; a}
   let!(:service2) {a = Factory(:service); user.services << a; a}

spec/controllers/sockets_controller_spec.rb

@@ -24,7 +24,7 @@ describe SocketsController do
 
   describe 'actionhash' do
     before do
-      @aspect = @user.aspect :name => "losers"
+      @aspect = @user.aspects.create(:name => "losers")
       @message = @user.post :status_message, :message => "post through user for victory", :to => @aspect.id
       @fixture_name = File.dirname(__FILE__) + '/../fixtures/button.png'
     end

spec/controllers/status_message_controller_spec.rb

@@ -8,7 +8,7 @@ describe StatusMessagesController do
   render_views
 
   let!(:user) { make_user }
-  let!(:aspect) { user.aspect(:name => "lame-os") }
+  let!(:aspect) { user.aspects.create(:name => "lame-os") }
 
   before do
     sign_in :user, user

spec/controllers/users_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe UsersController do
 
   let(:user) { make_user }
-  let!(:aspect) { user.aspect(:name => "lame-os") }
+  let!(:aspect) { user.aspects.create(:name => "lame-os") }
 
   let!(:old_password) { user.encrypted_password }
   let!(:old_language) { user.language }

spec/lib/diaspora/exporter_spec.rb

@@ -11,10 +11,10 @@ describe Diaspora::Exporter do
   let!(:user2) { make_user }
   let!(:user3) { make_user }
 
-  let!(:aspect) { user1.aspect(:name => "Old Work")   }
-  let(:aspect1) { user1.aspect(:name => "Work")   }
-  let(:aspect2) { user2.aspect(:name => "Family") }
-  let(:aspect3) { user3.aspect(:name => "Pivots") }
+  let!(:aspect) { user1.aspects.create(:name => "Old Work")   }
+  let(:aspect1) { user1.aspects.create(:name => "Work")   }
+  let(:aspect2) { user2.aspects.create(:name => "Family") }
+  let(:aspect3) { user3.aspects.create(:name => "Pivots") }
 
   let!(:status_message1) { user1.post(:status_message, :message => "One", :public => true, :to => aspect1.id) }
   let!(:status_message2) { user1.post(:status_message, :message => "Two", :public => true, :to => aspect1.id) }

spec/lib/diaspora/importer_spec.rb

@@ -20,18 +20,18 @@ describe Diaspora::Importer do
     @person2 = Factory(:person)
 
     # User1 has four aspects(1-4), each following user has one aspect
-    @aspect1 = @user1.aspect(:name => "Dudes") 
-    @aspect2 = @user1.aspect(:name => "Girls")
-    @aspect3 = @user1.aspect(:name => "Bros")
-    @aspect4 = @user1.aspect(:name => "People")
-    @aspect5 = @user2.aspect(:name => "Abe Lincolns")
-    @aspect6 = @user3.aspect(:name => "Cats")
-    @aspect7 = @user4.aspect(:name => "Dogs")
-    @aspect8 = @user5.aspect(:name => "Hamsters")
-    @aspect9 = @user5.aspect(:name => "Gophers")
+    @aspect1 = @user1.aspects.create(:name => "Dudes") 
+    @aspect2 = @user1.aspects.create(:name => "Girls")
+    @aspect3 = @user1.aspects.create(:name => "Bros")
+    @aspect4 = @user1.aspects.create(:name => "People")
+    @aspect5 = @user2.aspects.create(:name => "Abe Lincolns")
+    @aspect6 = @user3.aspects.create(:name => "Cats")
+    @aspect7 = @user4.aspects.create(:name => "Dogs")
+    @aspect8 = @user5.aspects.create(:name => "Hamsters")
+    @aspect9 = @user5.aspects.create(:name => "Gophers")
 
-    @aspect10 = @user1.aspect(:name => "Work") 
-    @aspect11 = @user1.aspect(:name => "Family")
+    @aspect10 = @user1.aspects.create(:name => "Work") 
+    @aspect11 = @user1.aspects.create(:name => "Family")
 
     # User1 posts one status messages to aspects (1-4), two other users post message to one aspect
     @status_message1 = @user1.post(:status_message, :message => "One", :public => false, :to => @aspect1.id)

spec/lib/diaspora/ostatus_builder.rb

@@ -9,7 +9,7 @@ require File.join(Rails.root,  'lib/diaspora/ostatus_builder')
 describe Diaspora::OstatusBuilder do
 
   let!(:user) { make_user }
-  let(:aspect) { user.aspect(:name => "Public People") }
+  let(:aspect) { user.aspects.create(:name => "Public People") }
   let!(:status_message1) { user.post(:status_message, :message => "One", :public => true, :to => aspect.id) }
   let!(:status_message2) { user.post(:status_message, :message => "Two", :public => true, :to => aspect.id) }
   let!(:status_message3) { user.post(:status_message, :message => "Three", :public => false, :to => aspect.id) }

spec/lib/diaspora/parser_spec.rb

@@ -6,9 +6,9 @@ require 'spec_helper'
 
 describe Diaspora::Parser do
   let(:user) { make_user }
-  let(:aspect) { user.aspect(:name => 'spies') }
+  let(:aspect) { user.aspects.create(:name => 'spies') }
   let(:user2) { make_user }
-  let(:aspect2) { user2.aspect(:name => "pandas") }
+  let(:aspect2) { user2.aspects.create(:name => "pandas") }
   let(:user3) { make_user }
   let(:person) { user3.person }
 

spec/lib/encryptor_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe 'user encryption' do
   before do
     @user = make_user
-    @aspect = @user.aspect(:name => 'dudes')
+    @aspect = @user.aspects.create(:name => 'dudes')
   end
 
   describe 'key exchange on friending' do
@@ -26,7 +26,7 @@ describe 'user encryption' do
       original_key = remote_user.exported_key
 
       request = remote_user.send_friend_request_to(
-        @user.person, remote_user.aspect(:name => "temp"))
+        @user.person, remote_user.aspects.create(:name => "temp"))
 
       xml = remote_user.salmon(request).xml_for(@user)
 

spec/lib/salmon_salmon_spec.rb

@@ -8,7 +8,7 @@ describe Salmon do
   let(:user){make_user}
   let(:user2) {make_user}
   let(:user3) {make_user}
-  let(:post){ user.post :status_message, :message => "hi", :to => user.aspect(:name => "sdg").id }
+  let(:post){ user.post :status_message, :message => "hi", :to => user.aspects.create(:name => "sdg").id }
 
   let!(:created_salmon) {Salmon::SalmonSlap.create(user, post.to_diaspora_xml)}
 

spec/lib/verify_spec.rb

@@ -11,9 +11,9 @@ describe Diaspora::Importer do
   let!(:user2) { make_user }
   let!(:user3) { make_user }
 
-  let(:aspect1) { user1.aspect(:name => "Work")   }
-  let(:aspect2) { user2.aspect(:name => "Family") }
-  let(:aspect3) { user3.aspect(:name => "Pivots") }
+  let(:aspect1) { user1.aspects.create(:name => "Work")   }
+  let(:aspect2) { user2.aspects.create(:name => "Family") }
+  let(:aspect3) { user3.aspects.create(:name => "Pivots") }
 
   let!(:status_message1) { user1.post(:status_message, :message => "One", :public => true, :to => aspect1.id) }
   let!(:status_message2) { user1.post(:status_message, :message => "Two", :public => true, :to => aspect1.id) }

spec/lib/websocket_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe Diaspora::WebSocket do
   before do
     @user = make_user
-    @aspect = @user.aspect(:name => "losers")
+    @aspect = @user.aspects.create(:name => "losers")
     @post = @user.build_post(:status_message, :message => "hey", :to => @aspect.id)
   end
 

spec/mailers/notifier_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Notifier do
 
   let!(:user) {make_user}
-  let!(:aspect) {user.aspect(:name => "science")}
+  let!(:aspect) {user.aspects.create(:name => "science")}
   let!(:person) {Factory.create :person}
   let!(:request_mail) {Notifier.new_request(user, person)}
   let!(:request_accepted_mail) {Notifier.request_accepted(user, person, aspect)}

spec/misc_spec.rb

@@ -43,9 +43,9 @@ describe 'making sure the spec runner works' do
    describe '#friend_users' do
     before do
       @user1 = make_user
-      @aspect1 = @user1.aspect(:name => "losers")
+      @aspect1 = @user1.aspects.create(:name => "losers")
       @user2 = make_user
-      @aspect2 = @user2.aspect(:name => "bruisers")
+      @aspect2 = @user2.aspects.create(:name => "bruisers")
       friend_users(@user1, @aspect1, @user2, @aspect2)
     end
 

spec/models/album_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe Album do
   let(:user) { make_user }
   let(:person) { user.person }
-  let(:aspect) { user.aspect(:name => "Foo") }
+  let(:aspect) { user.aspects.create(:name => "Foo") }
   let(:album) { user.post(:album, :name => "test collection", :to => aspect.id) }
 
   it 'is valid' do

spec/models/aspect_spec.rb

@@ -10,27 +10,27 @@ describe Aspect do
   let(:user2) { make_user }
   let(:friend_2) { Factory.create(:person) }
 
-  let(:aspect) {user.aspect(:name => 'losers')}
-  let(:aspect2) {user2.aspect(:name => 'failures')}
-  let(:aspect1) {user.aspect(:name => 'cats')}
+  let(:aspect) {user.aspects.create(:name => 'losers')}
+  let(:aspect2) {user2.aspects.create(:name => 'failures')}
+  let(:aspect1) {user.aspects.create(:name => 'cats')}
   let(:not_friend) { Factory(:person, :diaspora_handle => "not@person.com")}
   let(:user3) {make_user}
-  let(:aspect3) {user3.aspect(:name => "lala")}
+  let(:aspect3) {user3.aspects.create(:name => "lala")}
 
   describe 'creation' do
-    let!(:aspect){user.aspect(:name => 'losers')}
+    let!(:aspect){user.aspects.create(:name => 'losers')}
     it 'should have a name' do
       aspect.name.should == "losers"
     end
 
     it 'should not allow duplicate names' do
       lambda {
-        invalid_aspect = user.aspect(:name => "losers ")
+        invalid_aspect = user.aspects.create(:name => "losers ")
       }.should_not change(Aspect, :count)
     end
 
     it 'should not be creatable with people' do
-      aspect = user.aspect(:name => 'losers', :people => [friend, friend_2])
+      aspect = user.aspects.create(:name => 'losers', :people => [friend, friend_2])
       aspect.people.size.should == 0
     end
 
@@ -55,12 +55,12 @@ describe Aspect do
       aspect
     end
     it 'has a unique name for one user' do
-      aspect2 = user.aspect(:name => aspect.name)
+      aspect2 = user.aspects.create(:name => aspect.name)
       aspect2.valid?.should be_false
     end
 
     it 'has no uniqueness between users' do
-      aspect2 = user2.aspect(:name => aspect.name)
+      aspect2 = user2.aspects.create(:name => aspect.name)
       aspect2.valid?.should be_true
     end
   end
@@ -82,7 +82,7 @@ describe Aspect do
     end
 
     describe '#aspects_with_person' do
-      let!(:aspect_without_friend) {user.aspect(:name => "Another aspect")}
+      let!(:aspect_without_friend) {user.aspects.create(:name => "Another aspect")}
       it 'should return the aspects with given friend' do
         user.reload
         aspects = user.aspects_with_person(friend)
@@ -105,7 +105,7 @@ describe Aspect do
   describe 'posting' do
 
     it 'should add post to aspect via post method' do
-      aspect = user.aspect(:name => 'losers', :people => [friend])
+      aspect = user.aspects.create(:name => 'losers', :people => [friend])
 
       status_message = user.post( :status_message, :message => "hey", :to => aspect.id )
 
@@ -114,8 +114,8 @@ describe Aspect do
     end
 
     it 'should add post to aspect via receive method' do
-      aspect  = user.aspect(:name => 'losers')
-      aspect2 = user2.aspect(:name => 'winners')
+      aspect  = user.aspects.create(:name => 'losers')
+      aspect2 = user2.aspects.create(:name => 'winners')
       friend_users(user, aspect, user2, aspect2)
 
       message = user2.post(:status_message, :message => "Hey Dude", :to => aspect2.id)
@@ -128,8 +128,8 @@ describe Aspect do
     end
 
     it 'should retract the post from the aspects as well' do
-      aspect  = user.aspect(:name => 'losers')
-      aspect2 = user2.aspect(:name => 'winners')
+      aspect  = user.aspects.create(:name => 'losers')
+      aspect2 = user2.aspects.create(:name => 'winners')
       friend_users(user, aspect, user2, aspect2)
 
       message = user2.post(:status_message, :message => "Hey Dude", :to => aspect2.id)

spec/models/comment_spec.rb

@@ -6,10 +6,10 @@ require 'spec_helper'
 
 describe Comment do
   let(:user)    {make_user}
-  let(:aspect)  {user.aspect(:name => "Doofuses")}
+  let(:aspect)  {user.aspects.create(:name => "Doofuses")}
 
   let(:user2)   {make_user}
-  let(:aspect2) {user2.aspect(:name => "Lame-faces")}
+  let(:aspect2) {user2.aspects.create(:name => "Lame-faces")}
 
   it 'validates that the handle belongs to the person' do
     user_status = user.post(:status_message, :message => "hello", :to => aspect.id)
@@ -115,7 +115,7 @@ describe Comment do
   describe 'serialization' do
     it 'should serialize the handle and not the sender' do
       commenter = make_user
-      commenter_aspect = commenter.aspect :name => "bruisers"
+      commenter_aspect = commenter.aspects.create(:name => "bruisers")
       friend_users(user, aspect, commenter, commenter_aspect)
       post = user.post :status_message, :message => "hello", :to => aspect.id
       comment = commenter.comment "Fool!", :on => post

spec/models/person_spec.rb

@@ -9,8 +9,8 @@ describe Person do
     @user = make_user
     @user2 = make_user
     @person = Factory.create(:person)
-    @aspect = @user.aspect(:name => "Dudes")
-    @aspect2 = @user2.aspect(:name => "Abscence of Babes")
+    @aspect = @user.aspects.create(:name => "Dudes")
+    @aspect2 = @user2.aspects.create(:name => "Abscence of Babes")
   end
 
   describe "vaild  url" do

spec/models/photo_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe Photo do
   before do
     @user = make_user
-    @aspect = @user.aspect(:name => "losers")
+    @aspect = @user.aspects.create(:name => "losers")
     @album = @user.post :album, :name => "foo", :to => @aspect.id
 
     @fixture_filename = 'button.png'
@@ -112,7 +112,7 @@ describe Photo do
 
       #security hax
       user2 = Factory.create(:user)
-      aspect2 = user2.aspect(:name => "foobars")
+      aspect2 = user2.aspects.create(:name => "foobars")
       friend_users(@user, @aspect, user2, aspect2)
       @photo.person = user2.person
 

spec/models/post_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe Post do
   before do
     @user = make_user
-    @aspect = @user.aspect(:name => "winners")
+    @aspect = @user.aspects.create(:name => "winners")
   end
 
   describe 'deletion' do

spec/models/request_spec.rb

@@ -8,7 +8,7 @@ describe Request do
   let(:user) { make_user }
   let(:user2) { make_user}
   let(:person) {Factory :person}
-  let(:aspect) { user.aspect(:name => "dudes") }
+  let(:aspect) { user.aspects.create(:name => "dudes") }
   let(:request){ user.send_friend_request_to user2.person, aspect }
 
   it 'should require a destination and callback url' do

spec/models/retraction_spec.rb

@@ -8,7 +8,7 @@ describe Retraction do
 
   let(:user) { make_user }
   let(:person) { Factory(:person) }
-  let(:aspect) { user.aspect(:name => "Bruisers") }
+  let(:aspect) { user.aspects.create(:name => "Bruisers") }
   let!(:activation) { user.activate_friend(person, aspect) }
   let!(:post) { user.post :status_message, :message => "Destroy!", :to => aspect.id }
 

spec/models/status_message_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe StatusMessage do
   before do
       @user = make_user
-      @aspect = @user.aspect(:name => "losers")
+      @aspect = @user.aspects.create(:name => "losers")
   end
 
   it "should have a message" do

spec/models/user/attack_vectors_spec.rb

@@ -7,15 +7,15 @@ require 'spec_helper'
 describe "attack vectors" do
 
   let(:user) { make_user }
-  let(:aspect) { user.aspect(:name => 'heroes') }
+  let(:aspect) { user.aspects.create(:name => 'heroes') }
   
   let(:bad_user) { make_user}
 
   let(:user2) { make_user }
-  let(:aspect2) { user2.aspect(:name => 'losers') }
+  let(:aspect2) { user2.aspects.create(:name => 'losers') }
 
   let(:user3) { make_user }
-  let(:aspect3) { user3.aspect(:name => 'heroes') }
+  let(:aspect3) { user3.aspects.create(:name => 'heroes') }
 
   before do
     friend_users(user, aspect, user2, aspect2)

spec/models/user/invite_spec.rb

@@ -6,11 +6,11 @@ require 'spec_helper'
 
 describe User do
   let(:inviter)  {make_user}
-  let(:aspect)   {inviter.aspect(:name => "awesome")}
+  let(:aspect)   {inviter.aspects.create(:name => "awesome")}
   let(:another_user) {make_user}
-  let(:wrong_aspect) {another_user.aspect(:name => "super")}
+  let(:wrong_aspect) {another_user.aspects.create(:name => "super")}
   let(:inviter_with_3_invites) {Factory.create :user, :invites => 3}
-  let(:aspect2) {inviter_with_3_invites.aspect(:name => "Jersey Girls")}
+  let(:aspect2) {inviter_with_3_invites.aspects.create(:name => "Jersey Girls")}
 
 
   before do
@@ -122,7 +122,7 @@ describe User do
       u.pending_requests
       u.pending_requests.count.should == 1
       request = u.pending_requests.first
-      aspect2  = u.aspect(:name => "dudes")
+      aspect2  = u.aspects.create(:name => "dudes")
       u.reload
       inviter
       inviter.receive_salmon(u.salmon(u.accept_friend_request(request.id, aspect2.id)).xml_for(inviter.person))

spec/models/user/posting_spec.rb

@@ -9,9 +9,9 @@ describe User do
   let!(:user) { make_user }
   let!(:user2) { make_user }
 
-  let!(:aspect) { user.aspect(:name => 'heroes') }
-  let!(:aspect1) { user.aspect(:name => 'other') }
-  let!(:aspect2) { user2.aspect(:name => 'losers') }
+  let!(:aspect) { user.aspects.create(:name => 'heroes') }
+  let!(:aspect1) { user.aspects.create(:name => 'other') }
+  let!(:aspect2) { user2.aspects.create(:name => 'losers') }
 
   let!(:service1) { s = Factory(:service, :provider => 'twitter'); user.services << s; s }
   let!(:service2) { s = Factory(:service, :provider => 'facebook'); user.services << s; s }
@@ -81,9 +81,9 @@ describe User do
 
   context 'dispatching' do
     let!(:user3) { make_user }
-    let!(:aspect3) { user3.aspect(:name => 'heroes') }
+    let!(:aspect3) { user3.aspects.create(:name => 'heroes') }
     let!(:user4) { make_user }
-    let!(:aspect4) { user4.aspect(:name => 'heroes') }
+    let!(:aspect4) { user4.aspects.create(:name => 'heroes') }
 
     let!(:post) { user.build_post :status_message, :message => "hey" }
 

spec/models/user/querying_spec.rb

@@ -39,8 +39,8 @@ describe User do
 
       context 'with two users' do
         let!(:user)          {make_user}
-        let!(:first_aspect)  {user.aspect(:name => 'bruisers')}
-        let!(:second_aspect) {user.aspect(:name => 'losers')}
+        let!(:first_aspect)  {user.aspects.create(:name => 'bruisers')}
+        let!(:second_aspect) {user.aspects.create(:name => 'losers')}
 
         it "queries by aspect" do
           friend_users(user, first_aspect, user2, user2.aspects.first)
@@ -59,8 +59,8 @@ describe User do
 
   context 'with two users' do
     let!(:user)          {make_user}
-    let!(:first_aspect)  {user.aspect(:name => 'bruisers')}
-    let!(:second_aspect) {user.aspect(:name => 'losers')}
+    let!(:first_aspect)  {user.aspects.create(:name => 'bruisers')}
+    let!(:second_aspect) {user.aspects.create(:name => 'losers')}
     let!(:user4) { Factory.create(:user_with_aspect)}
 
     before do
@@ -103,8 +103,8 @@ describe User do
 
 
   describe '#albums_by_aspect' do
-    let!(:first_aspect)  {user2.aspect(:name => 'bruisers')}
-    let!(:second_aspect) {user2.aspect(:name => 'losers')}
+    let!(:first_aspect)  {user2.aspects.create(:name => 'bruisers')}
+    let!(:second_aspect) {user2.aspects.create(:name => 'losers')}
     before do
       user2.post :album, :name => "Georges", :to => first_aspect.id
       user2.post :album, :name => "Borges", :to => first_aspect.id

spec/models/user/receive_spec.rb

@@ -7,13 +7,13 @@ require 'spec_helper'
 describe User do
 
   let(:user) { make_user }
-  let(:aspect) { user.aspect(:name => 'heroes') }
+  let(:aspect) { user.aspects.create(:name => 'heroes') }
 
   let(:user2) { make_user }
-  let(:aspect2) { user2.aspect(:name => 'losers') }
+  let(:aspect2) { user2.aspects.create(:name => 'losers') }
 
   let(:user3) { make_user }
-  let(:aspect3) { user3.aspect(:name => 'heroes') }
+  let(:aspect3) { user3.aspects.create(:name => 'heroes') }
 
   before do
     friend_users(user, aspect, user2, aspect2)

spec/models/user/user_friending_spec.rb

@@ -7,8 +7,8 @@ require 'spec_helper'
 
 describe Diaspora::UserModules::Friending do
   let(:user) { make_user }
-  let(:aspect) { user.aspect(:name => 'heroes') }
-  let(:aspect1) { user.aspect(:name => 'other') }
+  let(:aspect) { user.aspects.create(:name => 'heroes') }
+  let(:aspect1) { user.aspects.create(:name => 'other') }
   let(:friend) { Factory.create(:person) }
 
   let(:person_one) { Factory.create :person }
@@ -16,7 +16,7 @@ describe Diaspora::UserModules::Friending do
   let(:person_three) { Factory.create :person }
 
   let(:user2) { make_user }
-  let(:aspect2) { user2.aspect(:name => "aspect two") }
+  let(:aspect2) { user2.aspects.create(:name => "aspect two") }
 
   before do
     deliverable = Object.new

spec/models/user_spec.rb

@@ -6,9 +6,9 @@ require 'spec_helper'
 
 describe User do
   let(:user) { make_user }
-  let(:aspect) { user.aspect(:name => 'heroes') }
+  let(:aspect) { user.aspects.create(:name => 'heroes') }
   let(:user2) { make_user }
-  let(:aspect2) { user2.aspect(:name => 'stuff') }
+  let(:aspect2) { user2.aspects.create(:name => 'stuff') }
 
   it 'should have a key' do
     user.encryption_key.should_not be nil