diff --git a/.gitignore b/.gitignore index fe6d1c4..6137e75 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ config/config.yml config/deploy.rb config/mongoid.yml .rvmrc +*~ diff --git a/Gemfile b/Gemfile index 61e1d07..82b710e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,19 +1,19 @@ source 'http://rubygems.org' -gem 'rails', '3.0.0.rc' +gem 'rails', '3.0.3' gem 'libxml-ruby' gem 'bson_ext', :require => nil -gem 'mongoid', '2.0.0.beta.15' +gem 'mongoid', '~> 2.0.0.beta.20' gem 'haml' gem 'will_paginate' -gem 'devise', '1.1.1' +gem 'devise', '~> 1.1.3' group :development, :test do - gem 'rspec-rails', '>= 2.0.0.beta.19' + gem 'rspec-rails', '~> 2.1' end group :test do - gem 'rspec', '>= 2.0.0.beta.19' - gem 'database_cleaner', '0.5.2' + gem 'rspec', '~> 2.1' + gem 'database_cleaner', '~> 0.6.0' gem 'factory_girl_rails' end diff --git a/Gemfile.lock b/Gemfile.lock index 68a23b8..57d8dab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,40 +2,39 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.0.rc) - actionpack (= 3.0.0.rc) - mail (~> 2.2.5) - actionpack (3.0.0.rc) - activemodel (= 3.0.0.rc) - activesupport (= 3.0.0.rc) + actionmailer (3.0.3) + actionpack (= 3.0.3) + mail (~> 2.2.9) + actionpack (3.0.3) + activemodel (= 3.0.3) + activesupport (= 3.0.3) builder (~> 2.1.2) erubis (~> 2.6.6) - i18n (~> 0.4.1) + i18n (~> 0.4) rack (~> 1.2.1) - rack-mount (~> 0.6.9) - rack-test (~> 0.5.4) - tzinfo (~> 0.3.22) - activemodel (3.0.0.rc) - activesupport (= 3.0.0.rc) + rack-mount (~> 0.6.13) + rack-test (~> 0.5.6) + tzinfo (~> 0.3.23) + activemodel (3.0.3) + activesupport (= 3.0.3) builder (~> 2.1.2) - i18n (~> 0.4.1) - activerecord (3.0.0.rc) - activemodel (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - arel (~> 0.4.0) - tzinfo (~> 0.3.22) - activeresource (3.0.0.rc) - activemodel (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - activesupport (3.0.0.rc) - arel (0.4.0) - activesupport (>= 3.0.0.beta) + i18n (~> 0.4) + activerecord (3.0.3) + activemodel (= 3.0.3) + activesupport (= 3.0.3) + arel (~> 2.0.2) + tzinfo (~> 0.3.23) + activeresource (3.0.3) + activemodel (= 3.0.3) + activesupport (= 3.0.3) + activesupport (3.0.3) + arel (2.0.4) bcrypt-ruby (2.1.2) - bson (1.0.4) - bson_ext (1.0.4) + bson (1.1.2) + bson_ext (1.1.2) builder (2.1.2) - database_cleaner (0.5.2) - devise (1.1.1) + database_cleaner (0.6.0) + devise (1.1.3) bcrypt-ruby (~> 2.1.2) warden (~> 0.10.7) diff-lcs (1.1.2) @@ -45,64 +44,58 @@ GEM factory_girl_rails (1.0) factory_girl (~> 1.3) rails (>= 3.0.0.beta4) - haml (3.0.16) - i18n (0.4.1) + haml (3.0.24) + i18n (0.4.2) libxml-ruby (1.1.4) - mail (2.2.5) + mail (2.2.10) activesupport (>= 2.3.6) - mime-types - treetop (>= 1.4.5) + i18n (~> 0.4.1) + mime-types (~> 1.16) + treetop (~> 1.4.8) mime-types (1.16) - mongo (1.0.6) - bson (>= 1.0.4) - mongoid (2.0.0.beta.15) - activemodel (= 3.0.0.rc) - bson (= 1.0.4) - mongo (= 1.0.6) - tzinfo (= 0.3.22) + mongo (1.1.2) + bson (>= 1.1.1) + mongoid (2.0.0.beta.20) + activemodel (~> 3.0) + mongo (~> 1.1) + tzinfo (~> 0.3.22) will_paginate (~> 3.0.pre) - nokogiri (1.4.3.1) polyglot (0.3.1) rack (1.2.1) - rack-mount (0.6.9) + rack-mount (0.6.13) rack (>= 1.0.0) - rack-test (0.5.4) + rack-test (0.5.6) rack (>= 1.0) - rails (3.0.0.rc) - actionmailer (= 3.0.0.rc) - actionpack (= 3.0.0.rc) - activerecord (= 3.0.0.rc) - activeresource (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - bundler (>= 1.0.0.rc.1) - railties (= 3.0.0.rc) - railties (3.0.0.rc) - actionpack (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - rake (>= 0.8.3) - thor (~> 0.14.0) + rails (3.0.3) + actionmailer (= 3.0.3) + actionpack (= 3.0.3) + activerecord (= 3.0.3) + activeresource (= 3.0.3) + activesupport (= 3.0.3) + bundler (~> 1.0) + railties (= 3.0.3) + railties (3.0.3) + actionpack (= 3.0.3) + activesupport (= 3.0.3) + rake (>= 0.8.7) + thor (~> 0.14.4) rake (0.8.7) - rspec (2.0.0.beta.19) - rspec-core (= 2.0.0.beta.19) - rspec-expectations (= 2.0.0.beta.19) - rspec-mocks (= 2.0.0.beta.19) - rspec-core (2.0.0.beta.19) - rspec-expectations (2.0.0.beta.19) - diff-lcs (>= 1.1.2) - rspec-mocks (2.0.0.beta.19) - rspec-rails (2.0.0.beta.19) - rspec (= 2.0.0.beta.19) - webrat (>= 0.7.2.beta.1) - thor (0.14.0) - treetop (1.4.8) + rspec (2.1.0) + rspec-core (~> 2.1.0) + rspec-expectations (~> 2.1.0) + rspec-mocks (~> 2.1.0) + rspec-core (2.1.0) + rspec-expectations (2.1.0) + diff-lcs (~> 1.1.2) + rspec-mocks (2.1.0) + rspec-rails (2.1.0) + rspec (~> 2.1.0) + thor (0.14.6) + treetop (1.4.9) polyglot (>= 0.3.1) - tzinfo (0.3.22) + tzinfo (0.3.23) warden (0.10.7) rack (>= 1.0.0) - webrat (0.7.2.beta.1) - nokogiri (>= 1.2.0) - rack (>= 1.0) - rack-test (>= 0.5.3) will_paginate (3.0.pre2) PLATFORMS @@ -110,13 +103,13 @@ PLATFORMS DEPENDENCIES bson_ext - database_cleaner (= 0.5.2) - devise (= 1.1.1) + database_cleaner (~> 0.6.0) + devise (~> 1.1.3) factory_girl_rails haml libxml-ruby - mongoid (= 2.0.0.beta.15) - rails (= 3.0.0.rc) - rspec (>= 2.0.0.beta.19) - rspec-rails (>= 2.0.0.beta.19) + mongoid (~> 2.0.0.beta.20) + rails (= 3.0.3) + rspec (~> 2.1) + rspec-rails (~> 2.1) will_paginate diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8793dde..a190415 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,8 +18,7 @@ RSpec.configure do |config| config.alias_example_to :fit, :focused => true config.before(:each) do - DatabaseCleaner.orm = "mongoid" - DatabaseCleaner.strategy = :truncation + DatabaseCleaner[:mongoid].strategy = :truncation DatabaseCleaner.clean end end \ No newline at end of file -- libgit2 0.21.2