Permalink
Browse files

Update gems

  • Loading branch information...
1 parent be77095 commit 528af1043490d9c11bc491cba2d853e568c90ee1 @hugomaiavieira committed Feb 18, 2012
View
8 Gemfile
@@ -1,17 +1,17 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.1'
gem 'mysql2', '~>0.3'
gem 'slim', '~>1.0'
gem 'simple_form', '~>1.5'
gem 'inherited_resources', '~>1.2'
gem 'escape_utils', '~>0.2'
-gem 'devise', '~>1.4'
+gem 'devise', '~>2.0'
gem 'redcarpet', '~>1.17' # Markdown
gem 'albino', '~>1.3' # Markdown syntax highlighting
gem 'nokogiri', '~>1.5' # Parse the html for markdown syntax highlighting
-gem 'jquery-rails', '~>1.0'
+gem 'jquery-rails', '~>2.0'
gem 'ruby-json', '~>1.1'
group :assets do
@@ -27,7 +27,7 @@ group :development, :test do
gem 'valid_attribute', '~>1.1'
gem 'capybara', '~>1.0'
gem 'launchy', '>=2.0' # save_and_open_page
- gem 'cucumber-rails', '~>1.0'
+ gem 'cucumber-rails', '~>1.0', :require => false
gem 'database_cleaner', '~>0.6'
# Speedy test iterations
View
224 Gemfile.lock
@@ -1,200 +1,194 @@
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.1)
+ actionpack (= 3.2.1)
+ mail (~> 2.4.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.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.1)
+ activesupport (= 3.2.1)
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.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
+ addressable (2.2.7)
albino (1.3.3)
posix-spawn (>= 0.3.6)
- arel (2.2.1)
- bcrypt-ruby (2.1.4)
+ arel (3.0.0)
+ bcrypt-ruby (3.0.1)
builder (3.0.0)
- capybara (1.0.1)
+ 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.2.2)
+ childprocess (0.3.1)
ffi (~> 1.0.6)
- coderay (0.9.8)
- cucumber (1.0.2)
+ coderay (1.0.5)
+ cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- gherkin (~> 2.4.5)
+ gherkin (~> 2.7.1)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.5)
- cucumber-rails (1.0.2)
- capybara (>= 1.0.0)
- cucumber (~> 1.0.0)
- nokogiri (>= 1.4.6)
- database_cleaner (0.6.7)
- devise (1.4.2)
- bcrypt-ruby (~> 2.1.2)
+ term-ansicolor (>= 1.0.6)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
+ nokogiri (>= 1.5.0)
+ database_cleaner (0.7.1)
+ devise (2.0.4)
+ bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
- diff-lcs (1.1.2)
+ railties (~> 3.1)
+ warden (~> 1.1.1)
+ diff-lcs (1.1.3)
erubis (2.7.0)
- escape_utils (0.2.3)
- execjs (1.2.9)
+ escape_utils (0.2.4)
+ execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.0.2)
- factory_girl_rails (1.1.0)
- factory_girl (~> 2.0.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)
ffi (1.0.11)
- gherkin (2.4.5)
+ gherkin (2.7.7)
json (>= 1.4.6)
- has_scope (0.5.0)
+ has_scope (0.5.1)
hike (1.2.1)
i18n (0.6.0)
- inherited_resources (1.2.2)
+ inherited_resources (1.3.0)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
- jquery-rails (1.0.12)
- railties (~> 3.0)
+ journey (1.0.1)
+ jquery-rails (2.0.0)
+ railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
- json (1.5.3)
- json_pure (1.6.1)
+ json (1.6.5)
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.3.10.4)
- mail (2.3.0)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- method_source (0.6.7)
- ruby_parser (>= 2.3.1)
+ method_source (0.7.0)
mime-types (1.17.2)
- multi_json (1.0.3)
- mysql2 (0.3.10)
+ multi_json (1.0.4)
+ mysql2 (0.3.11)
nokogiri (1.5.0)
- orm_adapter (0.0.5)
+ orm_adapter (0.0.6)
polyglot (0.3.3)
posix-spawn (0.3.6)
- pry (0.9.7.4)
- coderay (~> 0.9.8)
- method_source (~> 0.6.7)
- ruby_parser (>= 2.3.1)
- slop (~> 2.1.0)
- pry-doc (0.3.0)
+ pry (0.9.8.2)
+ coderay (~> 1.0.5)
+ method_source (~> 0.7)
+ slop (>= 2.4.4, < 3)
+ pry-doc (0.4.0)
pry (>= 0.9.0)
- yard (>= 0.6.4)
- rack (1.3.5)
+ yard (~> 0.7.4)
+ rack (1.4.1)
rack-cache (1.1)
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.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.1.3)
+ railties (= 3.2.1)
rails3-generators (0.17.4)
railties (>= 3.0.0)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
redcarpet (1.17.2)
- responders (0.6.4)
- rspec (2.6.0)
- rspec-core (~> 2.6.0)
- rspec-expectations (~> 2.6.0)
- rspec-mocks (~> 2.6.0)
- rspec-core (2.6.4)
- rspec-expectations (2.6.0)
+ responders (0.6.5)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
- rspec-rails (2.6.1)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.6.0)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
ruby-json (1.1.2)
- ruby_parser (2.3.1)
- sexp_processor (~> 3.0)
- rubyzip (0.9.4)
- selenium-webdriver (2.13.0)
- childprocess (>= 0.2.1)
+ rubyzip (0.9.6.1)
+ selenium-webdriver (2.19.0)
+ childprocess (>= 0.2.5)
ffi (~> 1.0.9)
- json_pure
+ multi_json (~> 1.0.4)
rubyzip
- sexp_processor (3.0.10)
simple_form (1.5.2)
actionpack (~> 3.0)
activemodel (~> 3.0)
- slim (1.0.0)
- temple (~> 0.3.0)
- tilt (~> 1.2)
- slop (2.1.0)
- spork (0.9.0.rc9)
- sprockets (2.0.3)
+ slim (1.1.0)
+ temple (~> 0.3.5)
+ tilt (~> 1.3.2)
+ slop (2.4.4)
+ spork (0.9.0)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
+ sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
- temple (0.3.2)
- term-ansicolor (1.0.6)
+ temple (0.3.5)
+ term-ansicolor (1.0.7)
therubyracer (0.9.9)
libv8 (~> 3.3.10)
thor (0.14.6)
- tilt (1.3.2)
+ tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
- uglifier (1.1.0)
+ uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- valid_attribute (1.1.0)
- warden (1.0.5)
+ valid_attribute (1.2.0)
+ warden (1.1.1)
rack (>= 1.0)
xpath (0.1.4)
nokogiri (~> 1.3)
- yard (0.7.4)
+ yard (0.7.5)
PLATFORMS
ruby
@@ -204,17 +198,17 @@ DEPENDENCIES
capybara (~> 1.0)
cucumber-rails (~> 1.0)
database_cleaner (~> 0.6)
- devise (~> 1.4)
+ devise (~> 2.0)
escape_utils (~> 0.2)
factory_girl_rails (~> 1.1)
inherited_resources (~> 1.2)
- jquery-rails (~> 1.0)
+ jquery-rails (~> 2.0)
launchy (>= 2.0)
mysql2 (~> 0.3)
nokogiri (~> 1.5)
pry
pry-doc
- rails (= 3.1.3)
+ rails (= 3.2.1)
rails3-generators
redcarpet (~> 1.17)
rspec (~> 2.6)
View
9 config/initializers/devise.rb
@@ -73,7 +73,7 @@
# You can use this to let your user access some features of your application
# without confirming the account, but blocking it after a certain period
# (ie 2 days).
- # config.confirm_within = 2.days
+ # config.allow_unconfirmed_access_for = 2.days
# Defines which key will be used when confirming an account
# config.confirmation_keys = [ :email ]
@@ -82,9 +82,6 @@
# The time the user will be remembered without asking for credentials again.
# config.remember_for = 2.weeks
- # If true, a valid remember token can be re-used between multiple browsers.
- # config.remember_across_browsers = true
-
# If true, extends the user's remember period when remembered via cookie.
# config.extend_remember_period = false
@@ -153,9 +150,9 @@
# Defines name of the authentication token params key
# config.token_authentication_key = :auth_token
- # If true, authentication through token does not store user in session and needs
+ # If uncommented, authentication through token does not store user in session and needs
# to be supplied on each request. Useful if you are using the token as API token.
- # config.stateless_token = false
+ # config.skip_session_storage << :auth_token
# ==> Scopes configuration
# Turn scoped views on. Before rendering "sessions/new", it will first check for
View
12 config/locales/devise.en.yml
@@ -1,4 +1,4 @@
-# Additional translations at http://github.com/plataformatec/devise/wiki/I18n
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
en:
errors:
@@ -27,19 +27,23 @@ en:
passwords:
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
updated: 'Your password was changed successfully. You are now signed in.'
+ updated_not_active: 'Your password was changed successfully.'
send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
confirmations:
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
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}.'
+ 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.'
updated: 'You updated your account successfully.'
+ update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
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.'
+ unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
omniauth_callbacks:
success: 'Successfully authorized from %{kind} account.'
@@ -50,4 +54,4 @@ en:
reset_password_instructions:
subject: 'Reset password instructions'
unlock_instructions:
- subject: 'Unlock Instructions'
+ subject: 'Unlock Instructions'
View
18 db/migrate/20100921012401_create_contributors.rb
@@ -3,23 +3,23 @@ def self.up
create_table(:contributors) do |t|
t.string :name
t.string :username
- t.database_authenticatable :null => false
- t.recoverable
- t.rememberable
- # t.trackable
- # t.confirmable
- # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
- # t.token_authenticatable
+ ## Devise: Database authenticatable
+ t.string :email, :null => false, :default => ""
+ t.string :encrypted_password, :null => false, :default => ""
+ ## Devise: Recoverable
+ t.string :reset_password_token
+ t.datetime :reset_password_sent_at
+
+ ## Devise: Rememberable
+ t.datetime :remember_created_at
t.timestamps
end
add_index :contributors, :email, :unique => true
add_index :contributors, :reset_password_token, :unique => true
- # add_index :contributors, :confirmation_token, :unique => true
- # add_index :contributors, :unlock_token, :unique => true
end
def self.down
View
11 features/step_definitions/contributor_steps.rb
@@ -7,10 +7,10 @@
Given /^I am(?:| an) authenticated(?:| contributor)$/ do
@contributor ||= Factory.create :contributor
- Given %{I am on the sign in page}
- And %{I fill in "contributor_login" with "#{@contributor.email}"}
- And %{I fill in "contributor_password" with "#{@contributor.password}"}
- And %{I press "Sign in"}
+ step %{I am on the sign in page}
+ step %{I fill in "contributor_login" with "#{@contributor.email}"}
+ step %{I fill in "contributor_password" with "#{@contributor.password}"}
+ step %{I press "Sign in"}
end
Given /^I am a contributor of "([^"]*)" project$/ do |name|
@@ -38,5 +38,4 @@
contributor = Factory.create :contributor, :name => name, :contributions => [@project]
@project.contributors << contributor
@project.save
-end
-
+end
View
14 features/step_definitions/web_steps.rb
@@ -32,13 +32,13 @@ def with_scope(locator)
World(WithinHelpers)
# Single-line step scoper
-When /^(.*) within (.*[^:])$/ do |step, parent|
- with_scope(parent) { When step }
+When /^(.*) within (.*[^:])$/ do |_step, parent|
+ with_scope(parent) { step _step }
end
# Multi-line step scoper
-When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
- with_scope(parent) { When "#{step}:", table_or_string }
+When /^(.*) within (.*[^:]):$/ do |_step, parent, table_or_string|
+ with_scope(parent) { step "#{_step}:", table_or_string }
end
Given /^(?:|I )am on (.+)$/ do |page_name|
@@ -183,7 +183,7 @@ def with_scope(locator)
end
end
end
-
+
Then /^(?:|I )should be on (.+)$/ do |page_name|
current_path = URI.parse(current_url).path
if current_path.respond_to? :should
@@ -197,8 +197,8 @@ def with_scope(locator)
query = URI.parse(current_url).query
actual_params = query ? CGI.parse(query) : {}
expected_params = {}
- expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
-
+ expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
if actual_params.respond_to? :should
actual_params.should == expected_params
else

0 comments on commit 528af10

Please sign in to comment.