diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index 0d1890a72..33bc0d975 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -17,7 +17,6 @@ class StatusMessagesController < ApplicationController public_flag = params[:status_message][:public] public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false params[:status_message][:public] = public_flag - puts public_flag @status_message = current_user.build_post(:status_message, params[:status_message]) aspects = current_user.aspects_from_ids(params[:aspect_ids]) diff --git a/app/models/status_message.rb b/app/models/status_message.rb index d72125b5e..35503c463 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -98,13 +98,6 @@ class StatusMessage < Post XML end - def public_message(length, url = "") - space_for_url = url.blank? ? 0 : (url.length + 1) - truncated = truncate(self.message, :length => (length - space_for_url)) - truncated = "#{truncated} #{url}" unless url.blank? - return truncated - end - protected def message_or_photos_present? diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb index 193e0f48d..afd7eddb7 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_spec.rb @@ -225,25 +225,4 @@ STR Post.find(post.id).youtube_titles.should == {video_id => CGI::escape(expected_title)} end end - - describe '#public_message' do - before do - message = "" - 440.times{message << 'd'} - @status_message = @user.post(:status_message, :message => message, :to => @aspect.id) - end - - it 'truncates the message' do - @status_message.public_message(140).length.should == 140 - @status_message.public_message(420).length.should == 420 - end - - it 'has the correct length if a url is present' do - @status_message.public_message(140, "a_url_goes_here").length.should == 140 - end - - it 'adds the public link if present' do - @status_message.public_message(140, "/p/#{@status_message.id}").should include "/p/#{@status_message.id}" - end - end end