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

app/controllers/photos_controller.rb

@@ -2,21 +2,20 @@ class PhotosController < ApplicationController
   before_filter :authenticate_user!
   
   def create
-    render :nothing => true
     begin
       @photo = current_user.post(:photo, params)
-
-      if @photo.created_at
-        flash[:notice] = "Successfully uploaded photo."
-      else
-        render :action => 'album#new'
-      end
+      render :nothing => true if @photo.created_at
+      
     rescue TypeError
       flash[:error] = "Photo upload failed. Are you sure an image was added?"
-      redirect_to Album.first(:id => params[:photo][:album_id])
-    rescue CarrierWave::IntegrityError || 
+      redirect_to Album.first(:id => params[:album_id])
+    rescue CarrierWave::IntegrityError
       flash[:error] = "Photo upload failed.  Are you sure that was an image?"
-      redirect_to Album.first(:id => params[:photo][:album_id])
+      redirect_to Album.first(:id => params[:album_id])
+    rescue RuntimeError => e
+      flash[:error] = "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      redirect_to Album.first(:id => params[:album_id])
+      raise e
     end
   end
   

app/helpers/sockets_helper.rb

@@ -7,7 +7,7 @@ module SocketsHelper
 
   def action_hash(uid, object, opts={})
     begin
-      user = User.find_by_id(uid)
+      user = User.find_by_id uid
       v = render_to_string(:partial => type_partial(object), :locals => {:post => object, :current_user => user}) unless object.is_a? Retraction
     rescue Exception => e
       Rails.logger.error("web socket view rendering failed for object #{object.inspect}.")

app/models/photo.rb

@@ -26,7 +26,6 @@ class Photo < Post
     photo
   end
   
-  after_save :log_save_inspection 
   validates_true_for :album_id, :logic => lambda {self.validate_album_person}
 
   before_destroy :ensure_user_picture

app/models/post.rb

@@ -46,14 +46,6 @@ class Post
       (self.send accessor.to_sym).to_s}.join ';'
   end
   
-  def log_inspection
-    Rails.logger.debug self.inspect
-  end
-  def log_save_inspection
-    Rails.logger.debug "After saving, object is:"
-    log_inspection
-  end
-
 protected
    def destroy_comments
     comments.each{|c| c.destroy}

app/models/user.rb

@@ -64,23 +64,38 @@ class User
   def post(class_name, options = {})
     options[:person] = self.person
 
-    group_ids = options[:to]
+    if class_name == :photo
+      raise "No album_id given" unless options[:album_id]
+      group_ids = groups_with_post( options[:album_id] )
+      group_ids.map!{ |group| group.id }
+    else
+      group_ids = options.delete(:to)
+    end
 
     group_ids = [group_ids] if group_ids.is_a? BSON::ObjectID
     raise "You must post to someone." if group_ids.nil? || group_ids.empty?
 
-
-    group_ids.map!{|gid| ensure_bson gid }
-    options.delete(:to)
-
     model_class = class_name.to_s.camelize.constantize
-    
     post = model_class.instantiate(options)
     post.creator_signature = post.sign_with_key(encryption_key)
     post.save
 
+    post.socket_to_uid(id, :group_ids => group_ids) if post.respond_to?(:socket_to_uid)
+
+    push_to_groups(post, group_ids)
+
+    self.raw_visible_posts << post
+    self.save
+    post
+  end
 
-    groups = self.groups.find_all_by_id( group_ids )
+  def push_to_groups( post, group_ids )
+    if group_ids == :all || group_ids == "all"
+      groups = self.groups
+    else
+      groups = self.groups.find_all_by_id( group_ids )
+    end
+#send to the groups
     target_people = [] 
 
     groups.each{ |group|
@@ -88,15 +103,9 @@ class User
       group.save
       target_people = target_people | group.people
     }
-    
-    post.socket_to_uid(id, :group_ids => group_ids) if post.respond_to?(:socket_to_uid)
     post.push_to( target_people )
-
-    self.raw_visible_posts << post
-    self.save
-    post
   end
