* pin rails to 3.x

admin/Gemfile

@@ -14,7 +14,7 @@ else
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 end
 
-gem 'rails'
+gem 'rails', '~> 3.2.11'
 gem 'bootstrap-sass', '2.0.4'
 gem 'bcrypt-ruby', '3.0.1'
 

db/manifest

@@ -111,3 +111,4 @@ feed.sql
 like_follower_poly_assoc.sql
 feed_use_recording.sql
 feed_autoincrement_primary_key.sql
+music_sessions_plays.sql

db/up/music_sessions_plays.sql

@@ -0,0 +1,8 @@
+-- sessions
+CREATE TABLE music_sessions_plays (
+    id VARCHAR(64) PRIMARY KEY DEFAULT uuid_generate_v4(),
+    music_session_id VARCHAR(64) NOT NULL REFERENCES music_sessions_history(id) ON DELETE CASCADE,
+    player_id VARCHAR(64) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);

ruby/lib/jam_ruby.rb

@@ -74,6 +74,7 @@ require "jam_ruby/models/music_session"
 require "jam_ruby/models/music_session_comment"
 require "jam_ruby/models/music_session_history"
 require "jam_ruby/models/music_session_liker"
+require "jam_ruby/models/music_session_play"
 require "jam_ruby/models/music_session_user_history"
 require "jam_ruby/models/music_session_perf_data"
 require "jam_ruby/models/invitation"
@@ -118,7 +119,7 @@ require "jam_ruby/models/icecast_template_socket"
 require "jam_ruby/models/icecast_server_group"
 require "jam_ruby/models/icecast_mount_template"
 require "jam_ruby/models/facebook_signup"
-require "jam_ruby/models/recordings_plays"
+require "jam_ruby/models/recording_play"
 require "jam_ruby/models/feed"
 
 

ruby/lib/jam_ruby/models/feed.rb

@@ -22,7 +22,8 @@ module JamRuby
       if sort == 'date'
         query = query.order('id DESC')
       elsif sort == 'plays'
-        query = query.order('')
+        query = query.
+        query = query.order('(COALESCE(recording., '')')
       end
 
       query

ruby/lib/jam_ruby/models/music_session_play.rb

@@ -0,0 +1,11 @@
+module JamRuby
+  class MusicSessionPlay < ActiveRecord::Base
+
+    self.table_name = "music_sessions_plays"
+    
+    self.primary_key = 'id'
+
+    belongs_to :music_session, :class_name => "JamRuby::MusicSession", :foreign_key => "music_session_id"
+    belongs_to :user, :class_name => "JamRuby::User", :foreign_key => "player_id"
+  end
+end

ruby/lib/jam_ruby/models/recordings_plays.rb

@@ -1,17 +0,0 @@
-module JamRuby
-  class RecordingsPlays < ActiveRecord::Base
-
-
-  self.table_name = "recordings_plays"
-
-    self.primary_key = 'id'
-
-    belongs_to :recording,
-               class_name: "JamRuby::Recording",
-               foreign_key: "recording_id"
-
-    belongs_to :player,
-               class_name: "JamRuby::User",
-               foreign_key: "player_id"
-  end
-end

ruby/spec/factories.rb

@@ -369,7 +369,7 @@ FactoryGirl.define do
     token_expires_at          Time.now
   end
 
-  factory :recordings_plays, :class => JamRuby::RecordingsPlays do
+  factory :recordings_plays, :class => JamRuby::RecordingPlay do
 
   end
 end

ruby/spec/jam_ruby/models/feed_spec.rb

@@ -51,7 +51,7 @@ describe Feed do
       claimed_recording2 = FactoryGirl.create(:claimed_recording)
       MusicSessionHistory.delete_all
 
-      FactoryGirl.create(:recordings_plays, recording: claimed_recording1.recording, player:claimed_recording1.user)
+      FactoryGirl.create(:recordings_plays, recording: claimed_recording1.recording, user:claimed_recording1.user)
 
       feeds = Feed.index(:sort => 'plays')
 

web/Gemfile

@@ -20,7 +20,7 @@ else
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 end
 gem 'builder'
-gem 'rails', '>=3.2.11'
+gem 'rails', '~>3.2.11'
 gem 'jquery-rails', '2.0.2'
 gem 'jquery-ui-rails'
 gem 'bootstrap-sass', '2.0.4'