app/controllers/sparkly_accounts_controller.rb in sparkly-auth-1.0.2 vs app/controllers/sparkly_accounts_controller.rb in sparkly-auth-1.1.0

@@ -1,18 +1,17 @@
 class SparklyAccountsController < SparklyController
-  unloadable
   require_login_for :show, :edit, :update, :destroy
 
   # GET new_model_url
   def new
   end
 
   # POST model_url
   def create
     if model.save
-      login!(model)
-      redirect_back_or_default Auth.default_destination, Auth.account_created_message
+      login!(model) if sparkly_config.login_after_signup
+      redirect_back_or_default sparkly_config.default_destination, sparkly_config.account_created_message
     else
       render :action => 'new'
     end
   end
 
@@ -30,30 +29,38 @@
       model.password = model_params[:password]
       model.password_confirmation = model_params[:password_confirmation]
     end
     
     if model.save
-      redirect_back_or_default user_path, Auth.account_updated_message
+      redirect_back_or_default user_path, sparkly_config.account_updated_message
     else
       render :action => 'edit'
     end
   end
 
   # DELETE model_url
   def destroy
     current_user && current_user.destroy
     logout!
     @current_user = nil
-    flash[:notice] = Auth.account_deleted_message
-    redirect_back_or_default Auth.default_destination
+    flash[:notice] = sparkly_config.account_deleted_message
+    redirect_back_or_default sparkly_config.default_destination
   end
 
   protected
-    def find_user_model
-      # password fields are protected attrs, so we need to exclude them then add them explicitly.
-      self.model_instance = current_user ||
-              returning(model_class.new(model_params.without(:password, :password_confirmation))) { |model|
-                model.password = model_params[:password]
-                model.password_confirmation = model_params[:password_confirmation]
-              }
+  def find_user_model
+    # password fields are protected attrs, so we need to exclude them then add them explicitly.
+    self.model_instance = current_user || begin
+            model = model_class.new(model_params.without(:password, :password_confirmation))
+            model.password = model_params[:password]
+            model.password_confirmation = model_params[:password_confirmation]
+            model
     end
+  end
+
+  # Uncomment if you don't trust the params[:model] set up by Sparkly routing, or if you've
+  # disabled them.
+  #
+  #def model_name
+  #  "User"
+  #end
 end