diff options
author | jessib <jessib@riseup.net> | 2013-09-03 10:48:13 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-09-03 10:48:13 -0700 |
commit | 07d0f6fe1d80cb730bd12a03a107c18d18779acc (patch) | |
tree | 8583a31661ba5032a9cd6ffd6b74273a6c862ab0 /users/app/models | |
parent | f3e17149116f6a3aeb87f8a6d0ecf29e8e33ad93 (diff) | |
parent | 29b306a4d49d395e5753e2e85f8fa1f25d18410c (diff) |
Merge pull request #73 from azul/bugfix/3623-teardown-test-data-properly
Bugfix/3623 teardown test data properly
Diffstat (limited to 'users/app/models')
-rw-r--r-- | users/app/models/account.rb (renamed from users/app/models/account_settings.rb) | 25 | ||||
-rw-r--r-- | users/app/models/signup_service.rb | 9 | ||||
-rw-r--r-- | users/app/models/user.rb | 4 |
3 files changed, 27 insertions, 11 deletions
diff --git a/users/app/models/account_settings.rb b/users/app/models/account.rb index 27fa227..5368a1b 100644 --- a/users/app/models/account_settings.rb +++ b/users/app/models/account.rb @@ -1,9 +1,21 @@ -class AccountSettings +# +# A Composition of a User record and it's identity records. +# +class Account - def initialize(user) + attr_reader :user + + def initialize(user = nil) @user = user end + # Returns the user record so it can be used in views. + def self.create(attrs) + @user = User.create(attrs).tap do |user| + Identity.create_for user + end + end + def update(attrs) if attrs[:password_verifier].present? update_login(attrs[:login]) @@ -12,6 +24,15 @@ class AccountSettings # TODO: move into identity controller update_pgp_key(attrs[:public_key]) if attrs.has_key? :public_key @user.save && save_identities + @user.refresh_identity + end + + def destroy + return unless @user + Identity.by_user_id.key(@user.id).each do |identity| + identity.destroy + end + @user.destroy end protected diff --git a/users/app/models/signup_service.rb b/users/app/models/signup_service.rb deleted file mode 100644 index f316ca9..0000000 --- a/users/app/models/signup_service.rb +++ /dev/null @@ -1,9 +0,0 @@ -class SignupService - - def register(attrs) - User.create(attrs).tap do |user| - Identity.create_for user - end - end - -end diff --git a/users/app/models/user.rb b/users/app/models/user.rb index 8874966..310eecd 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -86,6 +86,10 @@ class User < CouchRest::Model::Base @identity ||= Identity.for(self) end + def refresh_identity + @identity = Identity.for(self) + end + protected ## |