Skip to content
Browse files

Changed .rvmrc to run on ruby 1.9.3. Added pry and related gems to Ge…

…mfile. Upgraded devise localization to work devise v.2
  • Loading branch information...
1 parent 5f4b652 commit c70576bfccff662c9693a5c7267620f4e1e17360 @mhinton committed Feb 23, 2012
Showing with 124 additions and 98 deletions.
  1. +1 −1 .rvmrc
  2. +26 −2 Gemfile
  3. +94 −87 Gemfile.lock
  4. +3 −8 config/locales/devise.en.yml
View
2 .rvmrc
@@ -1 +1 @@
-rvm --create use 1.9.2@behave
+rvm --create use 1.9.3@behave
View
28 Gemfile
@@ -9,6 +9,15 @@ gem 'tabulous'
gem 'client_side_validations'
gem 'devise'
+# for file uploads and resizing
+# http://www.engineyard.com/blog/2011/a-gentle-introduction-to-carrierwave/
+gem 'carrierwave'
+gem 'rmagick'
+
+# pagination gem
+# https://github.com/amatsuda/kaminari
+gem 'kaminari'
+
# Use unicorn as the web server
gem 'unicorn'
@@ -29,14 +38,29 @@ group :development do
end
group :development, :test do
- gem 'ruby-debug19', :require => 'ruby-debug'
+ # gem 'ruby-debug19', :require => 'ruby-debug'
+
+ # pry related gems
+ gem 'pry-rails'
+ gem 'pry-doc'
+ gem 'pry-nav'
+ gem 'pry-stack_explorer'
+ gem 'pry-remote'
+ gem 'plymouth' # add require 'plymouth' to test file to debug
+
gem 'database_cleaner'
gem 'factory_girl_rails'
gem 'rspec-rails'
gem 'shoulda'
- gem 'capybara'
gem 'irbtools', :require => false
gem 'itslog' # colorize log output
gem 'silent-postgres' # remove postgres cruft from logs
end
+
+group :test do
+ gem 'timecop' # https://github.com/jtrupiano/timecop
+ gem 'database_cleaner'
+ gem 'shoulda'
+ # gem 'capybara'
+end
View
181 Gemfile.lock
@@ -1,84 +1,75 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.0)
- actionpack (= 3.2.0)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
mail (~> 2.4.0)
- actionpack (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.0)
+ journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.0)
- activesupport (= 3.2.0)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
- activerecord (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
- activesupport (3.2.0)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
alias (0.2.2)
- archive-tar-minitar (0.5.2)
- arel (3.0.0)
+ arel (3.0.1)
awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
- bootstrap-sass (1.4.4)
- sass-rails (~> 3.1)
- boson (0.3.4)
+ binding_of_caller (0.6.2)
+ bootstrap-sass (2.0.1)
+ boson (0.4.0)
alias (>= 0.2.2)
hirb (>= 0.5.0)
builder (3.0.0)
- capybara (1.1.2)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 0.1.4)
- childprocess (0.3.0)
- ffi (~> 1.0.6)
+ carrierwave (0.5.8)
+ activesupport (~> 3.0)
client_side_validations (3.1.4)
- clipboard (1.0.0)
+ clipboard (1.0.1)
coderay (1.0.5)
- coffee-rails (3.2.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.2.0.beta)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.2.0)
colored (1.2)
- columnize (0.3.6)
database_cleaner (0.7.1)
- devise (1.5.3)
+ devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.1)
+ railties (~> 3.1)
+ warden (~> 1.1.1)
diff-lcs (1.1.3)
erubis (2.7.0)
every_day_irb (1.2.0)
execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.5.0)
- activesupport
- factory_girl_rails (1.6.0)
- factory_girl (~> 2.5.0)
+ factory_girl (2.6.0)
+ activesupport (>= 2.3.9)
+ factory_girl_rails (1.7.0)
+ factory_girl (~> 2.6.0)
railties (>= 3.0.0)
fancy_irb (0.7.2)
paint (>= 0.8.1)
unicode-display_width (>= 0.1.1)
- ffi (1.0.11)
g (1.6.0)
ruby_gntp
hike (1.2.1)
@@ -105,14 +96,16 @@ GEM
wirb (>= 0.4.1)
zucker (>= 11)
itslog (0.6.1)
- journey (1.0.0)
+ journey (1.0.2)
jquery-rails (2.0.0)
- railties (< 5.0, >= 3.2.0.beta)
+ railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
json (1.6.5)
+ kaminari (0.13.0)
+ actionpack (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ railties (>= 3.0.0)
kgio (2.7.2)
- linecache19 (0.5.12)
- ruby_core_source (>= 0.1.4)
mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -121,33 +114,53 @@ GEM
method_source (0.7.0)
methodfinder (1.2.5)
mime-types (1.17.2)
- multi_json (1.0.4)
- nokogiri (1.5.0)
+ multi_json (1.1.0)
ori (0.1.0)
orm_adapter (0.0.6)
paint (0.8.4)
- pg (0.12.2)
+ pg (0.13.1)
+ plymouth (0.3.2)
+ pry-exception_explorer (>= 0.1.7)
polyglot (0.3.3)
+ pry (0.9.8.2)
+ coderay (~> 1.0.5)
+ method_source (~> 0.7)
+ slop (>= 2.4.4, < 3)
+ pry-doc (0.4.1)
+ pry (>= 0.9.0)
+ yard (~> 0.7.4)
+ pry-exception_explorer (0.1.9)
+ pry-stack_explorer (>= 0.3.9)
+ pry-nav (0.1.0)
+ pry (~> 0.9.8.1)
+ pry-rails (0.1.6)
+ pry
+ pry-remote (0.1.0)
+ pry (~> 0.9.6)
+ slop (~> 2.1)
+ pry-stack_explorer (0.4.0)
+ binding_of_caller (~> 0.6.2)
+ pry (~> 0.9.8.2)
rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.0)
- actionmailer (= 3.2.0)
- actionpack (= 3.2.0)
- activerecord (= 3.2.0)
- activeresource (= 3.2.0)
- activesupport (= 3.2.0)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.2.0)
+ railties (= 3.2.1)
rails-footnotes (3.7.5)
rails (>= 3.0.0)
- railties (3.2.0)
- actionpack (= 3.2.0)
- activesupport (= 3.2.0)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -158,6 +171,7 @@ GEM
json (~> 1.4)
rein (0.8.1)
activerecord
+ rmagick (2.13.1)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
@@ -171,66 +185,51 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.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)
ruby_gntp (0.3.4)
- rubyzip (0.9.5)
- sass (3.1.12)
- sass-rails (3.2.3)
- railties (~> 3.2.0.beta)
+ sass (3.1.15)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.17.0)
- childprocess (>= 0.2.5)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
- rubyzip
shoulda (2.11.3)
silent-postgres (0.1.1)
sketches (0.1.1)
+ slop (2.4.4)
spoon (0.0.1)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- tabulous (1.1.0)
+ tilt (~> 1.1, != 1.3.0)
+ tabulous (1.2.0)
colored (~> 1.2.0)
rails (~> 3.0)
thor (0.14.6)
tilt (1.3.3)
+ timecop (0.3.5)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
- uglifier (1.2.2)
+ uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
unicode-display_width (0.1.1)
- unicorn (4.1.1)
- kgio (~> 2.4)
+ unicorn (4.2.0)
+ kgio (~> 2.6)
rack
- raindrops (~> 0.6)
- warden (1.1.0)
+ raindrops (~> 0.7)
+ warden (1.1.1)
rack (>= 1.0)
wirb (0.4.1)
- xpath (0.1.4)
- nokogiri (~> 1.3)
+ yard (0.7.5)
zucker (12.1)
PLATFORMS
ruby
DEPENDENCIES
bootstrap-sass
- capybara
+ carrierwave
client_side_validations
coffee-rails (~> 3.2.1)
database_cleaner
@@ -239,15 +238,23 @@ DEPENDENCIES
irbtools
itslog
jquery-rails
+ kaminari
pg
+ plymouth
+ pry-doc
+ pry-nav
+ pry-rails
+ pry-remote
+ pry-stack_explorer
rails (~> 3.2.0)
rails-footnotes
rein
+ rmagick
rspec-rails
- ruby-debug19
sass-rails (~> 3.2.3)
shoulda
silent-postgres
tabulous
+ timecop
uglifier (>= 1.0.3)
unicorn
View
11 config/locales/devise.en.yml
@@ -34,14 +34,9 @@ en:
send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
confirmed: 'Your account was successfully confirmed. You are now signed in.'
registrations:
- signed_up: 'Welcome! You have signed up successfully.'
- inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
- updated: 'You updated your account successfully.'
- destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
- reasons:
- inactive: 'inactive'
- unconfirmed: 'unconfirmed'
- locked: 'locked'
+ signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+ signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+ signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
unlocks:
send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
unlocked: 'Your account was successfully unlocked. You are now signed in.'

0 comments on commit c70576b

Please sign in to comment.
Something went wrong with that request. Please try again.