deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removing monkeypatches to avoid conflict with CouchRest

Browse source
This commit is contained in:
Sam Lown 2010-05-10 22:28:19 +02:00
parent 3894579304
commit bd481151d9
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Rakefile
View file

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

4
lib/couchrest/casted_model.rb
View file

@ -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 CouchRest
module CastedModel module CastedModel

7
lib/couchrest/extended_document.rb
View file

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

5
lib/couchrest/monkeypatches.rb
View file

@ -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)