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]
-
- caches_action :list, :unless => :logged_in?, :layout => false
- caches_action :view, :layout => false
- caches_action :georss, :layout => true
- cache_sweeper :trace_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
- cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
+ 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]
- 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
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
- if target_user.nil? # all traces
- if @user
- @traces = Trace.visible_to(@user) #1
- else
- @traces = Trace.public #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.public #4
- end
- end
-
- if params[:tag]
- @tag = params[:tag]
-
- files = Tracetag.where(:tag => params[:tag]).select(:gpx_id).all
-
- if files.length > 0
- @traces = @traces.where(:id => files.collect { |tt| tt.gpx_id })
- end
- 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
@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|
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
- 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
- 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
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.count(:conditions => { :inserted => false }) > 4
- flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.count(:conditions => { :inserted => false })
+ if @user.traces.where(:inserted => false).count > 4
+ 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
- @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
else
- @trace = Trace.new({:visibility => default_visibility}, :without_protection => true)
+ @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])
- 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 :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
elsif request.format == Mime::XML
- send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.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
+ send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")
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 :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def edit
@trace = Trace.find(params[:id])
- if @user and @trace.user == @user
- @title = t 'trace.edit.title', :name => @trace.name
+ if !@trace.visible?
+ render :text => "", :status => :not_found
+ elsif @user.nil? || @trace.user != @user
+ render :text => "", :status => :forbidden
+ else
+ @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
- redirect_to :action => 'view', :display_name => @user.display_name
+ redirect_to :action => "view", :display_name => @user.display_name
end
end
- else
- render :nothing => true, :status => :forbidden
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def delete
trace = Trace.find(params[:id])
- if @user and trace.user == @user
- if trace.visible?
- trace.visible = false
- trace.save
- flash[:notice] = t 'trace.delete.scheduled_for_deletion'
- redirect_to :action => :list, :display_name => @user.display_name
- else
- render :nothing => true, :status => :not_found
- end
+ if !trace.visible?
+ render :text => "", :status => :not_found
+ elsif @user.nil? || trace.user != @user
+ render :text => "", :status => :forbidden
else
- render :nothing => true, :status => :forbidden
+ trace.visible = false
+ trace.save
+ flash[:notice] = t "trace.delete.scheduled_for_deletion"
+ redirect_to :action => :list, :display_name => @user.display_name
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def georss
- traces = Trace.public
+ @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.where("EXISTS (SELECT * FROM gpx_file_tags AS gft WHERE gft.gpx_id = gpx_files.id AND gft.tag = ?)", params[:tag])
- end
-
- traces = traces.order("timestamp DESC")
- traces = traces.limit(20)
- traces = traces.includes(:user)
-
- rss = OSM::GeoRSS.new
-
- traces.each do |trace|
- rss.add(trace.latitude, trace.longitude, trace.name, trace.user.display_name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), "<img src='#{url_for({:controller => 'trace', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp)
+ @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] })
end
- render :text => rss.to_s, :content_type => "application/rss+xml"
+ @traces = @traces.tagged(params[:tag]) if params[:tag]
+ @traces = @traces.order("timestamp DESC")
+ @traces = @traces.limit(20)
+ @traces = @traces.includes(:user)
end
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?
- 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 :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
else
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
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?
- 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 :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
else
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
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 :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
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
trace.visibility = new_trace.visibility
trace.save!
- render :nothing => true, :status => :ok
+ render :text => "", :status => :ok
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
trace.visible = false
trace.save!
- render :nothing => true, :status => :ok
+ render :text => "", :status => :ok
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
def api_data
- trace = Trace.find(params[:id])
+ trace = Trace.visible.find(params[:id])
- if trace.public? or trace.user == @user
+ if trace.public? || trace.user == @user
if request.format == Mime::XML
- send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.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
+ send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")
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 :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
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)
if @trace.id
render :text => @trace.id.to_s, :content_type => "text/plain"
elsif @trace.valid?
- render :nothing => true, :status => :internal_server_error
+ render :text => "", :status => :internal_server_error
else
- render :nothing => true, :status => :bad_request
+ render :text => "", :status => :bad_request
end
else
- render :nothing => true, :status => :bad_request
+ render :text => "", :status => :bad_request
end
end
-private
+ private
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}"
# ...and save the uploaded file to that location
- File.open(filename, "w") { |f| f.write(file.read) }
+ File.open(filename, "wb") { |f| f.write(file.read) }
# Create the trace object, falsely marked as already
# inserted to stop the import daemon trying to load it
- @trace = Trace.new({
+ @trace = Trace.new(
:name => name,
:tagstring => tags,
:description => description,
:inserted => true,
:user => @user,
:timestamp => Time.now.getutc
- }, :without_protection => true)
+ )
Trace.transaction do
begin
# 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)
# 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)
else
@user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
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
"public"
end
end
-
end
projects / rails.git / blobdiff