More whitespace fixes. Attempting to get tests to pass.

[rails.git] / app / controllers / trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index e1553cbb0f7ca399ed2b86b6a1fbcb7bda247eca..60b5a4585330309f5c7aa1bf873ae6e5fe220dea 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,27 +1,27 @@
 class TraceController < ApplicationController
 class TraceController < ApplicationController

-  layout 'site'
-
-  skip_before_filter :verify_authenticity_token, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user, :only => [:mine, :create, :edit, :delete]
-  before_filter :authorize, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
-  before_filter :check_database_readable, :except => [:api_read, :api_data]
-  before_filter :check_database_writable, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
-  before_filter :check_api_readable, :only => [:api_read, :api_data]
-  before_filter :check_api_writable, :only => [:api_create, :api_update, :api_delete]
-  before_filter :require_allow_read_gpx, :only => [:api_read, :api_data]
-  before_filter :require_allow_write_gpx, :only => [:api_create, :api_update, :api_delete]
-  before_filter :offline_warning, :only => [:mine, :view]
-  before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data]
-  around_filter :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
+  layout "site", :except => :georss
+
+  skip_before_action :verify_authenticity_token, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :require_user, :only => [:mine, :create, :edit, :delete]
+  before_action :authorize, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
+  before_action :check_database_readable, :except => [:api_read, :api_data]
+  before_action :check_database_writable, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
+  before_action :check_api_readable, :only => [:api_read, :api_data]
+  before_action :check_api_writable, :only => [:api_create, :api_update, :api_delete]
+  before_action :require_allow_read_gpx, :only => [:api_read, :api_data]
+  before_action :require_allow_write_gpx, :only => [:api_create, :api_update, :api_delete]
+  before_action :offline_warning, :only => [:mine, :view]
+  before_action :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data]
+  around_action :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]

 
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
   def list
     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]
 
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
   def list
     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]

-    if !display_name.blank?
+    unless display_name.blank?

       target_user = User.active.where(:display_name => display_name).first
       if target_user.nil?
         render_unknown_user display_name
       target_user = User.active.where(:display_name => display_name).first
       if target_user.nil?
         render_unknown_user display_name


@@ -30,38 +30,34 @@ class TraceController < ApplicationController
     end
 
     # set title
     end
 
     # set title

-    if target_user.nil?
-      @title = t 'trace.list.public_traces'
-    elsif @user and @user == target_user
-      @title = t 'trace.list.your_traces'
-    else
-      @title = t 'trace.list.public_traces_from', :user => target_user.display_name
-    end
+    @title = if target_user.nil?
+               t "trace.list.public_traces"
+             elsif @user && @user == target_user
+               t "trace.list.your_traces"
+             else
+               t "trace.list.public_traces_from", :user => target_user.display_name
+             end

 
 

-    @title += t 'trace.list.tagged_with', :tags => params[:tag] if params[:tag]
+    @title += t "trace.list.tagged_with", :tags => params[:tag] if params[:tag]

 
     # four main cases:
     # 1 - all traces, logged in = all public traces + all user's (i.e + all mine)
     # 2 - all traces, not logged in = all public traces
     # 3 - user's traces, logged in as same user = all user's traces
     # 4 - user's traces, not logged in as that user = all user's public traces
 
     # four main cases:
     # 1 - all traces, logged in = all public traces + all user's (i.e + all mine)
     # 2 - all traces, not logged in = all public traces
     # 3 - user's traces, logged in as same user = all user's traces
     # 4 - user's traces, not logged in as that user = all user's public traces

-    if target_user.nil? # all traces
-      if @user
-        @traces = Trace.visible_to(@user) #1
-      else
-        @traces = Trace.visible_to_all #2
-      end
-    else
-      if @user and @user == target_user
-        @traces = @user.traces #3 (check vs user id, so no join + can't pick up non-public traces by changing name)
-      else
-        @traces = target_user.traces.visible_to_all #4
-      end
-    end
-
-    if params[:tag]
-      @traces = @traces.tagged(params[:tag])
-    end
+    @traces = if target_user.nil? # all traces
+                if @user
+                  Trace.visible_to(@user) # 1
+                else
+                  Trace.visible_to_all # 2
+                end
+              elsif @user && @user == target_user
+                @user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name)
+              else
+                target_user.traces.visible_to_all # 4
+              end
+
+    @traces = @traces.tagged(params[:tag]) if params[:tag]

 
     @page = (params[:page] || 1).to_i
     @page_size = 20
 
     @page = (params[:page] || 1).to_i
     @page_size = 20


