nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade devise; devise_invitable

Browse source
This commit is contained in:
danielgrippi 2011-12-06 10:50:29 -08:00
parent 4fad432a30
commit 0f56ee7b77
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -9,8 +9,8 @@ gem 'thin', '~> 1.3.1', :require => false
# authentication # authentication
gem 'devise', '~> 1.3.1' gem 'devise', '~> 1.5.0'
gem 'devise_invitable', '0.5.0' gem 'devise_invitable', '~> 0.6.0'
gem 'jwt', "0.1.3" gem 'jwt', "0.1.3"
gem 'oauth2-provider', '0.0.16' gem 'oauth2-provider', '0.0.16'

22
Gemfile.lock
View file

@ -88,7 +88,7 @@ GEM
addressable (2.2.4) addressable (2.2.4)
archive-tar-minitar (0.5.2) archive-tar-minitar (0.5.2)
arel (2.0.10) arel (2.0.10)
bcrypt-ruby (2.1.4) bcrypt-ruby (3.0.1)
builder (2.1.2) builder (2.1.2)
bunny (0.7.8) bunny (0.7.8)
capistrano (2.5.19) capistrano (2.5.19)
@ -145,13 +145,13 @@ GEM
culerity (0.2.15) culerity (0.2.15)
daemons (1.1.4) daemons (1.1.4)
database_cleaner (0.7.0) database_cleaner (0.7.0)
devise (1.3.4) devise (1.5.2)
bcrypt-ruby (~> 2.1.2) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3) orm_adapter (~> 0.0.3)
warden (~> 1.0.3) warden (~> 1.1)
devise_invitable (0.5.0) devise_invitable (0.6.0)
devise (~> 1.3.1) devise (>= 1.4.6, < 1.6)
rails (>= 3.0.0, <= 3.2) rails (>= 3.0.0, < 3.2)
diff-lcs (1.1.3) diff-lcs (1.1.3)
em-synchrony (0.2.0) em-synchrony (0.2.0)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
@ -286,7 +286,7 @@ GEM
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.0)
open4 (1.3.0) open4 (1.3.0)
orm_adapter (0.0.5) orm_adapter (0.0.5)
parallel (0.5.9) parallel (0.5.10)
parallel_tests (0.6.11) parallel_tests (0.6.11)
parallel parallel
polyglot (0.3.3) polyglot (0.3.3)
@ -399,7 +399,7 @@ GEM
uuidtools (2.1.2) uuidtools (2.1.2)
vegas (0.1.8) vegas (0.1.8)
rack (>= 1.0.0) rack (>= 1.0.0)
warden (1.0.6) warden (1.1.0)
rack (>= 1.0) rack (>= 1.0)
webmock (1.6.2) webmock (1.6.2)
addressable (>= 2.2.2) addressable (>= 2.2.2)
@ -429,8 +429,8 @@ DEPENDENCIES
cucumber-api-steps (= 0.6) cucumber-api-steps (= 0.6)
cucumber-rails (= 0.3.2) cucumber-rails (= 0.3.2)
database_cleaner (= 0.7.0) database_cleaner (= 0.7.0)
devise (~> 1.3.1) devise (~> 1.5.0)
devise_invitable (= 0.5.0) devise_invitable (~> 0.6.0)
diaspora-client! diaspora-client!
em-synchrony em-synchrony
em-websocket em-websocket

2
app/controllers/invitations_controller.rb
View file

@ -22,7 +22,7 @@ class InvitationsController < Devise::InvitationsController
emails = params[:user][:email].to_s.gsub(/\s/, '').split(/, */) emails = params[:user][:email].to_s.gsub(/\s/, '').split(/, */)
#NOTE should we try and find users by email here? probs #NOTE should we try and find users by email here? probs
aspect = current_user.aspects.find(aspect_id) aspect = current_user.aspects.find(aspect_id)
language = params[:user][:language] language = params[:user][:language]
invites = Invitation.batch_invite(emails, :message => message, :sender => current_user, :aspect => aspect, :service => 'email', :language => language) invites = Invitation.batch_invite(emails, :message => message, :sender => current_user, :aspect => aspect, :service => 'email', :language => language)

3
spec/models/invitation_spec.rb
View file

@ -72,7 +72,8 @@ describe Invitation do
invite = Invitation.create(:sender => alice, :aspect => alice.aspects.first, :service => 'facebook', :identifier => bob.services.first.uid) invite = Invitation.create(:sender => alice, :aspect => alice.aspects.first, :service => 'facebook', :identifier => bob.services.first.uid)
lambda { lambda {
invite.send! invite.send!
}.should_not change(User, :count) #}.should_not change(User, :count)
}.should raise_error /ActiveRecord::ReadOnlyRecord/
end end
end end