Merge tag '0.5.3'

2 files changed, 15 insertions, 4 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index 32ed445..67fec58 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -16,11 +16,21 @@ class Account
 
   # Returns the user record so it can be used in views.
   def self.create(attrs)
-    @user = User.create(attrs)
+    @user = User.new(attrs)
+    @user.save
     if @user.persisted?
-      identity = @user.identity
-      identity.user_id = @user.id
-      identity.save
+      @identity = @user.identity
+      @identity.user_id = @user.id
+      @identity.save
+      @identity.errors.each do |attr, msg|
+        @user.errors.add(attr, msg)
+      end
+    end
+  rescue StandardError => ex
+    @user.errors.add(:base, ex.to_s)
+  ensure
+    if @user && @user.persisted? && (@identity.nil? || !@identity.persisted?)
+      @user.destroy
     end
     return @user
   end
diff --git a/app/models/identity.rb b/app/models/identity.rb
index 2f6241c..e7b5785 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -163,4 +163,5 @@ class Identity < CouchRest::Model::Base
     end
   end
 
+  ActiveSupport.run_load_hooks(:identity, self)
 end