github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration to mongoid 2.0.1

Browse Source
This commit is contained in:
did 2011-05-16 23:06:46 +02:00
parent 9fa701fdff
commit 7dfce2c336
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@ -2,12 +2,12 @@ source :rubygems
# add in all the runtime dependencies # add in all the runtime dependencies
gem 'rails', '>= 3.0.5' gem 'rails', '>= 3.0.7'
gem 'warden' gem 'warden'
gem 'devise', '= 1.1.3' gem 'devise', '= 1.1.3'
gem 'mongoid', '2.0.0.rc.7' gem 'mongoid', '~> 2.0.1'
gem 'bson_ext', '~> 1.3.0' gem 'bson_ext', '~> 1.3.0'
gem 'locomotive_mongoid_acts_as_tree', '0.1.5.5', :require => 'mongoid_acts_as_tree' gem 'locomotive_mongoid_acts_as_tree', '0.1.5.5', :require => 'mongoid_acts_as_tree'
gem 'will_paginate' gem 'will_paginate'
@ -20,7 +20,7 @@ gem 'inherited_resources', '~> 1.1.2'
gem 'rmagick', '2.12.2' gem 'rmagick', '2.12.2'
gem 'locomotive_carrierwave', '0.5.0.1.beta3', :require => 'carrierwave' gem 'locomotive_carrierwave', '0.5.0.1.beta3', :require => 'carrierwave'
gem 'custom_fields', '1.0.0.beta.10' gem 'custom_fields', '1.0.0.beta.11'
gem 'fog', '0.3.7' gem 'fog', '0.3.7'
gem 'mimetype-fu' gem 'mimetype-fu'
gem 'actionmailer-with-request', :require => 'actionmailer_with_request' gem 'actionmailer-with-request', :require => 'actionmailer_with_request'

35
Gemfile.lock
View File

