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

Gemfile

@@ -28,9 +28,12 @@ gem 'redfinger', :git => 'git://github.com/rsofaer/redfinger.git'
 
 #EventMachine
 gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
-gem 'em-websocket'
 gem 'thin'
 
+#Websocket
+gem 'em-websocket'
+gem 'magent', :git => 'http://github.com/dcu/magent.git'
+
 #File uploading
 gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
 gem 'mini_magick'

Gemfile.lock

@@ -47,6 +47,14 @@ GIT
       bcrypt-ruby (~> 2.1.2)
       warden (~> 0.10.7)
 
+GIT
+  remote: http://github.com/dcu/magent.git
+  revision: 06513f3dac812469a55f2e365c349af4d2abc92a
+  specs:
+    magent (0.4.2)
+      mongo (>= 0.1.0)
+      uuidtools (>= 2.0.0)
+
 GIT
   remote: http://github.com/jnunemaker/mongomapper.git
   revision: 931dab779011aa7acf60c1a4c7ad19e1ba838345
@@ -213,6 +221,7 @@ GEM
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
+    uuidtools (2.1.1)
     warden (0.10.7)
       rack (>= 1.0.0)
     webmock (1.3.5)
@@ -242,6 +251,7 @@ DEPENDENCIES
   haml
   jnunemaker-validatable (= 1.8.4)!
   json
+  magent!
   mini_magick
   mocha
   mongo_mapper (= 0.8.4)!

README.md

@@ -12,6 +12,13 @@ GEMS:  We would like to keep external dependencies unduplicated.  We're using No
 The privacy aware, personally controlled, do-it-all, open source social network.
 
 **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
+**PLEASE, DO NOT RUN IN PRODUCTION.  IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN**
+
+Also, we really want to continue to focus on features and improving the code base. When we think it is 
+ready for general use, we will post more detailed instructions.
+
+
+
 These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X.  We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest.
 
 ## Preparing your system

app/controllers/aspects_controller.rb

@@ -47,7 +47,7 @@ class AspectsController < ApplicationController
 
   def manage
     @aspect = :manage
-    @remote_requests = Request.for_user current_user
+    @remote_requests = Request.for_user(current_user).all
   end
 
   def update

app/controllers/sockets_controller.rb

@@ -14,7 +14,7 @@ class SocketsController < ApplicationController
 
   def outgoing(uid,object,opts={})
     @_request = ActionDispatch::Request.new({})
-    Diaspora::WebSocket.push_to_user(uid, action_hash(uid, object, opts))
+    Diaspora::WebSocket.queue_to_user(uid, action_hash(uid, object, opts))
   end
 
 end

app/models/person.rb

@@ -85,6 +85,7 @@ class Person
        local_person
      elsif  !identifier.include?("localhost") && !opts[:local]
        begin
+         puts "begin finger"
         f = Redfinger.finger(identifier)
        rescue SocketError => e
          raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/

app/models/post.rb

@@ -4,6 +4,7 @@
 
 
 class Post
+  require 'lib/diaspora/websocket'
   require 'lib/encryptable'
   include MongoMapper::Document
   include ApplicationHelper

app/models/request.rb

@@ -26,8 +26,8 @@ class Request
   validates_presence_of :destination_url, :callback_url
   before_validation :clean_link
 
-  scope :for_user,  lambda{ |user| where(:destination_url    => user.person.receive_url) }
-  scope :from_user, lambda{ |user| where(:destination_url.ne => user.person.receive_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 = {})
     person = options[:from]

config/app_config.yml

@@ -8,6 +8,7 @@ development:
   debug: false
   socket_debug : false
   socket_port: 8080
+  socket_collection_name: 'websocket'
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
 
 test:

config/deploy.rb

@@ -58,6 +58,11 @@ namespace :deploy do
    task :start do
       start_mongo
       start_thin
+      start_websocket
+  end
+
+  task :start_websocket do
+    run("cd #{current_path} && bundle exec ruby ./script/websocket_server.rb > /dev/null&")
   end
 
   task :start_mongo do

lib/diaspora/websocket.rb

@@ -6,6 +6,11 @@
 
 module Diaspora
   module WebSocket
+    def self.queue_to_user(uid, data)
+      channel = Magent::GenericChannel.new('websocket')
+      channel.enqueue({:uid => uid, :data => data})
+    end
+
     def self.initialize_channels
       @channels = {}
     end
@@ -44,6 +49,5 @@ module Diaspora
     def unsocket_from_uid(id, opts={})
       SocketsController.new.outgoing(id, Retraction.for(self), opts)
     end
-
   end
 end

lib/tasks/db.rake

@@ -63,6 +63,7 @@ namespace :db do
                         return this.diaspora_handle.charAt(this.diaspora_handle.length-1) == '@'
                         }")
     
+    puts "Found #{people.count} people with broken diaspora_handle fields"
     people.each do |person|
       if person.owner
         puts "Resetting diaspora handle for #{person.owner.username}"

public/javascripts/fancybox/jquery.fancybox-1.3.1.js

@@ -262,6 +262,11 @@
 				close.show();
 			}
 
+      $("#fancybox-inner input[type='text'], #fancybox-inner textarea").focus(function() {
+          $(document).unbind('keydown.fb');
+      });
+      
+
 			fancybox_set_navigation();
 
 			$(window).bind("resize.fb", $.fancybox.center);

public/stylesheets/application.css

@@ -601,3 +601,6 @@ h1.big_text {
     border: 1px solid #cccccc;
       border-bottom: none;
     padding: 3px 10px; }
+
+#fancybox-close:hover {
+  background-color: transparent; }

public/stylesheets/sass/application.sass

@@ -756,3 +756,7 @@ h1.big_text
       :bottom none
 
     :padding 3px 10px
+
+#fancybox-close:hover
+  :background
+    :color transparent

script/websocket_server.rb

@@ -2,11 +2,24 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
+require File.dirname(__FILE__) + '/../config/environment'
+require File.dirname(__FILE__) + '/../lib/diaspora/websocket'
 
-require 'em-websocket'
-require 'eventmachine'
-require 'lib/diaspora/websocket'
-  EM.next_tick {
+CHANNEL = Magent::GenericChannel.new('websocket')
+def process_message
+  if CHANNEL.queue_count > 0
+    message = CHANNEL.dequeue
+    if message
+      Diaspora::WebSocket.push_to_user(message['uid'], message['data'])
+    end
+    EM.next_tick{ process_message}
+  else
+    EM::Timer.new(1){process_message}
+  end
+
+end
+
+  EM.run {
     Diaspora::WebSocket.initialize_channels
 
     EventMachine::WebSocket.start(
@@ -22,5 +35,6 @@ require 'lib/diaspora/websocket'
         ws.onclose { Diaspora::WebSocket.unsubscribe(ws.request['Path'].gsub('/',''), sid) }
       }
     end
+    process_message
   }
 

spec/lib/websocket_spec.rb

@@ -0,0 +1,24 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Diaspora::WebSocket do
+  before do
+    @user = Factory.create(:user)
+    @aspect = @user.aspect(:name => "losers")
+    @post = @user.build_post(:status_message, :message => "hey", :to => @aspect.id)
+  end
+
+  it 'should queue a job' do
+    Diaspora::WebSocket.should_receive(:queue_to_user)
+    @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id)
+  end
+
+  it 'The queued job should reach Magent' do
+    Magent.should_receive(:push)
+    @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id)
+  end
+
+end