From bd481151d9d3b3ad14f9cb253863bfafe88f8ade Mon Sep 17 00:00:00 2001
From: Sam Lown <me@samlown.com>
Date: Mon, 10 May 2010 22:28:19 +0200
Subject: [PATCH] Removing monkeypatches to avoid conflict with CouchRest

---
 Rakefile                           | 1 +
 lib/couchrest/casted_model.rb      | 4 ----
 lib/couchrest/extended_document.rb | 7 +++++--
 lib/couchrest/monkeypatches.rb     | 5 -----
 4 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 lib/couchrest/monkeypatches.rb

diff --git a/Rakefile b/Rakefile
index 678bc95..e8a392a 100644
--- a/Rakefile
+++ b/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"
diff --git a/lib/couchrest/casted_model.rb b/lib/couchrest/casted_model.rb
index 62624b2..aef40d2 100644
--- a/lib/couchrest/casted_model.rb
+++ b/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
     
diff --git a/lib/couchrest/extended_document.rb b/lib/couchrest/extended_document.rb
index 0308518..47b1eb4 100644
--- a/lib/couchrest/extended_document.rb
+++ b/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    
diff --git a/lib/couchrest/monkeypatches.rb b/lib/couchrest/monkeypatches.rb
deleted file mode 100644
index b3c306b..0000000
--- a/lib/couchrest/monkeypatches.rb
+++ /dev/null
@@ -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)