@ -1,6 +1,6 @@
GIT GIT
remote: git://github.com/floehopper/mocha.git remote: git://github.com/floehopper/mocha.git
revision: 6fe08197f214457ac122c49d96fdac8e17adbea2 revision: f1d182ea33fe08cbc187df90f12013814ae59da8
specs: specs:
mocha (0.9.12.20110213002255) mocha (0.9.12.20110213002255)
@ -55,8 +55,8 @@ GEM
autotest (4.4.6) autotest (4.4.6)
ZenTest (>= 4.4.1) ZenTest (>= 4.4.1)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
bson (1.3.0) bson (1.3.1)
bson_ext (1.3.0) bson_ext (1.3.1)
builder (2.1.2) builder (2.1.2)
bushido (0.0.12) bushido (0.0.12)
highline (>= 1.6.1) highline (>= 1.6.1)
@ -72,7 +72,7 @@ GEM
selenium-webdriver (>= 0.0.27) selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.2) xpath (~> 0.1.2)
celerity (0.8.9) celerity (0.8.9)
childprocess (0.1.8) childprocess (0.1.9)
ffi (~> 1.0.6) ffi (~> 1.0.6)
closure-compiler (1.1.1) closure-compiler (1.1.1)
columnize (0.3.2) columnize (0.3.2)
@ -87,10 +87,10 @@ GEM
cucumber-rails (0.3.2) cucumber-rails (0.3.2)
cucumber (>= 0.8.0) cucumber (>= 0.8.0)
culerity (0.2.15) culerity (0.2.15)
custom_fields (1.0.0.beta.10) custom_fields (1.0.0.beta.11)
activesupport (>= 3.0.4) activesupport (>= 3.0.7)
locomotive_carrierwave locomotive_carrierwave
mongoid (~> 2.0.0.rc.7) mongoid (~> 2.0.1)
daemons (1.1.3) daemons (1.1.3)
database_cleaner (0.6.7) database_cleaner (0.6.7)
delayed_job (2.1.4) delayed_job (2.1.4)
@ -110,8 +110,7 @@ GEM
factory_girl_rails (1.0.1) factory_girl_rails (1.0.1)
factory_girl (~> 1.3) factory_girl (~> 1.3)
railties (>= 3.0.0) railties (>= 3.0.0)
ffi (1.0.7) ffi (1.0.8)
rake (>= 0.8.7)
fog (0.3.7) fog (0.3.7)
builder builder
excon (>= 0.2.3) excon (>= 0.2.3)
@ -135,7 +134,7 @@ GEM
activesupport (>= 2.1.0) activesupport (>= 2.1.0)
launchy (~> 0.3.2) launchy (~> 0.3.2)
rest-client (>= 1.4.0, < 1.7.0) rest-client (>= 1.4.0, < 1.7.0)
highline (1.6.1) highline (1.6.2)
httparty (0.7.7) httparty (0.7.7)
crack (= 0.1.8) crack (= 0.1.8)
i18n (0.5.0) i18n (0.5.0)
@ -171,11 +170,11 @@ GEM
mime-types (1.16) mime-types (1.16)
mimemagic (0.1.8) mimemagic (0.1.8)
mimetype-fu (0.1.2) mimetype-fu (0.1.2)
mongo (1.3.0) mongo (1.3.1)
bson (>= 1.3.0) bson (>= 1.3.1)
mongoid (2.0.0.rc.7) mongoid (2.0.1)
activemodel (~> 3.0) activemodel (~> 3.0)
mongo (~> 1.2) mongo (~> 1.3)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
will_paginate (~> 3.0.pre) will_paginate (~> 3.0.pre)
net-ssh (2.0.24) net-ssh (2.0.24)
@ -205,7 +204,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 0.14.4) thor (~> 0.14.4)
rake (0.8.7) rake (0.8.7)
responders (0.6.2) responders (0.6.4)
rest-client (1.6.1) rest-client (1.6.1)
mime-types (>= 1.16) mime-types (>= 1.16)
rmagick (2.12.2) rmagick (2.12.2)
@ -276,7 +275,7 @@ DEPENDENCIES
capybara capybara
cucumber (= 0.8.5) cucumber (= 0.8.5)
cucumber-rails cucumber-rails
custom_fields (= 1.0.0.beta.10) custom_fields (= 1.0.0.beta.11)
database_cleaner database_cleaner
delayed_job (= 2.1.4) delayed_job (= 2.1.4)
delayed_job_mongoid (= 1.0.2) delayed_job_mongoid (= 1.0.2)
@ -296,9 +295,9 @@ DEPENDENCIES
locomotive_mongoid_acts_as_tree (= 0.1.5.5) locomotive_mongoid_acts_as_tree (= 0.1.5.5)
mimetype-fu mimetype-fu
mocha! mocha!
mongoid (= 2.0.0.rc.7) mongoid (~> 2.0.1)
pickle pickle
rails (>= 3.0.5) rails (>= 3.0.7)
rmagick (= 2.12.2) rmagick (= 2.12.2)
rspec-rails (= 2.3.1) rspec-rails (= 2.3.1)
ruby-debug ruby-debug

2
app/models/membership.rb
View File

@ -6,7 +6,7 @@ class Membership
field :admin, :type => Boolean, :default => false field :admin, :type => Boolean, :default => false
## associations ## ## associations ##
referenced_in :account referenced_in :account, :validate => false
embedded_in :site, :inverse_of => :memberships embedded_in :site, :inverse_of => :memberships
## validations ## ## validations ##

4
locomotive_cms.gemspec
View File

@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.add_dependency "rails", ">= 3.0.6" s.add_dependency "rails", ">= 3.0.6"
s.add_dependency "warden" s.add_dependency "warden"
s.add_dependency "devise", "1.1.3" s.add_dependency "devise", "1.1.3"
s.add_dependency "mongoid", "2.0.0.rc.7" s.add_dependency "mongoid", "2.0.1"
s.add_dependency "bson_ext", "~> 1.3.0" s.add_dependency "bson_ext", "~> 1.3.0"
s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.5" s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.5"
s.add_dependency "will_paginate" s.add_dependency "will_paginate"
@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.add_dependency "rmagick", "2.12.2" s.add_dependency "rmagick", "2.12.2"
s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta3" s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta3"
s.add_dependency "custom_fields", "1.0.0.beta.10" s.add_dependency "custom_fields", "1.0.0.beta.11"
s.add_dependency "fog", "0.3.7" s.add_dependency "fog", "0.3.7"
s.add_dependency "mimetype-fu" s.add_dependency "mimetype-fu"
s.add_dependency "actionmailer-with-request" s.add_dependency "actionmailer-with-request"