Merge branch 'develop' into feature/billing-past-due-subscriptions

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