nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mysql' of github.com:diaspora/diaspora into mysql

Browse source
This commit is contained in:
zhitomirskiyi 2010-12-27 22:23:58 -08:00
commit be9101b51f
3 changed files with 28 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/controllers/status_messages_controller.rb
View file

@ -9,9 +9,8 @@ class StatusMessagesController < ApplicationController
respond_to :json, :only => :show
def create
if params[:status_message][:aspect_ids] == "all"
params[:status_message][:aspect_ids] = current_user.aspects.collect{|x| x.id}
params[:status_message][:aspect_ids] = current_user.aspects.collect { |x| x.id }
end
photos = Photo.where(:id => [*params[:photos]], :diaspora_handle => current_user.person.diaspora_handle)
@ -19,29 +18,25 @@ class StatusMessagesController < ApplicationController
public_flag = params[:status_message][:public]
public_flag.to_s.match(/(true)/) ? public_flag = true : public_flag = false
params[:status_message][:public] = public_flag
@status_message = current_user.build_post(:status_message, params[:status_message])
if !photos.empty? || @status_message.save
pp photos
pp @status_message
raise 'MongoMapper failed to catch a failed save' unless @status_message.id
@status_message.photos += photos unless photos.nil?
if @status_message.save
current_user.add_to_streams(@status_message, params[:status_message][:aspect_ids])
current_user.dispatch_post(@status_message,
:to => params[:status_message][:aspect_ids],
:url => post_url(@status_message))
for photo in photos
photo.public = public_flag
photo.save
current_user.add_to_streams(photo, params[:status_message][:aspect_ids])
current_user.dispatch_post(photo, :to => params[:status_message][:aspect_ids])
if !photos.empty?
@status_message.photos += photos
for photo in photos
photo.public = public_flag
photo.save
current_user.add_to_streams(photo, params[:status_message][:aspect_ids])
current_user.dispatch_post(photo, :to => params[:status_message][:aspect_ids])
end
end
respond_to do |format|
format.js{ render :json => { :post_id => @status_message.id,
format.js { render :json => {:post_id => @status_message.id,
:html => render_to_string(
:partial => 'shared/stream_element',
:locals => {
@ -51,21 +46,21 @@ class StatusMessagesController < ApplicationController
:comments => [],
:aspects => current_user.aspects,
:current_user => current_user
}
}
)
},
:status => 201 }
format.html{ respond_with @status_message }
},
:status => 201 }
format.html { respond_with @status_message }
end
else
respond_to do |format|
format.js{ render :status => 406 }
format.js { render :status => 406 }
end
end
end
def destroy
@status_message = current_user.posts.where(:id => params[:id]).first
@status_message = current_user.posts.where(:id => params[:id]).first
if @status_message
@status_message.destroy
render :nothing => true, :status => 200
@ -81,9 +76,10 @@ class StatusMessagesController < ApplicationController
person_hash = Person.from_post_comment_hash comments_hash
@comment_hashes = comments_hash[@status_message.id].map do |comment|
{:comment => comment,
:person => person_hash[comment.person_id]
:person => person_hash[comment.person_id]
}
end
respond_with @status_message
end
end

25
spec/controllers/status_message_controller_spec.rb
View file

@ -21,31 +21,17 @@ describe StatusMessagesController do
end
describe '#show' do
before do
@video_id = "ABYnqp-bxvg"
@url="http://www.youtube.com/watch?v=#{@video_id}&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
end
it 'renders posts with youtube urls' do
message = user1.build_post :status_message, :message => @url, :to => aspect1.id
message[:youtube_titles]= {@video_id => "title"}
it 'succeeds' do
message = user1.build_post :status_message, :message => "ohai", :to => aspect1.id
message.save!
user1.add_to_streams(message, aspect1.id)
user1.dispatch_post message, :to => aspect1.id
get :show, :id => message.id
response.body.should match /Youtube: title/
end
it 'renders posts with comments with youtube urls' do
message = user1.post :status_message, :message => "Respond to this with a video!", :to => aspect1.id
@comment = user1.comment "none", :on => message
@comment.text = @url
@comment[:youtube_titles][@video_id] = "title"
@comment.save!
get :show, :id => message.id
response.body.should match /Youtube: title/
get :show, "id" => message.id.to_s
response.should be_success
end
end
describe '#create' do
let(:status_message_hash) {
{ :status_message => {
@ -90,6 +76,7 @@ describe StatusMessagesController do
post :create, hash
end
end
describe '#destroy' do
let!(:message) {user1.post(:status_message, :message => "hey", :to => aspect1.id)}
let!(:message2) {user2.post(:status_message, :message => "hey", :to => aspect2.id)}

2
spec/helpers/application_helper_spec.rb
View file

@ -93,6 +93,7 @@ describe ApplicationHelper do
video_id = "0x__dDWdf23"
url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
res = markdownify(url)
res.should =~ /Youtube:/
res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{video_id}"/
end
@ -101,6 +102,7 @@ describe ApplicationHelper do
video_id = "ABYnqp-bxvg"
url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
res = markdownify(url)
res.should =~ /Youtube:/
res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{video_id}"/
end