Merge branch 'master' of github.com:diaspora/diaspora into fb

Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb

app/models/retraction.rb

@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Retraction
   include ROXML
   include Diaspora::Webhooks

app/models/status_message.rb

@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class StatusMessage < Post
 
   xml_name :status_message
@@ -11,7 +10,6 @@ class StatusMessage < Post
   key :message, String
   validates_presence_of :message
 
-
   def to_activity
         <<-XML
   <entry>

app/models/user.rb

@@ -2,11 +2,10 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-require 'lib/diaspora/user/friending.rb'
-require 'lib/diaspora/user/querying.rb'
-require 'lib/diaspora/user/receiving.rb'
-require 'lib/salmon/salmon'
+require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
+require File.expand_path('../../../lib/diaspora/user/querying', __FILE__)
+require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__)
+require File.expand_path('../../../lib/salmon/salmon', __FILE__)
 
 class User
   include MongoMapper::Document
@@ -19,6 +18,7 @@ class User
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
   key :username, :unique => true
+  key :serialized_private_key, String
 
   key :friend_ids,          Array
   key :pending_request_ids, Array
@@ -36,7 +36,7 @@ class User
 
   after_create :seed_aspects
 
-  before_validation_on_create :downcase_username
+  before_validation :downcase_username, :on => :create
 
    def self.find_for_authentication(conditions={})
     if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex
@@ -67,12 +67,11 @@ class User
   def drop_aspect( aspect )
     if aspect.people.size == 0
       aspect.destroy
-    else 
+    else
       raise "Aspect not empty"
     end
   end
 
-
   def move_friend( opts = {})
     return true if opts[:to] == opts[:from]
     friend = Person.first(:_id => opts[:friend_id])
@@ -108,12 +107,11 @@ class User
     intitial_post(class_name, aspect_ids, options)
   end
 
-
-  def intitial_post(class_name, aspect_ids, options = {}) 
+  def intitial_post(class_name, aspect_ids, options = {})
     post = build_post(class_name, options)
     post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
     push_to_aspects(post, aspect_ids)
-    post 
+    post
   end
 
   def repost( post, options = {} )
@@ -129,16 +127,20 @@ class User
   end
 
   def validate_aspect_permissions(aspect_ids)
-    aspect_ids = [aspect_ids.to_s] if aspect_ids.is_a? BSON::ObjectId
+    if aspect_ids == "all"
+      return aspect_ids
+    end
+
+    aspect_ids = [aspect_ids.to_s] unless aspect_ids.is_a? Array
 
     if aspect_ids.nil? || aspect_ids.empty?
       raise ArgumentError.new("You must post to someone.")
     end
 
     aspect_ids.each do |aspect_id|
-      unless aspect_id == "all" || self.aspects.find(aspect_id) 
+      unless self.aspects.find(aspect_id)
         raise ArgumentError.new("Cannot post to an aspect you do not own.")
-      end 
+      end
     end
 
     aspect_ids
@@ -250,7 +252,9 @@ class User
   def self.instantiate!( opts = {} )
     opts[:person][:diaspora_handle] = "#{opts[:username]}@#{APP_CONFIG[:terse_pod_url]}"
     opts[:person][:url] = APP_CONFIG[:pod_url]
-    opts[:person][:serialized_key] = generate_key
+    
+    opts[:serialized_private_key] = generate_key
+    opts[:person][:serialized_public_key] = opts[:serialized_private_key].public_key
     User.create(opts)
   end
 
@@ -258,22 +262,15 @@ class User
     aspect(:name => "Family")
     aspect(:name => "Work")
   end
-  
-  def terse_url
-    terse = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '')
-    terse = terse.chop! if terse[-1, 1] == '/'
-    terse
-  end
 
   def diaspora_handle
-    "#{self.username}@#{self.terse_url}"
+    "#{self.username}@#{APP_CONFIG[:terse_pod_url]}"
   end
 
   def downcase_username
     username.downcase! if username
   end
 
-
   def as_json(opts={})
     {
       :user => {
@@ -284,7 +281,14 @@ class User
       }
     }
   end
