diff --git a/Gemfile b/Gemfile index efec955..25912f1 100755 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ group :development do gem "json_pure" #ORM's - gem "activerecord", "3.2.6" + gem "activerecord" gem "datamapper" gem "dm-migrations" gem "dm-sqlite-adapter" diff --git a/Gemfile.lock b/Gemfile.lock index 93cda31..582f05a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GEM remote: http://rubygems.org/ specs: - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) + sprockets (~> 2.2.1) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activesupport (3.2.6) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.8) @@ -150,9 +150,9 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -179,8 +179,9 @@ GEM rspec-mocks (~> 2.12.0) sequel (3.21.0) slop (3.3.3) - sprockets (2.1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) @@ -196,7 +197,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord (= 3.2.6) + activerecord bson_ext bundler couch_potato