- 
+
   def visible_posts( opts = {} )
     if opts[:by_members_of]
       return raw_visible_posts if opts[:by_members_of] == :all
@@ -167,7 +176,7 @@ class User
       else
         object.perform self.id
         groups = self.groups_with_person(object.person)
-        groups.each{ |group| group.post_ids.delete(ensure_bson(object.post_id))
+        groups.each{ |group| group.post_ids.delete(object.post_id.to_id)
                              group.save
         }
       end
@@ -187,6 +196,7 @@ class User
 
     elsif object.is_a?(Comment) 
       dispatch_comment object unless owns?(object)
+      object.socket_to_uid(id)  if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
     else
       Rails.logger.debug("Saving object: #{object}")
       object.user_refs += 1
@@ -225,24 +235,28 @@ class User
   end 
 
   def visible_person_by_id( id )
-    id = ensure_bson id
+    id = id.to_id
     return self.person if id == self.person.id
     friends.detect{|x| x.id == id }
   end
 
   def group_by_id( id )
-    id = ensure_bson id
+    id = id.to_id
     groups.detect{|x| x.id == id }
   end
 
   def album_by_id( id )
-    id = ensure_bson id
+    id = id.to_id
     albums.detect{|x| x.id == id }
   end
 
+  def groups_with_post( id )
+    self.groups.find_all_by_post_ids( id )
+  end
+
   def groups_with_person person
-    id = ensure_bson person.id
-    groups.select {|group| group.person_ids.include? id}
+    id = person.id.to_id
+    groups.select { |g| g.person_ids.include? id}
   end
 
   def setup_person
@@ -263,7 +277,4 @@ class User
     OpenSSL::PKey::RSA::generate 1024 
   end
 
-  def ensure_bson id 
-    id.class == String ? BSON::ObjectID(id) : id 
-  end
 end

app/views/albums/_new_album.haml

@@ -5,4 +5,5 @@
   %p
     = f.label :name
     = f.text_field :name
+    = f.hidden_field :to, :value => :all
   = f.submit 'create', :class => 'button'

app/views/albums/show.html.haml

-:javascript
-  $(document).ready(function(){
-    reset_photo_fancybox();
-  });
+- content_for :head do
+  :javascript
+    $(document).ready(function(){
+      reset_photo_fancybox();
+    });
 
 .album_id{:id => @album.id, :style => "display:hidden;"}
 .back= link_to '⇧ albums', albums_path

app/views/js/_websocket_js.haml

@@ -48,6 +48,10 @@
     toggler = $('.show_post_comments', post)
     toggler.html(
       toggler.html().replace(/\d/,$('.comment_set', post)[0].childElementCount -1));
+
+    if( !$(".comments", post).is(':visible') ){
+      toggler.click();
+    }
   }
 
   function processPost(className, html, groupIds){
@@ -75,7 +79,7 @@
   }
   
   function onPageForClass(className){
-    return ((location.href.indexOf(className) != -1 ) || (location.pathname == '/')) && onPageOne();
+    return (location.href.indexOf(className) != -1 );
   }
 
   function onPageForGroups(groupIds){

app/views/photos/_photo.haml

@@ -9,7 +9,7 @@
 
     %br
     
-  = render "albums/album", :post => post.album
+  = render "albums/album", :post => post.album, :current_user => current_user
    
   = link_to (image_tag post.url(:thumb_medium)), object_path(post)
     

config/application.rb

@@ -3,11 +3,11 @@ require File.expand_path('../boot', __FILE__)
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
-
 # If you have a Gemfile, require the gems listed there, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
+require 'lib/mongo_mapper/bson_id'
 module Diaspora
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

lib/mongo_mapper/bson_id.rb

+class String
+  def to_id
+    BSON::ObjectID self
+  end
+end
+class BSON::ObjectID
+  def to_id
+    self
+  end
+end

public/javascripts/stream.js

 $(document).ready(function(){
+
 	$('.comment_set').each(function(index) {
       var $this = $(this);
 	    if($this.children().length > 1) {
-			$this.parent().show();
 			var show_comments_toggle = $this.parent().prev().children(".show_post_comments");
-			show_comments_toggle.html("hide comments ("+ ($this.children().length - 1) + ")");
+			show_comments_toggle.click();
 		};
   });
 });//end document ready

public/javascripts/tiny_mce/jquery.tinymce.js

-(function(b){var e,d,a=[],c=window;b.fn.tinymce=function(j){var p=this,g,k,h,m,i,l="",n="";if(!p.length){return p}if(!j){return tinyMCE.get(p[0].id)}function o(){var r=[],q=0;if(f){f();f=null}p.each(function(t,u){var s,w=u.id,v=j.oninit;if(!w){u.id=w=tinymce.DOM.uniqueId()}s=new tinymce.Editor(w,j);r.push(s);if(v){s.onInit.add(function(){var x,y=v;if(++q==r.length){if(tinymce.is(y,"string")){x=(y.indexOf(".")===-1)?null:tinymce.resolve(y.replace(/\.\w+$/,""));y=tinymce.resolve(y)}y.apply(x||tinymce,r)}})}});b.each(r,function(t,s){s.render()})}if(!c.tinymce&&!d&&(g=j.script_url)){d=1;h=g.substring(0,g.lastIndexOf("/"));if(/_(src|dev)\.js/g.test(g)){n="_src"}m=g.lastIndexOf("?");if(m!=-1){l=g.substring(m+1)}c.tinyMCEPreInit=c.tinyMCEPreInit||{base:h,suffix:n,query:l};if(g.indexOf("gzip")!=-1){i=j.language||"en";g=g+(/\?/.test(g)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(j.theme)+"&plugins="+escape(j.plugins)+"&languages="+i;if(!c.tinyMCE_GZ){tinyMCE_GZ={start:function(){tinymce.suffix=n;function q(r){tinymce.ScriptLoader.markDone(tinyMCE.baseURI.toAbsolute(r))}q("langs/"+i+".js");q("themes/"+j.theme+"/editor_template"+n+".js");q("themes/"+j.theme+"/langs/"+i+".js");b.each(j.plugins.split(","),function(s,r){if(r){q("plugins/"+r+"/editor_plugin"+n+".js");q("plugins/"+r+"/langs/"+i+".js")}})},end:function(){}}}}b.ajax({type:"GET",url:g,dataType:"script",cache:true,success:function(){tinymce.dom.Event.domLoaded=1;d=2;if(j.script_loaded){j.script_loaded()}o();b.each(a,function(q,r){r()})}})}else{if(d===1){a.push(o)}else{o()}}return p};b.extend(b.expr[":"],{tinymce:function(g){return g.id&&!!tinyMCE.get(g.id)}});function f(){function i(l){if(l==="remove"){this.each(function(n,o){var m=h(o);if(m){m.remove()}})}this.find("span.mceEditor,div.mceEditor").each(function(n,o){var m=tinyMCE.get(o.id.replace(/_parent$/,""));if(m){m.remove()}})}function k(n){var m=this,l;if(n!==e){i.call(m);m.each(function(p,q){var o;if(o=tinyMCE.get(q.id)){o.setContent(n)}})}else{if(m.length>0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(c.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(c.tinymce)&&(l.is(":tinymce")))}var j={};b.each(["text","html","val"],function(n,l){var o=j[l]=b.fn[l],m=(l==="text");b.fn[l]=function(s){var p=this;if(!g(p)){return o.apply(p,arguments)}if(s!==e){k.call(p.filter(":tinymce"),s);o.apply(p.not(":tinymce"),arguments);return p}else{var r="";var q=arguments;(m?p:p.eq(0)).each(function(u,v){var t=h(v);r+=t?(m?t.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):t.getContent()):o.apply(b(v),q)});return r}}});b.each(["append","prepend"],function(n,m){var o=j[m]=b.fn[m],l=(m==="prepend");b.fn[m]=function(q){var p=this;if(!g(p)){return o.apply(p,arguments)}if(q!==e){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.apply(p.not(":tinymce"),arguments);return p}}});b.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=b.fn[l];b.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=b.fn.attr;b.fn.attr=function(n,q,o){var m=this;if((!n)||(n!=="value")||(!g(m))){return j.attr.call(m,n,q,o)}if(q!==e){k.call(m.filter(":tinymce"),q);j.attr.call(m.not(":tinymce"),n,q,o);return m}else{var p=m[0],l=h(p);return l?l.getContent():j.attr.call(b(p),n,q,o)}}}})(jQuery);
\ No newline at end of file

public/javascripts/tiny_mce/langs/en.js

-tinyMCE.addI18n({en:{
-common:{
-edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
-apply:"Apply",
-insert:"Insert",
-update:"Update",
-cancel:"Cancel",
-close:"Close",
-browse:"Browse",
-class_name:"Class",
-not_set:"-- Not set --",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
-clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
-popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
-more_colors:"More colors"
-},
-contextmenu:{
-align:"Alignment",
-left:"Left",
-center:"Center",
-right:"Right",
-full:"Full"
-},
-insertdatetime:{
-date_fmt:"%Y-%m-%d",
-time_fmt:"%H:%M:%S",
-insertdate_desc:"Insert date",
-inserttime_desc:"Insert time",
-months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
-months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
-day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
-day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
-},
-print:{
-print_desc:"Print"
-},
-preview:{
-preview_desc:"Preview"
-},
-directionality:{
-ltr_desc:"Direction left to right",
-rtl_desc:"Direction right to left"
-},
-layer:{
-insertlayer_desc:"Insert new layer",
-forward_desc:"Move forward",
-backward_desc:"Move backward",
-absolute_desc:"Toggle absolute positioning",
-content:"New layer..."
-},
-save:{
-save_desc:"Save",
-cancel_desc:"Cancel all changes"
-},
-nonbreaking:{
-nonbreaking_desc:"Insert non-breaking space character"
-},
-iespell:{
-iespell_desc:"Run spell checking",
-download:"ieSpell not detected. Do you want to install it now?"
-},
-advhr:{
-advhr_desc:"Horizontal rule"
-},
-emotions:{
-emotions_desc:"Emotions"
-},
-searchreplace:{
-search_desc:"Find",
-replace_desc:"Find/Replace"
-},
-advimage:{
-image_desc:"Insert/edit image"
-},
-advlink:{
-link_desc:"Insert/edit link"
-},
-xhtmlxtras:{
-cite_desc:"Citation",
-abbr_desc:"Abbreviation",
-acronym_desc:"Acronym",
-del_desc:"Deletion",
-ins_desc:"Insertion",
-attribs_desc:"Insert/Edit Attributes"
-},
-style:{
-desc:"Edit CSS Style"
-},
-paste:{
-paste_text_desc:"Paste as Plain Text",
-paste_word_desc:"Paste from Word",
-selectall_desc:"Select All",
-plaintext_mode_sticky:"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.",
-plaintext_mode:"Paste is now in plain text mode. Click again to toggle back to regular paste mode."
-},
-paste_dlg:{
-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL+V on your keyboard to paste the text into the window."
-},
-table:{
-desc:"Inserts a new table",
-row_before_desc:"Insert row before",
-row_after_desc:"Insert row after",
-delete_row_desc:"Delete row",
-col_before_desc:"Insert column before",
-col_after_desc:"Insert column after",
-delete_col_desc:"Remove column",
-split_cells_desc:"Split merged table cells",
-merge_cells_desc:"Merge table cells",
-row_desc:"Table row properties",
-cell_desc:"Table cell properties",
-props_desc:"Table properties",
-paste_row_before_desc:"Paste table row before",
-paste_row_after_desc:"Paste table row after",
-cut_row_desc:"Cut table row",
-copy_row_desc:"Copy table row",
-del:"Delete table",
-row:"Row",
-col:"Column",
-cell:"Cell"
-},
-autosave:{
-unload_msg:"The changes you made will be lost if you navigate away from this page.",
-restore_content:"Restore auto-saved content.",
-warning_message:"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?."
-},
-fullscreen:{
-desc:"Toggle fullscreen mode"
-},
-media:{
-desc:"Insert / edit embedded media",
-edit:"Edit embedded media"
-},
-fullpage:{
-desc:"Document properties"
-},
-template:{
-desc:"Insert predefined template content"
-},
-visualchars:{
-desc:"Visual control characters on/off."
-},
-spellchecker:{
-desc:"Toggle spellchecker",
-menu:"Spellchecker settings",
-ignore_word:"Ignore word",
-ignore_words:"Ignore all",
-langs:"Languages",
-wait:"Please wait...",
-sug:"Suggestions",
-no_sug:"No suggestions",
-no_mpell:"No misspellings found."
-},
-pagebreak:{
-desc:"Insert page break."
-},
-advlist:{
-types:"Types",
-def:"Default",
-lower_alpha:"Lower alpha",
-lower_greek:"Lower greek",
-lower_roman:"Lower roman",
-upper_alpha:"Upper alpha",
-upper_roman:"Upper roman",
-circle:"Circle",
-disc:"Disc",
-square:"Square"
-}}});
\ No newline at end of file

public/javascripts/tiny_mce/plugins/advhr/css/advhr.css

-input.radio {border:1px none #000; background:transparent; vertical-align:middle;}
-.panel_wrapper div.current {height:80px;}
-#width {width:50px; vertical-align:middle;}
-#width2 {width:50px; vertical-align:middle;}
-#size {width:100px;}

public/javascripts/tiny_mce/plugins/advhr/editor_plugin.js

-(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
\ No newline at end of file

public/javascripts/tiny_mce/plugins/advhr/editor_plugin_src.js

-/**
- * editor_plugin_src.js
- *
- * Copyright 2009, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://tinymce.moxiecode.com/license
- * Contributing: http://tinymce.moxiecode.com/contributing
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.AdvancedHRPlugin', {
-		init : function(ed, url) {
-			// Register commands
-			ed.addCommand('mceAdvancedHr', function() {
-				ed.windowManager.open({
-					file : url + '/rule.htm',
-					width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)),
-					height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register buttons
-			ed.addButton('advhr', {
-				title : 'advhr.advhr_desc',
-				cmd : 'mceAdvancedHr'
-			});
-
-			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setActive('advhr', n.nodeName == 'HR');
-			});
-
-			ed.onClick.add(function(ed, e) {
-				e = e.target;
-
-				if (e.nodeName === 'HR')
-					ed.selection.select(e);
-			});
-		},
-
-		getInfo : function() {
-			return {
-				longname : 'Advanced HR',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
-})();
\ No newline at end of file

public/javascripts/tiny_mce/plugins/advhr/js/rule.js

-var AdvHRDialog = {
-	init : function(ed) {
-		var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;
-
-		w = dom.getAttrib(n, 'width');
-		f.width.value = w ? parseInt(w) : (dom.getStyle('width') || '');
-		f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || '';
-		f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width');
-		selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px');
-	},
-
-	update : function() {
-		var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = '';
-
-		h = '<hr';
-
-		if (f.size.value) {
-			h += ' size="' + f.size.value + '"';
-			st += ' height:' + f.size.value + 'px;';
-		}
-
-		if (f.width.value) {
-			h += ' width="' + f.width.value + (f.width2.value == '%' ? '%' : '') + '"';
-			st += ' width:' + f.width.value + (f.width2.value == '%' ? '%' : 'px') + ';';
-		}
-
-		if (f.noshade.checked) {
-			h += ' noshade="noshade"';
-			st += ' border-width: 1px; border-style: solid; border-color: #CCCCCC; color: #ffffff;';
-		}
-
-		if (ed.settings.inline_styles)
-			h += ' style="' + tinymce.trim(st) + '"';
-
-		h += ' />';
-
-		ed.execCommand("mceInsertContent", false, h);
-		tinyMCEPopup.close();
-	}
-};
-
-tinyMCEPopup.requireLangPack();
-tinyMCEPopup.onInit.add(AdvHRDialog.init, AdvHRDialog);

public/javascripts/tiny_mce/plugins/advhr/langs/en_dlg.js

-tinyMCE.addI18n('en.advhr_dlg',{
-width:"Width",
-size:"Height",
-noshade:"No shadow"
-});
\ No newline at end of file