-    def self.generate_key
-      OpenSSL::PKey::RSA::generate 4096
-    end
+
+
+  def self.generate_key
+    OpenSSL::PKey::RSA::generate 4096
+  end
+  
+  def encryption_key
+    OpenSSL::PKey::RSA.new( serialized_private_key )
+  end
+
 end

app/uploaders/image_uploader.rb

@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 

app/views/albums/_album.html.haml

@@ -8,11 +8,11 @@
 
     %div.time
       by
-      = link_to ((current_user.person == post.person)? 'you' : post.person.real_name), person_path(post.person)
+      = link_to ((current_user.person == post.person)? t('.you') : post.person.real_name), person_path(post.person)
       %br
       = link_to(how_long_ago(post), object_path(post, :aspect => @aspect))
 
   %div.image_cycle
     - for photo in post.photos[0..3]
       = link_to (image_tag photo.url(:thumb_large)), album_path(post, :aspect => @aspect)
-    
+

app/views/albums/_new_album.haml

@@ -2,8 +2,7 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-%h1 Add a new album
+%h1=t('.add_a_new_album')
 
 = form_for Album.new do |f|
   = f.error_messages
@@ -11,4 +10,4 @@
     = f.label :name
     = f.text_field :name
     = f.hidden_field :to, :value => aspect
-  = f.submit 'create', :class => 'button'
+  = f.submit t('.create'), :class => 'button'

app/views/albums/edit.html.haml

@@ -2,14 +2,13 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 .back= link_to "⇧ #{@album.name}", @album
 %h1.big_text
 
-  = "Editing #{@album.name}"
+  = "#{t('.editing')} #{@album.name}"
 
 .sub_header
-  ="updated #{how_long_ago(@album)}"
+  ="#{t('.updated')} #{how_long_ago(@album)}"
 
 - form_for @album do |a|
   = a.error_messages
@@ -21,12 +20,12 @@
     .photo_edit_block= image_tag photo.url(:thumb_medium)
 
   #submit_block
-    = link_to "Cancel", root_path
+    = link_to t('.cancel'), root_path
     or
     = a.submit
 
 .button.delete
-  = link_to 'Delete Album', @album, :confirm => 'Are you sure?', :method => :delete
+  = link_to t('.delete_album'), @album, :confirm => t('.are_you_sure'), :method => :delete
 
 #content_bottom
   .back

app/views/albums/index.html.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :head do
   :javascript
     $(document).ready(function(){
@@ -10,7 +9,7 @@
     });
 
 = content_for :page_title do
-  = link_to "◂ Home", aspects_path, :aspect => params[:aspect]
+  = link_to "◂ #{t('.home')}", aspects_path, :aspect => params[:aspect]
 
 - content_for :left_pane do
   = render "shared/aspect_friends"
@@ -19,7 +18,7 @@
   %h1
     Albums
   .right
-    = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"}
+    = link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"}
 
 .yo{:style => "display:none;" }
   #new_album_pane
@@ -34,4 +33,4 @@
 
 #content_bottom
   .back
-    = link_to "⇧ home", root_path
+    = link_to "⇧ #{t('.home')}", root_path

