Merge

web/app/controllers/api_jam_tracks_controller.rb

@@ -33,13 +33,14 @@ class ApiJamTracksController < ApiController
 
   def download  
     if @jam_track_right.valid?      
-      if (@jam_track_right && @jam_track_right.signed && @jam_track_right.url_48.present? &&@jam_track_right.url_48.file.exists?)
+      bitrate = params[:bitrate]
+      if (@jam_track_right && @jam_track_right.ready?(bitrate))
         @jam_track_right.update_download_count
         @jam_track_right.last_downloaded_at = Time.now
         @jam_track_right.save!
-        redirect_to @jam_track_right.sign_url(120, params[:bitrate])
+        redirect_to @jam_track_right.sign_url(120, bitrate)
       else
-        @jam_track_right.enqueue_if_needed
+        @jam_track_right.enqueue_if_needed(bitrate)
         render :json => { :message => "not available, digitally signing Jam Track offline." }, :status => 202
       end
     else
@@ -48,8 +49,7 @@ class ApiJamTracksController < ApiController
   end
 
   def enqueue
-    @jam_track_right.enqueue_if_needed
-
+    @jam_track_right.enqueue_if_needed(params[:bitrate])
     render :json => { :message => "enqueued" }, :status => 200
   end
 
@@ -73,8 +73,6 @@ class ApiJamTracksController < ApiController
     end
 
     @jam_tracks = JamTrackRight.list_keys(current_user, jamtrack_ids)
-
-    render "api_jam_tracks/list_keys", :layout => nil
   end
 
 private

web/app/controllers/api_recordings_controller.rb

@@ -57,7 +57,7 @@ class ApiRecordingsController < ApiController
     @recorded_track.valid?
     if !@recorded_track.errors.any?
       @recorded_track.save!
-      redirect_to @recorded_track.sign_url
+      redirect_to @recorded_track.sign_url()
     else
       render :json => { :message => "download limit surpassed" }, :status => 404
     end

web/spec/controllers/api_jam_tracks_controller_spec.rb

@@ -115,7 +115,7 @@ describe ApiJamTracksController do
       @jam_track = FactoryGirl.create(:jam_track) #jam_track_track.jam_track
       jam_track_track = @jam_track.jam_track_tracks.first
       
-      uploader = JamTrackTrackUploader.new(jam_track_track, :url)
+      uploader = JamTrackTrackUploader.new(jam_track_track, :url_48)
       uploader.store!(File.open(@ogg_path, 'rb'))
       #jam_track_track.url.store!(File.open(ogg_path, "rb"))
       jam_track_track.save!