From 5637fa4e4c694cac81cc667279bdfea124a0d943 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 19 Jun 2010 15:48:50 -0700
Subject: [PATCH 1/2] update em-http-request, removed the mutex because we are
 thin. also removed some uneeded config for database cleaner in the test setup
 env

---
 Gemfile                            |  2 +-
 config/environments/development.rb |  1 +
 config/environments/production.rb  |  1 +
 config/environments/test.rb        | 13 -------------
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 530573c68..f6a5cbb1a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0.beta4'
 gem 'mongrel'
 gem 'thin'
-gem 'em-http-request', :require => "em-http"
+gem 'em-http-request', :require => "em-http", :git => "git://github.com/igrigorik/em-http-request.git"
 gem 'addressable', :require => "addressable/uri"
 gem "mongoid", :git => "git://github.com/durran/mongoid.git"
 gem "bson_ext", "1.0.1"
diff --git a/config/environments/development.rb b/config/environments/development.rb
index dfb1f2e18..45d756166 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,4 +16,5 @@ Diaspora::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
+  config.threadsafe!
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e47cce459..312da846d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -43,4 +43,5 @@ Diaspora::Application.configure do
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
+  config.threadsafe!
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1a9134407..69a870933 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -29,18 +29,5 @@ Diaspora::Application.configure do
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
-  #
-  #
-  #
-
-
-
-begin
- require 'database_cleaner'
- DatabaseCleaner.strategy = :truncation
- DatabaseCleaner.orm = "mongoid"
-rescue LoadError => ignore_if_database_cleaner_not_present
- puts "Error on cleaner"
-end
   
 end

From da9bcb8bec4a53ec1984f2571cb60ab99a70599d Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 19 Jun 2010 15:53:37 -0700
Subject: [PATCH 2/2] just kidding.  needed that test config, but pulled out
 some deprecated curl stuff hanging around statusmessages and checked tests
 accordingly

---
 app/controllers/status_messages_controller.rb | 2 +-
 app/models/status_message.rb                  | 4 ----
 config/environments/test.rb                   | 9 +++++++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 0d9e1b9d8..23a2b342f 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -39,7 +39,7 @@ class StatusMessagesController < ApplicationController
     
     respond_to do |format|
       format.html 
-      format.xml { render :xml => @status_message }
+      format.xml { render :xml => Post.build_xml_for(@status_message) }
       format.json { render :json => @status_message }
     end
   end
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 0b58ee72b..82dbc00c6 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -1,6 +1,5 @@
 class StatusMessage < Post
   include StatusMessagesHelper
-  require 'lib/net/curl'
  
   xml_name :status_message
  
@@ -19,9 +18,6 @@ class StatusMessage < Post
     StatusMessage.newest(User.first.email)
   end
 
-  def self.retrieve_from_friend(friend)
-    StatusMessages.from_xml Curl.get(friend.url+"status_messages.xml")
-  end
 
   def ==(other)
     (self.message == other.message) && (self.owner == other.owner)
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 69a870933..4aa5f96ec 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -29,5 +29,14 @@ Diaspora::Application.configure do
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
+
+
+begin
+ require 'database_cleaner'
+ DatabaseCleaner.strategy = :truncation
+ DatabaseCleaner.orm = "mongoid"
+rescue LoadError => ignore_if_database_cleaner_not_present
+ puts "Error on cleaner"
+end
   
 end