muck-users 3.1.4 → 3.1.5

data/VERSION

@@ -1 +1 @@
-3.1.4
+3.1.5

data/lib/muck-users/models/user.rb

@@ -148,14 +148,26 @@ module MuckUsers
         return false if user.nil?
         self.id == user.id || user.admin?
       end
-              
-      def to_xml(options = {})
+      
+      def add_exclude_fields(options = {})
+        options ||= {}
         options[:except] ||= []
-        options[:except] << :email << :crypted_password << :salt << :remember_token << :remember_token_expires_at << :activation_code
+        options[:except] << :crypted_password << :salt << :remember_token << :remember_token_expires_at << :activation_code
         options[:except] << :activated_at << :password_reset_code << :enabled << :terms_of_service << :can_send_messages << :identity_url
-        options[:except] << :tmp_password << :protected_profile << :public_profile    
+        options[:except] << :tmp_password << :protected_profile << :public_profile << :disabled_at << :current_login_ip << :access_code_id
+        options[:except] << :failed_login_count << :last_login_ip
         options[:except] << :password_salt << :perishable_token << :persistence_token << :single_access_token
-        super
+        options
+      end
+                
+      def to_xml(options = {})
+        options = add_exclude_fields(options)
+        super(options)
+      end
+      
+      def as_json(options = {})
+        options = add_exclude_fields(options)
+        super(options)
       end
               
       # Authlogic automatically executes the following methods

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.4"
+  s.version = "3.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-12-23}
+  s.date = %q{2011-01-29}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{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: 11
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  version: 3.1.5
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -07:00
+date: 2011-01-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency