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

Conflicts:
	web/jt_metadata.json
	web/spec/controllers/api_recurly_spec.rb

ruby/lib/jam_ruby/models/jam_track_track.rb

@@ -36,7 +36,6 @@ module JamRuby
     # we would verify their rights (can_download?), and generates a URL in response to the click so that they can download
     # but the url is short lived enough so that it wouldn't be easily shared
     def sign_url(expiration_time = 120)
-      puts "Signing: #{self[:url]}"
       s3_manager.sign_url(self[:url], {:expires => expiration_time, :response_content_type => 'audio/ogg', :secure => false})
     end
 

web/app/controllers/api_jam_tracks_controller.rb

@@ -35,7 +35,6 @@ class ApiJamTracksController < ApiController
 private
   def lookup_jam_track
     @jam_track_right = JamTrackRight.where("jam_track_id=? AND user_id=?", params[:id], current_user).first
-    puts "@jam_track_right: #{@jam_track_right.nil?}"
     raise PermissionError, ValidationMessages::PERMISSION_VALIDATION_ERROR unless @jam_track_right
   end
 

web/jt_metadata.json

@@ -1 +0,0 @@
-{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150103-72563-6al174/jam-track-3.jkz", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150103-72563-6al174/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150103-72563-6al174/lead_guitar.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150103-72563-6al174/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpQHkILM"}

web/spec/controllers/api_recurly_spec.rb

@@ -42,8 +42,7 @@ describe ApiRecurlyController, :type=>:controller do
     post :create_account, {:format => 'json', :billing_info=>@billing_info}
     response.status.should == 404
     body = JSON.parse(response.body)
-    #puts "body.inspect: #{body.inspect}"
-    body['errors'].should have(1).items 
+    body['errors'].should have(1).items
     body['errors']['number'].should_not be_nil    
   end
 
@@ -59,7 +58,6 @@ describe ApiRecurlyController, :type=>:controller do
     get :get_account
     body = JSON.parse(response.body)
     response.should be_success      
-    puts "body: #{body}"
     body['email'].should eq(@user.email)
   end
 
@@ -86,13 +84,10 @@ describe ApiRecurlyController, :type=>:controller do
     pending "We don't have any subscriptions yet -- uncomment in routes"
     get :get_subscription, { :format => 'json'}
     response.should be_success      
-    body = JSON.parse(response.body)    
-    puts body
+    body = JSON.parse(response.body)        
   end
 
   it "should update billing info" do 
-    #pending "this fails in the controller spec only, possibly because it contacts an external site."
-
     # $enable_tracing = false
     # $trace_out = open('trace.txt', 'w')