Moving initial loading parts

Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require "rake/rdoctask"
-require File.join(File.expand_path(File.dirname(__FILE__)),'lib','couchrest','extended_document')
+require File.join(File.expand_path(File.dirname(__FILE__)),'lib','couchrest_extended_document')
 
 begin
   require 'spec/rake/spectask'

lib/couchrest/extended_document.rb

@@ -1,17 +1,6 @@
 
-gem 'samlown-couchrest'
-require 'couchrest'
-
-require 'active_support'
-require 'mime/types'
-require "enumerator"
 require File.join(File.dirname(__FILE__), "property")
 require File.join(File.dirname(__FILE__), 'mixins')
-require File.join(File.dirname(__FILE__), 'casted_model')
-
-# Monkey patches
-require File.join(File.dirname(__FILE__), 'support', 'couchrest')
-require File.join(File.dirname(__FILE__), 'support', 'rails') if defined?(Rails)
 
 module CouchRest
   

lib/couchrest_extended_document.rb

@@ -1,4 +1,21 @@
 
+# require File.join(File.dirname(__FILE__), "couchrest", "extended_document")
 
-require File.join(File.dirname(__FILE__), "couchrest", "extended_document")
+gem 'samlown-couchrest'
+
+require 'couchrest'
+
+require 'active_support'
+require 'mime/types'
+require "enumerator"
+
+# Monkey patches applied to couchrest
+require File.join(File.dirname(__FILE__), 'couchrest', 'support', 'couchrest')
+
+# Base libraries
+require File.join(File.dirname(__FILE__), 'couchrest', 'extended_document')
+require File.join(File.dirname(__FILE__), 'couchrest', 'casted_model')
+
+# Add rails support *after* everything has loaded
+require File.join(File.dirname(__FILE__), 'couchrest', 'support', 'rails') if defined?(Rails)