muck-users 3.2.15 → 3.2.16

data/VERSION

@@ -1 +1 @@
-3.2.15
+3.2.16

data/app/controllers/muck/user_sessions_controller.rb

@@ -24,11 +24,13 @@ class Muck::UserSessionsController < ApplicationController
   def create
     @title = t('muck.users.sign_in_title')    
     @user_session = UserSession.new(params[:user_session])
-    before_create_user_session
-    @user_session.save do |result|
-      after_create_user_session(result)
-      after_create_response(result)
+    if success = before_create_user_session
+      @user_session.save do |result|
+        success = result
+      end
     end
+    after_create_user_session(success)
+    after_create_response(success)
   end
   
   def destroy
@@ -52,6 +54,7 @@ class Muck::UserSessionsController < ApplicationController
   
     # Override to act on @user_session before it is created
     def before_create_user_session
+      true
     end
     
     # Override to act on @user_session after it is created

data/app/controllers/muck/users_controller.rb

@@ -51,10 +51,13 @@ class Muck::UsersController < ApplicationController
     setup_tos
     check_access_code
     check_recaptcha
-    before_create_user
-    success, path = setup_user
-    after_create_user(success)
-    after_create_response(success, path)
+    if before_create_user
+      success, path = setup_user
+      after_create_user(success)
+      after_create_response(success, path)
+    else
+      after_create_response(false)
+    end
   rescue MuckUsers::Exceptions::InvalidAccessCode, ActiveRecord::RecordInvalid => ex
     after_create_response(false)
   end
@@ -63,12 +66,15 @@ class Muck::UsersController < ApplicationController
     @title = t("users.update_profile")
     @user = admin? ? User.find(params[:id]) : User.find(current_user)
     @user.attributes = params[:user]
-    before_update_user
-    success = @user.save
-    after_update_user(success)
-    if success
-      flash[:notice] = t("muck.users.user_update")
-      after_update_response(true)
+    if before_update_user
+      success = @user.save
+      after_update_user(success)
+      if success
+        flash[:notice] = t("muck.users.user_update")
+        after_update_response(true)
+      else
+        after_update_response(false)
+      end
     else
       after_update_response(false)
     end
@@ -158,6 +164,7 @@ class Muck::UsersController < ApplicationController
   
     # Override to act on @user before it is created
     def before_create_user
+      true
     end
 
     # Override to act on @user after it is created
@@ -167,6 +174,7 @@ class Muck::UsersController < ApplicationController
 
     # Override to act on @user before it is updated
     def before_update_user
+      true
     end
     
     # Override to act on @user after it is updated

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "muck-users"
-  s.version = "3.2.15"
+  s.version = "3.2.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = "2011-09-22"
+  s.date = "2011-09-29"
   s.description = "Easily add user signup, login and other features to your application"
   s.email = "justin@tatemae.com"
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 47
   prerelease: 
   segments: 
   - 3
   - 2
-  - 15
-  version: 3.2.15
+  - 16
+  version: 3.2.16
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 Z
+date: 2011-09-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement