Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

ruby/lib/jam_ruby/models/jam_track.rb

@@ -255,6 +255,15 @@ module JamRuby
         {artists: artists, songs:songs}
       end
 
+      def purchase_stubs(user)
+        JamTrack.
+          select(['jam_tracks.id', :name, :original_artist, :year, 'jam_track_rights.created_at AS purchased_at']).
+          joins(:jam_track_rights).
+          where("jam_track_rights.user_id = ?", user.id).
+          includes(:genres).
+          order([:original_artist, :name])
+      end
+
       def index(options, user)
         if options[:page]
           page = options[:page].to_i
@@ -583,5 +592,9 @@ SQL
       self.find_by_sql(sql).first
     end
 
+    def genre_name
+      self.genres.first.try(:description)
+    end
+
   end
 end

web/app/controllers/api_jam_tracks_controller.rb

@@ -142,7 +142,13 @@ class ApiJamTracksController < ApiController
       self._handlePurchasedHead 
       return
     end
-   params[:show_purchased_only] = true
+    if params[:mobile]
+      @jam_tracks = JamTrack.purchase_stubs(current_user).to_a
+      response.headers['total-entries'] = @jam_tracks.count.to_s
+      render "api_jam_tracks/purchased_mobile", :layout => nil
+      return
+    end
+    params[:show_purchased_only] = true
     data = JamTrack.index(params, current_user)
     @jam_tracks, @next = data[0], data[1]
 

web/app/views/api_jam_tracks/purchased_mobile.rabl

@@ -0,0 +1,3 @@
+node :jamtracks do |page|
+  partial "api_jam_tracks/show_for_mobile", object: @jam_tracks
+end

web/app/views/api_jam_tracks/show_for_mobile.rabl

@@ -0,0 +1,7 @@
+object @jam_track
+
+attributes :id, :name, :original_artist, :year, :genre_name
+
+node :purchased_at do |jt|
+ Time.parse(jt.purchased_at).to_i rescue Time.now.to_i
+end