diff --git a/.gitignore b/.gitignore index 923b697..4643b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ db/*.sqlite3 log/*.log tmp/ .sass-cache/ +.rbenv-version +db/schema.rb diff --git a/Gemfile b/Gemfile index 7b4e91b..284ebe5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.1.1.rc2' +gem 'rails', '3.2.3' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -11,9 +11,9 @@ gem 'sqlite3' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '~> 3.1.0' - gem 'coffee-rails', '~> 3.1.0' - gem 'uglifier', '>= 1.0.3' + gem 'sass-rails' + gem 'coffee-rails' + gem 'uglifier' end gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index f081ac8..0b9cb04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,106 +1,104 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.1.rc2) - actionpack (= 3.1.1.rc2) - mail (~> 2.3.0) - actionpack (3.1.1.rc2) - activemodel (= 3.1.1.rc2) - activesupport (= 3.1.1.rc2) + actionmailer (3.2.3) + actionpack (= 3.2.3) + mail (~> 2.4.4) + actionpack (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) - rack-mount (~> 0.8.2) + journey (~> 1.0.1) + rack (~> 1.4.0) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.1.rc2) - activesupport (= 3.1.1.rc2) + sprockets (~> 2.1.2) + activemodel (3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.1.rc2) - activemodel (= 3.1.1.rc2) - activesupport (= 3.1.1.rc2) - arel (~> 2.2.1) + activerecord (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.1.1.rc2) - activemodel (= 3.1.1.rc2) - activesupport (= 3.1.1.rc2) - activesupport (3.1.1.rc2) + activeresource (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) + activesupport (3.2.3) + i18n (~> 0.6) multi_json (~> 1.0) - ansi (1.3.0) - arel (2.2.1) + ansi (1.4.2) + arel (3.0.2) builder (3.0.0) - coffee-rails (3.1.1) + coffee-rails (3.2.2) coffee-script (>= 2.2.0) - railties (~> 3.1.0) + railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.2) + coffee-script-source (1.3.3) erubis (2.7.0) - execjs (1.2.9) + execjs (1.3.2) multi_json (~> 1.0) hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.14) - railties (~> 3.0) + journey (1.0.3) + jquery-rails (2.0.2) + railties (>= 3.2.0, < 5.0) thor (~> 0.14) - mail (2.3.0) + json (1.7.3) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.16) - multi_json (1.0.3) - polyglot (0.3.2) - rack (1.3.4) - rack-cache (1.0.3) + mime-types (1.18) + multi_json (1.3.5) + polyglot (0.3.3) + rack (1.4.1) + rack-cache (1.2) rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-ssl (1.3.2) rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.1.rc2) - actionmailer (= 3.1.1.rc2) - actionpack (= 3.1.1.rc2) - activerecord (= 3.1.1.rc2) - activeresource (= 3.1.1.rc2) - activesupport (= 3.1.1.rc2) + rails (3.2.3) + actionmailer (= 3.2.3) + actionpack (= 3.2.3) + activerecord (= 3.2.3) + activeresource (= 3.2.3) + activesupport (= 3.2.3) bundler (~> 1.0) - railties (= 3.1.1.rc2) - railties (3.1.1.rc2) - actionpack (= 3.1.1.rc2) - activesupport (= 3.1.1.rc2) + railties (= 3.2.3) + railties (3.2.3) + actionpack (= 3.2.3) + activesupport (= 3.2.3) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2) - rdoc (3.9.4) - sass (3.1.8) - sass-rails (3.1.4) - actionpack (~> 3.1.0) - railties (~> 3.1.0) - sass (>= 3.1.4) - sprockets (~> 2.0.0) - tilt (~> 1.3.2) - sprockets (2.0.2) + rake (0.9.2.2) + rdoc (3.12) + json (~> 1.4) + sass (3.1.18) + sass-rails (3.2.5) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) - sqlite3 (1.3.4) + tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.6) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - turn (0.8.2) - ansi (>= 1.2.2) - tzinfo (0.3.30) - uglifier (1.0.3) + turn (0.9.5) + ansi + tzinfo (0.3.33) + uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -108,10 +106,10 @@ PLATFORMS ruby DEPENDENCIES - coffee-rails (~> 3.1.0) + coffee-rails jquery-rails - rails (= 3.1.1.rc2) - sass-rails (~> 3.1.0) + rails (= 3.2.3) + sass-rails sqlite3 turn - uglifier (>= 1.0.3) + uglifier diff --git a/config/routes.rb b/config/routes.rb index 2bb8b99..1bf8163 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ class RackTest def call(env) - [200, {}, [env['PATH_INFO']]] + [200, {}, ["Rails #{Rails.version} - #{env['PATH_INFO']}"]] end end