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

lib/jam_ruby/models/user.rb

@@ -7,6 +7,9 @@ module JamRuby
 
     self.primary_key = 'id'
 
+    # account
+    belongs_to :account, :class_name => "JamRuby::Account"
+
     # connections (websocket-gateway)
     has_many :connections, :class_name => "JamRuby::Connection"
 
@@ -89,10 +92,6 @@ module JamRuby
       updating_password || new_record?
     end
 
-    #def name
-    #  return self.first_name + " " + self.last_name
-    #end
-
     def friends?(user)
       return self.friends.exists?(user)
     end
@@ -106,7 +105,7 @@ module JamRuby
     end
 
     def following_count
-      return self.followings.size
+      return self.followings.size + self.band_followings.size
     end
 
     def to_s
@@ -123,6 +122,11 @@ module JamRuby
         user = User.find(params[:id])
       end
 
+      # account id
+      unless params[:account_id].nil?
+        user.account_id = params[:account_id]
+      end
+
       # first name
       unless params[:first_name].nil?
         user.first_name = params[:first_name]
@@ -158,6 +162,21 @@ module JamRuby
         user.musician = params[:musician]
       end
 
+      # gender
+      unless params[:gender].nil?
+        account.gender = params[:gender]
+      end
+
+      # birthdate
+      unless params[:birth_date].nil?
+        account.birth_date = params[:birth_date]
+      end
+
+      # ISP
+      unless params[:internet_service_provider].nil?
+        account.internet_service_provider = params[:internet_service_provider]
+      end
+
       # city
       unless params[:city].nil?
         user.city = params[:city]
@@ -263,7 +282,6 @@ module JamRuby
     ### Elasticsearch/Tire integration
 
 
-
     private
       def create_remember_token
         self.remember_token = SecureRandom.urlsafe_base64