Fixing syntax for newer rails

app/controllers/application_controller.rb

@@ -68,7 +68,7 @@ def require_login
           login_prompt = "You must be <a href='#{login_link}'>logged in to do this</a>."
           format.json { render :json => { :errors => [ login_prompt ] } }
           format.html do
-            render :text => login_prompt # halts request cycle
+            render html: login_prompt # halts request cycle
           end
         else
           format.html do

app/controllers/capture_controller.rb

@@ -115,8 +115,8 @@ def recent_calibrations
       @spectrums = current_user.calibrations.limit(20)
       # add the one that's being used in live display:
       if params[:calibration_id] && params[:calibration_id] != 'undefined'
-        new = Spectrum.where(id: params[:calibration_id])
-        @spectrums = new + @spectrums
+        new_spectrum = Spectrum.where(id: params[:calibration_id])
+        @spectrums = new_spectrum + @spectrums
       end
       @spectrums = @spectrums.uniq
       respond_to do |format|

app/controllers/likes_controller.rb

@@ -18,16 +18,16 @@ def toggle
     @spectrum = Spectrum.find params[:id]
     if @spectrum.liked_by(current_user.id)
       Like.find_by_user_id(current_user.id,:conditions => {:spectrum_id => @spectrum.id}).delete
-      render :text => "unliked"
+      render plain: "unliked"
     else
       @like = Like.new({
         :user_id => current_user.id,
         :spectrum_id => params[:id]
       })
       if @like.save
-        render :text => @spectrum.likes.length
+        render html: @spectrum.likes.length
       else
-        render :text => "error"
+        render plain: "error"
       end
     end
   end

app/controllers/macros_controller.rb

@@ -17,9 +17,9 @@ def show
       format.html {}
       format.js  { 
         if params[:run]
-          render :text => "$W.macro = {"+@macro.code+"};$W.macro.setup()" 
+          render plain: "$W.macro = {"+@macro.code+"};$W.macro.setup()" 
         else
-          render :text => "{"+@macro.code+"}" 
+          render plain: "{"+@macro.code+"}" 
         end
       }
     end

app/controllers/match_controller.rb

@@ -66,7 +66,7 @@ def search
       format.html { render partial: "macros/spectra", locals: { spectrums: @spectra } if params[:toolPane] }
       format.xml  { render :xml => @spectra }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv(@spectrum)
+        render html: SpectrumsHelper.show_csv(@spectrum)
       }
       format.json  { render :json => @spectra.map { |s| s.json } } # actually flatten in the json of each spectrum; kind of messy
     end

app/controllers/sets_controller.rb

@@ -52,7 +52,7 @@ def find_match
     range = @calibration.wavelength_range
     @spectrum.scale_data(range[0],range[1])
     @match = Spectrum.find(@set.match(@spectrum))
-    render :text => "Matched: <a href='/spectra/"+@match.id.to_s+"'>"+@match.title+"</a>"
+    render plain: "Matched: <a href='/spectra/"+@match.id.to_s+"'>"+@match.title+"</a>"
   end
 
   def embed

app/controllers/snapshots_controller.rb

@@ -19,7 +19,7 @@ def show
     respond_with(@snapshot) do |format|
       format.xml  { render :xml => @snapshot }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv_snapshot(@snapshot)
+        render html: SpectrumsHelper.show_csv_snapshot(@snapshot)
       }
       format.json  {
         render :json => @snapshot.data

app/controllers/spectrums_controller.rb

@@ -105,7 +105,7 @@ def show
       }
       format.xml  { render :xml => @spectrum }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv(@spectrum)
+        render html: SpectrumsHelper.show_csv(@spectrum)
       }
       format.json  {
         render :json => @spectrum.json
@@ -121,9 +121,9 @@ def latest_snapshot_id
                      .select('spectrum_id, created_at, id')
                      .order("created_at DESC")
                      .limit(1)
-      render :text => spectrum.latest_snapshot.id
+      render html: spectrum.latest_snapshot.id
     else
-      render :text => false
+      render html: false
     end
   end
 
@@ -139,8 +139,8 @@ def latest
     respond_with(@snapshot) do |format|
       format.xml  { render :xml => @snapshot }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv_snapshot(@snapshot) if is_snapshot
-        render :text => SpectrumsHelper.show_csv(@snapshot)          if !is_snapshot
+        render html: SpectrumsHelper.show_csv_snapshot(@snapshot) if is_snapshot
+        render html: SpectrumsHelper.show_csv(@snapshot)          if !is_snapshot
       }
       format.json  {
         render :json => @snapshot.json
@@ -280,7 +280,7 @@ def create
               flash[:notice] = 'Spectrum was successfully created.'
               format.html  { redirect_to spectrum_path(@spectrum) + calibration_param }
               format.xml   { render :xml => @spectrum, :status => :created, :location => @spectrum }
-              format.json  { render :text => spectrum_path(@spectrum), :status => :created, :location => @spectrum }
+              format.json  { render html: spectrum_path(@spectrum), :status => :created, :location => @spectrum }
             else
               render "spectrums/new"
             end
@@ -309,7 +309,7 @@ def create
       respond_to do |format|
         if request.xhr?
           format.json  { 
-            render :text => 'Token required for unauthenticated API usage.'
+            render html: 'Token required for unauthenticated API usage.'
           }
         else
           format.html { 
@@ -344,7 +344,7 @@ def save
     params[:tags].to_s.split(',').each do |tag|
       @spectrum.tag(tag, current_user.id)
     end
-    render :text => @spectrum.save
+    render html: @spectrum.save
   end
 
   # PUT /spectrums/1
@@ -469,7 +469,7 @@ def plots_rss
 
   def match
     @spectrum = Spectrum.find params[:id]
-    render :text => @spectrum.find_match_in_set(params[:set]).to_json
+    render html: @spectrum.find_match_in_set(params[:set]).to_json
   end
 
   # Start doing this client side!

app/controllers/tags_controller.rb

@@ -87,7 +87,7 @@ def destroy
           respond_to do |format|
             format.html do
               if request.xhr?
-                render :json => { :message => "success" }
+                render :json => { message: "success" }
               else
                 flash[:notice] = "Tag '#{@tag.name}' deleted."
                 redirect_to spectrum_path(@tag.spectrum_id)

config/routes.rb

@@ -35,7 +35,7 @@
   #   resources :products do
   #     resources :comments
   #     resources :sales do
-  #       get 'recent', :on => :collection
+  #       get 'recent', on: :collection
   #     end
   #   end