From d7fb9850e88d5cb50ad4e051fab8ee22ceb374b1 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 14 Oct 2012 22:02:55 -0400 Subject: [PATCH] include friend_request in jam_ruby --- lib/jam_ruby.rb | 1 + lib/jam_ruby/models/friend_request.rb | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/jam_ruby.rb b/lib/jam_ruby.rb index 94d641d67..14fce4ef6 100644 --- a/lib/jam_ruby.rb +++ b/lib/jam_ruby.rb @@ -11,6 +11,7 @@ require "jam_ruby/models/band" require "jam_ruby/models/connection" require "jam_ruby/models/friendship" require "jam_ruby/models/music_session" +require "jam_ruby/models/friend_request" include Jampb diff --git a/lib/jam_ruby/models/friend_request.rb b/lib/jam_ruby/models/friend_request.rb index b8fefe9df..29464b979 100644 --- a/lib/jam_ruby/models/friend_request.rb +++ b/lib/jam_ruby/models/friend_request.rb @@ -3,8 +3,15 @@ module JamRuby self.primary_key = 'id' - belongs_to :user + belongs_to :user, :class_name => "JamRuby::User" belongs_to :friend, :class_name => "JamRuby::User" + validates :user_id, :presence => true + validates :friend_id, :presence => true + + def to_s + return "#{self.user.to_s}:#{self.friend.to_s}" + end + end end \ No newline at end of file