Merge remote-tracking branch 'upstream/pull/1704'

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

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 538cf10d242b576d2a5a5e76e9e25b5762674654..a720c5fff438dc1ed4e8d9152e85dacf44ed4cc1 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]

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

       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,42 +30,42 @@ class TraceController < ApplicationController
     end
 
     # set title
     end
 
     # set title

-    if target_user.nil?
-      @title = t 'trace.list.public_traces'
-    elsif @user && @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 current_user && current_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 && @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
+    @traces = if target_user.nil? # all traces
+                if current_user
+                  Trace.visible_to(current_user) # 1
+                else
+                  Trace.visible_to_all # 2
+                end
+              elsif current_user && current_user == target_user
+                current_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]
 
 
     @traces = @traces.tagged(params[:tag]) if params[:tag]
 

+    @params = params.permit(:display_name, :tag)
+

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

-    @traces = @traces.order("timestamp DESC")
+    @traces = @traces.order(:id => :desc)

     @traces = @traces.offset((@page - 1) * @page_size)
     @traces = @traces.limit(@page_size)
     @traces = @traces.includes(:user, :tags)
     @traces = @traces.offset((@page - 1) * @page_size)
     @traces = @traces.limit(@page_size)
     @traces = @traces.includes(:user, :tags)


@@ -86,52 +86,49 @@ class TraceController < ApplicationController
   end
 
   def mine
   end
 
   def mine

-    redirect_to :action => :list, :display_name => @user.display_name
+    redirect_to :action => :list, :display_name => current_user.display_name

   end
 
   def view
     @trace = Trace.find(params[:id])
 
     if @trace && @trace.visible? &&
   end
 
   def view
     @trace = Trace.find(params[:id])
 
     if @trace && @trace.visible? &&

-       (@trace.public? || @trace.user == @user)
-      @title = t 'trace.view.title', :name => @trace.name
+       (@trace.public? || @trace.user == current_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 :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 :action => "list"

   end
 
   def create
   end
 
   def create

-    if params[:trace]
+    if request.post?

       logger.info(params[:trace][:gpx_file].class.name)
 
       if params[:trace][:gpx_file].respond_to?(:read)
         begin
           do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
                     params[:trace][:description], params[:trace][:visibility])
       logger.info(params[:trace][:gpx_file].class.name)
 
       if params[:trace][:gpx_file].respond_to?(:read)
         begin
           do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
                     params[:trace][:description], params[:trace][:visibility])

-        rescue => ex
+        rescue StandardError => ex

           logger.debug ex
         end
 
         if @trace.id
           logger.debug ex
         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
-            flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.where(:inserted => false).count
-          end
+          flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4

 
 

-          redirect_to :action => :list, :display_name => @user.display_name
+          redirect_to :action => :list, :display_name => current_user.display_name

         end
       else
         @trace = Trace.new(:name => "Dummy",
                            :tagstring => params[:trace][:tagstring],
                            :description => params[:trace][:description],
                            :visibility => params[:trace][:visibility],
         end
       else
         @trace = Trace.new(:name => "Dummy",
                            :tagstring => params[:trace][:tagstring],
                            :description => params[:trace][:description],
                            :visibility => params[:trace][:visibility],

-                           :inserted => false, :user => @user,
+                           :inserted => false, :user => current_user,

                            :timestamp => Time.now.getutc)
         @trace.valid?
         @trace.errors.add(:gpx_file, "can't be blank")
                            :timestamp => Time.now.getutc)
         @trace.valid?
         @trace.errors.add(:gpx_file, "can't be blank")


@@ -140,75 +137,71 @@ 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? && (trace.public? || (@user && @user == trace.user))
+    if trace.visible? && (trace.public? || (current_user && current_user == trace.user))

       if Acl.no_trace_download(request.remote_ip)
       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')
-      elsif request.format == Mime::GPX
-        send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => 'attachment')
+        head :forbidden
+      elsif request.format == Mime[:xml]
+        send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
+      elsif request.format == Mime[:gpx]
+        send_data(trace.xml_file.read, :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
       end
     else

-      render :text => "", :status => :not_found
+      head :not_found

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

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def edit
     @trace = Trace.find(params[:id])
 
     if !@trace.visible?
   end
 
   def edit
     @trace = Trace.find(params[:id])
 
     if !@trace.visible?

-      render :text => "", :status => :not_found
-    elsif @user.nil? || @trace.user != @user
-      render :text => "", :status => :forbidden
+      head :not_found
+    elsif current_user.nil? || @trace.user != current_user
+      head :forbidden

     else
     else

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

 
 

-      if params[:trace]
+      if request.post? && params[:trace]

         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
         @trace.visibility = params[:trace][:visibility]
         @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
-        end
+        redirect_to :action => "view", :display_name => current_user.display_name if @trace.save

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

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def delete
     trace = Trace.find(params[:id])
 
     if !trace.visible?
   end
 
   def delete
     trace = Trace.find(params[:id])
 
     if !trace.visible?

-      render :text => "", :status => :not_found
-    elsif @user.nil? || trace.user != @user
-      render :text => "", :status => :forbidden
+      head :not_found
+    elsif current_user.nil? || trace.user != current_user
+      head :forbidden

     else
       trace.visible = false
       trace.save
     else
       trace.visible = false
       trace.save

-      flash[:notice] = t 'trace.delete.scheduled_for_deletion'
-      redirect_to :action => :list, :display_name => @user.display_name
+      flash[:notice] = t "trace.delete.scheduled_for_deletion"
+      redirect_to :action => :list, :display_name => current_user.display_name

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

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def georss
     @traces = Trace.visible_to_all.visible
 
   end
 
   def georss
     @traces = Trace.visible_to_all.visible
 

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

 
     @traces = @traces.tagged(params[:tag]) if params[:tag]
     @traces = @traces.order("timestamp DESC")
 
     @traces = @traces.tagged(params[:tag]) if params[:tag]
     @traces = @traces.order("timestamp DESC")


@@ -219,92 +212,86 @@ class TraceController < ApplicationController
   def picture
     trace = Trace.find(params[:id])
 
   def picture
     trace = Trace.find(params[:id])
 

-    if trace.inserted?
-      if trace.public? || (@user && @user == trace.user)
+    if trace.visible? && trace.inserted?
+      if trace.public? || (current_user && current_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
       else

-        render :text => "", :status => :forbidden
+        head :forbidden

       end
     else
       end
     else

-      render :text => "", :status => :not_found
+      head :not_found

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

-    render :text => "", :status => :not_found
+    head :not_found

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

-    if trace.inserted?
-      if trace.public? || (@user && @user == trace.user)
+    if trace.visible? && trace.inserted?
+      if trace.public? || (current_user && current_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
       else

-        render :text => "", :status => :forbidden
+        head :forbidden

       end
     else
       end
     else

-      render :text => "", :status => :not_found
+      head :not_found

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

-    render :text => "", :status => :not_found
+    head :not_found

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

-    if trace.public? || trace.user == @user
-      render :text => trace.to_xml.to_s, :content_type => "text/xml"
+    if trace.public? || trace.user == current_user
+      render :xml => trace.to_xml.to_s

     else
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

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

-    if trace.user == @user
-      new_trace = Trace.from_xml(request.raw_post)
-
-      unless new_trace && new_trace.id == trace.id
-        fail OSM::APIBadUserInput.new("The id in the url (#{trace.id}) is not the same as provided in the xml (#{new_trace.id})")
-      end
-
-      trace.description = new_trace.description
-      trace.tags = new_trace.tags
-      trace.visibility = new_trace.visibility
+    if trace.user == current_user
+      trace.update_from_xml(request.raw_post)

       trace.save!
 
       trace.save!
 

-      render :text => "", :status => :ok
+      head :ok

     else
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

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

-    if trace.user == @user
+    if trace.user == current_user

       trace.visible = false
       trace.save!
 
       trace.visible = false
       trace.save!
 

-      render :text => "", :status => :ok
+      head :ok

     else
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

     end
   end
 
   def api_data
     end
   end
 
   def api_data

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

 
 

-    if trace.public? || trace.user == @user
-      if request.format == Mime::XML || 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 == current_user
+      if request.format == Mime[:xml]
+        send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
+      elsif request.format == Mime[:gpx]
+        send_data(trace.xml_file.read, :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
       end
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

     end
   end
 
     end
   end
 


@@ -314,25 +301,25 @@ 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)
       do_create(params[:file], tags, description, visibility)
 
       if @trace.id
     end
 
     if params[:file].respond_to?(:read)
       do_create(params[:file], tags, description, visibility)
 
       if @trace.id

-        render :text => @trace.id.to_s, :content_type => "text/plain"
+        render :plain => @trace.id.to_s

       elsif @trace.valid?
       elsif @trace.valid?

-        render :text => "", :status => :internal_server_error
+        head :internal_server_error

       else
       else

-        render :text => "", :status => :bad_request
+        head :bad_request

       end
     else
       end
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -340,7 +327,7 @@ class TraceController < ApplicationController
 
   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}"


@@ -356,7 +343,7 @@ class TraceController < ApplicationController
       :description => description,
       :visibility => visibility,
       :inserted => true,
       :description => description,
       :visibility => visibility,
       :inserted => true,

-      :user => @user,
+      :user => current_user,

       :timestamp => Time.now.getutc
     )
 
       :timestamp => Time.now.getutc
     )
 


@@ -389,16 +376,16 @@ class TraceController < ApplicationController
     end
 
     # Finally save the user's preferred privacy level
     end
 
     # Finally save the user's preferred privacy level

-    if pref = @user.preferences.where(:k => "gps.trace.visibility").first
+    if pref = current_user.preferences.where(:k => "gps.trace.visibility").first

       pref.v = visibility
       pref.save
     else
       pref.v = visibility
       pref.save
     else

-      @user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
+      current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility)

     end
   end
 
   def offline_warning
     end
   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


@@ -406,11 +393,11 @@ class TraceController < ApplicationController
   end
 
   def default_visibility
   end
 
   def default_visibility

-    visibility = @user.preferences.where(:k => "gps.trace.visibility").first
+    visibility = current_user.preferences.where(:k => "gps.trace.visibility").first

 
     if visibility
       visibility.v
 
     if visibility
       visibility.v

-    elsif @user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil?
+    elsif current_user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil?

       "private"
     else
       "public"
       "private"
     else
       "public"