Models Refactoring: Move methods to roles

app/models/user.rb

@@ -1,4 +1,6 @@
 class User < ActiveRecord::Base
+  include Account
+
   devise :database_authenticatable, :token_authenticatable,
          :recoverable, :rememberable, :trackable, :validatable, :omniauthable
 
@@ -65,30 +67,6 @@ class User < ActiveRecord::Base
     where('id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)')
   end
 
-  def identifier
-    email.gsub /[@.]/, "_"
-  end
-
-  def is_admin?
-    admin
-  end
-
-  def require_ssh_key?
-    keys.count == 0
-  end
-
-  def can_create_project?
-    projects_limit > my_own_projects.count
-  end
-
-  def last_activity_project
-    projects.first
-  end
-
-  def first_name
-    name.split.first unless name.blank?
-  end
-
   def self.find_for_ldap_auth(omniauth_info)
     name = omniauth_info.name.force_encoding("utf-8")
     email = omniauth_info.email.downcase
@@ -105,30 +83,6 @@ class User < ActiveRecord::Base
       )
     end
   end
-
-  def cared_merge_requests
-    MergeRequest.where("author_id = :id or assignee_id = :id", :id => self.id).opened
-  end
-
-  def project_ids
-    projects.map(&:id)
-  end
-
-  # Remove user from all projects and
-  # set blocked attribute to true
-  def block
-    users_projects.all.each do |membership|
-      return false unless membership.destroy
-    end
-
-    self.blocked = true
-    save
-  end
-
-  def projects_limit_percent
-    return 100 if projects_limit.zero?
-    (my_own_projects.count.to_f / projects_limit) * 100
-  end
 end
 # == Schema Information
 #