Rewriting user name method

Method now caters for more cases and can work with nulls in the database

Author: johngrimes

lib/typus/user.rb

@@ -56,7 +56,15 @@ def generate(*args)
     module InstanceMethods
 
       def name
-        (!first_name.empty? && !last_name.empty?) ? "#{first_name} #{last_name}" : email
+        if !first_name.blank? and !last_name.blank?
+          "#{first_name} #{last_name}"
+        elsif !first_name.blank? and last_name.blank?
+          first_name
+        elsif first_name.blank? and !last_name.blank?
+          last_name
+        else
+          email
+        end
       end
 
      def authenticated?(password)
@@ -159,4 +167,4 @@ def password_required?
 
 end
 
-ActiveRecord::Base.send :include, Typus::EnableAsTypusUser
+ActiveRecord::Base.send :include, Typus::EnableAsTypusUser