summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-10-09 11:16:11 -0700
committerazul <azul@riseup.net>2013-10-09 11:16:11 -0700
commitb60a75d8cbe25ac47bb037e9e54a7cf4e2ba4e1f (patch)
tree0ce1e785c3ceb6ed166f4bd3b4ec5ce4e5658a31 /core
parent68e056061648be393dc785419fc066ec3d719e58 (diff)
parent95a5324f12c6f9c44021a93bcd2a45c05bba3f88 (diff)
Merge pull request #95 from azul/hotfix/4080-couchrest-model-breaks-bundle
Fix couchrest model migrations to work with latest version
Diffstat (limited to 'core')
-rw-r--r--core/leap_web_core.gemspec2
-rw-r--r--core/lib/extensions/couchrest.rb36
2 files changed, 20 insertions, 18 deletions
diff --git a/core/leap_web_core.gemspec b/core/leap_web_core.gemspec
index f391f00..e98c892 100644
--- a/core/leap_web_core.gemspec
+++ b/core/leap_web_core.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency "rails", "~> 3.2.11"
s.add_dependency "couchrest", "~> 1.1.3"
- s.add_dependency "couchrest_model", "~> 2.0.0.beta2"
+ s.add_dependency "couchrest_model", "~> 2.0.0"
s.add_dependency "couchrest_session_store", "~> 0.2.0"
s.add_dependency "json"
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