Merge pull request #85 from azul/refactor/user_account_shortcut

user.account shortcut to Account.new(user)

4 files changed, 10 insertions, 11 deletions

diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
index 01a1a2f..03a5a62 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/users/app/controllers/v1/users_controller.rb
@@ -31,7 +31,7 @@ module V1
     protected
 
     def account
-      Account.new(@user)
+      @user.account
     end
 
   end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 310eecd..a14fcb5 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -82,6 +82,10 @@ class User < CouchRest::Model::Base
     identity.keys[:pgp]
   end
 
+  def account
+    Account.new(self)
+  end
+
   def identity
     @identity ||= Identity.for(self)
   end
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index a5ec2c5..06f2401 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -13,9 +13,7 @@ class AccountTest < BrowserIntegrationTest
     assert page.has_content?("Sign Up")
     assert_equal '/', current_path
     assert user = User.find_by_login(username)
-    assert id = user.identity
-    id.destroy
-    user.destroy
+    user.account.destroy
   end
 
   test "successful login" do
diff --git a/users/test/unit/account_test.rb b/users/test/unit/account_test.rb
index 39969c0..94a9980 100644
--- a/users/test/unit/account_test.rb
+++ b/users/test/unit/account_test.rb
@@ -9,15 +9,14 @@ class AccountTest < ActiveSupport::TestCase
     assert id = user.identity
     assert_equal user.email_address, id.address
     assert_equal user.email_address, id.destination
-    id.destroy
-    user.destroy
+    user.account.destroy
   end
 
   test "create and remove a user account" do
     assert_no_difference "Identity.count" do
       assert_no_difference "User.count" do
         user = Account.create(FactoryGirl.attributes_for(:user))
-        Account.new(user).destroy
+        user.account.destroy
       end
     end
   end
@@ -26,7 +25,7 @@ class AccountTest < ActiveSupport::TestCase
     user = Account.create(FactoryGirl.attributes_for(:user))
     old_id = user.identity
     old_email = user.email_address
-    Account.new(user).update(FactoryGirl.attributes_for(:user))
+    user.account.update(FactoryGirl.attributes_for(:user))
     user.reload
     old_id.reload
     assert user.valid?
@@ -37,9 +36,7 @@ class AccountTest < ActiveSupport::TestCase
     assert_equal user.email_address, id.destination
     assert_equal user.email_address, old_id.destination
     assert_equal old_email, old_id.address
-    old_id.destroy
-    id.destroy
-    user.destroy
+    user.account.destroy
   end
 
 end