nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move user module requires out to the user modules definition file

Browse source
This commit is contained in:
Raphael 2010-10-13 11:18:06 -07:00
parent 9898c8b158
commit 9a1590fa02
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/user.rb
View file

@ -2,9 +2,7 @@
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
require File.join(Rails.root, 'lib/diaspora/user/friending')
require File.join(Rails.root, 'lib/diaspora/user/querying')
require File.join(Rails.root, 'lib/diaspora/user/receiving')
require File.join(Rails.root, 'lib/diaspora/user')
require File.join(Rails.root, 'lib/salmon/salmon')
class InvitedUserValidator < ActiveModel::Validator
@ -20,9 +18,7 @@ end
class User
include MongoMapper::Document
plugin MongoMapper::Devise
include Diaspora::UserModules::Friending
include Diaspora::UserModules::Querying
include Diaspora::UserModules::Receiving
include Diaspora::UserModules
include Encryptor::Private
QUEUE = MessageHandler.new

11
lib/diaspora/user.rb Normal file
View file

@ -0,0 +1,11 @@
require File.join(Rails.root, 'lib/diaspora/user/friending')
require File.join(Rails.root, 'lib/diaspora/user/querying')
require File.join(Rails.root, 'lib/diaspora/user/receiving')
module Diaspora
module UserModules
include Friending
include Querying
include Receiving
end
end