Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby

lib/jam_ruby.rb

@@ -12,13 +12,13 @@ require "jam_ruby/version"
 require "jam_ruby/message_factory"
 require "jam_ruby/models/genre"
 require "jam_ruby/models/user"
-require "jam_ruby/models/musician"
 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/invitation"
 require "jam_ruby/models/friend_request"
+require "jam_ruby/models/instrument"
 
 include Jampb
 

lib/jam_ruby/models/band.rb

@@ -1,9 +1,10 @@
 module JamRuby
   class Band < ActiveRecord::Base
 
-  	self.primary_key = 'id'
+    self.primary_key = 'id'
 
-    has_and_belongs_to_many :musicians, :class_name => "JamRuby::Musician"
+    has_and_belongs_to_many :users, :class_name => "JamRuby::User"
+    has_many :genres, :class_name => "JamRuby::Genre"
 
   end
 end

lib/jam_ruby/models/friend_request.rb

@@ -9,5 +9,9 @@ module JamRuby
     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

lib/jam_ruby/models/genre.rb

@@ -1,9 +1,9 @@
 module JamRuby
   class Genre < ActiveRecord::Base
 
-  	self.primary_key = 'id'
+    self.primary_key = 'id'
 
-    has_and_belongs_to_many :musicians, :class_name => "JamRuby::Musician"
+    has_and_belongs_to_many :bands, :class_name => "JamRuby::Band"
     has_and_belongs_to_many :music_sessions, :class_name => "JamRuby::MusicSession", :join_table => "genres_music_sessions"
 
   end

lib/jam_ruby/models/instrument.rb

@@ -0,0 +1,10 @@
+module JamRuby
+  class Instrument < ActiveRecord::Base
+
+    self.primary_key = 'id'
+
+    has_and_belongs_to_many :users, :class_name => "JamRuby::User"
+    has_and_belongs_to_many :music_sessions, :class_name => "JamRuby::MusicSession", :join_table => "genres_music_sessions"
+
+  end
+end

lib/jam_ruby/models/musician.rb

@@ -1,9 +0,0 @@
-module JamRuby
-  class Musician < JamRuby::User
-
-    self.primary_key = 'id'
-
-    has_and_belongs_to_many :bands, :class_name => "JamRuby::Band"
-
-  end
-end

lib/jam_ruby/models/user.rb

@@ -12,6 +12,7 @@ module JamRuby
     has_many :connections, :class_name => "JamRuby::Connection"
 
     has_many :friend_requests, :class_name => "JamRuby::FriendRequest"
+    has_and_belongs_to_many :bands, :class_name => "JamRuby::Band"
 
     has_many :friendships, :class_name => "JamRuby::Friendship", :foreign_key => "user_id"
     has_many :friends, :through => :friendships, :class_name => "JamRuby::User"