app/views/albums/show.html.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   $(document).ready(function(){
     $(".image_thumb img").load( function() {
@@ -11,7 +10,7 @@
   });
 
 = content_for :page_title do
-  = link_to "◂ Albums", albums_path(:aspect => @aspect)
+  = link_to "◂ #{t('.albums')}", albums_path(:aspect => @aspect)
 
 - content_for :left_pane do
   = render "shared/aspect_friends"
@@ -20,17 +19,15 @@
   -if current_user.owns? @album
     .right
       =render 'photos/new_photo'
-      = link_to 'Edit Album', edit_album_path(@album), :class => 'button'
+      = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
   %h1
     = @album.name
-  ="updated #{how_long_ago(@album)}"
-
-
+  ="#{t('.updated')} #{how_long_ago(@album)}"
 
 .album_id{:id => @album.id, :style => "display:hidden;"}
 
 -unless current_user.owns? @album
-  %h4= "by #{@album.person.real_name}"
+  %h4= "#{t('.by')} #{@album.person.real_name}"
 
 #thumbnails
   - for photo in @album_photos
@@ -39,5 +36,4 @@
 
 #content_bottom
   .back
-    = link_to "⇧ albums", albums_path
-
+    = link_to "⇧ #{t('.albums')}", albums_path

app/views/aspects/_new_aspect.haml

@@ -2,11 +2,10 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1=t('.add_a_new_aspect')
 = form_for Aspect.new do |f|
   = f.error_messages
   %p
     = f.label :name
     = f.text_field :name
-    = f.submit 'create', :class => 'button'
+    = f.submit t('.create'), :class => 'button'

app/views/aspects/index.html.haml

@@ -2,10 +2,8 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
-  = link_to "photos", albums_path(:aspect => @aspect)
-  
+  = link_to t('.photos'), albums_path(:aspect => @aspect)
 
 - content_for :left_pane do
   = render "shared/aspect_friends"

app/views/aspects/manage.html.haml

@@ -2,14 +2,12 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-- content_for :head do 
+- content_for :head do
   = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
   = javascript_include_tag 'aspect-edit.js'
 
 - content_for :left_pane do
-  %h1
-    Requests
+  %h1=t('.requests')
 
   .requests
     %ul.dropzone
@@ -21,34 +19,31 @@
             = person_image_tag(request.person)
             .name
               = request.person.real_name
-  %h1
-    Ignore/Remove
+  %h1=t('.ignore_remove')
 
   %li.remove
     %ul.dropzone
       %li.grey Drag to ignore/remove
 
 - content_for :publish do
-  = link_to("add a new aspect", "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => "Add a new aspect")
-
-
+  = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
 
 %ul#aspect_list
   - for aspect in @aspects
     %li.aspect
-      
+
       .aspect_name
         %span.edit_name_field
           %h1{:contenteditable => true}= aspect.name
           %span.tip click to edit
 
         %ul.tools
-          %li= link_to "add a new friend", "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
-          %li= link_to "show", aspect_path(aspect)
+          %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
+          %li= link_to t('.show'), aspect_path(aspect)
           %li!= remove_link(aspect)
-      
+
       %ul.dropzone{:id => aspect.id}
-      
+
         -if aspect.people.size < 1
           %li.grey Drag to add people
 

app/views/aspects/show.html.haml

@@ -2,9 +2,8 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
-  = link_to "photos", albums_path(:aspect => @aspect)
+  = link_to t('.photos'), albums_path(:aspect => @aspect)
 
 - content_for :left_pane do
   = render "shared/aspect_friends"

app/views/comments/_comment.html.haml

@@ -2,8 +2,7 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-%li.comment{:id => post.id} 
+%li.comment{:id => post.id}
   = person_image_tag(post.person)
   %span.from
     = link_to post.person.real_name, post.person

app/views/comments/_comments.html.haml

@@ -2,11 +2,10 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %div.comments
   %ul.comment_set{:id => post.id}
     - for comment in post.comments
       = render 'comments/comment', :post => comment
     %li.comment.show
       = render 'comments/new_comment', :post => post
-	 	
+

app/views/comments/_new_comment.html.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = form_for Comment.new, :remote => true do |f|
   %p
     %label{:for => "comment_text_on_#{post.id}"} Comment

app/views/devise/sessions/new.html.haml

 %h1
   This is a technology preview, do not provide any private information.
-%h3 
-  your account may be deleted until we move into a more stable development period. 
+%h3
+  your account may be deleted until we move into a more stable development period.
 %h3
   USE AT YOUR OWN RISK!!
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
@@ -10,7 +10,7 @@
       = f.label :username
       = f.text_field :username
     %p.user_network
-      ="@#{APP_CONFIG[:pod_url]}"
+      ="@#{APP_CONFIG[:terse_pod_url]}"
 
     %p
       = f.label :password

app/views/js/_websocket_js.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
 :javascript
   WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
@@ -19,25 +18,23 @@
 
       if (obj['class']=="retractions"){
         processRetraction(obj['post_id']);
-      
+
       }else if (obj['class']=="comments"){
-        processComment(obj['post_id'], obj['html']) 
-      
+        processComment(obj['post_id'], obj['html'])
+
       }else if (obj['class']=='photos' && onPageForClass('albums')){
         processPhotoInAlbum(obj['photo_hash'])
       }else{
         processPost(obj['class'], obj['html'], obj['aspect_ids'])
       }
 
-      
-    }; 
+    };
     ws.onclose = function() { debug("socket closed"); };
     ws.onopen = function() {
       ws.send(location.pathname);
       debug("connected...");
     };
 
-
   });
   function processRetraction(post_id){
     $('#' + post_id ).fadeOut(500, function(){
@@ -66,7 +63,7 @@
         $(html).fadeIn("fast", function(){
           $("#stream label:first").inFieldLabels();
         })
-      ); 
+      );
     }
   }
 
