Removing monkeypatches to avoid conflict with CouchRest

Rakefile

@@ -26,6 +26,7 @@ begin
     gemspec.has_rdoc = true
     gemspec.add_dependency("samlown-couchrest", ">= 1.0.0")
     gemspec.add_dependency("mime-types", ">= 1.15")
+    gemspec.add_dependency("activesupport", ">= 2.3.0")
     gemspec.version = CouchRest::ExtendedDocument::VERSION
     gemspec.date = "2008-11-22"
     gemspec.require_path = "lib"

lib/couchrest/casted_model.rb

@@ -1,7 +1,3 @@
-require 'couchrest'
-require File.join(File.dirname(__FILE__), 'mixins/callbacks')
-require File.join(File.dirname(__FILE__), 'mixins/properties')
-
 module CouchRest
   module CastedModel
     

lib/couchrest/extended_document.rb

@@ -3,17 +3,20 @@ require 'couchrest'
 require 'active_support'
 require 'mime/types'
 require "enumerator"
-require File.join(File.dirname(__FILE__), "monkeypatches")
 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
   
   # Same as CouchRest::Document but with properties and validations
   class ExtendedDocument < Document
 
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
 
     include CouchRest::Mixins::Callbacks
     include CouchRest::Mixins::DocumentQueries    

lib/couchrest/monkeypatches.rb

@@ -1,5 +0,0 @@
-
-# CouchRest already includes the class extlib patches.
-
-require File.join(File.dirname(__FILE__), 'support', 'couchrest')
-require File.join(File.dirname(__FILE__), 'support', 'rails') if defined?(Rails)