From 848323905470d90d7fee99c452cba0d0550d37da Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 18 Feb 2014 03:42:42 +0000
Subject: [PATCH] * pg_migrate bump to 0.1.13 with relaxed thor version

---
 db/Gemfile                       | 2 +-
 db/Gemfile.lock                  | 8 ++++----
 ruby/lib/jam_ruby/models/feed.rb | 4 ++--
 websocket-gateway/Gemfile        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/db/Gemfile b/db/Gemfile
index 0b7addf09..903a1c2dc 100644
--- a/db/Gemfile
+++ b/db/Gemfile
@@ -3,4 +3,4 @@ source 'http://rubygems.org'
 # Assumes you have already cloned pg_migrate_ruby in your workspace
 # $ cd [workspace]
 # $ git clone https://github.com/sethcall/pg_migrate_ruby
-gem 'pg_migrate', '0.1.12'
+gem 'pg_migrate', '0.1.13'
diff --git a/db/Gemfile.lock b/db/Gemfile.lock
index 072f29905..c802ae983 100644
--- a/db/Gemfile.lock
+++ b/db/Gemfile.lock
@@ -6,15 +6,15 @@ GEM
       little-plugger (>= 1.1.3)
     pg (0.17.1)
     pg (0.17.1-x86-mingw32)
-    pg_migrate (0.1.12)
+    pg_migrate (0.1.13)
       logging (= 1.7.2)
       pg (= 0.17.1)
-      thor (= 0.15.4)
-    thor (0.15.4)
+      thor
+    thor (0.18.1)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
-  pg_migrate (= 0.1.12)
+  pg_migrate (= 0.1.13)
diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb
index 39f32fef1..81cf53cac 100644
--- a/ruby/lib/jam_ruby/models/feed.rb
+++ b/ruby/lib/jam_ruby/models/feed.rb
@@ -21,8 +21,8 @@ module JamRuby
       query = Feed.includes(:recording).includes(:music_session_history).offset(start).limit(limit)
       if sort == 'date'
         query = query.order('id DESC')
-      else
-        throw "not implemented"
+      elsif sort == 'plays'
+        query = query.order('')
       end
 
       query
diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile
index 75294360a..7aa627446 100644
--- a/websocket-gateway/Gemfile
+++ b/websocket-gateway/Gemfile
@@ -58,7 +58,7 @@ group :test do
     gem 'database_cleaner', '0.7.0'
     gem 'guard', '>= 0.10.0'
     gem 'guard-rspec', '>= 0.7.3'
-    gem 'pg_migrate','0.1.12' #:path => "#{workspace}/pg_migrate_ruby"
+    gem 'pg_migrate','0.1.13' #:path => "#{workspace}/pg_migrate_ruby"
     gem 'evented-spec'
 end