@@ -77,13 +74,13 @@
     html =  "<div class=\'image_thumb\' id=\'"+photoHash['id']+"\' style=\'padding-right:3px;\'> \
       <a href=\"/photos/"+ photoHash['id'] +"\"> \
       <img alt=\"New thumbnail\" src=\""+ photoHash['thumb_url'] +"\" /> \
-      </a> </div>"  
+      </a> </div>"
     $("#thumbnails").append( $(html) )
     $("#"+ photoHash['id'] + "  img").load( function() {
       $(this).fadeIn("slow");
     });
   }
-  
+
   function onPageForClass(className){
     return (location.href.indexOf(className) != -1 );
   }
@@ -100,9 +97,9 @@
   }
 
   function onPageForAspect(aspectId){
-    return (location.href.indexOf(aspectId) != -1 ) 
+    return (location.href.indexOf(aspectId) != -1 )
   }
-  
+
   function onPageOne() {
       var c = document.location.search.charAt(document.location.search.length-1);
       return ((c =='') || (c== '1'));

app/views/layouts/application.html.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 !!!
 %html
   %head
@@ -10,24 +9,24 @@
       = "#{current_user.real_name} | diaspora" if current_user
 
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
-    
+
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
     = stylesheet_link_tag "application", "ui"
 
-    = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1" 
-    = stylesheet_link_tag "fileuploader" 
+    = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1"
+    = stylesheet_link_tag "fileuploader"
 
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery-1.4.2.min', 'rails'
     = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
-    
+
     = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
     = javascript_include_tag 'fileuploader'
 
     = javascript_include_tag 'view', 'image_picker', 'stream'
 
     = render 'js/websocket_js'
-    
+
     = csrf_meta_tag
     = yield(:head)
 
@@ -50,8 +49,8 @@
                 = text_field_tag 'q'
 
             %li= link_to current_user.real_name, current_user.person
-            %li= link_to "settings", edit_user_path(current_user)
-            %li= link_to "logout", destroy_user_session_path
+            %li= link_to t('.edit_profile'), edit_user_path(current_user)
+            %li= link_to t('.logout.'), destroy_user_session_path
 
         = render "shared/aspect_nav"
       = render "shared/sub_header"

app/views/layouts/session_wall.html.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 !!!
 %html
   %head
@@ -10,7 +9,7 @@
       DIASPORA | login
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
     %meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" }
-    
+
     = stylesheet_link_tag "sessions"
     /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery142'
@@ -18,10 +17,10 @@
 
     :javascript
       $(document).ready(function(){
-        $("#user_username").focus(); 
+        $("#user_username").focus();
         $("label").inFieldLabels();
       });
-  
+
     = csrf_meta_tag
     = yield(:head)
 
@@ -44,11 +43,11 @@
         </div>
       </div>
       <![endif]-->
-  
+
     - flash.each do |name, msg|
       = content_tag :div, msg, :id => "flash_#{name}"
     %div#huge_text
       DIASPORA*
     = yield
-    
+
     /= link_to "signup", "/signup"