@@ -73,7 +69,7 @@ class TraceController < ApplicationController
     @traces = @traces.includes(:user, :tags)
 
     # put together SET of tags across traces, for related links
     @traces = @traces.includes(:user, :tags)
 
     # put together SET of tags across traces, for related links

-    tagset = Hash.new
+    tagset = {}

     @traces.each do |trace|
       trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here
       trace.tags.each do |tag|
     @traces.each do |trace|
       trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here
       trace.tags.each do |tag|


@@ -94,16 +90,16 @@ class TraceController < ApplicationController
   def view
     @trace = Trace.find(params[:id])
 
   def view
     @trace = Trace.find(params[:id])
 

-    if @trace and @trace.visible? and
-       (@trace.public? or @trace.user == @user)
-      @title = t 'trace.view.title', :name => @trace.name
+    if @trace && @trace.visible? &&
+       (@trace.public? || @trace.user == @user)
+      @title = t "trace.view.title", :name => @trace.name

     else
     else

-      flash[:error] = t 'trace.view.trace_not_found'
-      redirect_to :controller => 'trace', :action => 'list'
+      flash[:error] = t "trace.view.trace_not_found"
+      redirect_to :controller => "trace", :action => "list"

     end
   rescue ActiveRecord::RecordNotFound
     end
   rescue ActiveRecord::RecordNotFound

-    flash[:error] = t 'trace.view.trace_not_found'
-    redirect_to :controller => 'trace', :action => 'list'
+    flash[:error] = t "trace.view.trace_not_found"
+    redirect_to :controller => "trace", :action => "list"

   end
 
   def create
   end
 
   def create


@@ -119,22 +115,21 @@ class TraceController < ApplicationController
         end
 
         if @trace.id
         end
 
         if @trace.id

-          logger.info("id is #{@trace.id}")
-          flash[:notice] = t 'trace.create.trace_uploaded'
+          flash[:notice] = t "trace.create.trace_uploaded"

 
           if @user.traces.where(:inserted => false).count > 4
 
           if @user.traces.where(:inserted => false).count > 4

-            flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.where(:inserted => false).count
+            flash[:warning] = t "trace.trace_header.traces_waiting", :count => @user.traces.where(:inserted => false).count

           end
 
           redirect_to :action => :list, :display_name => @user.display_name
         end
       else
           end
 
           redirect_to :action => :list, :display_name => @user.display_name
         end
       else

-        @trace = Trace.new({:name => "Dummy",
-                            :tagstring => params[:trace][:tagstring],
-                            :description => params[:trace][:description],
-                            :visibility => params[:trace][:visibility],
-                            :inserted => false, :user => @user,
-                            :timestamp => Time.now.getutc})
+        @trace = Trace.new(:name => "Dummy",
+                           :tagstring => params[:trace][:tagstring],
+                           :description => params[:trace][:description],
+                           :visibility => params[:trace][:visibility],
+                           :inserted => false, :user => @user,
+                           :timestamp => Time.now.getutc)

         @trace.valid?
         @trace.errors.add(:gpx_file, "can't be blank")
       end
         @trace.valid?
         @trace.errors.add(:gpx_file, "can't be blank")
       end


@@ -142,21 +137,21 @@ class TraceController < ApplicationController
       @trace = Trace.new(:visibility => default_visibility)
     end
 
       @trace = Trace.new(:visibility => default_visibility)
     end
 

-    @title = t 'trace.create.upload_trace'
+    @title = t "trace.create.upload_trace"

   end
 
   def data
     trace = Trace.find(params[:id])
 
   end
 
   def data
     trace = Trace.find(params[:id])
 

-    if trace.visible? and (trace.public? or (@user and @user == trace.user))
+    if trace.visible? && (trace.public? || (@user && @user == trace.user))

       if Acl.no_trace_download(request.remote_ip)
         render :text => "", :status => :forbidden
       elsif request.format == Mime::XML
       if Acl.no_trace_download(request.remote_ip)
         render :text => "", :status => :forbidden
       elsif request.format == Mime::XML

-        send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment')
+        send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")

       elsif request.format == Mime::GPX
       elsif request.format == Mime::GPX

-        send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => 'attachment')
+        send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")

       else
       else

-        send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment')
+        send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")

       end
     else
       render :text => "", :status => :not_found
       end
     else
       render :text => "", :status => :not_found


@@ -168,19 +163,19 @@ class TraceController < ApplicationController
   def edit
     @trace = Trace.find(params[:id])
 
   def edit
     @trace = Trace.find(params[:id])
 

-    if not @trace.visible?
+    if !@trace.visible?

       render :text => "", :status => :not_found
       render :text => "", :status => :not_found

-    elsif @user.nil? or @trace.user != @user
+    elsif @user.nil? || @trace.user != @user

       render :text => "", :status => :forbidden
     else
       render :text => "", :status => :forbidden
     else

-      @title = t 'trace.edit.title', :name => @trace.name
+      @title = t "trace.edit.title", :name => @trace.name

 
       if params[:trace]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
         @trace.visibility = params[:trace][:visibility]
         if @trace.save
 
       if params[:trace]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
         @trace.visibility = params[:trace][:visibility]
         if @trace.save

-          redirect_to :action => 'view', :display_name => @user.display_name
+          redirect_to :action => "view", :display_name => @user.display_name

         end
       end
     end
         end
       end
     end


@@ -191,14 +186,14 @@ class TraceController < ApplicationController
   def delete
     trace = Trace.find(params[:id])
 
   def delete
     trace = Trace.find(params[:id])
 

-    if not trace.visible?
+    if !trace.visible?

       render :text => "", :status => :not_found
       render :text => "", :status => :not_found

-    elsif @user.nil? or trace.user != @user
+    elsif @user.nil? || trace.user != @user

       render :text => "", :status => :forbidden
     else
       trace.visible = false
       trace.save
       render :text => "", :status => :forbidden
     else
       trace.visible = false
       trace.save

-      flash[:notice] = t 'trace.delete.scheduled_for_deletion'
+      flash[:notice] = t "trace.delete.scheduled_for_deletion"

       redirect_to :action => :list, :display_name => @user.display_name
     end
   rescue ActiveRecord::RecordNotFound
       redirect_to :action => :list, :display_name => @user.display_name
     end
   rescue ActiveRecord::RecordNotFound


@@ -209,13 +204,10 @@ class TraceController < ApplicationController
     @traces = Trace.visible_to_all.visible
 
     if params[:display_name]
     @traces = Trace.visible_to_all.visible
 
     if params[:display_name]

-      @traces = @traces.joins(:user).where(:users => {:display_name => params[:display_name]})
-    end
-
-    if params[:tag]
-      @traces = @traces.tagged(params[:tag])
+      @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] })

     end
 
     end
 

+    @traces = @traces.tagged(params[:tag]) if params[:tag]

     @traces = @traces.order("timestamp DESC")
     @traces = @traces.limit(20)
     @traces = @traces.includes(:user)
     @traces = @traces.order("timestamp DESC")
     @traces = @traces.limit(20)
     @traces = @traces.includes(:user)


@@ -224,10 +216,10 @@ class TraceController < ApplicationController
   def picture
     trace = Trace.find(params[:id])
 
   def picture
     trace = Trace.find(params[:id])
 

-    if trace.inserted?
-      if trace.public? or (@user and @user == trace.user)
+    if trace.visible? && trace.inserted?
+      if trace.public? || (@user && @user == trace.user)

         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         expires_in 7.days, :private => !trace.public?, :public => trace.public?

-        send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline')
+        send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")

       else
         render :text => "", :status => :forbidden
       end
       else
         render :text => "", :status => :forbidden
       end


@@ -241,10 +233,10 @@ class TraceController < ApplicationController
   def icon
     trace = Trace.find(params[:id])
 
   def icon
     trace = Trace.find(params[:id])
 

-    if trace.inserted?
-      if trace.public? or (@user and @user == trace.user)
+    if trace.visible? && trace.inserted?
+      if trace.public? || (@user && @user == trace.user)

         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         expires_in 7.days, :private => !trace.public?, :public => trace.public?

-        send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline')
+        send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")

       else
         render :text => "", :status => :forbidden
       end
       else
         render :text => "", :status => :forbidden
       end


@@ -258,7 +250,7 @@ class TraceController < ApplicationController
   def api_read
     trace = Trace.visible.find(params[:id])
 
   def api_read
     trace = Trace.visible.find(params[:id])
 

-    if trace.public? or trace.user == @user
+    if trace.public? || trace.user == @user

       render :text => trace.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :forbidden
       render :text => trace.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :forbidden


@@ -271,7 +263,7 @@ class TraceController < ApplicationController
     if trace.user == @user
       new_trace = Trace.from_xml(request.raw_post)
 
     if trace.user == @user
       new_trace = Trace.from_xml(request.raw_post)
 

-      unless new_trace and new_trace.id == trace.id
+      unless new_trace && new_trace.id == trace.id

         raise OSM::APIBadUserInput.new("The id in the url (#{trace.id}) is not the same as provided in the xml (#{new_trace.id})")
       end
 
         raise OSM::APIBadUserInput.new("The id in the url (#{trace.id}) is not the same as provided in the xml (#{new_trace.id})")
       end
 


@@ -300,13 +292,15 @@ class TraceController < ApplicationController
   end
 
   def api_data
   end
 
   def api_data

-    trace = Trace.find(params[:id])
+    trace = Trace.visible.find(params[:id])

 
 

-    if trace.public? or trace.user == @user
-      if request.format == Mime::XML or request.format == Mime::GPX
-        send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment')
+    if trace.public? || trace.user == @user
+      if request.format == Mime::XML
+        send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
+      elsif request.format == Mime::GPX
+        send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")

       else
       else

-        send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment')
+        send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")

       end
     else
       render :text => "", :status => :forbidden
       end
     else
       render :text => "", :status => :forbidden


@@ -319,11 +313,11 @@ class TraceController < ApplicationController
     visibility = params[:visibility]
 
     if visibility.nil?
     visibility = params[:visibility]
 
     if visibility.nil?

-      if params[:public] && params[:public].to_i.nonzero?
-        visibility = "public"
-      else
-        visibility = "private"
-      end
+      visibility = if params[:public] && params[:public].to_i.nonzero?
+                     "public"
+                   else
+                     "private"
+                   end

     end
 
     if params[:file].respond_to?(:read)
     end
 
     if params[:file].respond_to?(:read)


@@ -341,11 +335,11 @@ class TraceController < ApplicationController
     end
   end
 
     end
   end
 

-private
+  private

 
   def do_create(file, tags, description, visibility)
     # Sanitise the user's filename
 
   def do_create(file, tags, description, visibility)
     # Sanitise the user's filename

-    name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, '_')
+    name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_")

 
     # Get a temporary filename...
     filename = "/tmp/#{rand}"
 
     # Get a temporary filename...
     filename = "/tmp/#{rand}"


@@ -372,7 +366,7 @@ private
 
         # Rename the temporary file to the final name
         FileUtils.mv(filename, @trace.trace_name)
 
         # Rename the temporary file to the final name
         FileUtils.mv(filename, @trace.trace_name)

-      rescue Exception => ex
+      rescue StandardError

         # Remove the file as we have failed to update the database
         FileUtils.rm_f(filename)
 
         # Remove the file as we have failed to update the database
         FileUtils.rm_f(filename)
 


@@ -384,7 +378,7 @@ private
         # Clear the inserted flag to make the import daemon load the trace
         @trace.inserted = false
         @trace.save!
         # Clear the inserted flag to make the import daemon load the trace
         @trace.inserted = false
         @trace.save!

-      rescue Exception => ex
+      rescue StandardError

         # Remove the file as we have failed to update the database
         FileUtils.rm_f(@trace.trace_name)
 
         # Remove the file as we have failed to update the database
         FileUtils.rm_f(@trace.trace_name)
 


@@ -400,11 +394,10 @@ private
     else
       @user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
     end
     else
       @user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
     end

-

   end
 
   def offline_warning
   end
 
   def offline_warning

-    flash.now[:warning] = t 'trace.offline_warning.message' if STATUS == :gpx_offline
+    flash.now[:warning] = t "trace.offline_warning.message" if STATUS == :gpx_offline

   end
 
   def offline_redirect
   end
 
   def offline_redirect


@@ -422,5 +415,4 @@ private
       "public"
     end
   end
       "public"
     end
   end

-

 end
 end