diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
index 2fb5ac47f..fe33376f3 100644
--- a/app/controllers/albums_controller.rb
+++ b/app/controllers/albums_controller.rb
@@ -12,7 +12,8 @@ class AlbumsController < ApplicationController
flash[:notice] = "Successfully created album."
redirect_to @album
else
- render :action => 'new'
+ flash[:error] = "Successfully failed."
+ redirect_to albums_path
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c525ad1cd..c3b74a861 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -16,9 +16,12 @@ class ApplicationController < ActionController::Base
end
def set_friends_and_status
- @friends = Person.friends.all if current_user
- @latest_status_message = StatusMessage.newest(current_user) if current_user
-
+ if current_user
+ @groups = current_user.groups
+ @friends = current_user.friends
+ @latest_status_message = StatusMessage.newest_for(current_user.person)
+ @group = params[:group] ? current_user.group_by_id(params[:group]) : current_user.groups.first
+ end
end
def count_requests
diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index a74b12e43..4075e04ed 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -24,7 +24,6 @@ class BlogsController < ApplicationController
if @blog.created_at
flash[:notice] = "Successfully created blog."
- redirect_to @blog
else
render :action => 'new'
end
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 79bf76d12..5d9959732 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -4,11 +4,6 @@ class BookmarksController < ApplicationController
def index
@bookmark = Bookmark.new
@bookmarks = Bookmark.paginate :page => params[:page], :order => 'created_at DESC'
-
-
- respond_to do |format|
- format.html
- end
end
def edit
@@ -34,7 +29,6 @@ class BookmarksController < ApplicationController
if @bookmark.created_at
flash[:notice] = "Successfully created bookmark."
- redirect_to @bookmark
else
render :action => 'new'
end
diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
deleted file mode 100644
index 438163fff..000000000
--- a/app/controllers/dashboards_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class DashboardsController < ApplicationController
- before_filter :authenticate_user!
- include ApplicationHelper
-
- def index
- @posts = Post.paginate :page => params[:page], :order => 'created_at DESC'
- end
-
- end
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index f5f96683f..a9711164e 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -1,33 +1,37 @@
class DevUtilitiesController < ApplicationController
- before_filter :authenticate_user!
+ before_filter :authenticate_user!, :except => [:set_backer_number]
include ApplicationHelper
+ include RequestsHelper
def warzombie
render :nothing => true
- if User.owner.email == "tom@tom.joindiaspora.com" && StatusMessage.where(:message => "There's a bomb in the lasagna!?").first == nil
- StatusMessage.create(:message => "There's a bomb in the lasagna!?", :person => User.owner)
- Bookmark.create(:title => "xkcd", :link => "http://xkcd.com/743/", :person => User.owner )
- StatusMessage.create(:message => "I switched to Motoroi today, a Motorola Android-based phone, in Korea. Now, I am using Android phones in both the U.S. and Korea", :person => User.owner, :created_at => Time.now-930)
- StatusMessage.create(:message => "I had 5 hours to study for it :-( GREs on Thursday. Wunderbar.", :person => User.owner, :created_at => Time.now-43990)
- StatusMessage.create(:message => "Spotted in toy story 3: google maps, OSX, and windows XP. Two out of three isn't bad.", :person => User.owner, :created_at => Time.now-4390)
- Bookmark.create( :title => "Reddit", :link => "http://reddit.com", :person => User.owner, :created_at => Time.now-54390)
- Blog.create(:title => "I Love Rock'N'Roll - Joan Jett & The Blackhearts", :body => "
The loudspeakers played this song as we walked into the city pool for the first time this summer. Those loudspeakers make every song sound fresh even if I have heard it a thousand times and their effect on this song was no different. Joan sounded young and strong and ready, and for a moment I forgot where or when I was.
also i can tell it won’t be long and also happy summer imaginary constructs -mumblelard
", :person => User.owner, :created_at => Time.now-3090)
- StatusMessage.create(:message => "Commercials for IE make me SO MAD and my friends just don't get why.", :person => User.owner, :created_at => Time.now-30900)
- Bookmark.create(:title => "Zombo.com", :link => "http://zombo.com", :person => User.owner, :created_at => Time.now-9090)
- StatusMessage.create(:message => "Why do I have \"No More Heroes\" by Westlife on repeat all day?", :person => User.owner, :created_at => Time.now-590000)
- StatusMessage.create(:message => "Mmm. Friday night. Acknowledged.", :person => User.owner, :created_at => Time.now-503900)
- StatusMessage.create(:message => "Getting a universal remote is the epitome of laziness, I do declare.", :person => User.owner, :created_at => Time.now-4400)
- StatusMessage.create(:message => "Does anyone know how to merge two Skype contact entries of the same person? (i.e. one Skype ID and one mobile number)", :person => User.owner, :created_at => Time.now-400239)
- StatusMessage.create(:message => "A cool, cool morning for once.", :person => User.owner, :created_at => Time.now-150000)
+ if current_user.email == "tom@tom.joindiaspora.com" && StatusMessage.where(:message => "There's a bomb in the lasagna!?").first == nil
+ current_user.post(:status_message, :message => "There's a bomb in the lasagna!?")
+ current_user.post(:bookmark, :title => "xkcd", :link => "http://xkcd.com/743/" )
+ current_user.post(:status_message, :message => "I switched to Motoroi today, a Motorola Android-based phone, in Korea. Now, I am using Android phones in both the U.S. and Korea", :created_at => Time.now-930)
+ current_user.post(:status_message, :message => "I had 5 hours to study for it :-( GREs on Thursday. Wunderbar.", :created_at => Time.now-43990)
+ current_user.post(:status_message, :message => "Spotted in toy story 3: google maps, OSX, and windows XP. Two out of three isn't bad.", :created_at => Time.now-4390)
+ current_user.post(:bookmark, :title => "Reddit", :link => "http://reddit.com", :created_at => Time.now-54390)
+ current_user.post(:blog, :title => "I Love Rock'N'Roll - Joan Jett & The Blackhearts", :body => "
The loudspeakers played this song as we walked into the city pool for the first time this summer. Those loudspeakers make every song sound fresh even if I have heard it a thousand times and their effect on this song was no different. Joan sounded young and strong and ready, and for a moment I forgot where or when I was.
also i can tell it won’t be long and also happy summer imaginary constructs -mumblelard
", :created_at => Time.now-3090)
+ current_user.post(:status_message, :message => "Commercials for IE make me SO MAD and my friends just don't get why.", :created_at => Time.now-30900)
+ current_user.post(:bookmark, :title => "Zombo.com", :link => "http://zombo.com", :created_at => Time.now-9090)
+ current_user.post(:status_message, :message => "Why do I have \"No More Heroes\" by Westlife on repeat all day?", :created_at => Time.now-590000)
+ current_user.post(:status_message, :message => "Mmm. Friday night. Acknowledged.", :created_at => Time.now-503900)
+ current_user.post(:status_message, :message => "Getting a universal remote is the epitome of laziness, I do declare.", :created_at => Time.now-4400)
+ current_user.post(:status_message, :message => "Does anyone know how to merge two Skype contact entries of the same person? (i.e. one Skype ID and one mobile number)", :created_at => Time.now-400239)
+ current_user.post(:status_message, :message => "A cool, cool morning for once.", :created_at => Time.now-150000)
end
end
def zombiefriends
render :nothing => true
- backer_info
- if User.owner.email == "tom@tom.joindiaspora.com" && Person.friends.first.nil?
- backer_info.each do |backer|
+ bkr_info = backer_info
+
+ if current_user.email == "tom@tom.joindiaspora.com"
+ bkr_info.each do |backer|
+ backer_email = "#{backer['username']}@#{backer['username']}.joindiaspora.com"
+ rel_hash = relationship_flow(backer_email)
logger.info "Zombefriending #{backer['given_name']} #{backer['family_name']}"
- User.owner.send_friend_request_to("http://#{backer['username']}.joindiaspora.com/")
+ current_user.send_request(rel_hash, current_user.groups.first.id)
end
end
end
@@ -35,7 +39,7 @@ def warzombie
def zombiefriendaccept
render :nothing => true
Request.all.each{|r|
- User.owner.accept_friend_request(r.id)
+ current_user.accept_and_respond(r.id, current_user.groups.first.id)
}
end
@@ -44,4 +48,11 @@ def warzombie
config['servers']['backer']
end
+ def set_backer_number
+ render :nothing => true
+ seed_num_hash = {:seed_number => params[:number]}
+ file = File.new(Rails.root.join('config','backer_number.yml'),'w')
+ file.write(seed_num_hash.to_yaml)
+ file.close
+ end
end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
new file mode 100644
index 000000000..f3da1ec8a
--- /dev/null
+++ b/app/controllers/groups_controller.rb
@@ -0,0 +1,50 @@
+class GroupsController < ApplicationController
+ before_filter :authenticate_user!
+
+ def index
+ @posts = Post.paginate :page => params[:page], :order => 'created_at DESC'
+ end
+
+ def create
+ @group = current_user.group(params[:group])
+
+ if @group.created_at
+ flash[:notice] = "Successfully created group."
+ redirect_to @group
+ else
+ render :action => 'new'
+ end
+ end
+
+ def new
+ @group = Group.new
+ end
+
+ def destroy
+ @group = Group.first(:id => params[:id])
+ @group.destroy
+ flash[:notice] = "Successfully destroyed group."
+ redirect_to groups_url
+ end
+
+ def show
+ @people_ids = @group.people.map {|p| p.id}
+ @posts = Post.paginate :person_id => @people_ids, :order => 'created_at DESC'
+ @group = Group.first(:id => params[:id])
+ end
+
+ def edit
+ @group = Group.first(:id => params[:id])
+ end
+
+ def update
+ @group = Group.first(:id => params[:id])
+ if @group.update_attributes(params[:group])
+ flash[:notice] = "Successfully updated group."
+ redirect_to @group
+ else
+ render :action => 'edit'
+ end
+ end
+
+end
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index ec9826967..e161f6acd 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -3,7 +3,7 @@ class PeopleController < ApplicationController
def index
unless params[:q]
- @people = Person.friends.paginate :page => params[:page], :order => 'created_at DESC'
+ @people = current_user.friends.paginate :page => params[:page], :order => 'created_at DESC'
render :index
else
@people = Person.search_for_friends(params[:q])
@@ -12,15 +12,16 @@ class PeopleController < ApplicationController
end
def show
- @person= Person.where(:id => params[:id]).first
+ @person= current_user.friend_by_id(params[:id])
+
@person_profile = @person.profile
@person_posts = Post.where(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC'
- @latest_status_message = StatusMessage.newest(@person)
+ @latest_status_message = StatusMessage.newest_for(@person)
@post_count = @person_posts.count
end
def destroy
- current_user.unfriend(params[:id])
+ current_user.unfriend(current_user.friend_by_id(params[:id]))
flash[:notice] = "unfriended person."
redirect_to people_url
end
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 128115d6a..2996a23ec 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -7,7 +7,6 @@ class PhotosController < ApplicationController
if @photo.created_at
flash[:notice] = "Successfully uploaded photo."
- redirect_to @photo.album
else
render :action => 'album#new'
end
@@ -25,14 +24,14 @@ class PhotosController < ApplicationController
end
def destroy
- @photo = Photo.where(:id => params[:id]).first
+ @photo = Photo.first(:id => params[:id])
@photo.destroy
flash[:notice] = "Successfully deleted photo."
redirect_to @photo.album
end
def show
- @photo = Photo.where(:id => params[:id]).first
+ @photo = Photo.first(:id => params[:id])
@album = @photo.album
end
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 128999d09..91edf995d 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -3,23 +3,28 @@ class PublicsController < ApplicationController
include Diaspora::Parser
def hcard
- @user = User.owner
- render 'hcard'
+ @person = Person.first(:_id => params[:id])
+
+ unless @person.nil? || @person.owner.nil?
+ render 'hcard'
+ end
end
def host_meta
- @user = User.owner
render 'host_meta', :layout => false, :content_type => 'application/xrd+xml'
end
def webfinger
- @user = Person.first(:email => params[:q].gsub('acct:', ''))
- render 'webfinger', :layout => false, :content_type => 'application/xrd+xml'
+ @person = Person.by_webfinger(params[:q])
+ unless @person.nil? || @person.owner.nil?
+ render 'webfinger', :layout => false, :content_type => 'application/xrd+xml'
+ end
end
def receive
- puts "SOMEONE JUST SENT ME: #{params[:xml]}"
- store_objects_from_xml params[:xml]
+ @user = Person.first(:id => params[:id]).owner
+ Rails.logger.debug "PublicsController has received: #{params[:xml]}"
+ @user.receive params[:xml] if params[:xml]
render :nothing => true
end
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 39f9c8376..f5c73660f 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -8,10 +8,16 @@ class RequestsController < ApplicationController
def destroy
if params[:accept]
- @friend = current_user.accept_friend_request params[:id]
-
- flash[:notice] = "you are now friends"
- redirect_to root_url
+
+ if params[:group_id]
+ @friend = current_user.accept_and_respond( params[:id], params[:group_id])
+
+ flash[:notice] = "you are now friends"
+ redirect_to root_url
+ else
+ flash[:error] = "please select a group!"
+ redirect_to requests_url
+ end
else
current_user.ignore_friend_request params[:id]
flash[:notice] = "ignored friend request"
@@ -26,8 +32,8 @@ class RequestsController < ApplicationController
def create
rel_hash = relationship_flow(params[:request][:destination_url])
- Rails.logger.info("Sending request: #{rel_hash}")
- @request = current_user.send_request(rel_hash)
+ Rails.logger.debug("Sending request: #{rel_hash}")
+ @request = current_user.send_request(rel_hash, params[:request][:group])
if @request
flash[:notice] = "a friend request was sent to #{@request.destination_url}"
@@ -43,9 +49,4 @@ class RequestsController < ApplicationController
end
end
-
-
- private
-
-
end
diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index e25472d52..802aa9cb5 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -2,22 +2,14 @@ class SocketsController < ApplicationController
include ApplicationHelper
include SocketsHelper
include Rails.application.routes.url_helpers
- before_filter :authenticate_user!
def incoming(msg)
- puts "#{msg} connected!"
+ puts "Got a connection to: #{msg}"
end
- def new_subscriber
- WebSocket.subscribe
- end
-
- def outgoing(object)
+ def outgoing(uid,object)
@_request = ActionDispatch::Request.new({})
- WebSocket.push_to_clients(action_hash(object))
+ Diaspora::WebSocket.push_to_user(uid, action_hash(uid, object))
end
- def delete_subscriber(sid)
- WebSocket.unsubscribe(sid)
- end
end
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index f499492e8..f941389a5 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -1,5 +1,5 @@
class StatusMessagesController < ApplicationController
- #before_filter :authenticate_user!
+ before_filter :authenticate_user!
def index
@status_messages = StatusMessage.paginate :page => params[:page], :order => 'created_at DESC'
@@ -16,7 +16,6 @@ class StatusMessagesController < ApplicationController
if @status_message.created_at
flash[:notice] = "Successfully created status message."
- redirect_to status_messages_url
else
render :action => 'new'
end
@@ -38,7 +37,7 @@ class StatusMessagesController < ApplicationController
respond_to do |format|
format.html
- format.xml { render :xml => Post.build_xml_for(@status_message) }
+ format.xml { render :xml => @status_message.build_xml_for }
format.json { render :json => @status_message }
end
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9b4411c7a..12f87c481 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,12 +1,12 @@
class UsersController < ApplicationController
+ before_filter :authenticate_user!, :except => [:new, :create]
- before_filter :authenticate_user!
def index
@users = User.sort(:created_at.desc).all
end
def show
- @user= Person.first(:id => params[:id])
- @user_profile = @user.profile
+ @user= User.first(:id => params[:id])
+ @user_profile = @user.person.profile
end
def edit
@@ -25,4 +25,20 @@ class UsersController < ApplicationController
render :action => 'edit'
end
end
+
+ def create
+ @user = User.instantiate(params[:user])
+
+ if @user.created_at && @user.person.created_at
+ flash[:notice] = "Successfully signed up."
+ redirect_to root_path
+ else
+ render :action => 'new'
+ end
+ end
+
+ def new
+ @user = User.new
+ end
+
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2e2895fbb..7f6a7bae2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -8,7 +8,7 @@ module ApplicationHelper
end
def mine?(post)
- post.person == User.owner
+ current_user.owns? post
end
def type_partial(post)
@@ -31,12 +31,12 @@ module ApplicationHelper
end
end
- def link_to_person(person)
- link_to person.real_name, person_path(person)
+ def owner_image_tag
+ person_image_tag(current_user)
end
- def owner_image_tag
- person_image_tag(User.owner)
+ def owner_image_link
+ person_image_link(current_user)
end
def person_image_tag(person)
@@ -50,10 +50,6 @@ module ApplicationHelper
link_to person_image_tag(person), object_path(person)
end
- def owner_image_link
- person_image_link(User.owner)
- end
-
def new_request(request_count)
"new_requests" if request_count > 0
end
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index a94d176ad..b1e4df9cd 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -1,9 +1,3 @@
module CommentsHelper
- def target
-
- end
-
- def text
- params[:comment][:text]
- end
+
end
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index b858aaf7e..b9231fe94 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -5,7 +5,7 @@ module PhotosHelper
end
def link_to_prev(photo, album)
- link_to "<< previous", photo_path(album.prev_photo(photo)), :rel => "prefetch"
+ link_to "<< prev", photo_path(album.prev_photo(photo)), :rel => "prefetch"
end
def link_to_next(photo, album)
diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
index e694adef9..1e8ecac8f 100644
--- a/app/helpers/publics_helper.rb
+++ b/app/helpers/publics_helper.rb
@@ -14,4 +14,11 @@ module PublicsHelper
400
end
end
-end
\ No newline at end of file
+
+ def terse_url(full_url)
+ terse = full_url.gsub(/https?:\/\//, '')
+ terse.gsub!(/www\./, '')
+ terse = terse.chop! if terse[-1, 1] == '/'
+ terse
+ end
+end
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index 4404ec223..16a50a886 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -26,10 +26,16 @@ module RequestsHelper
end
def relationship_flow(identifier)
- f = Redfinger.finger(identifier)
- action = subscription_mode(f)
- url = subscription_url(action, f)
-
+ puts request.host
+ if identifier.include?(request.host)
+ person = Person.by_webfinger identifier
+ action = (person == current_user.person ? :none : :friend)
+ url = person.owner.receive_url
+ else
+ f = Redfinger.finger(identifier)
+ action = subscription_mode(f)
+ url = subscription_url(action, f)
+ end
{ action => url }
end
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index f13576306..b35780399 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -5,17 +5,16 @@ module SocketsHelper
(object.is_a? Post) ? object.id : object.post_id
end
- def url_options
- {:host => ""}
- end
+ #def url_options
+ # {:host => ""}
+ #end
- def action_hash(object)
+ def action_hash(uid, object)
begin
- v = render_to_string(:partial => type_partial(object), :locals => {:post => object}) unless object.is_a? Retraction
+ user = User.first(:id => uid)
+ v = render_to_string(:partial => type_partial(object), :locals => {:post => object, :current_user => user}) unless object.is_a? Retraction
rescue Exception => e
- puts "web socket view rendering failed for some reason." + v.inspect
- puts object.inspect
- puts e.message
+ Rails.logger.error("web socket view rendering failed for object #{object.inspect}.")
raise e
end
action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}
@@ -24,6 +23,7 @@ module SocketsHelper
action_hash[:photo_hash] = object.thumb_hash
elsif object.is_a? StatusMessage
action_hash[:status_message_hash] = object.latest_hash
+ action_hash[:status_message_hash][:mine?] = true if object.person.owner_id == uid
end
action_hash.to_json
diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb
index 57d0f2f17..840e789a0 100644
--- a/app/helpers/status_messages_helper.rb
+++ b/app/helpers/status_messages_helper.rb
@@ -1,5 +1,4 @@
module StatusMessagesHelper
-
def my_latest_message
unless @latest_status_message.nil?
return @latest_status_message.message
@@ -7,7 +6,4 @@ module StatusMessagesHelper
return "No message to display."
end
end
-
-
-
end
diff --git a/app/models/album.rb b/app/models/album.rb
index 3fb8917c4..03dc5ed1a 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -26,9 +26,9 @@ class Album
def self.mine_or_friends(friend_param, current_user)
if friend_param
- Album.where(:person_id.ne => current_user.id)
+ Album.where(:person_id => current_user.friend_ids)
else
- Album.where(:person_id => current_user.id)
+ current_user.person.albums
end
end
diff --git a/app/models/blog.rb b/app/models/blog.rb
index 0df0dd558..3859cfa1e 100644
--- a/app/models/blog.rb
+++ b/app/models/blog.rb
@@ -15,8 +15,8 @@ class Blog < Post
http://activitystrea.ms/schema/1.0/post#{self.title}#{self.body}
-
- #{User.owner.url}blogs/#{self.id}
+
+ #{person.url}blogs/#{self.id}#{self.created_at.xmlschema}#{self.updated_at.xmlschema}
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 8f793fd47..677bfa126 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -12,27 +12,31 @@ class Bookmark < Post
validates_format_of :link, :with =>
/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
- before_validation :clean_link
-
def to_activity
<<-XML
http://activitystrea.ms/schema/1.0/post#{self.title}
-
+
- #{User.owner.url}bookmarks/#{self.id}
+ #{person.url}bookmarks/#{self.id}#{self.created_at.xmlschema}#{self.updated_at.xmlschema}
XML
end
+
+ def self.instantiate params
+ params[:link] = clean_link(params[:link])
+ create params
+ end
protected
- def clean_link
- if self.link
- self.link = 'http://' + self.link unless self.link.match('https?://')
- self.link = self.link + '/' if self.link[-1,1] != '/'
+ def self.clean_link link
+ if link
+ link = 'http://' + link unless link.match('https?://')
+ link = link + '/' if link[-1,1] != '/'
+ link
end
end
end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 1808952a8..3b574f28f 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -3,11 +3,12 @@ class Comment
include ROXML
include Diaspora::Webhooks
include Encryptable
+ include Diaspora::Socketable
xml_accessor :text
xml_accessor :person, :as => Person
xml_accessor :post_id
-
+ xml_accessor :_id
key :text, String
timestamps!
@@ -17,19 +18,22 @@ class Comment
key :person_id, ObjectId
belongs_to :person, :class_name => "Person"
-
- after_save :send_people_comments_on_my_posts
- after_save :send_to_view
-
- def ==(other)
- (self.message == other.message) && (self.person.email == other.person.email)
- end
+ validates_presence_of :text
+ def push_upstream
+ Rails.logger.info("GOIN UPSTREAM")
+ push_to([post.person])
+ end
+
+ def push_downstream
+ Rails.logger.info("SWIMMIN DOWNSTREAM")
+ push_to(post.people_with_permissions)
+ end
+
#ENCRYPTION
before_validation :sign_if_mine, :sign_if_my_post
- #validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
validates_true_for :post_creator_signature, :logic => lambda {self.verify_post_creator_signature}
xml_accessor :creator_signature
@@ -53,8 +57,7 @@ class Comment
end
def verify_post_creator_signature
- unless person == User.owner
- puts "verifying post creator sig from #{post.person.real_name}"
+ if person.owner.nil?
verify_signature(post_creator_signature, post.person)
else
true
@@ -64,19 +67,9 @@ class Comment
protected
def sign_if_my_post
- if self.post.person == User.owner
- self.post_creator_signature = sign
+ unless self.post.person.owner.nil?
+ self.post_creator_signature = sign_with_key self.post.person.encryption_key
end
end
-
- def send_people_comments_on_my_posts
- if User.owner.mine?(self.post) && !(self.person.is_a? User)
- self.push_to(self.post.people_with_permissions)
- end
- end
-
-
- def send_to_view
- SocketsController.new.outgoing(self)
- end
+
end
diff --git a/app/models/group.rb b/app/models/group.rb
new file mode 100644
index 000000000..6b8f18921
--- /dev/null
+++ b/app/models/group.rb
@@ -0,0 +1,19 @@
+class Group
+ include MongoMapper::Document
+
+ key :name, String
+
+ key :person_ids, Array
+ key :request_ids, Array
+ key :post_ids, Array
+
+ many :people, :in => :person_ids, :class_name => 'Person'
+ many :requests, :in => :request_ids, :class_name => 'Request'
+ many :posts, :in => :post_ids, :class_name => 'Post'
+
+ belongs_to :user, :class_name => 'User'
+
+ timestamps!
+
+end
+
diff --git a/app/models/person.rb b/app/models/person.rb
index ee7ad104f..d7fa74418 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -5,32 +5,35 @@ class Person
xml_accessor :_id
xml_accessor :email
xml_accessor :url
- xml_accessor :serialized_key
xml_accessor :profile, :as => Profile
- key :email, String
+ key :email, String, :unique => true
key :url, String
- key :active, Boolean, :default => false
key :serialized_key, String
+
+ key :owner_id, ObjectId
+ key :user_refs, Integer, :default => 0
+
+ belongs_to :owner, :class_name => 'User'
one :profile, :class_name => 'Profile'
+
many :posts, :class_name => 'Post', :foreign_key => :person_id
many :albums, :class_name => 'Album', :foreign_key => :person_id
+
timestamps!
before_validation :clean_url
- validates_presence_of :email, :url, :serialized_key
+ validates_presence_of :email, :url, :profile, :serialized_key
validates_format_of :url, :with =>
/^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
- validates_true_for :url, :logic => lambda { self.url_unique?}
after_destroy :remove_all_traces
- scope :friends, where(:_type => "Person", :active => true)
def self.search_for_friends(query)
Person.all('$where' => "function() { return this.profile.first_name.match(/^#{query}/i) || this.profile.last_name.match(/^#{query}/i); }")
@@ -40,25 +43,84 @@ class Person
"#{profile.first_name.to_s} #{profile.last_name.to_s}"
end
- def key
+ def encryption_key
OpenSSL::PKey::RSA.new( serialized_key )
end
- def key= new_key
+ def encryption_key= new_key
raise TypeError unless new_key.class == OpenSSL::PKey::RSA
serialized_key = new_key.export
end
def export_key
- key.public_key.export
+ encryption_key.public_key.export
+ end
+
+
+ ######## Posting ########
+ def post(class_name, options = {})
+ options[:person] = self
+ model_class = class_name.to_s.camelize.constantize
+ post = model_class.instantiate(options)
+ post.notify_people
+ post.socket_to_uid owner.id if (owner_id && post.respond_to?( :socket_to_uid))
+ post
+ end
+
+ ######## Commenting ########
+ def comment(text, options = {})
+ raise "must comment on something!" unless options[:on]
+ c = Comment.new(:person_id => self.id, :text => text, :post => options[:on])
+ if c.save
+ begin
+ dispatch_comment c
+ rescue Exception => e
+ puts e.inspect
+ raise e
+ end
+
+
+ c.socket_to_uid owner.id if owner_id
+ true
+ else
+ Rails.logger.warn "this failed to save: #{c.inspect}"
+ end
+ false
+ end
+
+ def dispatch_comment( c )
+ if owns? c.post
+ c.push_downstream
+ elsif owns? c
+ c.push_upstream
+ end
+ end
+ ##profile
+ def update_profile(params)
+ if self.update_attributes(params)
+ self.profile.notify_people!
+ true
+ else
+ false
+ end
+ end
+
+ def owns?(post)
+ self.id == post.person.id
+ end
+
+ def receive_url
+ "#{self.url}receive/users/#{self.id}/"
+ end
+
+ def self.by_webfinger( identifier )
+ Person.first(:email => identifier.gsub('acct:', ''))
+ end
+
+ def remote?
+ owner.nil?
end
protected
-
- def url_unique?
- same_url = Person.first(:url => self.url)
- return same_url.nil? || same_url.id == self.id
- end
-
def clean_url
self.url ||= "http://localhost:3000/" if self.class == User
if self.url
diff --git a/app/models/photo.rb b/app/models/photo.rb
index e57e2f78d..d93a1189a 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -37,22 +37,20 @@ class Photo < Post
end
def remote_photo
- @remote_photo ||= User.owner.url.chop + image.url
+ @remote_photo ||= self.person.url.chop + image.url
end
def remote_photo= remote_path
- Rails.logger.info("Setting remote photo with id #{id}")
@remote_photo = remote_path
image.download! remote_path
image.store!
- Rails.logger.info("Setting remote photo with id #{id}")
end
def ensure_user_picture
- user = User.owner
- if user.profile.image_url == image.url(:thumb_medium)
+ users = Person.all('profile.image_url' => image.url(:thumb_medium) )
+ users.each{ |user|
user.profile.update_attributes!(:image_url => nil)
- end
+ }
end
def thumb_hash
diff --git a/app/models/post.rb b/app/models/post.rb
index 1b4149fdc..e35b028cd 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -5,6 +5,7 @@ class Post
include ROXML
include Diaspora::Webhooks
include Encryptable
+ include Diaspora::Socketable
xml_accessor :_id
xml_accessor :person, :as => Person
@@ -20,11 +21,8 @@ class Post
timestamps!
- after_save :send_to_view
- after_save :notify_people
-
before_destroy :propagate_retraction
- after_destroy :destroy_comments, :remove_from_view
+ after_destroy :destroy_comments
def self.instantiate params
self.create params
@@ -35,19 +33,10 @@ class Post
Post.sort(:created_at.desc).all
end
- def self.newest(person = nil)
- return self.last if person.nil?
-
+ def self.newest_for(person)
self.first(:person_id => person.id, :order => '_id desc')
end
- def self.my_newest
- self.newest(User.owner)
- end
- def self.newest_by_email(email)
- self.newest(Person.first(:email => email))
- end
-
#ENCRYPTION
before_validation :sign_if_mine
validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
@@ -69,10 +58,10 @@ class Post
end
def log_inspection
- Rails.logger.info self.inspect
+ Rails.logger.debug self.inspect
end
def log_save_inspection
- Rails.logger.info "After saving, object is:"
+ Rails.logger.debug "After saving, object is:"
log_inspection
end
@@ -85,13 +74,7 @@ protected
Retraction.for(self).notify_people
end
- def send_to_view
- SocketsController.new.outgoing(self)
- end
-
- def remove_from_view
- SocketsController.new.outgoing(Retraction.for(self))
- end
+
end
diff --git a/app/models/profile.rb b/app/models/profile.rb
index bb5176eac..9b4c81005 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -20,8 +20,7 @@ class Profile
self._parent_document.id
end
- def to_diaspora_xml
- ""+ self.to_xml.to_s + ""
+ def person
+ Person.first(:id => self.person_id)
end
-
end
diff --git a/app/models/request.rb b/app/models/request.rb
index f39d1267f..99625ad13 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -15,6 +15,7 @@ class Request
key :callback_url, String
key :person_id, ObjectId
key :exported_key, String
+ key :group_id, ObjectId
belongs_to :person
@@ -25,23 +26,35 @@ class Request
before_validation :clean_link
- scope :for_user, lambda{ |user| where(:destination_url => user.url) }
- scope :from_user, lambda{ |user| where(:destination_url.ne => user.url) }
+ scope :for_user, lambda{ |user| where(:destination_url => user.receive_url) }
+ scope :from_user, lambda{ |user| where(:destination_url.ne => user.receive_url) }
- def self.instantiate(options ={})
+ def self.instantiate(options = {})
person = options[:from]
- self.new(:destination_url => options[:to], :callback_url => person.url, :person => person, :exported_key => person.export_key)
+ self.new(:destination_url => options[:to],
+ :callback_url => person.receive_url,
+ :person => person,
+ :exported_key => person.export_key,
+ :group_id => options[:into])
end
-
- def activate_friend
- p = Person.where(:url => self.person.url).first
- p.active = true
- p.save
+
+ def reverse accepting_user
+ self.person = accepting_user.person
+ self.exported_key = accepting_user.export_key
+ self.destination_url = self.callback_url
+ save
+ end
+
+ def set_pending_friend
+ p = Person.first(:id => self.person.id)
+
+ self.person.save #save pending friend
+
end
#ENCRYPTION
- before_validation :sign_if_mine
- validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
+ #before_validation :sign_if_mine
+ #validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
xml_accessor :creator_signature
key :creator_signature, String
diff --git a/app/models/retraction.rb b/app/models/retraction.rb
index 9a07de141..c9cf8dd77 100644
--- a/app/models/retraction.rb
+++ b/app/models/retraction.rb
@@ -5,9 +5,15 @@ class Retraction
def self.for(object)
retraction = self.new
- retraction.post_id= object.id
+ if object.is_a? User
+ retraction.post_id = object.person.id
+ retraction.type = object.person.class.to_s
+ else
+ retraction.post_id = object.id
+ retraction.type = object.class.to_s
+ end
retraction.person_id = person_id_from(object)
- retraction.type = object.class.to_s
+ retraction.send(:sign_if_mine)
retraction
end
@@ -19,10 +25,14 @@ class Retraction
attr_accessor :person_id
attr_accessor :type
- def perform
+ def perform receiving_user_id
+ Rails.logger.debug "Performing retraction for #{post_id}"
begin
- return unless signature_valid?
- self.type.constantize.destroy(self.post_id)
+ return unless signature_valid?
+ Rails.logger.debug("Retracting #{self.type} id: #{self.post_id}")
+ target = self.type.constantize.first(self.post_id)
+ target.unsocket_from_uid receiving_user_id if target.respond_to? :unsocket_from_uid
+ target.destroy
rescue NameError
Rails.logger.info("Retraction for unknown type recieved.")
end
@@ -44,12 +54,22 @@ class Retraction
object.person.id
end
end
+
+ def person
+ Person.first(:id => self.person_id)
+ end
#ENCRYPTION
xml_reader :creator_signature
def creator_signature
- @creator_signature ||= sign if person_id == User.owner.id
+ object = self.type.constantize.first(:id => post_id)
+
+ if object.class == Person && person_id == object.id
+ @creator_signature || sign_with_key(object.key)
+ elsif person_id == object.person.id
+ @creator_signature || sign_if_mine
+ end
end
def creator_signature= input
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index fe641bdb2..3fb9aa39d 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -13,8 +13,8 @@ class StatusMessage < Post
http://activitystrea.ms/schema/1.0/post#{self.message}
-
- #{User.owner.url}status_messages/#{self.id}
+
+ #{person.url}status_messages/#{self.id}#{self.created_at.xmlschema}#{self.updated_at.xmlschema}
@@ -22,7 +22,7 @@ class StatusMessage < Post
end
def latest_hash
- {:mine? => self.person == User.owner, :text => message}
+ { :text => message}
end
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 730b2a0c8..16a58862e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,109 +1,188 @@
-class User < Person
+class User
+ include MongoMapper::Document
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable
-
+ key :friend_ids, Array
+ key :pending_request_ids, Array
+
+ one :person, :class_name => 'Person', :foreign_key => :owner_id
+
+ many :friends, :in => :friend_ids, :class_name => 'Person'
+ many :pending_requests, :in => :pending_request_ids, :class_name => 'Request'
+
+ many :groups, :class_name => 'Group'
+
before_validation_on_create :assign_key
- validates_presence_of :profile
-
before_validation :do_bad_things
-
- ######## Posting ########
+ ######## Making things work ########
- def post(class_name, options = {})
- options[:person] = self
- model_class = class_name.to_s.camelize.constantize
- post = model_class.instantiate(options)
+ key :email, String
+
+ def method_missing(method, *args)
+ self.person.send(method, *args)
end
- ######## Commenting ########
- def comment(text, options = {})
- raise "must comment on something!" unless options[:on]
- c = Comment.new(:person_id => self.id, :text => text, :post => options[:on])
- if c.save
- if mine?(c.post)
- c.push_to(c.post.people_with_permissions) # should return plucky query
- else
- c.push_to([c.post.person])
- end
- true
- end
- false
+
+ def real_name
+ "#{person.profile.first_name.to_s} #{person.profile.last_name.to_s}"
end
- ##profile
- def update_profile(params)
- if self.update_attributes(params)
- puts self.profile.class
- self.profile.notify_people!
- true
- else
- false
- end
+ ######### Groups ######################
+
+ def group( opts = {} )
+ opts[:user] = self
+ Group.create(opts)
end
- ######### Friend Requesting
- def send_friend_request_to(friend_url)
- unless Person.where(:url => friend_url).first
- p = Request.instantiate(:to => friend_url, :from => self)
- if p.save
- p.push_to_url friend_url
+ ######### Friend Requesting ###########
+ def send_friend_request_to(friend_url, group_id)
+ unless self.friends.detect{ |x| x.receive_url == friend_url}
+ request = Request.instantiate(:to => friend_url, :from => self.person, :into => group_id)
+ if request.save
+ self.pending_requests << request
+ self.save
+
+ group = self.group_by_id(group_id)
+
+ group.requests << request
+ group.save
+
+ request.push_to_url friend_url
end
- p
+ request
end
end
- def accept_friend_request(friend_request_id)
+ def accept_friend_request(friend_request_id, group_id)
request = Request.where(:id => friend_request_id).first
- request.activate_friend
- request.person = self
- request.exported_key = self.export_key
- request.destination_url = request.callback_url
+ n = pending_requests.delete(request)
+
+ activate_friend(request.person, group_by_id(group_id))
+
+ request.reverse self
+ request
+ end
+
+ def dispatch_friend_acceptance(request)
request.push_to_url(request.callback_url)
- request.destroy
+ request.destroy unless request.callback_url.include? url
+ end
+
+ def accept_and_respond(friend_request_id, group_id)
+ dispatch_friend_acceptance(accept_friend_request(friend_request_id, group_id))
end
def ignore_friend_request(friend_request_id)
request = Request.first(:id => friend_request_id)
person = request.person
- person.destroy unless person.active
+ person.user_refs -= 1
+ pending_requests.delete(request)
+ save
+ (person.user_refs > 0 || person.owner.nil? == false) ? person.save : person.destroy
request.destroy
end
def receive_friend_request(friend_request)
Rails.logger.info("receiving friend request #{friend_request.to_json}")
- friend_request.person.serialized_key = friend_request.exported_key
- if Request.where(:callback_url => friend_request.callback_url).first
- friend_request.activate_friend
+ if request_from_me?(friend_request)
+ group = self.group_by_id(friend_request.group_id)
+ activate_friend(friend_request.person, group)
+
+ Rails.logger.info("#{self.real_name}'s friend request has been accepted")
friend_request.destroy
else
+ friend_request.person.user_refs += 1
friend_request.person.save
+ pending_requests << friend_request
+ save
+ Rails.logger.info("#{self.real_name} has received a friend request")
friend_request.save
end
end
- def unfriend(friend_id)
- bad_friend = Person.first(:id => friend_id, :active => true)
- if bad_friend
- Retraction.for(self).push_to_url(bad_friend.url)
- bad_friend.destroy
- end
+ def unfriend(bad_friend)
+ Rails.logger.info("#{self.real_name} is unfriending #{bad_friend.inspect}")
+ Retraction.for(self).push_to_url(bad_friend.receive_url)
+ remove_friend(bad_friend)
+ end
+
+ def remove_friend(bad_friend)
+ raise "Friend not deleted" unless self.friend_ids.delete( bad_friend.id )
+ groups.each{|g| g.person_ids.delete( bad_friend.id )}
+ self.save
+ bad_friend.user_refs -= 1
+ (bad_friend.user_refs > 0 || bad_friend.owner.nil? == false) ? bad_friend.save : bad_friend.destroy
end
- def send_request(rel_hash)
+ def unfriended_by(bad_friend)
+ Rails.logger.info("#{self.real_name} is being unfriended by #{bad_friend.inspect}")
+ remove_friend bad_friend
+ end
+
+ def send_request(rel_hash, group)
if rel_hash[:friend]
- self.send_friend_request_to(rel_hash[:friend])
+ self.send_friend_request_to(rel_hash[:friend], group)
else
raise "you can't do anything to that url"
end
end
-
+ def activate_friend(person, group)
+ person.user_refs += 1
+ group.people << person
+ friends << person
+ person.save
+ group.save
+ save
+ end
+
+ def request_from_me?(request)
+ pending_requests.detect{|req| (req.callback_url == person.receive_url) && (req.destination_url == person.receive_url)}
+ end
+
+ ###### Receiving #######
+ def receive xml
+ object = Diaspora::Parser.from_xml(xml)
+ Rails.logger.debug("Receiving object:\n#{object.inspect}")
+
+ if object.is_a? Retraction
+ if object.type == 'Person' && object.signature_valid?
+
+ Rails.logger.info( "the person id is #{object.post_id} the friend found is #{friend_by_id(object.post_id).inspect}")
+ unfriended_by friend_by_id(object.post_id)
+
+ else
+ object.perform self.id
+ end
+ elsif object.is_a? Request
+ person = Diaspora::Parser.get_or_create_person_object_from_xml( xml )
+ person.serialized_key ||= object.exported_key
+ object.person = person
+ object.person.save
+ old_request = Request.first(:id => object.id)
+ object.group_id = old_request.group_id if old_request
+ object.save
+ receive_friend_request(object)
+ elsif object.is_a? Profile
+ person = Diaspora::Parser.owner_id_from_xml xml
+ person.profile = object
+ person.save
+ elsif object.verify_creator_signature == true
+ Rails.logger.debug("Saving object: #{object}")
+ object.save
+ object.socket_to_uid( id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
+ dispatch_comment object if object.is_a?(Comment) && !owns?(object)
+ end
+ end
+
###Helpers############
- def mine?(post)
- self == post.person
+ def self.instantiate( opts = {} )
+ opts[:person][:email] = opts[:email]
+ opts[:person][:serialized_key] = generate_key
+ User.create( opts)
end
def terse_url
@@ -117,18 +196,29 @@ class User < Person
self.password_confirmation = self.password
end
- def self.owner
- User.first
+ def friend_by_id( id )
+ friends.detect{|x| x.id == ensure_bson( id ) }
end
-
+
+ def group_by_id( id )
+ groups.detect{|x| x.id == ensure_bson( id ) }
+ end
+
protected
def assign_key
- self.serialized_key ||= generate_key.export
+ self.person.serialized_key ||= generate_key.export
end
def generate_key
OpenSSL::PKey::RSA::generate 1024
end
+ def self.generate_key
+ OpenSSL::PKey::RSA::generate 1024
+ end
+
+ def ensure_bson id
+ id.class == String ? BSON::ObjectID(id) : id
+ end
end
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index e118e0f84..2a55e3059 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -24,7 +24,7 @@ class ImageUploader < CarrierWave::Uploader::Base
end
version :thumb_large do
- process :resize_to_fill => [300,200]
+ process :resize_to_fill => [300,300]
end
version :scaled_full do
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index d4a629ba0..52cb7fe4a 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -1,4 +1,4 @@
-.album{:id => post.id, :class => ("mine" if mine?(post))}
+.album{:id => post.id, :class => ("mine" if current_user.owns?(post))}
%div.name
= link_to post.name, object_path(post)
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index ae83e0e99..a52f0c9ec 100644
--- a/app/views/albums/_new_album.haml
+++ b/app/views/albums/_new_album.haml
@@ -1,3 +1,5 @@
+%h1 Add a new album
+
= form_for Album.new do |f|
= f.error_messages
%p
diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
index 3843685e0..b505cf76b 100644
--- a/app/views/albums/edit.html.haml
+++ b/app/views/albums/edit.html.haml
@@ -1,6 +1,5 @@
+.back= link_to "⇧ #{@album.name}", @album
%h1.big_text
- .back
- = link_to "⇧ #{@album.name}", @album
= "Editing #{@album.name}"
@@ -12,6 +11,10 @@
%p
= a.text_field :name
+ %ul
+ - for photo in @album.photos
+ %li.photo_edit_block= image_tag photo.image.url(:thumb_large)
+
#submit_block
= link_to "Cancel", root_path
or
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 8f3816f3d..47d2f68a9 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -1,17 +1,17 @@
+.back= link_to "⇧ home", root_path
%h1.big_text
- .back
- = link_to "⇧ home", root_path
Albums
- .button.right#add_album_button
- = link_to 'New Album', "#"
+ .right
+ = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"}
- #add_album_box.contextual_pane
+.yo{:style => "display:none;" }
+ #new_album_pane
= render "albums/new_album"
.sub_header
%ul.button_set
- %li.selected= friends_albums_link
- %li= your_albums_link
+ %li{:class => ("selected" if params[:friends])}= friends_albums_link
+ %li{:class => ("selected" if not params[:friends])}= your_albums_link
%div
- for album in @albums
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 253d94d19..b63dea9de 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -1,20 +1,22 @@
+.back= link_to '⇧ albums', albums_path
%h1.big_text
- .back
- = link_to '⇧ albums', albums_path
= @album.name
- -if mine? @album
- .button.right#add_photos_button
- = link_to 'Add Photos', '#'
+ -if current_user.owns? @album
+ .right
+ #add_photo_loader
+ = image_tag 'ajax-loader.gif'
+ = link_to 'Add Photos', '#new_photo_pane', :class => 'button', :id => "add_photo_button"
- #add_photo_box.contextual_pane
+ .yo{:style => "display:none;"}
+ #new_photo_pane
= render "photos/new_photo", :photo => @photo, :album => @album
.sub_header
="updated #{how_long_ago(@album)}"
--unless mine? @album
+-unless current_user.owns? @album
%h4= "by #{@album.person.real_name}"
#thumbnails
@@ -25,6 +27,7 @@
#content_bottom
.back
= link_to "⇧ albums", albums_path
- -if mine? @album
- .button.right
- = link_to 'Edit Album', edit_album_path(@album)
+
+ -if current_user.owns? @album
+ .right
+ = link_to 'Edit Album', edit_album_path(@album), :class => 'button'
diff --git a/app/views/blogs/_blog.html.haml b/app/views/blogs/_blog.html.haml
index 79d0612b3..0896d7d6b 100644
--- a/app/views/blogs/_blog.html.haml
+++ b/app/views/blogs/_blog.html.haml
@@ -1,9 +1,9 @@
-%li.message{:id => post.id, :class => ("mine" if mine?(post))}
+%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
= person_image_tag(post.person)
%span.from
- = link_to_person post.person
+ = link_to post.person.real_name, post.person
%b wrote a new blog post
%br
%b= post.title
@@ -15,6 +15,6 @@
= link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
= render "comments/comments", :post => post
- - if mine?(post)
+ - if current_user.owns?(post)
.destroy_link
= link_to 'Delete', blog_path(post), :confirm => 'Are you sure?', :method => :delete, :remote=> true
diff --git a/app/views/bookmarks/_bookmark.html.haml b/app/views/bookmarks/_bookmark.html.haml
index 8356bf91d..5df9f1a25 100644
--- a/app/views/bookmarks/_bookmark.html.haml
+++ b/app/views/bookmarks/_bookmark.html.haml
@@ -1,9 +1,9 @@
-%li.message{:id => post.id, :class => ("mine" if mine?(post))}
+%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
= person_image_tag(post.person)
%span.from
- = link_to_person post.person
+ = link_to post.person.real_name, post.person
%b shared a link
%br
= post.title
@@ -16,6 +16,6 @@
= link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
= render "comments/comments", :post => post
- - if mine?(post)
+ - if current_user.owns?(post)
.destroy_link
= link_to 'Delete', bookmark_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 8783b4502..0c7fe954d 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -1,7 +1,7 @@
%li.comment{:id => post.id}
= person_image_tag(post.person)
%span.from
- = link_to_person post.person
+ = link_to post.person.real_name, post.person
= auto_link post.text
%div.time
= "#{time_ago_in_words(post.updated_at)} ago"
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index b03da3518..8e268c926 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,17 +1,29 @@
+= image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg"
+
+
%h2 Sign up
= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
= devise_error_messages!
%p
= f.label :email
- %br/
= f.text_field :email
%p
= f.label :password
- %br/
= f.password_field :password
%p
= f.label :password_confirmation
- %br/
= f.password_field :password_confirmation
+
+ = f.fields_for :person do |p|
+ = p.hidden_field :url, :value => "http://google.com/"
+
+ = p.fields_for :profile do |pr|
+ %p
+ = pr.label :first_name
+ = pr.text_field :first_name
+ %p
+ = pr.label :last_name
+ = pr.text_field :last_name
+
%p= f.submit "Sign up"
= render :partial => "devise/shared/links"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 96b9ca9c4..a36917c7b 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,12 +1,13 @@
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
%p
+ = f.text_field :email
+ %br
= f.password_field :password
+ /%p
+ /- if devise_mapping.rememberable?
+ / = f.check_box :remember_me
+ / = f.label :remember_me
%p
- - if devise_mapping.rememberable?
- /= f.check_box :remember_me
- /= f.label :remember_me
-
- = hidden_field_tag "user_email", "#{User.owner.email}", :name => "user[email]"
= f.submit "Sign in"
-/= render :partial => "devise/shared/links"
+= render :partial => "devise/shared/links"
diff --git a/app/views/groups/_new_group.haml b/app/views/groups/_new_group.haml
new file mode 100644
index 000000000..5ac136eae
--- /dev/null
+++ b/app/views/groups/_new_group.haml
@@ -0,0 +1,7 @@
+%h1 Add a new group
+= form_for Group.new do |f|
+ = f.error_messages
+ %p
+ = f.label :name
+ = f.text_field :name
+ = f.submit 'create', :class => 'button'
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
new file mode 100644
index 000000000..461bff1db
--- /dev/null
+++ b/app/views/groups/edit.html.haml
@@ -0,0 +1,25 @@
+%h1.big_text
+ .back
+ = link_to "⇧ #{@group.name}", @group
+
+ = "Editing #{@group.name}"
+
+.sub_header
+ ="updated #{how_long_ago(@group)}"
+
+- form_for @group do |a|
+ = a.error_messages
+ %p
+ = a.text_field :name
+
+ #submit_block
+ = link_to "Cancel", root_path
+ or
+ = a.submit
+
+.button.delete
+ = link_to 'Delete Album', @group, :confirm => 'Are you sure?', :method => :delete
+
+#content_bottom
+ .back
+ = link_to "⇧ #{@group.name}", @group
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
new file mode 100644
index 000000000..b3b4d2acb
--- /dev/null
+++ b/app/views/groups/index.html.haml
@@ -0,0 +1,11 @@
+%h1
+ welcome home,
+ = current_user.profile.first_name
+
+= render "shared/publisher"
+%ul#stream
+ - for post in @posts
+ = render type_partial(post), :post => post
+#pagination
+ = will_paginate @posts
+
diff --git a/app/views/albums/new.html.haml b/app/views/groups/new.html.haml
similarity index 50%
rename from app/views/albums/new.html.haml
rename to app/views/groups/new.html.haml
index 2f4450cd9..c899fd9ae 100644
--- a/app/views/albums/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -1,9 +1,9 @@
%h1.big_text
- =link_to 'albums', albums_path
+ =link_to 'groups', groups_path
>>
- new album
+ new group
-= form_for @album do |f|
+= form_for @group do |f|
= f.error_messages
%p
= f.label :name
@@ -11,4 +11,4 @@
%p
= f.submit
-%p= link_to "Back to List", albums_path
+%p= link_to "Back to List", groups_path
diff --git a/app/views/dashboards/index.html.haml b/app/views/groups/show.html.haml
similarity index 100%
rename from app/views/dashboards/index.html.haml
rename to app/views/groups/show.html.haml
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 768c03cb7..e65962761 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -7,7 +7,9 @@
$(document).ready(function(){
function debug(str){ $("#debug").append("
" + str); };
- ws = new WebSocket("ws://#{request.host}:8080/");
+ ws = new WebSocket("ws://#{request.host}:8080/#{CGI::escape(current_user.id.to_s)}");
+
+ //Attach onmessage to websocket
ws.onmessage = function(evt) {
var obj = jQuery.parseJSON(evt.data);
debug("got a " + obj['class']);
@@ -62,6 +64,7 @@
function processStatusMessage(className, html, messageHash){
processPost(className, html);
+ console.log(messageHash)
if(messageHash['mine?']){
updateMyLatestStatus(messageHash);
}
@@ -76,7 +79,7 @@
if (location.href.indexOf(photoHash['album_id']) == -1){
return ;
}
- html = "