Permalink
Browse files

Upgraded app to Rails 3.2.3

  • Loading branch information...
1 parent 65c5e37 commit 99fc702c4a337523ceecec1dc23ec5124a8c790c Patryk Grunt committed Jun 11, 2012
Showing with 170 additions and 95 deletions.
  1. +8 −2 .gitignore
  2. +52 −0 .rvmrc
  3. +2 −2 Gemfile
  4. +97 −91 Gemfile.lock
  5. +7 −0 config/environments/development.rb
  6. +4 −0 config/environments/test.rb
  7. BIN db/test.sqlite3
View
@@ -1,2 +1,8 @@
-log
-tmp
+.bundle
+db/*.sqlite3
+log/*.log
+/tmp/**/*
+.rvmrc
+.DS_Store
+config/database.yml
+.sass-cache/
View
52 .rvmrc
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+# echo "rvm use 1.9.2" > .rvmrc
+environment_id="ruby-1.9.2-p290@3.2.3"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.13.4 ()" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+# echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+# return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+ && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+ \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+ [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+ \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+ if [[ $- == *i* ]] # check for interactive shells
+ then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+ else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
+ fi
+else
+ # If the environment file has not yet been created, use the RVM CLI to select.
+ rvm --create use "$environment_id" || {
+ echo "Failed to create RVM environment '${environment_id}'."
+ return 1
+ }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+# ! builtin command -v bundle >/dev/null ||
+# builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+# printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+# gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+# bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+# fi
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '~>3.1'
+gem 'rails', '3.2.3'
gem 'sqlite3'
@@ -9,7 +9,7 @@ group :test do
gem 'cucumber-rails'
gem 'capybara'
gem 'capybara-webkit'
- gem 'capybara-screenshot', '~>0.1'
+ gem 'capybara-screenshot', '0.1.10'
gem 'rspec'
end
View
@@ -1,35 +1,36 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ 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.5)
- rack-cache (~> 1.1)
- 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.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- 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.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- arel (2.2.1)
+ addressable (2.2.8)
+ archive-tar-minitar (0.5.2)
+ arel (3.0.2)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -38,108 +39,113 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- capybara-screenshot (0.1.11)
+ capybara-screenshot (0.1.10)
capybara (>= 1.0)
- capybara-webkit (0.7.2)
- capybara (>= 1.0.0, < 1.2)
- childprocess (0.3.1)
+ capybara-webkit (0.12.1)
+ capybara (< 1.2, >= 1.0.0)
+ json
+ childprocess (0.3.2)
ffi (~> 1.0.6)
- columnize (0.3.5)
- cucumber (1.1.4)
+ columnize (0.3.6)
+ cucumber (1.2.1)
builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.7.1)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.11.0)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
- cucumber-rails (1.2.0)
- capybara (>= 1.1.1)
- cucumber (>= 1.1.1)
+ cucumber-rails (1.3.0)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
diff-lcs (1.1.3)
erubis (2.7.0)
ffi (1.0.11)
- gherkin (2.7.6)
+ gherkin (2.11.0)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
- json (1.6.5)
- linecache (0.46)
- rbx-require-relative (> 0.0.4)
- mail (2.3.0)
+ journey (1.0.3)
+ json (1.7.3)
+ libwebsocket (0.1.3)
+ addressable
+ linecache19 (0.5.12)
+ ruby_core_source (>= 0.1.4)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- mini_specunit (0.1.1)
+ mime-types (1.18)
+ mini_specunit (0.4.0)
minitest
- minitest (2.8.1)
- multi_json (1.0.4)
- nokogiri (1.5.0)
+ minitest (3.0.1)
+ multi_json (1.3.6)
+ nokogiri (1.5.4)
polyglot (0.3.3)
- rack (1.3.6)
- rack-cache (1.1)
+ 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.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ 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.3)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ 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.2)
- rbx-require-relative (0.0.5)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
- rubyzip (0.9.6.1)
- selenium-webdriver (2.19.0)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.1)
+ rspec-expectations (2.10.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.10.1)
+ rspec-rails (2.10.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.10.0)
+ ruby-debug-base19 (0.11.25)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
+ rubyzip (0.9.8)
+ selenium-webdriver (2.22.2)
childprocess (>= 0.2.5)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
+ ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
rubyzip
- sprockets (2.0.3)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
- term-ansicolor (1.0.7)
+ tilt (!= 1.3.0, ~> 1.1)
+ sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
+ tzinfo (0.3.33)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -148,14 +154,14 @@ PLATFORMS
DEPENDENCIES
capybara
- capybara-screenshot (~> 0.1)
+ capybara-screenshot (= 0.1.10)
capybara-webkit
cucumber
cucumber-rails
mini_specunit
minitest
- rails (~> 3.1)
+ rails (= 3.2.3)
rspec
rspec-rails
- ruby-debug
+ ruby-debug19
sqlite3
@@ -27,4 +27,11 @@
# Expands the lines which load the assets
config.assets.debug = true
+
+ # Raise exception on mass assignment protection for Active Record models
+ config.active_record.mass_assignment_sanitizer = :strict
+
+ # Log the query plan for queries taking more than this (works
+ # with SQLite, MySQL, and PostgreSQL)
+ config.active_record.auto_explain_threshold_in_seconds = 0.5
end
@@ -36,4 +36,8 @@
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
+
+ # Raise exception on mass assignment protection for Active Record models
+ config.active_record.mass_assignment_sanitizer = :strict
+
end
View
Binary file not shown.

0 comments on commit 99fc702

Please sign in to comment.