From 95a5324f12c6f9c44021a93bcd2a45c05bba3f88 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 9 Oct 2013 19:36:11 +0200
Subject: Fix couchrest model migrations to work with latest version
Also we now depend upon couchrest model ~> 2.0.0. The beta2 still has the old naming scheme for CouchRest::Model::Utils::Migrate
---
core/lib/extensions/couchrest.rb | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
(limited to 'core/lib/extensions')
diff --git a/core/lib/extensions/couchrest.rb b/core/lib/extensions/couchrest.rb
index 176184f..91dfc1c 100644
--- a/core/lib/extensions/couchrest.rb
+++ b/core/lib/extensions/couchrest.rb
@@ -42,30 +42,32 @@ module CouchRest
end
- class Migrate
- def self.load_all_models_with_engines
- self.load_all_models_without_engines
- return unless defined?(Rails)
- Dir[Rails.root + 'app/models/**/*.rb'].each do |path|
- require path
+ module Utils
+ module Migrate
+ def self.load_all_models_with_engines
+ self.load_all_models_without_engines
+ return unless defined?(Rails)
+ Dir[Rails.root + 'app/models/**/*.rb'].each do |path|
+ require path
+ end
+ Dir[Rails.root + '*/app/models/**/*.rb'].each do |path|
+ require path
+ end
end
- Dir[Rails.root + '*/app/models/**/*.rb'].each do |path|
- require path
+
+ def self.all_models_and_proxies
+ callbacks = migrate_each_model(find_models)
+ callbacks += migrate_each_proxying_model(find_proxying_models)
+ cleanup(callbacks)
end
- end
- def self.all_models_and_proxies
- callbacks = migrate_each_model(find_models)
- callbacks += migrate_each_proxying_model(find_proxying_models)
- cleanup(callbacks)
- end
+ class << self
+ alias_method_chain :load_all_models, :engines
+ end
- class << self
- alias_method_chain :load_all_models, :engines
end
-
end
end
--
cgit v1.2.3