diff options
author | jessib <jessib@riseup.net> | 2013-10-10 11:03:54 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-10-10 11:03:54 -0700 |
commit | 634db9875cc8f6f6b9a4a83dfc6b8d53728eb2b5 (patch) | |
tree | a2e76370ad530210be3a3ff67567d22003eae365 /core/lib/extensions/couchrest.rb | |
parent | 014ff5bda0802d51b4cbca5a2fd904d953223d2f (diff) | |
parent | 0acbf6a158f149c1f4273bde0cfca47547e080f8 (diff) |
Merge branch 'develop' into feature/billing-no-authenticated-payments
Diffstat (limited to 'core/lib/extensions/couchrest.rb')
-rw-r--r-- | core/lib/extensions/couchrest.rb | 36 |
1 files changed, 19 insertions, 17 deletions
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 |