muck-users 3.2.14 → 3.2.15

data/VERSION

@@ -1 +1 @@
-3.2.14
+3.2.15

data/app/controllers/muck/users_controller.rb

@@ -184,34 +184,31 @@ class Muck::UsersController < ApplicationController
       end
     end
   
-    def standard_response(template, success = true, failure_path = '')
-      if success
-        respond_to do |format|
-          format.html { render :template => "users/#{template}" }
-          format.xml { render :xml => @user }
-          format.json do
-            if MuckUsers.configuration.use_http_status_failures
-              render :json => @user
-            else
-              render :json => { :success => true, :user => @user.as_json }
-            end
+    # override to customize the json generated for the user
+    def standard_user_json
+      @user.as_json
+    end
+
+    def standard_response(template, success = true, failure_path = '')      
+      respond_to do |format|        
+        format.html do
+          if success
+            render :template => "users/#{template}"
+          else
+            redirect_to failure_path
           end
         end
-      else 
-        respond_to do |format|
-          format.html { redirect_to failure_path }
-          format.xml { render :xml => @user }
-          format.json do
-            if MuckUsers.configuration.use_http_status_failures
-              render :json => @user, :status => :unprocessable_entity
-            else
-              render :json => { :success => false, :user => @user.as_json }
-            end
+        format.xml { render :xml => @user }
+        format.json do
+          if MuckUsers.configuration.use_http_status_failures
+            render :json => standard_user_json, :status => success ? :ok : :unprocessable_entity
+          else        
+            render :json => { :success => success, :user => standard_user_json }
           end
-        end
-      end  
+        end                 
+      end
     end
-  
+    
     def after_create_response(success, local_uri = '')
       if success
         respond_to do |format|

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "muck-users"
-  s.version = "3.2.14"
+  s.version = "3.2.15"
 
   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-21"
+  s.date = "2011-09-22"
   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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 2
-  - 14
-  version: 3.2.14
+  - 15
+  version: 3.2.15
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 Z
+date: 2011-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement