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

README.md

@@ -184,6 +184,8 @@ If you installed the Ubuntu package, MongoDB should already be running (if not,
 
 If you installed the Fedora package, MongoDB will need to be started via `service mongodb start`. If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo.
 
+If you installed the OsX package through "brew", MongoDB will need to be started via `sudo launchctl load org.mongodb.mongod.plist`. (before you have to go to /Library/LaunchDaemons and add a symlink to /usr/local/Cellar/mongodb/1.6.2-x86_64/org.mongodb.mongod.plist)
+
 Diaspora will not run unless mongo is running.  Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora.
 
 ### Run the app server

config/application.rb

@@ -6,9 +6,9 @@
 
 require File.expand_path('../boot', __FILE__)
 
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
+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)

config/environment.rb

@@ -7,6 +7,7 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 Haml::Template.options[:format] = :html5
+Haml::Template.options[:escape_html] = true
 # Initialize the rails application
 Diaspora::Application.initialize!
 

config/initializers/socket.rb

@@ -5,7 +5,7 @@
 
 require 'em-websocket'
 require 'eventmachine'
-require "lib/diaspora/websocket"
+require 'lib/diaspora/websocket'
   EM.next_tick {
     Diaspora::WebSocket.initialize_channels
 

config/sprinkle/provision.rb

@@ -7,11 +7,11 @@
 
 
 
-require "#{File.dirname(__FILE__)}/packages/essential"
-require "#{File.dirname(__FILE__)}/packages/database"
-require "#{File.dirname(__FILE__)}/packages/server"
-require "#{File.dirname(__FILE__)}/packages/scm"
-require "#{File.dirname(__FILE__)}/packages/ruby"
+require '#{File.dirname(__FILE__)}/packages/essential'
+require '#{File.dirname(__FILE__)}/packages/database'
+require '#{File.dirname(__FILE__)}/packages/server'
+require '#{File.dirname(__FILE__)}/packages/scm'
+require '#{File.dirname(__FILE__)}/packages/ruby'
 
 policy :diaspora, :roles => [:tom,:backer] do
 #  requires :clean_dreamhost

lib/tasks/db.rake

@@ -59,10 +59,13 @@ namespace :db do
     puts "fixing the people in this seed"
     require 'config/environment'
     
-    people = Person.all
+    people = Person.all( '$where' => "function(){ 
+                        return this.diaspora_handle.charAt(this.diaspora_handle.length-1) == '@'
+                        }")
     
     people.each do |person|
-      if person.diaspora_handle[-1, 1]=='@' && person.owner.nil? == false
+      if person.owner
+        puts "Resetting diaspora handle for #{person.owner.username}"
         person.diaspora_handle = person.owner.diaspora_handle
         person.save
       end