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_details, :api_data, :api_create]
- before_filter :check_database_readable, :except => [:api_details, :api_data, :api_create]
- before_filter :check_database_writable, :only => [:create, :edit, :delete]
- before_filter :check_api_readable, :only => [:api_details, :api_data]
- before_filter :check_api_writable, :only => [:api_create]
- before_filter :require_allow_read_gpx, :only => [:api_details, :api_data]
- before_filter :require_allow_write_gpx, :only => [:api_create]
+ 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_data, :api_create]
- around_filter :api_call_handle_error, :only => [:api_details, :api_data, :api_create]
-
- 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]
- cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create]
+ 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]
# 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(target_user = nil, action = "list")
+ def list
# from display name, pick up user id if one user's traces only
display_name = params[:display_name]
- if target_user.nil? and !display_name.blank?
- target_user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, display_name])
+ if !display_name.blank?
+ target_user = User.active.where(:display_name => display_name).first
if target_user.nil?
- @title = t'trace.no_such_user.title'
- @not_found_user = display_name
- render :action => 'no_such_user', :status => :not_found
+ render_unknown_user display_name
return
end
end
# 4 - user's traces, not logged in as that user = all user's public traces
if target_user.nil? # all traces
if @user
- conditions = ["(gpx_files.visibility in ('public', 'identifiable') OR gpx_files.user_id = ?)", @user.id] #1
+ @traces = Trace.visible_to(@user) #1
else
- conditions = ["gpx_files.visibility in ('public', 'identifiable')"] #2
+ @traces = Trace.public #2
end
else
if @user and @user == target_user
- conditions = ["gpx_files.user_id = ?", @user.id] #3 (check vs user id, so no join + can't pick up non-public traces by changing name)
+ @traces = @user.traces #3 (check vs user id, so no join + can't pick up non-public traces by changing name)
else
- conditions = ["gpx_files.visibility in ('public', 'identifiable') AND gpx_files.user_id = ?", target_user.id] #4
+ @traces = target_user.traces.public #4
end
end
if params[:tag]
- @tag = params[:tag]
-
- files = Tracetag.find_all_by_tag(params[:tag]).collect { |tt| tt.gpx_id }
-
- if files.length > 0
- conditions[0] += " AND gpx_files.id IN (#{files.join(',')})"
- else
- conditions[0] += " AND 0 = 1"
- end
+ @traces = @traces.tagged(params[:tag])
end
- conditions[0] += " AND gpx_files.visible = ?"
- conditions << true
-
@page = (params[:page] || 1).to_i
@page_size = 20
- @traces = Trace.find(:all,
- :include => [:user, :tags],
- :conditions => conditions,
- :order => "gpx_files.timestamp DESC",
- :offset => (@page - 1) * @page_size,
- :limit => @page_size)
+ @traces = @traces.visible
+ @traces = @traces.order("timestamp DESC")
+ @traces = @traces.offset((@page - 1) * @page_size)
+ @traces = @traces.limit(@page_size)
+ @traces = @traces.includes(:user, :tags)
# put together SET of tags across traces, for related links
tagset = Hash.new
- if @traces
- @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|
- tagset[tag.tag] = tag.tag
- end
+ @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|
+ tagset[tag.tag] = tag.tag
end
end
# final helper vars for view
- @action = action
+ @target_user = target_user
@display_name = target_user.display_name if target_user
@all_tags = tagset.values
- @trace = Trace.new(:visibility => default_visibility) if @user
end
def mine
def create
if params[:trace]
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],
logger.info("id is #{@trace.id}")
flash[:notice] = t 'trace.create.trace_uploaded'
- redirect_to :action => 'mine'
+ if @user.traces.count(:conditions => { :inserted => false }) > 4
+ flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.count(:conditions => { :inserted => false })
+ end
+
+ redirect_to :action => :list, :display_name => @user.display_name
end
else
@trace = Trace.new({:name => "Dummy",
@trace.valid?
@trace.errors.add(:gpx_file, "can't be blank")
end
+ else
+ @trace = Trace.new(:visibility => default_visibility)
end
+
@title = t 'trace.create.upload_trace'
end
trace = Trace.find(params[:id])
if trace.visible? and (trace.public? or (@user and @user == trace.user))
- if request.format == Mime::XML
- send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.to_s, :disposition => 'attachment')
+ if Acl.no_trace_download(request.remote_ip)
+ render :text => "", :status => :forbidden
+ elsif 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')
else
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.tagstring = params[:trace][:tagstring]
@trace.visibility = params[:trace][:visibility]
if @trace.save
- redirect_to :action => 'view'
+ redirect_to :action => 'view', :display_name => @user.display_name
end
end
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :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 request.post? and trace.visible?
+ if trace.visible?
trace.visible = false
trace.save
flash[:notice] = t 'trace.delete.scheduled_for_deletion'
- redirect_to :controller => 'traces', :action => 'mine'
+ redirect_to :action => :list, :display_name => @user.display_name
else
- render :nothing => true, :status => :bad_request
+ render :text => "", :status => :not_found
end
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def georss
- conditions = ["gpx_files.visibility in ('public', 'identifiable')"]
+ @traces = Trace.public.visible
if params[:display_name]
- conditions[0] += " AND users.display_name = ?"
- conditions << params[:display_name]
+ @traces = @traces.joins(:user).where(:users => {:display_name => params[:display_name]})
end
if params[:tag]
- conditions[0] += " AND EXISTS (SELECT * FROM gpx_file_tags AS gft WHERE gft.gpx_id = gpx_files.id AND gft.tag = ?)"
- conditions << params[:tag]
+ @traces = @traces.tagged(params[:tag])
end
- traces = Trace.find(:all, :include => :user, :conditions => conditions,
- :order => "timestamp DESC", :limit => 20)
-
- 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)
- end
-
- render :text => rss.to_s, :content_type => "application/rss+xml"
+ @traces = @traces.order("timestamp DESC")
+ @traces = @traces.limit(20)
+ @traces = @traces.includes(:user)
end
def picture
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')
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
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')
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_details
- trace = Trace.find(params[:id])
+ def api_read
+ trace = Trace.visible.find(params[:id])
if trace.public? or 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
+
+ def api_update
+ trace = Trace.visible.find(params[:id])
+
+ if trace.user == @user
+ new_trace = Trace.from_xml(request.raw_post)
+
+ unless new_trace and 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.description = new_trace.description
+ trace.tags = new_trace.tags
+ trace.visibility = new_trace.visibility
+ trace.save!
+
+ render :text => "", :status => :ok
+ else
+ render :text => "", :status => :forbidden
+ end
+ end
+
+ def api_delete
+ trace = Trace.visible.find(params[:id])
+
+ if trace.user == @user
+ trace.visible = false
+ trace.save!
+
+ render :text => "", :status => :ok
+ else
+ render :text => "", :status => :forbidden
end
- rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
end
def api_data
trace = Trace.find(params[:id])
if trace.public? or trace.user == @user
- send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment')
+ 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')
+ else
+ 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
- rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
end
def api_create
- if request.post?
- tags = params[:tags] || ""
- description = params[:description] || ""
- visibility = params[:visibility]
-
- if visibility.nil?
- if params[:public] && params[:public].to_i.nonzero?
- visibility = "public"
- else
- visibility = "private"
- end
+ tags = params[:tags] || ""
+ description = params[:description] || ""
+ visibility = params[:visibility]
+
+ if visibility.nil?
+ if params[:public] && params[:public].to_i.nonzero?
+ visibility = "public"
+ else
+ visibility = "private"
end
+ end
- if params[:file].respond_to?(:read)
- do_create(params[:file], tags, description, visibility)
+ 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"
- elsif @trace.valid?
- render :nothing => true, :status => :internal_server_error
- else
- render :nothing => true, :status => :bad_request
- end
+ if @trace.id
+ render :text => @trace.id.to_s, :content_type => "text/plain"
+ elsif @trace.valid?
+ render :text => "", :status => :internal_server_error
else
- render :nothing => true, :status => :bad_request
+ render :text => "", :status => :bad_request
end
else
- render :nothing => true, :status => :method_not_allowed
+ render :text => "", :status => :bad_request
end
end
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
- })
+ )
Trace.transaction do
begin
end
# Finally save the user's preferred privacy level
- if pref = @user.preferences.find(:first, :conditions => {:k => "gps.trace.visibility"})
+ if pref = @user.preferences.where(:k => "gps.trace.visibility").first
pref.v = visibility
pref.save
else
end
def offline_warning
- flash.now[:warning] = t 'trace.offline_warning.message' if OSM_STATUS == :gpx_offline
+ flash.now[:warning] = t 'trace.offline_warning.message' if STATUS == :gpx_offline
end
def offline_redirect
- redirect_to :action => :offline if OSM_STATUS == :gpx_offline
+ redirect_to :action => :offline if STATUS == :gpx_offline
end
def default_visibility
- visibility = @user.preferences.find(:first, :conditions => {:k => "gps.trace.visibility"})
+ visibility = @user.preferences.where(:k => "gps.trace.visibility").first
if visibility
visibility.v
- elsif @user.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}).nil?
+ elsif @user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil?
"private"
else
"public"
projects / rails.git / blobdiff