Merge branch 'master' into group-top

app/controllers/albums_controller.rb

@@ -6,10 +6,9 @@ class AlbumsController < ApplicationController
   end
   
   def create
-    @album = Album.new(params[:album])
+    @album = current_user.post(:album, params[:album])
-    @album.person = current_user
     
-    if @album.save
+    if @album.created_at
       flash[:notice] = "Successfully created album."
       redirect_to @album
     else
@@ -47,4 +46,5 @@ class AlbumsController < ApplicationController
       render :action => 'edit'
     end
   end
+
 end

app/controllers/blogs_controller.rb

@@ -21,9 +21,9 @@ class BlogsController < ApplicationController
   end
   
   def create
-    @blog = Blog.new(params[:blog])
+    @blog = current_user.post(:blog, params[:blog])
-    @blog.person = current_user
+
-    if @blog.save
+    if @blog.created_at
       flash[:notice] = "Successfully created blog."
       redirect_to @blog
     else

app/controllers/bookmarks_controller.rb

@@ -31,9 +31,9 @@ class BookmarksController < ApplicationController
   end
   
   def create
-    @bookmark = Bookmark.new(params[:bookmark])
+    @bookmark = current_user.post(:bookmark, params[:bookmark])
-    @bookmark.person = current_user
+
-    if @bookmark.save
+    if @bookmark.created_at
       flash[:notice] = "Successfully created bookmark."
       redirect_to @bookmark
     else

app/controllers/photos_controller.rb

@@ -3,11 +3,9 @@ class PhotosController < ApplicationController
   
   def create
     begin
-      #puts params.inspect 
+      @photo = current_user.post(:photo, params)
-      @photo = Photo.instantiate(params)
-      @photo.person = current_user
 
-      if @photo.save
+      if @photo.created_at
         flash[:notice] = "Successfully uploaded photo."
         redirect_to @photo.album
       else

app/controllers/status_messages_controller.rb

@@ -13,10 +13,9 @@ class StatusMessagesController < ApplicationController
   end
   
   def create
-    @status_message = StatusMessage.new(params[:status_message])
+    @status_message = current_user.post(:status_message, params[:status_message])
-    @status_message.person = current_user
     
-    if @status_message.save
+    if @status_message.created_at
       flash[:notice] = "Successfully created status message."
       redirect_to status_messages_url
     else

app/models/album.rb

@@ -20,6 +20,10 @@ class Album
   after_save :notify_people
   before_destroy :propagate_retraction
   
+  def instantiate params
+    self.create params
+  end
+
   def self.mine_or_friends(friend_param, current_user)
     if friend_param
       Album.where(:person_id.ne => current_user.id)

app/models/post.rb

@@ -26,6 +26,11 @@ class Post
   before_destroy :propagate_retraction
   after_destroy :destroy_comments, :remove_from_view
 
+  def self.instantiate params
+    self.create params
+  end
+
+#Querying
   def self.stream
     Post.sort(:created_at.desc).all
   end

app/models/user.rb

@@ -13,6 +13,13 @@ class User < Person
  
  
   
+  ######## Posting ########
+
+  def post(class_name, options = {})
+    options[:person] = self
+    model_class = class_name.to_s.camelize.constantize
+    post = model_class.instantiate(options)
+  end
 
   ######## Commenting  ########
   def comment(text, options = {})

public/stylesheets/application.css

@@ -173,9 +173,10 @@ form {
       color: black; }
   #user_name span {
     size: small;
-    font-style: italic;
     font-weight: normal;
     color: #999999; }
+  #user_name #latest_message_time {
+    font-style: italic; }
   #user_name ul {
     display: inline;
     margin: 0;

public/stylesheets/sass/application.sass

@@ -206,11 +206,11 @@ form
 
   span
     :size small 
-    :font-style italic
     :font
       :weight normal
     :color #999
-
+  #latest_message_time
+    :font-style italic
   ul
     :display inline
     :margin 0

spec/models/post_spec.rb

@@ -14,7 +14,6 @@ describe Post do
     it "should associate the owner if none is present" do
       @post.person.should == User.owner
     end
-
   end
 
   describe "newest" do

spec/models/status_message_spec.rb

@@ -12,6 +12,10 @@ describe StatusMessage do
     n.valid?.should be true
   end
   
+  it 'should be postable through the user' do
+    status = @user.post(:status_message, :message => "Users do things")
+  end
+
   describe "XML" do
     it 'should serialize to XML' do
       message = Factory.create(:status_message, :message => "I hate WALRUSES!")

spec/models/user_spec.rb

@@ -7,26 +7,29 @@ describe User do
     Person.count.should == n+1
   end
 
-  it "should be able to accept a pending friend request" do
+  describe 'friend requesting' do
+    before do
       @user = Factory.create(:user)
-    @friend = Factory.create(:person, :active => false)
+    end
-    r = Request.instantiate(:to => @user.url, :from => @friend)
+
+    it "should be able to accept a pending friend request" do
+      friend = Factory.create(:person, :active => false)
+      r = Request.instantiate(:to => @user.url, :from => friend)
       r.save
       Person.all.count.should == 2
       Request.for_user(@user).all.count.should == 1
       @user.accept_friend_request(r.id)
       Request.for_user(@user).all.count.should == 0
-    Person.where(:id => @friend.id).first.active.should == true
+      Person.where(:id => friend.id).first.active.should == true
     end
 
     it 'should be able to ignore a pending friend request' do
-    @user = Factory.create(:user)
+      friend = Factory.create(:person, :active => false)
-    @friend = Factory.create(:person, :active => false)
+      r = Request.instantiate(:to => @user.url, :from => friend)
-    r = Request.instantiate(:to => @user.url, :from => @friend)
       r.save
 
       Person.count.should == 2
-    @friend.active.should == false
+      friend.active.should == false
 
       @user.ignore_friend_request(r.id)
 
@@ -35,19 +38,16 @@ describe User do
     end
 
     it 'should not be able to friend request an existing friend' do
-    @user = Factory.create(:user)
+      friend = Factory.create(:person)
-    @friend = Factory.create(:person)
 
-    @user.send_friend_request_to( @friend.url ).should be nil
+      @user.send_friend_request_to( friend.url ).should be nil
     end
 
     it 'should be able to give me the terse url for webfinger' do
-    user = Factory.create(:user)
+      @user.terse_url.should == 'example.com'
-    user.terse_url.should == 'example.com'
     end
 
     it 'should be able to unsubscribe from a status.net user' do
-    @user = Factory.create(:user)
       author = Factory.create(:author)
       Author.all.count.should == 1
       q = Request.send :class_variable_get, :@@queue
@@ -60,22 +60,15 @@ describe User do
     
     it 'should be able to update their profile and send it to their friends' do 
       Factory.create(:person)
-    p = {:profile => {:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clowntown.com"}}
       
-    @user = Factory.create(:user)
+      updated_profile = {:profile => {:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clown.com"}}
-     p = {:profile => {:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clown.com"}}
       
-    n = Profile.send :class_variable_get, :@@queue
+      queue = Profile.send :class_variable_get, :@@queue
-    n.should_receive(:process)
+      queue.should_receive(:process)
-    
-    
-    @user.update_profile(p).should == true
       
+      @user.update_profile(updated_profile).should == true
       @user.profile.image_url.should == "http://clown.com"
-    
+    end
-   
-
   end
 
-
 end